医学规则测试

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;
@@ -297,6 +298,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 +355,17 @@ 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 -> {
+                    diseaseConfigMap.keySet().forEach(uniqueName -> {
+                        if (uniqueName.contains(name)) {
+                            diseaseNames.add(uniqueName);
+                        }
+                    });
+                });
+            }
+            //diseaseNames.addAll(otherPacsMap.get("disease"));
         }
         if (otherTransfusionMap.containsKey("disease")) {
             diseaseNames.addAll(otherTransfusionMap.get("disease"));