结构调整

src/main/java/com/diagbot/dto/OtherTipTransfusionNeoDTO.java

@@ -22,7 +22,10 @@ public class OtherTipTransfusionNeoDTO {
     private List<Lis> lisList = new ArrayList<>();
 
     // 辅检
-    // private PacsLabel pacsLabel = new PacsLabel();
+    private List<Item> pacs = new ArrayList<>();
+
+    // 辅检结果
+    private List<Item> pacsRes = new ArrayList<>();
 
     // 手术及操作
     private List<Item> operation = new ArrayList<>();

src/main/java/com/diagbot/facade/OtherTipFacade.java

@@ -66,7 +66,85 @@ public class OtherTipFacade {
 
         // 其他提示——输血
         List<OtherTipTransfusionNeoDTO> otherTipTransfusionNeoDTOList = new ArrayList<>();
-        // otherTipProcess.processTransfusion(otherTipTransfusionNeoDTOList, res);
+        // TODO 测试数据开始
+        // // 化验 + 诊断
+        // OtherTipTransfusionNeoDTO otherTipTransfusionNeoDTO = new OtherTipTransfusionNeoDTO();
+        // otherTipTransfusionNeoDTO.setName("血小板");
+        // List<Lis> lisList = new ArrayList<>();
+        // Lis lis1 = new Lis();
+        // lis1.setValue(30.0);
+        // // lis1.setOtherValue("阳性");
+        // lis1.setName("血常规");
+        // lis1.setDetailName("血小板计数");
+        // lisList.add(lis1);
+        // otherTipTransfusionNeoDTO.setLisList(lisList);
+        // List<Item> diag = new ArrayList<>();
+        // Item item = new Item();
+        // item.setName("败血症");
+        // item.setUniqueName("败血症");
+        // diag.add(item);
+        // otherTipTransfusionNeoDTO.setDiag(diag);
+        // otherTipTransfusionNeoDTOList.add(otherTipTransfusionNeoDTO);
+        //
+        // // 化验 + 手术
+        // OtherTipTransfusionNeoDTO otherTipTransfusionNeoDTO2 = new OtherTipTransfusionNeoDTO();
+        // otherTipTransfusionNeoDTO2.setName("血小板");
+        // List<Lis> lisList2 = new ArrayList<>();
+        // Lis lis2 = new Lis();
+        // lis2.setValue(30.0);
+        // // lis2.setOtherValue("阳性");
+        // lis2.setName("血常规");
+        // lis2.setDetailName("血小板计数");
+        // lisList2.add(lis2);
+        // otherTipTransfusionNeoDTO2.setLisList(lisList2);
+        // List<Item> operation = new ArrayList<>();
+        // Item item2 = new Item();
+        // item2.setName("咽鼓管置管术");
+        // item2.setUniqueName("咽鼓管置管术");
+        // operation.add(item2);
+        // otherTipTransfusionNeoDTO2.setOperation(operation);
+        // otherTipTransfusionNeoDTOList.add(otherTipTransfusionNeoDTO2);
+        //
+        // // 化验 + 辅检名称
+        // OtherTipTransfusionNeoDTO otherTipTransfusionNeoDTO3 = new OtherTipTransfusionNeoDTO();
+        // otherTipTransfusionNeoDTO3.setName("血小板");
+        // List<Lis> lisList3 = new ArrayList<>();
+        // Lis lis3 = new Lis();
+        // lis3.setValue(30.0);
+        // // lis2.setOtherValue("阳性");
+        // lis3.setName("血常规");
+        // lis3.setDetailName("血小板计数");
+        // lisList3.add(lis3);
+        // otherTipTransfusionNeoDTO3.setLisList(lisList3);
+        // List<Item> pacs = new ArrayList<>();
+        // Item item3 = new Item();
+        // item3.setName("直视下支气管活检术");
+        // item3.setUniqueName("直视下支气管活检术");
+        // pacs.add(item3);
+        // otherTipTransfusionNeoDTO3.setPacs(pacs);
+        // otherTipTransfusionNeoDTOList.add(otherTipTransfusionNeoDTO3);
+        //
+        // // 化验 + 辅检结果
+        // OtherTipTransfusionNeoDTO otherTipTransfusionNeoDTO4 = new OtherTipTransfusionNeoDTO();
+        // otherTipTransfusionNeoDTO4.setName("血小板");
+        // List<Lis> lisList4 = new ArrayList<>();
+        // Lis lis4 = new Lis();
+        // lis4.setValue(30.0);
+        // // lis2.setOtherValue("阳性");
+        // lis4.setName("血常规");
+        // lis4.setDetailName("血小板计数");
+        // lisList4.add(lis4);
+        // otherTipTransfusionNeoDTO4.setLisList(lisList4);
+        // List<Item> pacsRes = new ArrayList<>();
+        // Item item4 = new Item();
+        // item4.setName("MA 值降低伴有明显出血");
+        // item4.setUniqueName("MA 值降低伴有明显出血");
+        // pacsRes.add(item4);
+        // otherTipTransfusionNeoDTO4.setPacsRes(pacsRes);
+        // otherTipTransfusionNeoDTOList.add(otherTipTransfusionNeoDTO4);
+
+        // TODO 测试数据结束
+        otherTipProcess.processTransfusion(otherTipTransfusionNeoDTOList, res);
 
         // 其他提示——辅检
     }

src/main/java/com/diagbot/process/CriticalProcess.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -37,7 +38,7 @@ public class CriticalProcess {
                     if (critical.getStandname().equals(bean.getUniqueName())) {
                         Map<String, Object> map = CoreUtil.compareLis(nodeNeoDTO, bean);
                         if ((Boolean) map.get("flag") == true) {
-                            BillMsg criticalMsg = CoreUtil.getCommonCriticalMsg((String)map.get("msg"), TypeEnum.lis.getName());
+                            BillMsg criticalMsg = MsgUtil.getCommonCriticalMsg((String)map.get("msg"), TypeEnum.lis.getName());
                             criticalList.add(criticalMsg);
                         }
                     }

src/main/java/com/diagbot/process/HighRiskProcess.java

@@ -11,6 +11,7 @@ import com.diagbot.enums.TypeEnum;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -91,7 +92,7 @@ public class HighRiskProcess {
                         String name = nodeNeoDTO.getName();
                         for (Item item : diag) {
                             if (item.getUniqueName().equals(name)) {
-                                BillMsg billMsg = CoreUtil.getComplexOperationMsg("高风险手术", item.getName(), nodeNeoDTO.getTermtype());
+                                BillMsg billMsg = MsgUtil.getComplexOperationMsg("高风险手术", item.getName(), nodeNeoDTO.getTermtype());
                                 res.getHighRiskList().add(billMsg);
                             }
                         }
@@ -100,7 +101,7 @@ public class HighRiskProcess {
                             if (lis.getUniqueName().equals(nodeNeoDTO.getName())) {
                                 Map<String, Object> map = CoreUtil.compareLis(nodeNeoDTO, lis);
                                 if ((Boolean) map.get("flag") == true) {
-                                    BillMsg billMsg = CoreUtil.getComplexOperationMsg("高风险手术", (String)map.get("msg"), nodeNeoDTO.getTermtype());
+                                    BillMsg billMsg = MsgUtil.getComplexOperationMsg("高风险手术", (String)map.get("msg"), nodeNeoDTO.getTermtype());
                                     res.getHighRiskList().add(billMsg);
                                 }
                             }
@@ -124,7 +125,7 @@ public class HighRiskProcess {
                         //辅检匹配结果
                         for (Item item : pacsDescList) {
                             if (item.getUniqueName().equals(nodeNeoDTO.getVal())) {
-                                BillMsg billMsg = CoreUtil.getComplexOperationMsg("高风险手术", item.getName(), nodeNeoDTO.getTermtype());
+                                BillMsg billMsg = MsgUtil.getComplexOperationMsg("高风险手术", item.getName(), nodeNeoDTO.getTermtype());
                                 res.getHighRiskList().add(billMsg);
                             }
                         }

src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -10,6 +10,7 @@ import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import com.diagbot.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -52,7 +53,7 @@ public class OtherTipProcess {
                         } else {
                             content += otherTipNeoDTO.getValue();
                         }
-                        BillMsg billMsg = CoreUtil.getCommonOtherTipLisMsg(content, nodeNeoDTO.getName(), nodeNeoDTO.getTermtype());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, nodeNeoDTO.getName(), nodeNeoDTO.getTermtype());
                         res.getOtherList().add(billMsg);
                     }
                 }
@@ -68,36 +69,50 @@ public class OtherTipProcess {
      */
     public void processTransfusion(List<OtherTipTransfusionNeoDTO> otherTipTransfusionNeoDTOList, IndicationDTO res) {
         for (OtherTipTransfusionNeoDTO bean : otherTipTransfusionNeoDTOList) {
+            if (StringUtil.isBlank(bean.getName())) {
+                continue;
+            }
             StringBuffer sb = new StringBuffer();
+            // 诊断
             if (ListUtil.isNotEmpty(bean.getDiag())) {
                 sb.append("诊断");
                 List<String> diag = bean.getDiag().stream().map(r -> r.getName()).collect(Collectors.toList());
-                sb.append(StringUtils.join(diag));
+                sb.append(StringUtils.join(diag, ","));
             }
-            if (ListUtil.isNotEmpty(bean.getOperation())) {
-                List<String> operation = bean.getOperation().stream().map(r -> r.getName()).collect(Collectors.toList());
-                if (sb.toString().length() > 0) {
-                    sb.append("，");
-                }
-                sb.append(StringUtils.join(operation));
+            // 辅检结果
+            if (ListUtil.isNotEmpty(bean.getPacsRes())) {
+                List<String> pacsRes = bean.getPacsRes().stream().map(r -> r.getName()).collect(Collectors.toList());
+                sb.append(StringUtils.join(pacsRes, ","));
             }
-            // if (ListUtil.isNotEmpty(bean.getPacsLabel().getPacsNewList())) {
-            //     List<PacsNew> pacsNewList = bean.getPacsLabel().getPacsNewList();
-            //     for (PacsNew pacsNew : pacsNewList) {
-            //         if (sb.toString().length() > 0) {
-            //             sb.append("，");
-            //         }
-            //         sb.append(pacsNew.getName() + StringUtils.join(pacsNew.getMatchRes()));
-            //     }
-            // }
+            // 化验
             if (ListUtil.isNotEmpty(bean.getLisList())) {
                 for (Lis lis : bean.getLisList()) {
                     if (sb.toString().length() > 0) {
                         sb.append("，");
                     }
-                    sb.append(lis.getName() + lis.getDetailName() + lis.getOtherValue() + CoreUtil.getLisValue(lis));
+                    sb.append(lis.getName() + lis.getDetailName() + CoreUtil.getLisValue(lis));
+                }
+            }
+            // 辅检名称
+            if (ListUtil.isNotEmpty(bean.getPacs())) {
+                if (sb.toString().length() > 0) {
+                    sb.append("，");
+                }
+                sb.append("已开");
+                List<String> pacs = bean.getPacs().stream().map(r -> r.getName()).collect(Collectors.toList());
+                sb.append(StringUtils.join(pacs, ","));
+            }
+            // 手术
+            if (ListUtil.isNotEmpty(bean.getOperation())) {
+                List<String> operation = bean.getOperation().stream().map(r -> r.getName()).collect(Collectors.toList());
+                if (sb.toString().length() > 0) {
+                    sb.append("，");
                 }
+                sb.append("已开");
+                sb.append(StringUtils.join(operation, ","));
             }
+            BillMsg billMsg = MsgUtil.getCommonOtherTipTransfusionMsg(sb.toString(), bean.getName());
+            res.getOtherList().add(billMsg);
         }
     }
 }

src/main/java/com/diagbot/rule/AgeRule.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public class AgeRule {
         if (flag) {
             // String message = CoreUtil.getStrMsgWithRange(ageNeoDTO, "年龄", String.valueOf(wordCrfDTO.getAge()));
             String message = "年龄" + wordCrfDTO.getAge();
-            BillMsg billMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
+            BillMsg billMsg = MsgUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                     message, type);
             billMsgList.add(billMsg);
         }

src/main/java/com/diagbot/rule/CommonRule.java

@@ -1,6 +1,5 @@
 package com.diagbot.rule;
 
-import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
@@ -11,6 +10,7 @@ import com.diagbot.util.CatalogueUtil;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import com.diagbot.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -56,7 +56,7 @@ public class CommonRule {
             }
             if (old_stand.size() > 0) {
                 for (Map.Entry<String, String> d : old_stand.entrySet()) {
-                    BillMsg commonBillMsg = CoreUtil.getCommonSurgeryMsg(
+                    BillMsg commonBillMsg = MsgUtil.getCommonSurgeryMsg(
                             billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                             d.getKey(), type);
                     billMsgList.add(commonBillMsg);
@@ -86,7 +86,7 @@ public class CommonRule {
             }
             if (old_stand.size() > 0) {
                 for (String key : old_stand.keySet()) {
-                    BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(
+                    BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
                             billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                             key, type);
                     billMsgList.add(commonBillMsg);
@@ -153,7 +153,7 @@ public class CommonRule {
                                 if (!CatalogueUtil.compareTime(last, cur, 60L * 24)) {
                                     String name = (String)CoreUtil.getFieldValue(it, "name");
                                     String uniqueName = (String)CoreUtil.getFieldValue(it, "uniqueName");
-                                    BillMsg commonBillMsg = CoreUtil.getBillMsg24Repeat(
+                                    BillMsg commonBillMsg = MsgUtil.getBillMsg24Repeat(
                                             name, uniqueName, name, type);
                                     billMsgList.add(commonBillMsg);
                                     break;

src/main/java/com/diagbot/rule/DrugRule.java

@@ -7,6 +7,7 @@ import com.diagbot.enums.RedisEnum;
 import com.diagbot.model.entity.Negative;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import com.diagbot.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +70,7 @@ public class DrugRule {
                     } else {
                         message = "可能正在用药" + d.getKey();
                     }
-                    BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(
+                    BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
                             billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                             message, type);
                     billMsgList.add(commonBillMsg);

src/main/java/com/diagbot/rule/GroupRule.java

@@ -5,7 +5,7 @@ import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.util.CoreUtil;
+import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -33,7 +33,7 @@ public class GroupRule {
                 List<Item> diag = wordCrfDTO.getDiag();
                 for (Item item : diag) {
                     if (item.getUniqueName().contains("妊娠")) {
-                        BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(
+                        BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
                                 billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                                 item.getUniqueName(), type);
                         billMsgList.add(commonBillMsg);

src/main/java/com/diagbot/rule/LisRule.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -36,7 +37,7 @@ public class LisRule {
                     if (StringUtil.isNotBlank(val) && val.equals(neo.getName())) {
                         Map<String, Object> map = CoreUtil.compareLis(neo, lis);
                         if ((Boolean) map.get("flag") == true) {
-                            BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),
+                            BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),
                                     billNeoMaxDTO.getOrderStandName(), (String)map.get("msg"), type);
                             billMsgList.add(commonBillMsg);
                         }

src/main/java/com/diagbot/rule/PacsRule.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -41,7 +42,7 @@ public class PacsRule {
         }
         if(old_stand.size() > 0){
             for (Map.Entry<String,String> d: old_stand.entrySet()) {
-                BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(
+                BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
                         billNeoMaxDTO.getOrderName(),billNeoMaxDTO.getOrderStandName(),
                         "已开" + d.getKey(), type);
                 billMsgList.add(commonBillMsg);

src/main/java/com/diagbot/rule/SexRule.java

@@ -4,7 +4,7 @@ import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.util.CoreUtil;
+import com.diagbot.util.MsgUtil;
 import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -37,11 +37,11 @@ public class SexRule {
             }
             if (sex.equals(sexStr)) {
                 if ("男性".equals(sexStr)) {
-                    BillMsg billMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
+                    BillMsg billMsg = MsgUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                             "男性", type);
                     billMsgList.add(billMsg);
                 } else if ("女性".equals(sexStr)) {
-                    BillMsg billMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
+                    BillMsg billMsg = MsgUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(), billNeoMaxDTO.getOrderStandName(),
                             "女性", type);
                     billMsgList.add(billMsg);
                 }

src/main/java/com/diagbot/rule/VitalRule.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.model.label.VitalLabel;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public class VitalRule {
             for (NodeNeoDTO neo : neoList) {
                 Map<String, Object> map = CoreUtil.compareVital(neo, vitalLabel);
                 if ((Boolean) map.get("flag") == true) {
-                    BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),
+                    BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),
                             billNeoMaxDTO.getOrderStandName(), (String) map.get("msg"), type);
                     billMsgList.add(commonBillMsg);
                 }

src/main/java/com/diagbot/util/CoreUtil.java

@@ -2,9 +2,7 @@ package com.diagbot.util;
 
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
-import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.NodeNeoDTO;
-import com.diagbot.enums.TypeEnum;
 import com.diagbot.model.entity.Clinical;
 import com.diagbot.model.entity.Usual;
 import com.diagbot.model.entity.Vital;
@@ -243,119 +241,6 @@ public class CoreUtil {
 
     }
 
-    /**
-     * 危急值通用提示信息
-     *
-     * @param content 匹配内容
-     * @param type 类型
-     * @return
-     */
-    public static BillMsg getCommonCriticalMsg(String content, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = String.format("该患者%s，请留意", content);
-        billMsg.setMsg(msg);
-        billMsg.setType(type);
-        billMsg.setContent(content);
-        return billMsg;
-    }
-
-    /**
-     * 开单合理性通用提示信息
-     *
-     * @param orderName 原开单项
-     * @param orderStandName 标准开单项
-     * @param content 匹配内容
-     * @param type 类型
-     * @return
-     */
-    public static BillMsg getCommonBillMsg(String orderName, String orderStandName, String content, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = String.format("该患者%s，不宜开%s", content, orderName);
-        billMsg.setMsg(msg);
-        billMsg.setOrderName(orderName);
-        billMsg.setOrderStandName(orderStandName);
-        billMsg.setContent(content);
-        billMsg.setType(type);
-        return billMsg;
-    }
-    /**
-     * 开单合理性手术提示信息
-     *
-     * @param orderName 原开单项
-     * @param orderStandName 标准开单项
-     * @param content 匹配内容
-     * @param type 类型
-     * @return
-     */
-    public static BillMsg getCommonSurgeryMsg(String orderName, String orderStandName, String content, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = String.format("该患者有%s史，不宜开%s", content, orderName);
-        billMsg.setMsg(msg);
-        billMsg.setOrderName(orderName);
-        billMsg.setOrderStandName(orderStandName);
-        billMsg.setContent(content);
-        billMsg.setType(type);
-        return billMsg;
-    }
-    /**
-     * 复杂情况高危手术提示
-     *
-     * @param content
-     * @param name
-     * @param type
-     * @return
-     */
-    public static BillMsg getComplexOperationMsg(String name, String content, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = String.format("%s：%s，请留意", name, content);
-        billMsg.setMsg(msg);
-        billMsg.setContent(content);
-        billMsg.setType(type);
-        return billMsg;
-    }
-
-    /**
-     * 其他提醒化验提醒
-     *
-     * @param content
-     * @param name
-     * @param type
-     * @return
-     */
-    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = "";
-        if (TypeEnum.disease.getName().equals(type)) {
-            msg = String.format("该患者%s，患有%s，请留意", content, name);
-        } else if (TypeEnum.drug.getName().equals(type)) {
-            msg = String.format("该患者%s，已开%s，请留意", content, name);
-        }
-        billMsg.setMsg(msg);
-        billMsg.setContent(content);
-        billMsg.setType(type);
-        return billMsg;
-    }
-
-    /**
-     * 开单合理性24小时重复开通用提示信息
-     *
-     * @param orderName 原开单项
-     * @param orderStandName 标准开单项
-     * @param content 匹配内容
-     * @param type 类型
-     * @return
-     */
-    public static BillMsg getBillMsg24Repeat(String orderName, String orderStandName, String content, String type) {
-        BillMsg billMsg = new BillMsg();
-        String msg = String.format("%s重复开立", orderName);
-        billMsg.setMsg(msg);
-        billMsg.setOrderName(orderName);
-        billMsg.setOrderStandName(orderStandName);
-        billMsg.setContent(content);
-        billMsg.setType(type);
-        return billMsg;
-    }
-
     /**
      * 将对象添加到列表中
      *
@@ -738,10 +623,4 @@ public class CoreUtil {
     public static void getDebugStr(String msg, String error, Map<String, Object> debugMap) {
         debugMap.put(msg,  error);
     }
-
-    public static void main(String[] args) {
-        String msg = String.format("该患者%s%s%s,请留意", "套餐","明细项","值");
-        System.out.println(msg);
-
-    }
 }

src/main/java/com/diagbot/util/MsgUtil.java

@@ -0,0 +1,141 @@
+package com.diagbot.util;
+import com.diagbot.dto.BillMsg;
+import com.diagbot.enums.TypeEnum;
+
+/**
+ * @description: 提示语工具类
+ * @author: zhoutg
+ * @time: 2020/9/14 11:16
+ */
+public class MsgUtil {
+
+    /**
+     * 危急值通用提示信息
+     *
+     * @param content 匹配内容
+     * @param type 类型
+     * @return
+     */
+    public static BillMsg getCommonCriticalMsg(String content, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("该患者%s，请留意", content);
+        billMsg.setMsg(msg);
+        billMsg.setType(type);
+        billMsg.setContent(content);
+        return billMsg;
+    }
+
+    /**
+     * 开单合理性通用提示信息
+     *
+     * @param orderName 原开单项
+     * @param orderStandName 标准开单项
+     * @param content 匹配内容
+     * @param type 类型
+     * @return
+     */
+    public static BillMsg getCommonBillMsg(String orderName, String orderStandName, String content, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("该患者%s，不宜开%s", content, orderName);
+        billMsg.setMsg(msg);
+        billMsg.setOrderName(orderName);
+        billMsg.setOrderStandName(orderStandName);
+        billMsg.setContent(content);
+        billMsg.setType(type);
+        return billMsg;
+    }
+
+    /**
+     * 复杂情况高危手术提示
+     *
+     * @param content
+     * @param name
+     * @param type
+     * @return
+     */
+    public static BillMsg getComplexOperationMsg(String name, String content, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("%s：%s，请留意", name, content);
+        billMsg.setMsg(msg);
+        billMsg.setContent(content);
+        billMsg.setType(type);
+        return billMsg;
+    }
+
+    /**
+     * 其他提醒——化验
+     *
+     * @param content
+     * @param name
+     * @param type
+     * @return
+     */
+    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = "";
+        if (TypeEnum.disease.getName().equals(type)) {
+            msg = String.format("该患者%s，患有%s，请留意", content, name);
+        } else if (TypeEnum.drug.getName().equals(type)) {
+            msg = String.format("该患者%s，已开%s，请留意", content, name);
+        }
+        billMsg.setMsg(msg);
+        billMsg.setContent(content);
+        billMsg.setType(type);
+        return billMsg;
+    }
+
+    /**
+     * 其他提醒——输血
+     *
+     * @param content
+     * @param name
+     * @return
+     */
+    public static BillMsg getCommonOtherTipTransfusionMsg(String content, String name) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("该患者%s，建议输注%s", content, name);
+        billMsg.setMsg(msg);
+        billMsg.setContent(content);
+        return billMsg;
+    }
+
+    /**
+     * 开单合理性24小时重复开通用提示信息
+     *
+     * @param orderName 原开单项
+     * @param orderStandName 标准开单项
+     * @param content 匹配内容
+     * @param type 类型
+     * @return
+     */
+    public static BillMsg getBillMsg24Repeat(String orderName, String orderStandName, String content, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("%s重复开立", orderName);
+        billMsg.setMsg(msg);
+        billMsg.setOrderName(orderName);
+        billMsg.setOrderStandName(orderStandName);
+        billMsg.setContent(content);
+        billMsg.setType(type);
+        return billMsg;
+    }
+
+    /**
+     * 开单合理性手术提示信息
+     *
+     * @param orderName 原开单项
+     * @param orderStandName 标准开单项
+     * @param content 匹配内容
+     * @param type 类型
+     * @return
+     */
+    public static BillMsg getCommonSurgeryMsg(String orderName, String orderStandName, String content, String type) {
+        BillMsg billMsg = new BillMsg();
+        String msg = String.format("该患者有%s史，不宜开%s", content, orderName);
+        billMsg.setMsg(msg);
+        billMsg.setOrderName(orderName);
+        billMsg.setOrderStandName(orderStandName);
+        billMsg.setContent(content);
+        billMsg.setType(type);
+        return billMsg;
+    }
+}