8/8 药品搜索字段以及插入字段维护

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

@@ -340,6 +340,13 @@ public class BasicProductsEntity {
     @TableField(value = "`createUser`")
     private String createUser;
 
+
+    /**
+     * 包装规格
+     */
+    @TableField(value = "bzgg")
+    private String bzgg;
+
     /**
      * 更新人
      */
@@ -349,8 +356,8 @@ public class BasicProductsEntity {
     @TableField(value = "remark")
     private String remark;
 
-    @TableField(value = "pinyinInitial")
+    @TableField(value = "cphhhbh")
-    private String pinyinInitial;
+    private String cphhhbh;
 
     /**
      * 一级分类名称(学科，品名）
@@ -374,23 +381,41 @@ public class BasicProductsEntity {
     private String catalogname3;
 
     /**
-     * 耗材材质
+     * 一级分类名称(学科，品名）
      */
-    @TableField(value = "matrial")
+    @TableField(value = "catalogcode1")
-    @ApiModelProperty(value="耗材材质")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
-    private String matrial;
+    private Integer catalogcode1;
-
 
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogcode2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private Integer catalogcode2;
 
     /**
-     * 包装规格
+     * 三级分类名称(部位、功能、品种）
      */
-    @TableField(value = "bzgg")
+    @TableField(value = "catalogcode3")
-    private String bzgg;
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private Integer catalogcode3;
 
+    /**
+     * 是否扫码
+     */
     @TableField(value = "requireScanCode")
     private Integer requireScanCode;
 
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
+
+
 
     /**
      * 产品类型 1:药品 2:耗材
@@ -474,6 +499,13 @@ public class BasicProductsEntity {
     private Integer medicareType;
 
 
+    @TableField(value = "pinyinInitial")
+    private String pinyinInitial;
+
+
+    @TableField(value = "majorStatus")
+    private String majorStatus;
+
 
 
 
@@ -591,6 +623,5 @@ public class BasicProductsEntity {
     public static final String COL_UPDATEUSER = "updateUser";
 
     public static final String COL_REMARK = "remark";
-
     public static final String COL_BZGG= "bzgg";
 }

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

@@ -276,6 +276,7 @@ public class AddProductRequest {
      * 收费编码
      */
     private String payFeeCode;
+    private String packUnit;
 
 
 }

src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java

@@ -42,7 +42,7 @@ public class FilterReceiveRequest extends ListPageRequest {
     private String createUser;
 
     private Boolean sysApprovalFlow;
-    private Integer productType;
+    private Integer productType = 1;
 
 
 }

src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java

@@ -120,6 +120,6 @@ public class PurApplyRequest extends ListPageRequest {
     /**
      * 产品类型 1.器械 2.药品
      */
-    private Integer productType;
+    private Integer productType = 1;
 
 }

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

@@ -121,4 +121,10 @@ public class UdiRlSupResponse {
     private String matrial;
 
     private Integer requireScanCode;
+
+
+    private String bzgg;
+    private String prepnUnit;
+    private String prepnSpec;
+
 }

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

@@ -297,8 +297,14 @@ public class UdiProductService {
                         throw new JsonException(500, "层级编码已存在！");
                     }
                     UdiProductEntity udiProductEntity = new UdiProductEntity();
-                    BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity);
+//                    BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity);
+                    BeanUtils.copyProperties(addProductRequest, udiProductEntity);
+                    udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode());
+                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
+                    udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                    udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                     udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc());
+                    udiProductEntity.setPackLevel(String.valueOf(updateLevelDrugRequest.getPackLevel()));
                     udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
                     udiProductEntity.setProductsType(2);
                     udiProductEntity.setGgxh(addProductRequest.getSpec());

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1707,7 +1707,6 @@ public class HeartService {
         Integer code = obj.getInt("code");
         if (!code.equals(20000)) {
             log.error("从UDI自助平台拉取数据错误，报文-----{}", data);
-            log.error("打印出来{}",exportType);
             return;
         }
         //数据内容
@@ -1941,18 +1940,14 @@ public class HeartService {
      */
     @Transactional(propagation = Propagation.NESTED)
     public void insertDeviceInfoData(String content) {
-        log.error("这个是什么{}",content);
         cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
         List<DeviceInfoEntity> deviceInfoEntities = JSONUtil.toList(jsonObject.getJSONArray(DeviceInfoEntity.class.getSimpleName()), DeviceInfoEntity.class);
-        log.error("shebei jichu 数据 到底是什么{}",deviceInfoEntities);
         if (CollectionUtil.isNotEmpty(deviceInfoEntities)) {
             for (DeviceInfoEntity deviceInfoEntity : deviceInfoEntities) {
                 deviceInfoEntity.setUpdateTime(null);
             }
-            log.error("hahahhahhahahah woyao fengle{}",deviceInfoEntities);
             boolean b = deviceInfoMapper.replaceBatchs(deviceInfoEntities);
             if (b == false){
-                log.error("差距自己找，头像右上角");
             }
         }
         List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);

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

@@ -109,6 +109,9 @@
                basic_products.catalogname2,
                basic_products.catalogname3,
                basic_products.requireScanCode,
+               basic_products.bzgg,
+               basic_products.prepnUnit,
+               basic_products.prepnSpec,
                basic_products.matrial
         FROM company_product_relevance
                      inner JOIN basic_udirel

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

@@ -4123,3 +4123,5 @@ CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagStatus',
 CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagMsg',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''处方赋码错误信息''',
                          1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'cphhhbh', 'varchar(255)', 1);