医学规则测试-其他值提醒-输血

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

@@ -2122,18 +2122,36 @@ public class RuleConvertFacade {
      */
     public BillMsg getOtherTransfusionMsg(ResultOtherTransfusion result) {
         BillMsg billMsg = new BillMsg();
-        if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoDiseaseName.getName())) {
-            String content = "诊断" + result.getConflictItemHisName() + "，";
-            content += result.getOtherItemHisName();
-            if (StringUtil.isNotBlank(result.getOtherItemHisDetailName())
-                    && !result.getOtherItemHisDetailName().equals(result.getOtherItemHisName())) {
-                content += result.getOtherItemHisDetailName();
-            }
-            if (StringUtil.isNotBlank(result.getOtherItemInputValue())) {
-                content += trimZero(result.getOtherItemInputValue());
+        if (StringUtil.isNotBlank(result.getConflictItemType())) {
+            if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoDiseaseName.getName())) {
+                String content = "诊断" + result.getConflictItemHisName() + "，";
+                content += result.getOtherItemHisName();
+                if (StringUtil.isNotBlank(result.getOtherItemHisDetailName())
+                        && !result.getOtherItemHisDetailName().equals(result.getOtherItemHisName())) {
+                    content += result.getOtherItemHisDetailName();
+                }
+                if (StringUtil.isNotBlank(result.getOtherItemInputValue())) {
+                    content += trimZero(result.getOtherItemInputValue());
+                }
+                billMsg = MsgUtil.getCommonOtherTipTransfusionMsg(content, result.getTransfusionType());
+            } else if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoOperationName.getName())) {
+                String content = "";
+                content += result.getOtherItemHisName();
+                if (StringUtil.isNotBlank(result.getOtherItemHisDetailName())
+                        && !result.getOtherItemHisDetailName().equals(result.getOtherItemHisName())) {
+                    content += result.getOtherItemHisDetailName();
+                }
+                if (StringUtil.isNotBlank(result.getOtherItemInputValue())) {
+                    content += trimZero(result.getOtherItemInputValue());
+                }
+                if (StringUtil.isNotBlank(content)) {
+                    content += "，";
+                }
+                content += "已开" + result.getConflictItemHisName();
+
+                billMsg = MsgUtil.getCommonOtherTipTransfusionMsg(content, result.getTransfusionType());
             }
-            billMsg = MsgUtil.getCommonOtherTipTransfusionMsg(content, result.getTransfusionType());
-        } else if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoOperationName.getName())) {
+        } else {
             String content = "";
             content += result.getOtherItemHisName();
             if (StringUtil.isNotBlank(result.getOtherItemHisDetailName())
@@ -2143,11 +2161,6 @@ public class RuleConvertFacade {
             if (StringUtil.isNotBlank(result.getOtherItemInputValue())) {
                 content += trimZero(result.getOtherItemInputValue());
             }
-            if (StringUtil.isNotBlank(content)) {
-                content += "，";
-            }
-            content += "已开" + result.getConflictItemHisName();
-
             billMsg = MsgUtil.getCommonOtherTipTransfusionMsg(content, result.getTransfusionType());
         }