From 036048bdddc272e7160d044b83ca14c1b4fce28d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 14 Oct 2024 20:44:43 +0800
Subject: [PATCH] 10/14   yaopin

---
 .../basic/UdiRelevanceController.java         |  1 +
 .../api/entity/basic/UdiRelevanceEntity.java  | 58 +++++++++----------
 .../api/service/basic/UdiContrastService.java |  2 +-
 .../api/service/thrsys/YbDrugService.java     |  2 +-
 .../mybatis/mapper/thrsys/ThrProductsDao.xml  |  3 +
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 35c41c96..990d488b 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -127,6 +127,7 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
+
     //基础信息-耗材字典-查询页面、业务单据-选入耗材字典-查询页面
     @AuthRuleAnnotation("")
     @GetMapping("/udi/udirel/filterUdi")
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index dbe5db06..0e67ccc3 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -213,18 +213,18 @@ public class UdiRelevanceEntity {
     private Boolean newNeedUpload;
 
 
-//    /**
-//     * 流通计量层层级标识
-//     */
-//    @TableField(value = "distributeLevelDi")
-//    private String distributeLevelDi;
-//
-//    /**
-//     * 流通计量层级单位
-//     */
-//    @TableField(value = "distributeLevelUnit")
-//    private String distributeLevelUnit;
-//
+    /**
+     * 流通计量层层级标识
+     */
+    @TableField(value = "distributeLevelDi")
+    private String distributeLevelDi;
+
+    /**
+     * 流通计量层级单位
+     */
+    @TableField(value = "distributeLevelUnit")
+    private String distributeLevelUnit;
+
     /**
      * 流通时最小包装层级包含计量单元的数量
      */
@@ -238,23 +238,23 @@ public class UdiRelevanceEntity {
     private Integer distributeLevel;
 
 
-//    /**
-//     * 使用计量层级标识
-//     */
-//    @TableField(value = "useLevelDi")
-//    private String useLevelDi;
-//
-//    /**
-//     * 使用计量层级单位
-//     */
-//    @TableField(value = "useLevelUnit")
-//    private String useLevelUnit;
-//
-//    /**
-//     * 使用是当前层级包含计量单元数量
-//     */
-//    @TableField(value = "useLeverCount")
-//    private Integer useLeverCount;
+    /**
+     * 使用计量层级标识
+     */
+    @TableField(value = "useLevelDi")
+    private String useLevelDi;
+
+    /**
+     * 使用计量层级单位
+     */
+    @TableField(value = "useLevelUnit")
+    private String useLevelUnit;
+
+    /**
+     * 使用是当前层级包含计量单元数量
+     */
+    @TableField(value = "useLeverCount")
+    private Integer useLeverCount;
 
 
     /**
diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index 0e9d01fd..aa4fc68b 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -236,7 +236,7 @@ public class UdiContrastService {
                 UdiProductEntity udiProductEntity = new UdiProductEntity();
                 BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
                 udiProductEntity.setId(IdUtil.getSnowflakeNextId());
-                if (list.size() > 0) {
+                if (list != null && list.size() > 0){
                     YbDrug ybDrug = list.get(0);
 //                    udiProductEntity.setNameCode(thrProductsEntity.getCode());
                     udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook());
diff --git a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
index 19544d74..b6792f2e 100644
--- a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
@@ -28,7 +28,7 @@ public class YbDrugService {
             BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest);
             PageSimpleResponse<YbDrug> data = ybDrugDetail.getData();
             List<YbDrug> list1 = data.getList();
-            ybDrugMapper.batchSaveOrUpdateByGoodsCode(list1);
+            if (CollUtil.isNotEmpty(list1)) ybDrugMapper.batchSaveOrUpdateByGoodsCode(list1);
             return list1;
         }
         return list;
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index 3f29b0b3..592474af 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -136,6 +136,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>