8/28 药品数据维护第三方药品

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -81,6 +81,9 @@ public class ThrProductsController {
                 BaseResponse<PageSimpleResponse<ThrProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest);
                 return udiDlDeviceResponse;
             } else {
+                if (filterThrProductsRequest.getProductType() == null){
+                    filterThrProductsRequest.setProductType(1);
+                }
                 List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);
                 PageInfo<ThrProductsResponse> pageInfo;
                 pageInfo = new PageInfo<>(thrCorpEntities);

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -238,4 +238,12 @@ public class ThrProductsEntity {
     @TableField(value = "matrial")
     @ApiModelProperty(value="耗材材质")
     private String matrial;
+
+
+    /**
+     * 产品类别 1:器械 2:药品
+     */
+    @TableField(value = "productType")
+    private Integer productType;
+
 }

src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java

@@ -37,6 +37,11 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private Integer type;
     private Boolean isStack;
 
+    /**
+     * 产品类型 1:器械 2:药品
+     */
+    private Integer productType;
+
     public List<ThrProductsEntity> getThrProductsEntities() {
         return thrProductsEntities;
     }

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

@@ -215,6 +215,14 @@ public class UdiContrastService {
         udiProductEntity.setScbssfbhscrq("是");
         udiProductEntity.setScbssfbhsxrq("是");
         udiProductEntity.setScbssfbhxlh("否");
+
+        udiProductEntity.setProductsType(thrProductsEntity.getProductType());
+        if (thrProductsEntity.getProductType() == 2){
+            udiProductEntity.setRequireScanCode(1);
+            udiProductEntity.setMajorStatus(1);
+        }else {
+            udiProductEntity.setRequireScanCode(0);
+        }
         if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
             udiProductEntity.setPrice(null);
         }

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

@@ -1178,7 +1178,7 @@ public class HeartService {
 
     @Transactional(rollbackFor = Exception.class)
     public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) {
-        Date startTime = new Date();
+         Date startTime = new Date();
         Integer status = StatusEnum.SUCCESS.getCode();
         Object data = dataMethod.apply(this);
         if (data == null) {

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -139,6 +139,9 @@
             <if test="thirdSys != '' and thirdSys != null">
                 AND thirdSysFk = #{thirdSys}
             </if>
+            <if test="productType != '' and productType != null">
+                AND productType = #{productType}
+            </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
@@ -171,7 +174,7 @@
                 (id, code, `name`, measname, spec, registerNo, manufactory,
                  cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
                  thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,
-                 price, createUser, createTime, updateUser, manufactoryCode, supCode, type, prcitmcode,invCode)
+                 price, createUser, createTime, updateUser, manufactoryCode, supCode, type, prcitmcode,invCode,productType)
         values (#{id},
                 #{code},
                 #{name},
@@ -203,7 +206,7 @@
                 #{price},
                 #{createUser},
                 #{createTime},
-                #{updateUser}, #{manufactoryCode}, #{supCode}, #{type}, #{prcitmcode},#{invCode})
+                #{updateUser}, #{manufactoryCode}, #{supCode}, #{type}, #{prcitmcode},#{invCode},#{productType})
     </insert>
 
     <select id="selectByLastTime" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">

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

@@ -4277,6 +4277,12 @@ CALL Pro_Temp_ColumnWork('io_collect_order', 'invAlert',
                          'int NULL DEFAULT b''0'' COMMENT ''库存预警： 1:正常; 2:不足''',
                          1);
 
+
+
+CALL Pro_Temp_ColumnWork('thr_products', 'productType',
+                         ' tinyint NULL DEFAULT b''1'' COMMENT ''产品类型 1:耗材 2:药品''',
+                         1);
+
 CALL Pro_Temp_ColumnWork('io_collect_order', 'orderTime',
                          ' datetime(0) NULL COMMENT ''排序时间''',
                          1);