diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index 4151ff490..e5a536647 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -160,8 +160,8 @@ public class UdiContrastController {
         udiRelevanceEntity.setSupName(udiCombineRequest.getSupName());
         udiRelevanceEntity.setUpdateUser(customerService.getUserId() + "");
         UdiRelevanceResponse temp = udiContrastService.findById(udiRelevanceEntity.getId());
-        if (temp.getType() == 2){
-            if (udiContrastService.isDrugExit(temp.getOriginUuid(),udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
+        if (temp.getType() == 2) {
+            if (udiContrastService.isDrugExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
             } else {
                 try {
@@ -170,7 +170,7 @@ public class UdiContrastController {
                     return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
                 }
             }
-        }else {
+        } else {
             if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
             } else {
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index ade0d3629..69dfeadb8 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1061,9 +1061,9 @@ public class IoCodeTempController extends BaseController {
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
 
                 if (bussinessTypeEntity.isUse()) {
-                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
                 } else {
-                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
 
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 40468f531..7932c93b5 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -268,8 +268,8 @@ public class UdiProductService {
                     udiProductEntity.setDiType(1);
                 }
                 int i = udiProductDao.updateById(udiProductEntity);
-                if (i == 0){
-                    throw  new JsonException(500,"更新错误");
+                if (i == 0) {
+                    throw new JsonException(500, "更新错误");
                 }
             }
 
@@ -418,16 +418,16 @@ public class UdiProductService {
                         if (nextLevelProduct2 != null && IntUtil.value(nextLevelProduct2.getPackLevel()) > IntUtil.value(curLevel)) {
                             UdiProductEntity nextLevelProduct3 = getNextLevelProduct(nextLevelProduct2, udiProductEntities);
                             if (nextLevelProduct3 != null && IntUtil.value(nextLevelProduct3.getPackLevel()) == IntUtil.value(curLevel)) {
-                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()) );
+                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()));
                             } else {
-                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()) );
+                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()));
                             }
                         } else {
-                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) );
+                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()));
                         }
                     } else {
                         if (nextLevelProduct1 != null && IntUtil.value(nextLevelProduct1.getPackLevel()) == IntUtil.value(curLevel)) {
-                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) );
+                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()));
                         }
                     }
                 } else {
@@ -462,10 +462,10 @@ public class UdiProductService {
 
             List<UdiProductEntity> byUuids = udiProductDao.findByUuids(updateLevelDrugRequest.getUuid());
             UdiProductEntity udiProductEntity1 = null;
-            if (byUuids.size() == 1){
+            if (byUuids.size() == 1) {
                 //只有一条药品数据
-                 udiProductEntity1 = byUuids.get(0);
-                if (udiProductEntity1!= null && udiProductEntity1.getNameCode() == null){
+                udiProductEntity1 = byUuids.get(0);
+                if (udiProductEntity1 != null && udiProductEntity1.getNameCode() == null) {
                     //更新
                     udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
                     udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
@@ -473,35 +473,38 @@ public class UdiProductService {
                     udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                     udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
                     udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                    udiProductDao.updateById(udiProductEntity1);
+
                 }
             }
-             udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
+            udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
             //有药品数据 但是nameCode如果为空的话 院内新增的 更改nameCode
-                if (udiProductEntity1 != null) {
-                    //更新
-                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
-                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
-                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
-                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                    udiProductDao.updateById(udiProductEntity1);
-                } else {
-                    //新增
-                    udiProductEntity1 = udiProductDao.findByUuid(udiRelevanceEntity.getUuid());
-                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
-                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
-                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
-                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                    udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
-                    udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
-                    udiProductDao.insert(udiProductEntity1);
+            if (udiProductEntity1 != null) {
+                //更新
+                udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+            } else {
+                //新增
+                udiProductEntity1 = udiProductDao.findByUuid(udiRelevanceEntity.getUuid());
+                udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
+                udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
+            }
+            if (IntUtil.value(udiProductEntity1.getPackLevel()) == 1) {
+                if (IntUtil.value(udiProductEntity1.getPackLevel()) == 1) {
+                    calculateDistCount(udiProductEntity1, udiRelevanceEntity);
+                    calculateUseCount(udiProductEntity1, udiRelevanceEntity);
                 }
-
-
+            }
+            udiProductDao.updateById(udiProductEntity1);
         } else {
             //必须先提交后才能保存
             UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
@@ -520,6 +523,7 @@ public class UdiProductService {
         findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
         udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
         udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
+        udiRelevanceEntity.setDistributeLevel(IntUtil.value(udiProductEntity.getPackLevel()));
         udiRelevanceEntity.setDistributeLevelCount(xjCountWrapper.getCount());
     }
 
@@ -532,6 +536,7 @@ public class UdiProductService {
         findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
         udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
         udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
+        udiRelevanceEntity.setUseLevel(IntUtil.value(udiProductEntity.getPackLevel()));
         udiRelevanceEntity.setUseLeverCount(xjCountWrapper.getCount());
     }