Merge remote-tracking branch 'origin/master'

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

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/BeHospitalizedAI.java

@@ -126,11 +126,11 @@ public class BeHospitalizedAI {
             putInitialDiagCrfData(midData.getJSONObject(Content.pridiag), inputInfo);
             if (StringUtils.isNotEmpty(revised_diag_text)) {
                 //处理修正诊断
-                putInitialDiagCrfData(midData.getJSONObject(Content.revised_diag), inputInfo);
+                putRevisedDiagCrfData(midData.getJSONObject(Content.revised_diag), inputInfo);
             }
             if (StringUtils.isNotEmpty(revised_diag_text)) {
                 //处理补充诊断
-                putInitialDiagCrfData(midData.getJSONObject(Content.supple_diag), inputInfo);
+                putSuppleDiagCrfData(midData.getJSONObject(Content.supple_diag), inputInfo);
             }
             //处理辅助检查
             putPacsCrfData(midData.getJSONObject(Content.pacs), inputInfo);
@@ -309,6 +309,13 @@ public class BeHospitalizedAI {
         revisedDiagLabel.setText(inputInfo.getBeHospitalizedDoc().getRevisedDiagLabel().getText());
         revisedDiagLabel.setDiags(diags);
         inputInfo.getBeHospitalizedDoc().setRevisedDiagLabel(revisedDiagLabel);
+
+        //替换初步诊断中的第一个诊断信息
+        DiagLabel initialDiagLabel = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel();
+        if (initialDiagLabel.getDiags().size() > 0 && diags.size() > 0) {
+            initialDiagLabel.getDiags().remove(0);
+            initialDiagLabel.getDiags().add(0, diags.get(0));
+        }
     }
 
     /**

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,14 +1,9 @@
 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;
 
-import java.util.List;
-
 /**
  * @ClassName : LeaveHospitalDoc
  * @Description : 出院小结文档
@@ -18,9 +13,7 @@ import java.util.List;
 @Getter
 @Setter
 public class LeaveHospitalDoc extends ModelDoc {
-    private List<ChiefLabel> chiefLabels;  //主诉
-    private List<NoticeLabel> noticeLabels;//注意事项
-    private List<DoctorAdviceLabel> doctorAdviceLabels;//医嘱
-    private DiagLabel beDiagLabel;//入院诊断
+    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/DoctorAdviceLabel.java

@@ -1,15 +0,0 @@
-package com.lantone.qc.pub.model.label;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @ClassName : DoctorAdvice
- * @Description : 医嘱
- * @Author : 楼辉荣
- * @Date: 2020-03-17 14:44
- */
-@Getter
-@Setter
-public class DoctorAdviceLabel extends GeneralLabel {
-}

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<>();   //医嘱信息
+}

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

@@ -1,15 +0,0 @@
-package com.lantone.qc.pub.model.label;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @ClassName : NoticeLabel
- * @Description : 注意事项，主要出现在出院小结
- * @Author : 楼辉荣
- * @Date: 2020-03-17 14:42
- */
-@Setter
-@Getter
-public class NoticeLabel extends GeneralLabel {
-}

public/src/main/java/com/lantone/qc/pub/model/vo/QueryVo.java

@@ -23,6 +23,4 @@ public class QueryVo extends TokenVO {
 
     private String cid;
 
-    private String org;
-
 }