层级数量换算

src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java

@@ -113,8 +113,6 @@ public class IoSplitFifoController extends BaseController {
         return ResultVOUtils.success(invRemind);
     }
 
-    @Resource
-    SysWorkplaceQueueService sysWorkplaceQueueService;
 
     /**
      * 自动发药机上药

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -524,8 +524,8 @@ public class UdiContrastService {
                 udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
                 udiProductService.insertUdiInfo(udiProductEntity);
                 udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
-
                 udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+                udiProductService.updateLevelCount(udiRelevanceEntity);
             }
         } else {
             //没有医保编码

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -464,10 +464,10 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
                 int bhltsl = 1;
                 if (IntUtil.value(udiProductEntity.getPackLevel()) > curLevel) {
-                    bhltsl = udiProductEntity.getBhxjsl();
+                    bhltsl = IntUtil.value(udiProductEntity.getBhxjsl(), 1);
                     for (DiLevelResponse diLevelResponse : diLevelResponses) {
                         if (IntUtil.value(udiProductEntity.getPackLevel()) > diLevelResponse.getPackLevel() && IntUtil.value(diLevelResponse.getPackLevel()) > curLevel) {
-                            bhltsl = bhltsl * diLevelResponse.getBhxjsl();
+                            bhltsl = bhltsl * IntUtil.value(diLevelResponse.getBhxjsl(), 1);
                         }
                     }
                 }
@@ -480,14 +480,15 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
                 int bhltsl = 1;
                 if (IntUtil.value(udiProductEntity.getPackLevel()) > curLevel) {
-                    bhltsl = udiProductEntity.getBhxjsl();
+                    bhltsl = IntUtil.value(udiProductEntity.getBhxjsl(), 1);
                     for (DiLevelResponse diLevelResponse : diLevelResponses) {
                         if (IntUtil.value(udiProductEntity.getPackLevel()) > diLevelResponse.getPackLevel() && IntUtil.value(diLevelResponse.getPackLevel()) > curLevel) {
-                            bhltsl = bhltsl * diLevelResponse.getBhxjsl();
+                            bhltsl = bhltsl * IntUtil.value(diLevelResponse.getBhxjsl(), 1);
                         }
                     }
                 }
                 udiProductEntity.setBhsycjsl(bhltsl);
+                udiProductEntity.setUpdateTime(new Date());
             }
         }
 

src/main/java/com/glxp/api/util/IntUtil.java

@@ -42,4 +42,18 @@ public class IntUtil {
 
     }
 
+
+    public static int value(Integer value, int defaultValue) {
+        if (value != null && value != 0)
+            return value;
+        else return defaultValue;
+    }
+
+    public static int value(String value, int defaultValue) {
+        if (StrUtil.isEmpty(value) || "0".equals(value))
+            return defaultValue;
+        else return Integer.parseInt(value);
+
+    }
+
 }