药品测试

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

@@ -262,6 +262,7 @@ public class TestFacade {
             Drug item = new Drug();
             item.setUniqueName(bean.getDrugHighRisk());
             item.setName(bean.getDrugHighRisk());
+            item.setForm(bean.getDrugForm());
             drugOrder.add(item);
             indicationPushVO.setDrugOrder(drugOrder);
             indicationPushVOList.add(indicationPushVO);

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

@@ -3,6 +3,7 @@ package com.diagbot.process;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.HighRiskNeoDTO;
 import com.diagbot.dto.IndicationDTO;
+import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -24,10 +25,9 @@ public class HighRiskProcess {
         for (HighRiskNeoDTO highRiskNeoDTO : highRiskNeoDTOList) {
             BillMsg billMsg = new BillMsg();
             String type = highRiskNeoDTO.getType();
-            if ("药品通用名称".equals(type)) {
-                type = "药品";
-            }
-            billMsg.setMsg(highRiskNeoDTO.getName() + "为高风险" + type + "，请留意");
+            billMsg.setMsg(highRiskNeoDTO.getName()
+                    + (StringUtil.isNotBlank(highRiskNeoDTO.getForm()) ? highRiskNeoDTO.getForm() : "")  // 药品剂型
+                    + "为高风险" + type + "，请留意");
             billMsg.setOrderName(highRiskNeoDTO.getName());
             billMsg.setOrderStandName(highRiskNeoDTO.getStandname());
             billMsg.setType(type);

src/main/java/com/diagbot/vo/TestIndicationVO.java

@@ -199,6 +199,8 @@ public class TestIndicationVO implements Serializable {
     private String operationHighRisk;
     @Excel(name="药品高危级别")
     private String drugLevel;
-    @Excel(name="药品注册名称")
+    @Excel(name="药品通用名称")
     private String drugHighRisk;
+    @Excel(name="注册剂型")
+    private String drugForm;
 }