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

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

@@ -336,7 +336,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

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

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

@@ -27,4 +27,9 @@ public class SupplementRequest {
     private String flbm;
 
     private String requireScanCode;
+
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }

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

@@ -79,6 +79,10 @@ public class UdiInfoRequest {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
     public void setCheck(Boolean check) {
         isCheck = check;

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

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

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

@@ -139,6 +139,9 @@ public class UdiRlSupResponse {
     private String storageCondition;
     private String transportCondition;
     private String productPrice;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
 }

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -406,7 +406,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
 //                    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());
@@ -546,7 +546,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
         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());
     }

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

@@ -589,7 +589,8 @@
         basic_products.majorType,
         basic_products.medicareType,
         basic_products.workPlaceCount,
-        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

@@ -121,7 +121,8 @@
                basic_products.storageCondition,
                basic_products.transportCondition,
                basic_products.majorStatus,
-               basic_products.matrial
+               basic_products.matrial,
+               basic_products.detailSort
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id

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

@@ -4786,4 +4786,8 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'twoLevelCount',
 
 CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount',
                          'int NULL DEFAULT null COMMENT ''三级数量''',
-                         1);
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
+                         '  tinyint DEFAULT NULL COMMENT ''明细分类''',
+                         1);