Merge remote-tracking branch 'origin/master'

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java

@@ -44,8 +44,9 @@ public class BEH0376 extends QCCatalogue {
                 )
                 .count();
         if (count > 0
-                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getMaritalStatus().getName().contains("未婚")
-                || inputInfo.getBeHospitalizedDoc().getMaritalLabel() == null) {
+                || (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getMaritalStatus() != null
+                && inputInfo.getBeHospitalizedDoc().getMaritalLabel().getMaritalStatus().getName().contains("未婚"))
+                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText() == null) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0187.java

@@ -23,7 +23,8 @@ public class FIRP0187 extends QCCatalogue {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             String outWay = firstpageStructureMap.get(Content.outWay).toString();
             String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy).toString();
-            if (!CatalogueUtil.isEmpty(outWay) && !outWay.contains("死亡") && !CatalogueUtil.isEmpty(deadAutopsy)){
+            if (!CatalogueUtil.isEmpty(outWay) && !outWay.contains("死亡")
+                    && !CatalogueUtil.isEmpty(deadAutopsy) && !deadAutopsy.trim().equals("-")){
                 status.set("-1");
             }
         }

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

@@ -24,10 +24,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ClassName : QCTestController
@@ -211,6 +208,15 @@ public class QCTestController {
                     }
                     medrec.add(medrecVo);
                     details = new ArrayList<>();
+                } else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label) && (label.equals("会诊记录") || label.equals("会诊申请单") || label.equals("会诊结果单"))) {
+                    MedrecVo medrecVo = createLevelMedrecVo(medrec, details, "会诊", label);
+                    medrec.add(medrecVo);
+                    details = new ArrayList<>();
+                }  else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)
+                        && (label.equals("术后首次病程及谈话记录") || label.equals("手术记录") || label.equals("术前讨论、术前小结") || label.equals("手术知情同意书") || label.equals("手术安全核查表"))) {
+                    MedrecVo medrecVo = createLevelMedrecVo(medrec, details, "手术", label);
+                    medrec.add(medrecVo);
+                    details = new ArrayList<>();
                 } else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
                     MedrecVo medrecVo = new MedrecVo();
                     medrecVo.setTitle(label);
@@ -247,6 +253,29 @@ public class QCTestController {
         }
         return queryVoMap;
     }
+
+    private MedrecVo createLevelMedrecVo(List<MedrecVo> medrec, List<String> details, String label, String level_1) {
+        MedrecVo medrecVo = null;
+        for (MedrecVo mv : medrec) {
+            if (label.equals(mv.getTitle())) {
+                medrecVo = mv;
+            }
+        }
+        Map<String, List<String>> m = null;
+        if (medrecVo == null) {
+            m = new HashMap<>();
+            medrecVo = new MedrecVo();
+            medrecVo.setTitle(label);
+        } else {
+            m = (Map) medrecVo.getContent().get("content");
+        }
+        m.put(level_1, details);
+        Map<String, Object> cur = new HashMap<>();
+        cur.put("content", m);
+        medrecVo.setContent(cur);
+        return medrecVo;
+    }
+
     public int number(List<String> labels,String lab){
         int initNume = 0;
         if(labels != null && labels.size()>0){