11/12 供应商选入药品增加查询条件 包装规格 制剂规格

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -97,4 +97,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Integer codeCheck;
 
     private Integer productType;
+    private String bzgg;
 }

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -118,6 +118,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String cpms;
     private Integer productsType = 1;//默认是耗材
     private Integer productType;
+    private String bzgg;
+    private String prepnSpec;
 
     /**
      * 收费项目编码

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -627,6 +627,12 @@
             <if test="cpms != null and cpms != ''">
                 AND basic_products.cpms LIKE concat(#{cpms}, '%')
             </if>
+            <if test="bzgg != null and bzgg != ''">
+                AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+            </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND basic_products.prepnSpec LIKE concat('%', #{prepnSpec}, '%')
+            </if>
             <if test="dispatch != null">
                 and basic_udirel.dispatch = #{dispatch}
             </if>

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -48,7 +48,6 @@
                basic_udirel.isAdavence,
                basic_udirel.purType,
                basic_udirel.attributeType,
-               basic_udirel.hcType,
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,
@@ -126,7 +125,6 @@
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
                basic_products.categoryName,
-               basic_products.cphhhbh,
                basic_products.requireScanCode,
                basic_udirel.hcType,
                basic_udirel.groupBuy,
@@ -137,7 +135,6 @@
                basic_products.catalogname3,
                basic_products.matrial,
                basic_products.bzgg,
-               basic_products.packUnit,
                basic_products.prepnSpec,
                basic_products.prepnUnit,
                basic_products.packMatrial,
@@ -171,6 +168,9 @@
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
+            <if test="bzgg != '' and bzgg != null">
+                AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+            </if>
             <if test="purType != '' and purType != null">
                 AND basic_udirel.purType = #{purType}
             </if>
@@ -272,6 +272,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY rlId
         ORDER BY company_product_relevance.updateTime DESC
     </select>