医学规则测试

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

@@ -155,13 +155,14 @@ public class RuleConvertFacade {
                     for (String medName : medNameList) {
                         ResultBill resultBill1Ext = new ResultBill();
                         BeanUtil.copyProperties(resultBill, resultBill1Ext);
+                        resultBill1Ext.setBillItemType(GraphLabelEnum.Medicine.getName());
                         resultBill1Ext.setReferenceValue(resultBill1Ext.getBillItemName());
                         resultBill1Ext.setBillItemName(medName);
                         retMedNameList.add(resultBill1Ext);
                     }
                 } else {
                     resultBill.setSuccess(0);
-                    resultBill.setMessage(resultBill.getBillItemName()+"（药品注册名称）找不到对应药品通用名称；");
+                    resultBill.setMessage(resultBill.getBillItemName() + "（药品注册名称）找不到对应药品通用名称；");
                     retMedNameList.add(resultBill);
                 }
             } else {
@@ -200,15 +201,15 @@ public class RuleConvertFacade {
                         billMappingList.add(setMappingShortEntity(resultBill.getBillItemName(), subEntry.getKey(), ""));
                     });
                 }
-            } else if (resultBill.getBillItemType().equals(GraphLabelEnum.MedRegName.getName())) {
-                if (medNameRegNameMap.containsKey(resultBill.getBillItemName())) {
-                    Map<String, Map<String, List<Long>>> subMap = drugConfigMap.get(resultBill.getBillItemName());
-                    if (subMap != null) {
-                        subMap.entrySet().forEach(subEntry -> {
-                            billMappingList.add(setMappingShortEntity(resultBill.getBillItemName(), subEntry.getKey(), ""));
-                        });
-                    }
+            } else if (resultBill.getBillItemType().equals(GraphLabelEnum.Medicine.getName())) {
+                //if (medNameRegNameMap.containsKey(resultBill.getBillItemName())) {
+                Map<String, Map<String, List<Long>>> subMap = drugConfigMap.get(resultBill.getBillItemName());
+                if (subMap != null) {
+                    subMap.entrySet().forEach(subEntry -> {
+                        billMappingList.add(setMappingShortEntity(resultBill.getBillItemName(), subEntry.getKey(), ""));
+                    });
                 }
+                //}
             }
 
             if (ListUtil.isEmpty(billMappingList)) {
@@ -274,10 +275,16 @@ public class RuleConvertFacade {
                             });
                         }
                     });
+                } else {
+                    Map<String, Map<String, List<Long>>> subMap = drugConfigMap.get(resultBill.getConflictItemName());
+                    if (subMap != null) {
+                        subMap.entrySet().forEach(subEntry -> {
+                            conflictMappingList.add(setMappingShortEntity(resultBill.getConflictItemName(), subEntry.getKey(), ""));
+                        });
+                    }
                 }
             }
 
-
             if (ListUtil.isEmpty(conflictMappingList)) {
                 if (resultBill.getConflictItemType().equals(GraphLabelEnum.MedAllergen.getName())
                         || resultBill.getConflictItemType().equals(GraphLabelEnum.OralMedicine.getName())
@@ -496,10 +503,10 @@ public class RuleConvertFacade {
                     }
                 });
             } else {
-                result.setSuccess(0);
-                result.setMessage(result.getMessage() + result.getCriticalItemName() + "缺少医院端映射；");
                 ResultCritical resultExt = new ResultCritical();
                 BeanUtil.copyProperties(result, resultExt);
+                resultExt.setSuccess(0);
+                resultExt.setMessage(resultExt.getMessage() + resultExt.getCriticalItemName() + "缺少医院端映射；");
                 resultMappingList.add(resultExt);
             }
         }
@@ -551,11 +558,11 @@ public class RuleConvertFacade {
                     resultMappingList.add(resultExt);
                 });
             } else {
-                result.setSuccess(0);
-                result.setMessage(result.getMessage() + result.getCriticalItemName() + "缺少医院端映射；");
                 ResultCritical resultExt = new ResultCritical();
                 BeanUtil.copyProperties(result, resultExt);
-                resultMappingList.add(result);
+                resultExt.setSuccess(0);
+                resultExt.setMessage(resultExt.getMessage() + resultExt.getCriticalItemName() + "缺少医院端映射；");
+                resultMappingList.add(resultExt);
             }
         }
 
@@ -629,10 +636,10 @@ public class RuleConvertFacade {
                     }
                 });
             } else {
-                result.setSuccess(0);
-                result.setMessage(result.getMessage() + result.getHighriskItemName() + "缺少医院端映射；");
                 ResultHighriskDrug resultExt = new ResultHighriskDrug();
                 BeanUtil.copyProperties(result, resultExt);
+                resultExt.setSuccess(0);
+                resultExt.setMessage(resultExt.getMessage() + resultExt.getHighriskItemName() + "缺少医院端映射；");
                 retMappingList.add(resultExt);
             }
         }
@@ -942,10 +949,10 @@ public class RuleConvertFacade {
                     retMappingList.add(resultExt);
                 });
             } else {
-                result.setSuccess(0);
-                result.setMessage(result.getMessage() + result.getHighriskItemName() + "缺少医院端映射；");
                 ResultHighriskOperation resultExt = new ResultHighriskOperation();
                 BeanUtil.copyProperties(result, resultExt);
+                resultExt.setSuccess(0);
+                resultExt.setMessage(resultExt.getMessage() + resultExt.getHighriskItemName() + "缺少医院端映射；");
                 retMappingList.add(resultExt);
             }
         }
@@ -966,10 +973,10 @@ public class RuleConvertFacade {
                         retFactorMappingList.add(resultExt);
                     });
                 } else {
-                    result.setSuccess(0);
-                    result.setMessage(result.getMessage() + result.getFactorItemName() + "缺少医院端映射；");
                     ResultHighriskOperation resultExt = new ResultHighriskOperation();
                     BeanUtil.copyProperties(result, resultExt);
+                    resultExt.setSuccess(0);
+                    resultExt.setMessage(resultExt.getMessage() + resultExt.getFactorItemName() + "缺少医院端映射；");
                     retFactorMappingList.add(resultExt);
                 }
             } else if (result.getFactorItemType().equals(TypeEnum.lis.getName())) {
@@ -989,10 +996,10 @@ public class RuleConvertFacade {
                         }
                     });
                 } else {
-                    result.setSuccess(0);
-                    result.setMessage(result.getMessage() + result.getFactorItemName() + "缺少医院端映射；");
                     ResultHighriskOperation resultExt = new ResultHighriskOperation();
                     BeanUtil.copyProperties(result, resultExt);
+                    resultExt.setSuccess(0);
+                    resultExt.setMessage(resultExt.getMessage() + resultExt.getFactorItemName() + "缺少医院端映射；");
                     retFactorMappingList.add(resultExt);
                 }
             } else {
@@ -1057,17 +1064,17 @@ public class RuleConvertFacade {
                                     retOtherList.add(resultExt);
                                 });
                             } else {
-                                result.setSuccess(0);
-                                result.setMessage(result.getMessage() + result.getRemindItemName() + "缺少医院端映射；");
                                 ResultOtherLis resultExt = new ResultOtherLis();
                                 BeanUtil.copyProperties(result, resultExt);
+                                resultExt.setSuccess(0);
+                                resultExt.setMessage(resultExt.getMessage() + resultExt.getRemindItemName() + "缺少医院端映射；");
                                 retOtherList.add(resultExt);
                             }
                         } else {
-                            result.setSuccess(0);
-                            result.setMessage(result.getMessage() + result.getRemindItemName() + "缺少医院端映射；");
                             ResultOtherLis resultExt = new ResultOtherLis();
                             BeanUtil.copyProperties(result, resultExt);
+                            resultExt.setSuccess(0);
+                            resultExt.setMessage(resultExt.getMessage() + resultExt.getRemindItemName() + "缺少医院端映射；");
                             retOtherList.add(resultExt);
                         }
                     }
@@ -1105,17 +1112,17 @@ public class RuleConvertFacade {
                                     retOtherList.add(resultExt);
                                 });
                             } else {
-                                result.setSuccess(0);
-                                result.setMessage(result.getMessage() + result.getRemindItemName() + "缺少医院端映射；");
                                 ResultOtherLis resultExt = new ResultOtherLis();
                                 BeanUtil.copyProperties(result, resultExt);
+                                resultExt.setSuccess(0);
+                                resultExt.setMessage(resultExt.getMessage() + resultExt.getRemindItemName() + "缺少医院端映射；");
                                 retOtherList.add(resultExt);
                             }
                         } else {
-                            result.setSuccess(0);
-                            result.setMessage(result.getMessage() + result.getRemindItemName() + "缺少医院端映射；");
                             ResultOtherLis resultExt = new ResultOtherLis();
                             BeanUtil.copyProperties(result, resultExt);
+                            resultExt.setSuccess(0);
+                            resultExt.setMessage(resultExt.getMessage() + resultExt.getRemindItemName() + "缺少医院端映射；");
                             retOtherList.add(resultExt);
                         }
                     }
@@ -1310,17 +1317,17 @@ public class RuleConvertFacade {
                                 retOtherList.add(resultExt);
                             });
                         } else {
-                            result.setMessage(result.getMessage() + result.getConflictItemName() + "缺少医院端映射；");
-                            result.setSuccess(0);
                             ResultOtherTransfusion resultExt = new ResultOtherTransfusion();
                             BeanUtil.copyProperties(result, resultExt);
+                            resultExt.setSuccess(0);
+                            resultExt.setMessage(resultExt.getMessage() + resultExt.getConflictItemName() + "缺少医院端映射；");
                             retOtherList.add(resultExt);
                         }
                     } else {
-                        result.setMessage(result.getMessage() + "缺少禁忌项；");
-                        result.setSuccess(0);
                         ResultOtherTransfusion resultExt = new ResultOtherTransfusion();
                         BeanUtil.copyProperties(result, resultExt);
+                        resultExt.setSuccess(0);
+                        resultExt.setMessage(resultExt.getMessage() + "缺少禁忌项；");
                         retOtherList.add(resultExt);
                     }
                 });
@@ -1343,17 +1350,17 @@ public class RuleConvertFacade {
                                 retOtherList.add(resultExt);
                             });
                         } else {
-                            result.setMessage(result.getMessage() + result.getConflictItemName() + "缺少医院端映射；");
-                            result.setSuccess(0);
                             ResultOtherTransfusion resultExt = new ResultOtherTransfusion();
                             BeanUtil.copyProperties(result, resultExt);
+                            resultExt.setSuccess(0);
+                            resultExt.setMessage(resultExt.getMessage() + resultExt.getConflictItemName() + "缺少医院端映射；");
                             retOtherList.add(resultExt);
                         }
                     } else {
-                        result.setMessage(result.getMessage() + "缺少禁忌项；");
-                        result.setSuccess(0);
                         ResultOtherTransfusion resultExt = new ResultOtherTransfusion();
                         BeanUtil.copyProperties(result, resultExt);
+                        resultExt.setSuccess(0);
+                        resultExt.setMessage(resultExt.getMessage() + "缺少禁忌项；");
                         retOtherList.add(resultExt);
                     }
                 });
@@ -1382,8 +1389,8 @@ public class RuleConvertFacade {
                     }
                 });
             } else {
-                result.setMessage(result.getMessage() + result.getOtherItemName() + "缺少医院端映射；");
                 result.setSuccess(0);
+                result.setMessage(result.getMessage() + result.getOtherItemName() + "缺少医院端映射；");
                 retMappingList.add(result);
             }
         }

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

@@ -62,7 +62,7 @@ public class SearchDataFacade {
             operation.setUniqueName(resultBill.getBillItemName());
             indicationPushVO.getOperationOrder().add(operation);
         }
-        if (resultBill.getBillItemType().equals(GraphLabelEnum.MedRegName.getName())) {
+        if (resultBill.getBillItemType().equals(GraphLabelEnum.Medicine.getName())) {
             Drug drug = new Drug();
             drug.setName(resultBill.getBillItemHisName());
             drug.setUniqueName(resultBill.getBillItemName());