正常项目重复开立修改提示语

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

@@ -27,4 +27,6 @@ public class RuleSimpleDTO {
     private String content;
     // 禁忌类型
     private String conType;
+    // 项目名称(目前用于辅检项目名称)
+    private String structName = "";
 }

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

@@ -250,6 +250,9 @@ public class CommonRule {
         if (ListUtil.isNotEmpty(pacsList)) {
             sortByProperty(pacsList, "dateValue");
             Pacs pacs = pacsList.get(pacsList.size() - 1); // 按时间排序，取最后一条
+            if (StringUtil.isNotBlank(pacs.getName())) {
+                ruleSimpleDTO.setStructName(pacs.getName());
+            }
             String result = pacs.getResult();
             if (StringUtil.isNotBlank(result) && StringUtil.isNotBlank(ruleBaseDTO.getBaseEqValue())
                     && RegexUtil.getRegexRes(result, ruleBaseDTO.getBaseEqValue())) {

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

@@ -31,6 +31,7 @@ public class MsgNewUtil {
         String content = ruleSimpleDTO.getContent(); // 界面匹配内容
         String conType = ruleSimpleDTO.getConType(); // 禁忌类型
         String unionMsg = ruleSimpleDTO.getMsg(); // 原因及建议
+        String structName = ruleSimpleDTO.getStructName(); // 项目名称
         String msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), orderType + "_" + conType);
         if (StringUtil.isBlank(msg)) {
             // msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), "通用" + "_" + "默认提示语");
@@ -59,6 +60,7 @@ public class MsgNewUtil {
         // 放到最后统一替换【多处匹配】
         msg = msg.replaceAll("\\[匹配内容]", content);
         msg = msg.replaceAll("\\[开单名称]", orderName);
+        msg = msg.replaceAll("\\[项目名称]", structName);
         billMsg.setMsg(msg);
         billMsg.setOrderName(orderName);
         billMsg.setOrderStandName(orderStandName);