1、增加抢救次数、查房记录文档对象

public/src/main/java/com/lantone/qc/pub/model/InputInfo.java

@@ -4,7 +4,9 @@ import com.lantone.qc.pub.model.doc.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,15 +29,15 @@ public class InputInfo {
     //临床用血审核制度
     private ClinicalBloodDoc clinicalBloodDoc;
     //会诊制度
-    private ConsultationDoc consultationDoc;
+    private List<ConsultationDoc> consultationDocs = new ArrayList<>();
     //死亡病例讨论制度
     private DeathCaseDiscussDoc deathCaseDiscussDoc;
     //死亡记录
     private DeathRecordDoc deathRecordDoc;
     //疑难病例讨论制度
-    private DifficultCaseDiscussDoc difficultCaseDiscussDoc;
+    private List<DifficultCaseDiscussDoc> difficultCaseDiscussDocs = new ArrayList<>();
     //值班交接制度
-    private DutyShiftSystemDoc dutyShiftSystemDoc;
+    private List<DutyShiftSystemDoc> dutyShiftSystemDocs = new ArrayList<>();
     //首次病程录
     private FirstCourseRecordDoc firstCourseRecordDoc;
     //病案首页
@@ -45,9 +47,18 @@ public class InputInfo {
     //分级护理制度
     private NursingSystemDoc nursingSystemDoc;
     //围手术期病历讨论及记录
-    private OperationDiscussionDoc operationDiscussionDoc;
+    private List<OperationDiscussionDoc> operationDiscussionDocs = new ArrayList<>();
     //术前讨论制度
-    private PreoperativeDiscussionDoc preoperativeDiscussionDoc;
+    private List<PreoperativeDiscussionDoc> preoperativeDiscussionDocs = new ArrayList<>();
     //三级查房制度测试
     private ThreeLevelWardDoc threeLevelWardDoc;
+    //抢救记录
+    private List<RescueDoc> rescueDocs = new ArrayList<>();
+    //查房记录
+    private List<RoundDoc> roundDocs = new ArrayList<>();
+
+    //新增记录
+    public <T> void addDoc(List<T> list, T obj) {
+        list.add(obj);
+    }
 }

public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.pub.model.doc;
 
 import com.lantone.qc.pub.model.label.ChiefLabel;
+import com.lantone.qc.pub.model.label.DiagLabel;
 import com.lantone.qc.pub.model.label.DoctorAdviceLabel;
 import com.lantone.qc.pub.model.label.NoticeLabel;
 import lombok.Getter;
@@ -20,6 +21,7 @@ import java.util.Map;
 public class LeaveHospitalDoc {
     //出院小结所有结构化信息存储
     private Map<String, String> structureMap = new HashMap<>();
+    private DiagLabel leaveDiagLabel;//出院诊断
     private ChiefLabel chiefLabel;  //主诉
     private NoticeLabel noticeLabel;//注意事项
     private DoctorAdviceLabel doctorAdviceLabel;//医嘱

public/src/main/java/com/lantone/qc/pub/model/doc/RescueDoc.java

@@ -0,0 +1,20 @@
+package com.lantone.qc.pub.model.doc;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName : RescueDoc
+ * @Description : 抢救记录
+ * @Author : 楼辉荣
+ * @Date: 2020-03-17 15:14
+ */
+@Setter
+@Getter
+public class RescueDoc {
+    //抢救记录
+    private Map<String, String> structureMap = new HashMap<>();
+}

public/src/main/java/com/lantone/qc/pub/model/doc/RoundDoc.java

@@ -0,0 +1,20 @@
+package com.lantone.qc.pub.model.doc;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName : RoundDoc
+ * @Description : 查房记录
+ * @Author : 楼辉荣
+ * @Date: 2020-03-17 15:29
+ */
+@Setter
+@Getter
+public class RoundDoc {
+    //查房记录
+    private Map<String, String> structureMap = new HashMap<>();
+}

public/src/main/java/com/lantone/qc/pub/model/label/DiagLabel.java

@@ -0,0 +1,20 @@
+package com.lantone.qc.pub.model.label;
+
+import com.lantone.qc.pub.model.entity.Diag;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName : DiagLabel
+ * @Description : 疾病统一标签
+ * @Author : 楼辉荣
+ * @Date: 2020-03-17 14:51
+ */
+@Getter
+@Setter
+public class DiagLabel extends GeneralLabel {
+    List<Diag> diags = new ArrayList<>();//疾病信息
+}