Revert: 药品加入剂型

src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -101,11 +101,11 @@ public class AssembleAggregate {
         //药品
         if (MapUtils.isNotEmpty(drugConfigMap)) {
             if (ListUtil.isNotEmpty(searchData.getDrug())) {
-                List<ItemExt> convertItem = itemExtConvert(searchData.getDrug(), drugConfigMap);
+                List<Item> convertItem = itemConvert(searchData.getDrug(), drugConfigMap);
                 searchData.setDrug(convertItem);
             }
             if (ListUtil.isNotEmpty(searchData.getDrugOrder())) {
-                List<ItemExt> convertItem = itemExtConvert(searchData.getDrugOrder(), drugConfigMap);
+                List<Item> convertItem = itemConvert(searchData.getDrugOrder(), drugConfigMap);
                 searchData.setDrugOrder(convertItem);
             }
         }

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

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