Merge remote-tracking branch 'origin/dev/ruleTest20210105' into test

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

@@ -29,6 +29,7 @@ import com.diagbot.repository.TransfusionRemindRepository;
 import com.diagbot.repository.TransfusionSuggestRepository;
 import com.diagbot.repository.YiBaoOperationNameRepository;
 import com.diagbot.util.ExcelUtils;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.BillRuleVO;
 import com.diagbot.vo.CriticalRuleVO;
 import com.diagbot.vo.HighriskRuleVO;
@@ -43,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:
@@ -297,6 +299,9 @@ public class RuleTestFacade {
         //输血其他值提醒
         List<TransfusionSuggest> otherRule_transfusion = transfusionSuggestRepository.findByStatus(StatusEnum.Enable.getKey());
 
+        //诊断映射关系
+        Map<String, Map<String, List<Long>>> diseaseConfigMap = diseaseConfigFacade.getUniqueConfigMap(hospitalId, null, null);
+
         Map<String, List<String>> billMap = unUsedMappingFacade.billUsedNames(billRules);
         Map<String, List<String>> billTransfusionMap = unUsedMappingFacade.billTransfusionUsedNames(billRules_transfusion);
         Map<String, List<String>> criticalLisMap = unUsedMappingFacade.criticalLisUsedNames(criticalRules_lis);
@@ -351,7 +356,13 @@ public class RuleTestFacade {
             diseaseNames.addAll(otherLisMap.get("disease"));
         }
         if (otherPacsMap.containsKey("disease")) {
-            diseaseNames.addAll(otherPacsMap.get("disease"));
+            List<String> names = otherPacsMap.get("disease");
+            if (ListUtil.isNotEmpty(names)) {
+                names.forEach(name -> {
+                    diseaseNames.addAll(diseaseConfigMap.keySet().stream().filter(i -> i.contains(name)).collect(Collectors.toList()));
+                });
+            }
+            //diseaseNames.addAll(otherPacsMap.get("disease"));
         }
         if (otherTransfusionMap.containsKey("disease")) {
             diseaseNames.addAll(otherTransfusionMap.get("disease"));