药品加入剂型

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

@@ -13,6 +13,7 @@ import com.diagbot.model.label.PastLabel;
 import com.diagbot.model.label.PersonalLabel;
 import com.diagbot.model.label.PresentLabel;
 import com.diagbot.model.label.VitalLabel;
+import com.diagbot.vo.Drug;
 import com.diagbot.vo.ItemExt;
 import lombok.Data;
 
@@ -70,7 +71,7 @@ public class WordCrfDTO {
     // 当前诊断开单项
     private List<Item> diagOrder = new ArrayList<>();
     // 当前药品开单项
-    private List<Item> drugOrder = new ArrayList<>();
+    private List<Drug> drugOrder = new ArrayList<>();
     // 当前手术开单项
     private List<Item> operationOrder = new ArrayList<>();
     // 当前输血开单项

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

@@ -11,6 +11,7 @@ import com.diagbot.process.BillProcess;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BillNeoVO;
+import com.diagbot.vo.Drug;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.ItemExt;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,7 +77,7 @@ public class BillFacade {
     public BillNeoVO fillBillNeo(WordCrfDTO wordCrfDTO) {
         BillNeoVO billNeoVO = new BillNeoVO();
 
-        List<Item> items = wordCrfDTO.getDrugOrder();
+        List<Drug> items = wordCrfDTO.getDrugOrder();
 
         for (Item item : items) {
             billNeoVO.getDrugList().put(item.getName(), item.getUniqueName());

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

@@ -5,6 +5,7 @@ import com.diagbot.dto.HighRiskNeoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.HighRiskProcess;
+import com.diagbot.vo.Drug;
 import com.diagbot.vo.HighRiskNeoVO;
 import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,13 +45,13 @@ public class HighRiskFacade {
     public HighRiskNeoVO fillHighRiskNeo(WordCrfDTO wordCrfDTO) {
         HighRiskNeoVO highRiskNeoVO = new HighRiskNeoVO();
 
-        List<Item> items = wordCrfDTO.getDrugOrder();
+        List<Drug> drugs = wordCrfDTO.getDrugOrder();
 
-        for (Item item : items) {
+        for (Drug item : drugs) {
             highRiskNeoVO.getDrugList().put(item.getName(), item.getUniqueName());
         }
 
-        items = wordCrfDTO.getOperationOrder();
+        List<Item> items = wordCrfDTO.getOperationOrder();
 
         for (Item item : items) {
             highRiskNeoVO.getOperationList().put(item.getName(), item.getUniqueName());

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.StandConvertCrfDTO;
 import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.Drug;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.StandConvertCrfVO;
 import com.diagbot.vo.TestIndicationVO;
@@ -257,8 +258,8 @@ public class TestFacade {
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("3");
             indicationPushVO.setIdNum(bean.getIdNum());
-            List<Item> drugOrder = new ArrayList<>();
-            Item item = new Item();
+            List<Drug> drugOrder = new ArrayList<>();
+            Drug item = new Drug();
             item.setUniqueName(bean.getDrugHighRisk());
             item.setName(bean.getDrugHighRisk());
             drugOrder.add(item);

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

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.diagbot.biz.push.entity.Item;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/9/7 20:09
+ */
+@Getter
+@Setter
+public class Drug extends Item {
+    // 剂型
+    private String form;
+}

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

@@ -120,7 +120,7 @@ public class SearchData extends HospitalBaseVO {
     /**
      * 药品
      */
-    private List<Item> drug = new ArrayList<>();
+    private List<Drug> drug = new ArrayList<>();
     /**
      * 手术及操作
      */
@@ -144,7 +144,7 @@ public class SearchData extends HospitalBaseVO {
     /**
      * 当前药品开单项
      */
-    private List<Item> drugOrder = new ArrayList<>();
+    private List<Drug> drugOrder = new ArrayList<>();
     /**
      * 当前手术开单项
      */