医学规则测试

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

@@ -328,11 +328,11 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //重复数据过滤
-        pacsConfigList = pacsConfigList
+        /*pacsConfigList = pacsConfigList
                 .stream()
                 .distinct()
                 .collect(Collectors.toList());
-
+*/
         // 已存在数据
         Map<String, Map<String, List<Long>>> hisConfigMap = pacsConfigFacade.getConfigMap(Long.valueOf(hospitalId), null, null);
         //术语映射
@@ -505,10 +505,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //重复数据过滤
-        drugConfigList = drugConfigList
+        /*drugConfigList = drugConfigList
                 .stream()
                 .distinct()
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
 
         // 已存在数据
         Map<String, Map<String, Long>> hisConfigMap = drugConfigFacade.getConfigMapWithoutForm(Long.valueOf(hospitalId), null, null);
@@ -651,10 +651,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //重复数据过滤
-        diseaseConfigList = diseaseConfigList
+        /*diseaseConfigList = diseaseConfigList
                 .stream()
                 .distinct()
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
 
         // 已存在数据
         Map<String, Map<String, List<Long>>> hisConfigMap = diseaseConfigFacade.getConfigMap(Long.valueOf(hospitalId), null, null);
@@ -797,10 +797,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //重复数据过滤
-        operationConfigList = operationConfigList
+        /*operationConfigList = operationConfigList
                 .stream()
                 .distinct()
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
 
         // 已存在数据
         Map<String, Map<String, List<Long>>> hisConfigMap = operationConfigFacade.getConfigMap(Long.valueOf(hospitalId), null, null);

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

@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -358,11 +359,7 @@ public class RuleTestFacade {
             List<String> names = otherPacsMap.get("disease");
             if (ListUtil.isNotEmpty(names)) {
                 names.forEach(name -> {
-                    diseaseConfigMap.keySet().forEach(uniqueName -> {
-                        if (uniqueName.contains(name)) {
-                            diseaseNames.add(uniqueName);
-                        }
-                    });
+                    diseaseNames.addAll(diseaseConfigMap.keySet().stream().filter(i -> i.contains(name)).collect(Collectors.toList()));
                 });
             }
             //diseaseNames.addAll(otherPacsMap.get("disease"));