自动化测试

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

@@ -523,19 +523,16 @@ public class MedRuleConvertFacade {
                                 + "过敏",
                         "禁忌" + resultBill.getConflictItemType(),
                         orderType);
-            } else if (resultBill.getConflictItemTypeCode().equals(LexiconEnum.Group.getName())) {
+            } else if (resultBill.getConflictItemTypeCode().equals(LexiconEnum.Group.getKey())) {
                 //禁忌禁忌人群
                 billMsg = MsgUtil.getCommonBillMsg(resultBill.getBillItemHisName(),
                         resultBill.getBillItemName(),
                         resultBill.getConflictItemName(),
                         "禁忌" + resultBill.getConflictItemType(),
                         orderType);
-            } else if (resultBill.getConflictItemTypeCode().equals(LexiconEnum.LisSubName.getName())) {
+            } else if (resultBill.getConflictItemTypeCode().equals(LexiconEnum.LisSubName.getKey())) {
                 //禁忌实验室检查
-                String content = "";
-                if (StringUtil.isNotBlank(resultBill.getConflictItemHisName())) {
-                    content = resultBill.getConflictItemHisName();
-                }
+                String content = resultBill.getConflictItemHisName();
                 if (StringUtil.isNotBlank(resultBill.getConflictItemHisDetailName())
                         && !resultBill.getConflictItemHisName().equals(resultBill.getConflictItemHisDetailName())) {
                     content += resultBill.getConflictItemHisDetailName();
@@ -548,7 +545,7 @@ public class MedRuleConvertFacade {
                         content,
                         "禁忌" + resultBill.getConflictItemType(),
                         orderType);
-            } else if (resultBill.getConflictItemType().equals(GraphLabelEnum.Disease.getName())) {
+            } else if (resultBill.getConflictItemTypeCode().equals(GraphLabelEnum.Disease.getKey())) {
                 //禁忌疾病
                 billMsg = MsgUtil.getCommonBillMsg(resultBill.getBillItemHisName(),
                         resultBill.getBillItemName(),