From e8389840135980d7ceb2e4ba7759eead8f185443 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 26 Nov 2024 10:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/service/basic/UdiContrastService.java    | 2 +-
 .../com/glxp/api/service/basic/UdiRelevanceService.java   | 4 ++--
 src/main/resources/mybatis/mapper/basic/UdiProductDao.xml | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

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 b5fe8045d..7644c2f6d 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -340,7 +340,7 @@ public class UdiContrastService {
                                 e.printStackTrace();
                                 Log.error("计算包装级别出错" + thirdAliDrug.getPackLevel() + "---" + integers + "-----" + thirdAliDrug.toString());
                             }
-//                            udiProductEntity.setBhxjsl(integers.get(IntUtil.value(thirdAliDrug.getPackLevel()) - 1));
+
                             udiProductEntity.setNameCode(thirdAliDrug.getNameCode());
                             if (IntUtil.value(thirdAliDrug.getPackLevel()) == 1) {
                                 udiProductEntity.setXjdw(ybDrug.getMinUnit());
diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
index bb8b1bcdf..b134c713a 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
@@ -399,12 +399,12 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
 
     public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) {
         if (udiProductEntity != null) {
-            udiRelevanceEntity.setDistributeLevel(IntUtil.value(udiProductEntity.getPackLevel()));
+            udiRelevanceEntity.setDistributeLevel(1);
 //            udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
 //            udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
 //            udiRelevanceEntity.setDistributeLevelCount(IntUtil.value(udiProductEntity.getBhxjsl()));
 
-            udiRelevanceEntity.setUseLevel(IntUtil.value(udiProductEntity.getPackLevel()));
+            udiRelevanceEntity.setUseLevel(0);
 //            udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
 //            udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
 //            udiRelevanceEntity.setUseLeverCount(IntUtil.value(udiProductEntity.getBhxjsl()));
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 20751ab5a..03887652b 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -195,7 +195,7 @@
          matrial,
          destinyType,
          productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
-         majorStatus, physicType, medicareType, bzgg,
+         majorStatus, physicType, medicareType, bzgg, xjdw,
          requireScanCode, detailSort)
         values (#{id}, #{uuid},
                 #{originUuid},
@@ -269,8 +269,8 @@
                 #{majorStatus},
                 #{physicType},
                 #{medicareType},
-                #{bzgg},
-                #{requireScanCode},#{detailSort})
+                #{bzgg}, #{xjdw},
+                #{requireScanCode}, #{detailSort})
     </insert>
 
     <insert id="insertUdiInfos" parameterType="java.util.List">
@@ -590,7 +590,6 @@
             <if test="detailSort != null">
                 packMatrial=#{packMatrial},
             </if>
-
         </trim>
         WHERE nameCode = #{nameCode}
           and uuid = #{uuid}
@@ -805,7 +804,6 @@
             <if test="detailSort != null">
                 workPlaceCount=#{workPlaceCount},
             </if>
-
         </trim>
         where uuid = #{uuid}
     </update>