소스 검색

报错处理

zhoutg 4 년 전
부모
커밋
95bf6f8ef4
2개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 4 4
      src/main/java/com/diagbot/rule/LisRule.java
  2. 5 5
      src/main/java/com/diagbot/util/MsgUtil.java

+ 4 - 4
src/main/java/com/diagbot/rule/LisRule.java

@@ -137,13 +137,13 @@ public class LisRule {
             if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
                 if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
                     for (String str : lisOtherDTO.getDiseaseMsg()) {
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName(), lisBean);
                         otherList.add(billMsg);
                     }
                 }
                 if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
                     for (String str : lisOtherDTO.getDrugMsg()) {
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName(), lisBean);
                         otherList.add(billMsg);
                     }
                 }
@@ -208,13 +208,13 @@ public class LisRule {
             if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
                 if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
                     for (String str : lisOtherDTO.getDiseaseMsg()) {
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName(), lisBean);
                         otherList.add(billMsg);
                     }
                 }
                 if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
                     for (String str : lisOtherDTO.getDrugMsg()) {
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName(), lisBean);
                         otherList.add(billMsg);
                     }
                 }

+ 5 - 5
src/main/java/com/diagbot/util/MsgUtil.java

@@ -1,7 +1,7 @@
 package com.diagbot.util;
 
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.BillMsg;
-import com.diagbot.dto.OtherTipNeoDTO;
 import com.diagbot.enums.NeoEnum;
 import com.diagbot.enums.TypeEnum;
 
@@ -137,10 +137,10 @@ public class MsgUtil {
      * @param content
      * @param name
      * @param type
-     * @param otherTipNeoDTO
+     * @param lis
      * @return
      */
-    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type, OtherTipNeoDTO otherTipNeoDTO) {
+    public static BillMsg getCommonOtherTipLisMsg(String content, String name, String type, Lis lis) {
         BillMsg billMsg = new BillMsg();
         String msg = "";
         if (TypeEnum.disease.getName().equals(type)) {
@@ -153,8 +153,8 @@ public class MsgUtil {
         billMsg.setMsg(msg);
         billMsg.setContent(content);
         billMsg.setType(type);
-        billMsg.setOrderName(otherTipNeoDTO.getName());
-        billMsg.setOrderDetailName(otherTipNeoDTO.getDetailName());
+        billMsg.setOrderName(lis.getName());
+        billMsg.setOrderDetailName(lis.getDetailName());
         return billMsg;
     }