1、出院数据结构重做调整

kernel/src/main/java/com/lantone/qc/kernel/web/controller/QCTestController.java

@@ -71,7 +71,7 @@ public class QCTestController {
             //测试数据查询
             String sql = "SELECT qmap.id, qi.id text_id, qi.text, ca.name, entry.code FROM " +
                     "qc_inputcases_mapping_all qmap, (" + textSql + ") qi, qc_cases_entry entry, qc_cases ca " +
-                    "where qmap.text_id = qi.id and qmap.cases_entry_id = entry.id and entry.cases_id = ca.id";
+                    "where qmap.text_id = qi.id and qmap.cases_entry_id = entry.id and entry.cases_id = ca.id and is_delelted = 'N' ";
 
             if (StringUtils.isNotEmpty(caseIds)) {
                 sql = sql + " and entry.cases_id in (" + caseIds + ")";

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

@@ -1,9 +1,6 @@
 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 com.lantone.qc.pub.model.label.*;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +13,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class LeaveHospitalDoc extends ModelDoc {
-    private ChiefLabel chiefLabel;  //主诉
-    private NoticeLabel noticeLabel;//注意事项
-    private DoctorAdviceLabel doctorAdviceLabel;//医嘱
+    private LeaveHospitalLabel leaveHospitalLabel;
+    private DiagLabel beHospitalizedLabel;//入院诊断
     private DiagLabel leaveDiagLabel;//出院诊断
 }

public/src/main/java/com/lantone/qc/pub/model/entity/DoctorAdvice.java

@@ -0,0 +1,10 @@
+package com.lantone.qc.pub.model.entity;
+
+/**
+ * @ClassName : DoctorAdvice
+ * @Description : 医嘱信息
+ * @Author : 楼辉荣
+ * @Date: 2020-03-18 15:55
+ */
+public class DoctorAdvice extends General {
+}

public/src/main/java/com/lantone/qc/pub/model/entity/Notice.java

@@ -0,0 +1,10 @@
+package com.lantone.qc.pub.model.entity;
+
+/**
+ * @ClassName : Notice
+ * @Description : 注意事项
+ * @Author : 楼辉荣
+ * @Date: 2020-03-18 15:54
+ */
+public class Notice extends General {
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.qc.pub.model.label;
+
+import com.lantone.qc.pub.model.entity.DoctorAdvice;
+import com.lantone.qc.pub.model.entity.General;
+import com.lantone.qc.pub.model.entity.Notice;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName : LeaveHospital
+ * @Description :
+ * @Author : 楼辉荣
+ * @Date: 2020-03-18 15:51
+ */
+@Getter
+@Setter
+public class LeaveHospitalLabel {
+    List<General> chiefs = new ArrayList<>();   //主诉
+    List<Notice> notices = new ArrayList<>();   //注意事项
+    List<DoctorAdvice> doctorAdvices = new ArrayList<>();   //医嘱信息
+}