医学规则测试

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

@@ -1138,15 +1138,23 @@ public class RuleConvertFacade {
             if (StringUtil.isNotBlank(item.getDisease())) {
                 result.setRemindItemType(GraphLabelEnum.YiBaoDiseaseName.getName());
                 result.setRemindItemName(item.getDisease());
-                Map<String, List<Long>> subMap = diseaseConfigMap.get(item.getDisease());
-                if (subMap != null && subMap.size() > 0) {
-                    subMap.keySet().forEach(hisName -> {
-                        ResultOtherPacs resultExt = new ResultOtherPacs();
-                        BeanUtil.copyProperties(result, resultExt);
-                        resultExt.setRemindItemHisName(hisName);
-                        retOtherList.add(resultExt);
-                    });
-                } else {
+                Boolean contains = false;
+                for (Map.Entry<String, Map<String, List<Long>>> entry : diseaseConfigMap.entrySet()) {
+                    if (entry.getKey().contains(item.getDisease())) {
+                        Map<String, List<Long>> subMap = entry.getValue();
+                        if (subMap != null && subMap.size() > 0) {
+                            contains = true;
+                            subMap.keySet().forEach(hisName -> {
+                                ResultOtherPacs resultExt = new ResultOtherPacs();
+                                BeanUtil.copyProperties(result, resultExt);
+                                resultExt.setRemindItemName(entry.getKey());
+                                resultExt.setRemindItemHisName(hisName);
+                                retOtherList.add(resultExt);
+                            });
+                        }
+                    }
+                }
+                if (!contains) {
                     result.setSuccess(0);
                     result.setMessage(result.getMessage() + "诊断缺少医院端映射；");
                     retOtherList.add(result);