From 8a674aca2e9d92d4ab336d66b19b5d577888a548 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 19 Nov 2024 09:12:39 +0800
Subject: [PATCH] =?UTF-8?q?11/19=20=E4=BE=9B=E5=BA=94=E5=95=86=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E9=80=89=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/thrsys/ThrProductsAddDiController.java    | 4 ++++
 .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java    | 1 +
 .../api/service/thrsys/impl/ThrProductsAddDiService.java     | 5 ++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index e7875f29..02b8163d 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -237,6 +237,10 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setCatalogname3(thrProductsAddDiEntity.getCatalogname3());
                     udiProductEntity.setMatrial(thrProductsAddDiEntity.getMatrial());
                     udiProductEntity.setDiType(1);
+                    if (thrProductsAddDiEntity.getProductsType() != null){
+                        udiProductEntity.setProductsType(thrProductsAddDiEntity.getProductsType());
+                    }
+
 
                     BeanUtil.copyProperties(udiProductEntity, udiRelevanceEntity);
                     udiRelevanceEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy());
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 5ca28c63..70f75dcb 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -245,6 +245,7 @@ public class UdiRelevanceResponse {
     private Integer useLeverCount;
     private String payFeeCode;
 
+
     /**
      * 当前层级包含流通层级使用数量
      */
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 e25124f6..492959d8 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
@@ -157,10 +157,9 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
                 thrProductsAddDiEntity.setProductsType(thrDiProductsRequest.getProductsType());
             }
 
-            //医保编码解析
-            String catalogcode = thrDiProductsRequest.getCatalogcode();
-
             try {
+                //医保编码解析
+                String catalogcode = thrDiProductsRequest.getCatalogcode();
                 if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
                     Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
                     Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));