From bec388063b9d2d4595f5e414025f89666747634b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 15 Apr 2024 16:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8C=BB=E4=BF=9D=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/basic/impl/UdiProductServiceImpl.java |  4 ++--
 .../service/purchase/impl/SupCertRemindMsgImpl.java   |  6 +++---
 .../service/thrsys/impl/ThrProductsAddDiService.java  |  2 +-
 .../mybatis/mapper/basic/UdiRelevanceDao.xml          | 11 +++++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
index 2dbca623..7f9968bf 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
@@ -118,7 +118,7 @@ public class UdiProductServiceImpl implements UdiProductService {
 
         //医保编码解析
         String catalogcode = udiProductEntity.getCatalogcode();
-        if (catalogcode.length() >= 7) {
+        if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
             Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
             Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
             Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@@ -166,7 +166,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         udiProductEntity.setUpdateTime(new Date());
         //医保编码解析
         String catalogcode = udiProductEntity.getCatalogcode();
-        if (catalogcode.length() >= 7) {
+        if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
             Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
             Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
             Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
index d54ae07c..c55f6572 100644
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
@@ -150,13 +150,13 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
         wrapper.eq("status", 0).lt("expireDate", new Date()).eq("type", type);
         switch (type) {
             case 1: //查询供应商ID
-                wrapper.select("CustomerId", "code", "vailDate", "expireDate", "type");
+                wrapper.select("id", "CustomerId", "code", "vailDate", "expireDate", "type");
                 break;
             case 2: //查询生产企业ID
-                wrapper.select("manufacturerIdFk", "code", "vailDate", "expireDate", "type");
+                wrapper.select("id", "manufacturerIdFk", "code", "vailDate", "expireDate", "type");
                 break;
             case 3: //查询产品ID
-                wrapper.select("productIdFk", "code", "vailDate", "expireDate", "type");
+                wrapper.select("id", "productIdFk", "code", "vailDate", "expireDate", "type");
                 break;
             default:
                 break;
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
index d6e53c1d..56e50dc1 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
@@ -140,7 +140,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
             //医保编码解析
             String catalogcode = thrDiProductsRequest.getCatalogcode();
-            if (catalogcode.length() >= 7){
+            if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
                 Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
                 Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
                 Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 2648e868..a331d04e 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -467,10 +467,10 @@
                basic_products.groupBuy,
                basic_products.basicPrductRemak8,
                basic_products.cphhhbh,
-        basic_products.catalogname1,
-        basic_products.catalogname2,
-        basic_products.catalogname3,
-        basic_products.matrial
+               basic_products.catalogname1,
+               basic_products.catalogname2,
+               basic_products.catalogname3,
+               basic_products.matrial
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
@@ -585,6 +585,9 @@
             <if test="groupBuy != null">
                 and basic_udirel.groupBuy = #{groupBuy}
             </if>
+            <if test="purType != null">
+                and basic_udirel.purType = #{purType}
+            </if>
         </where>
         ORDER BY modifyTime DESC
     </select>