辅检危急值

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

@@ -8,16 +8,15 @@ import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
-import com.diagbot.model.entity.Vital;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.model.label.VitalLabel;
-import com.diagbot.rule.AgeRule;
+import com.diagbot.rule.CommonRule;
 import com.diagbot.util.CoreUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.MsgUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +28,9 @@ import java.util.Map;
 @Component
 public class HighRiskProcess {
 
+    @Autowired
+    CommonRule commonRule;
+
     /**
      * 处理业务
      *
@@ -36,21 +38,12 @@ public class HighRiskProcess {
      * @param res
      */
     public void process(List<HighRiskNeoDTO> highRiskNeoDTOList, IndicationDTO res, WordCrfDTO wordCrfDTO) {
+        List<BillMsg> highRiskList = new ArrayList<>();
         for (HighRiskNeoDTO highRiskNeoDTO : highRiskNeoDTOList) {
             System.out.println(highRiskNeoDTO);
             String type = highRiskNeoDTO.getType();
             if (highRiskNeoDTO.getIsHighrisk()) {
-                BillMsg billMsg = new BillMsg();
-                if (TypeEnum.operation.getName().equals(type)) {
-                    billMsg.setMsg(highRiskNeoDTO.getName() + "为高风险手术，请留意");
-                } else if (TypeEnum.drug.getName().equals(type)) {
-                    billMsg.setMsg(highRiskNeoDTO.getName() + "为" + highRiskNeoDTO.getHighLevel() + "药品，请留意");
-                }
-
-                billMsg.setOrderName(highRiskNeoDTO.getName());
-                billMsg.setOrderStandName(highRiskNeoDTO.getStandname());
-                billMsg.setType(type);
-                res.getHighRiskList().add(billMsg);
+                commonRule.highRisk(highRiskNeoDTO, highRiskList);
             } else {
 
                 List<Item> diag = wordCrfDTO.getDiag();
@@ -112,5 +105,6 @@ public class HighRiskProcess {
                 }
             }
         }
+        res.setHighRiskList(highRiskList);
     }
 }

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

@@ -2,6 +2,7 @@ package com.diagbot.rule;
 
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoMaxDTO;
+import com.diagbot.dto.HighRiskNeoDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
@@ -169,4 +170,16 @@ public class CommonRule {
             }
         }
     }
+
+    /**
+     * 高风险药品、手术
+     * @param highRiskNeoDTO
+     * @param highRiskList
+     */
+    public void highRisk(HighRiskNeoDTO highRiskNeoDTO, List<BillMsg> highRiskList) {
+        BillMsg billMsg = MsgUtil.getCommonHighRiskMsg(highRiskNeoDTO.getName(),
+                highRiskNeoDTO.getHighLevel(), highRiskNeoDTO.getType());
+        highRiskList.add(billMsg);
+    }
+
 }

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

@@ -9,6 +9,25 @@ import com.diagbot.enums.TypeEnum;
  */
 public class MsgUtil {
 
+    /**
+     * 高危药品、手术通用提示信息
+     *
+     * @param name
+     * @param highLevel
+     * @param type
+     * @return
+     */
+    public static BillMsg getCommonHighRiskMsg(String name, String highLevel, String type) {
+        BillMsg billMsg = new BillMsg();
+        if (TypeEnum.operation.getName().equals(type)) {
+            billMsg.setMsg(name + "为高风险手术，请留意");
+        } else if (TypeEnum.drug.getName().equals(type)) {
+            billMsg.setMsg(name + "为" + highLevel + "药品，请留意");
+        }
+        billMsg.setType(type);
+        return billMsg;
+    }
+
     /**
      * 危急值通用提示信息
      *