供应商和基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -342,7 +342,11 @@ public class UdiProductEntity {
      */
     @TableField(value = "xjdw")
     private String xjdw;
-
+    /**
+     * 明细分类
+     */
+    @TableField(value = "detailSort")
+    private Integer detailSort;
     public Integer getMyBhxjsl() {
         if (bhxjsl == null || bhxjsl == 0)
             return 1;

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

@@ -296,5 +296,8 @@ public class AddProductRequest {
      * 使用允许采集的最大层级
      */
     private Integer useMaxLevel;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }

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

@@ -74,6 +74,9 @@ public class SupplementRequest {
     private String prepnUnit;
     private String prepnSpec;
     private String ggxh;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
 }

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

@@ -127,6 +127,10 @@ public class UdiInfoRequest {
     private String prepnSpec;
     private String prepnUnit;
     private String bzgg;
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
 
     public void setCheck(Boolean check) {

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -329,5 +329,9 @@ public class UdiRelevanceResponse {
      */
     @TableField(value = "unpackUseTime")
     private Integer unpackUseTime;
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
 }

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -184,5 +184,8 @@ public class UdiRlSupResponse {
      * 拆包后可用时长(小时)
      */
     private Integer unpackUseTime;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -370,7 +370,7 @@ public class UdiProductServiceImpl implements UdiProductService {
 //                    BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity);
                     BeanUtils.copyProperties(addProductRequest, udiProductEntity);
                     udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
                     udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit());
                     udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                     udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc());
@@ -449,7 +449,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         entity.setPackUnit(request.getPackUnit());
         entity.setSjcpbm(request.getSjcpbm());
         entity.setBhxjcpbm(request.getBhxjcpbm());
-        entity.setBhxjsl(request.getMyBhxjsl());
+        entity.setBhxjsl(request.getBhxjsl());
         entity.setDiType(request.getDiType());
         entity.setXjdw(request.getXjdw());
         entity.setUpdateTime(new Date());

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

@@ -202,7 +202,7 @@
          matrial,
          destinyType,
          productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg,
-         requireScanCode)
+         requireScanCode,detailSort)
         values (#{id}, #{uuid},
                 #{originUuid},
                 #{nameCode},
@@ -276,7 +276,11 @@
                 #{physicType},
                 #{medicareType},
                 #{bzgg},
-                #{requireScanCode})
+                #{requireScanCode},
+                #{detailSort}
+
+
+        )
     </insert>
 
     <insert id="insertUdiInfos" parameterType="java.util.List">
@@ -1227,6 +1231,9 @@
             <if test="price != null">
                 price=#{price},
             </if>
+            <if test="price != null">
+                detailSort=#{detailSort},
+            </if>
         </trim>
         WHERE uuid = #{uuid}
     </update>

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

@@ -493,7 +493,8 @@
                basic_products.workPlaceCount,
                basic_products.bhltcjsl,
                basic_products.bhsycjsl,
-               th.hsmc              hslbName
+               th.hsmc              hslbName,
+                basic_products.detailSort
         FROM basic_products
                  inner JOIN basic_udirel
                             ON basic_products.uuid = basic_udirel.uuid

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

@@ -144,7 +144,8 @@
                basic_products.majorStatus,
                basic_products.physicType,
                basic_products.medicareType,
-               basic_products.indate
+               basic_products.indate,
+               basic_products.detailSort
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id
@@ -168,9 +169,6 @@
             <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,7 +270,6 @@
                 </foreach>
             </if>
         </where>
-        GROUP BY rlId
         ORDER BY company_product_relevance.updateTime DESC
     </select>
 

src/main/resources/schemas/schema_v2.4.sql

@@ -1182,3 +1182,9 @@ CALL Pro_Temp_ColumnWork('third_ali_drug', 'approvalNum',
 
 
 call Modify_index('third_ali_drug', 'approvalNum', 'approvalNum', 'BTREE');
+
+
+CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
+                         '  tinyint DEFAULT NULL COMMENT ''明细分类''',
+                         1);
+