药品加入剂型

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

@@ -70,7 +70,7 @@ public class WordCrfDTO {
     // 当前诊断开单项
     private List<Item> diagOrder = new ArrayList<>();
     // 当前药品开单项
-    private List<Item> drugOrder = new ArrayList<>();
+    private List<ItemExt> drugOrder = new ArrayList<>();
     // 当前手术开单项
     private List<Item> operationOrder = new ArrayList<>();
     // 当前输血开单项

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

@@ -76,9 +76,9 @@ public class BillFacade {
     public BillNeoVO fillBillNeo(WordCrfDTO wordCrfDTO) {
         BillNeoVO billNeoVO = new BillNeoVO();
 
-        List<Item> items = wordCrfDTO.getDrugOrder();
+        List<ItemExt> items = wordCrfDTO.getDrugOrder();
 
-        for (Item item : items) {
+        for (ItemExt item : items) {
             billNeoVO.getDrugList().put(item.getName(), item.getUniqueName());
         }
 

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.HighRiskProcess;
 import com.diagbot.vo.HighRiskNeoVO;
 import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.ItemExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -44,13 +45,13 @@ public class HighRiskFacade {
     public HighRiskNeoVO fillHighRiskNeo(WordCrfDTO wordCrfDTO) {
         HighRiskNeoVO highRiskNeoVO = new HighRiskNeoVO();
 
-        List<Item> items = wordCrfDTO.getDrugOrder();
+        List<ItemExt> itemExts = wordCrfDTO.getDrugOrder();
 
-        for (Item item : items) {
+        for (ItemExt item : itemExts) {
             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

@@ -11,6 +11,7 @@ import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.ItemExt;
 import com.diagbot.vo.StandConvertCrfVO;
 import com.diagbot.vo.TestIndicationVO;
 import com.diagbot.vo.TestLineVO;
@@ -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<ItemExt> drugOrder = new ArrayList<>();
+            ItemExt item = new ItemExt();
             item.setUniqueName(bean.getDrugHighRisk());
             item.setName(bean.getDrugHighRisk());
             drugOrder.add(item);

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

@@ -12,6 +12,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ItemExt extends Item {
+    // (药品剂型)、（血量）
+    private String form;
     // 备注内容
     private String remark;
 }

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