Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.diagbot.biz.push.entity.Item;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/8/27 19:09
+ */
+@Getter
+@Setter
+public class ItemExt extends Item {
+    // 备注内容
+    private String remark;
+}

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

@@ -125,6 +125,10 @@ public class SearchData extends HospitalBaseVO {
      * 手术及操作
      */
     private List<Item> operation = new ArrayList<>();
+    /**
+     * 输血记录
+     */
+    private List<ItemExt> transfusion = new ArrayList<>();
     /**
      * 当前化验开单项
      */
@@ -145,6 +149,10 @@ public class SearchData extends HospitalBaseVO {
      * 当前手术开单项
      */
     private List<Item> operationOrder = new ArrayList<>();
+    /**
+     * 当前输血开单项
+     */
+    private List<ItemExt> transfusionOrder = new ArrayList<>();
     /**
      * 其他开单项
      */