Browse Source

返回提示语

zhoutg 4 years ago
parent
commit
4101b7b440

+ 2 - 0
src/main/java/com/diagbot/dto/BillMsg.java

@@ -14,6 +14,8 @@ public class BillMsg {
     private String msg;
     // 开单名称
     private String orderName;
+    // 明细名称
+    private String orderDetailName;
     // 开单标准名称
     private String orderStandName;
     // 匹配的内容

+ 1 - 1
src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -78,7 +78,7 @@ public class OtherTipProcess {
                         List<String> msgList = (List<String>)map.get("msg");
                         if (ListUtil.isNotEmpty(msgList)) {
                             for (String msg : msgList) {
-                                BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, msg, nodeNeoDTO.getTermtype());
+                                BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, msg, nodeNeoDTO.getTermtype(), otherTipNeoDTO);
                                 res.getOtherList().add(billMsg);
                             }
                         }

+ 6 - 1
src/main/java/com/diagbot/util/MsgUtil.java

@@ -1,5 +1,7 @@
 package com.diagbot.util;
+
 import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.OtherTipNeoDTO;
 import com.diagbot.enums.NeoEnum;
 import com.diagbot.enums.TypeEnum;
 
@@ -155,9 +157,10 @@ public class MsgUtil {
      * @param content
      * @param name
      * @param type
+     * @param otherTipNeoDTO
      * @return
      */
-    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type) {
+    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type, OtherTipNeoDTO otherTipNeoDTO) {
         BillMsg billMsg = new BillMsg();
         String msg = "";
         if (TypeEnum.disease.getName().equals(type)) {
@@ -170,6 +173,8 @@ public class MsgUtil {
         billMsg.setMsg(msg);
         billMsg.setContent(content);
         billMsg.setType(type);
+        billMsg.setOrderName(otherTipNeoDTO.getName());
+        billMsg.setOrderDetailName(otherTipNeoDTO.getDetailName());
         return billMsg;
     }