医学规则测试

cdssman-service/src/main/java/com/diagbot/facade/ResultStaticKnowledgeFacade.java

@@ -134,6 +134,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
             }
         }
 
+        Integer totleNum = 0;
+        if (ListUtil.isNotEmpty(lisConfigList)) {
+            totleNum = lisConfigList.size();
+        } else {
+            lisConfigList = Lists.newLinkedList();
+        }
+
         //数据预处理
         for (int i = 0; i < lisConfigList.size(); i++) {
             if (StringUtil.isNotBlank(lisConfigList.get(i).getHisName())) {
@@ -278,7 +285,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //保存
-        saveResult(saveList, testVO);
+        saveResult(saveList, testVO, totleNum);
         return true;
     }
 
@@ -320,6 +327,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
             }
         }
 
+        Integer totleNum = 0;
+        if (ListUtil.isNotEmpty(pacsConfigList)) {
+            totleNum = pacsConfigList.size();
+        } else {
+            pacsConfigList = Lists.newLinkedList();
+        }
+
         //数据预处理
         for (PacsConfig config : pacsConfigList) {
             if (StringUtil.isNotBlank(config.getHisName())) {
@@ -455,7 +469,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //保存
-        saveResult(saveList, testVO);
+        saveResult(saveList, testVO, totleNum);
         return true;
     }
 
@@ -497,6 +511,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
             }
         }
 
+        Integer totleNum = 0;
+        if (ListUtil.isNotEmpty(drugConfigList)) {
+            totleNum = drugConfigList.size();
+        } else {
+            drugConfigList = Lists.newLinkedList();
+        }
+
         //数据预处理
         for (DrugConfig config : drugConfigList) {
             if (StringUtil.isNotBlank(config.getHisName())) {
@@ -529,7 +550,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
             if (hisConfigMap.containsKey(result.getHisName())) {
                 Map<String, Long> subMap = hisConfigMap.get(result.getHisName());
-                if (subMap != null && subMap.size() > 0) {
+                if (subMap != null && subMap.size() > 1) {
                     for (String subKey : subMap.keySet()) {
                         ResultStaticKnowledge subResult = new ResultStaticKnowledge();
                         BeanUtil.copyProperties(result, subResult);
@@ -601,7 +622,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //保存
-        saveResult(saveList, testVO);
+        saveResult(saveList, testVO, totleNum);
         return true;
     }
 
@@ -643,6 +664,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
             }
         }
 
+        Integer totleNum = 0;
+        if (ListUtil.isNotEmpty(diseaseConfigList)) {
+            totleNum = diseaseConfigList.size();
+        } else {
+            diseaseConfigList = Lists.newLinkedList();
+        }
+
         //数据预处理
         for (DiseaseConfig config : diseaseConfigList) {
             if (StringUtil.isNotBlank(config.getHisName())) {
@@ -747,7 +775,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //保存
-        saveResult(saveList, testVO);
+        saveResult(saveList, testVO, totleNum);
         return true;
     }
 
@@ -789,6 +817,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
             }
         }
 
+        Integer totleNum = 0;
+        if (ListUtil.isNotEmpty(operationConfigList)) {
+            totleNum = operationConfigList.size();
+        } else {
+            operationConfigList = Lists.newLinkedList();
+        }
+
         //数据预处理
         for (OperationConfig config : operationConfigList) {
             if (StringUtil.isNotBlank(config.getHisName())) {
@@ -893,7 +928,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //保存
-        saveResult(saveList, testVO);
+        saveResult(saveList, testVO, totleNum);
         return true;
     }
 
@@ -905,9 +940,8 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
      * @return
      */
     @Transactional
-    public Boolean saveResult(List<ResultStaticKnowledge> list, StaticKnowledgeTestVO testVO) {
+    public Boolean saveResult(List<ResultStaticKnowledge> list, StaticKnowledgeTestVO testVO, Integer totleNum) {
         Date now = new Date();
-        Integer totleNum = list.size();
         Integer unMappingNum = list.stream().filter(i -> i.getHasStandName() != null && i.getHasStandName().equals(0)).collect(Collectors.toList()).size();
         Integer withoutKnowledgeNum = list.stream().filter(i -> i.getHasStaticKnowledge() != null && i.getHasStaticKnowledge().equals(0)).collect(Collectors.toList()).size();
         QueryWrapper<ResultStaticInfo> resultStaticInfoQueryWrapper = new QueryWrapper<>();