1、测试类修改

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

@@ -151,13 +151,12 @@ public class QCTestController {
             rs = st.executeQuery(sql);
             String tempCaseNumber = "", label = "";
             List<String> details = new ArrayList<>();
-            List<String> labels = new ArrayList<>();
             while (rs.next()) {
                 r1 = rs.getString(1);
                 r2 = rs.getString(2);
                 r3 = rs.getString(3);
                 r4 = rs.getString(4);
-                labels.add(r3);
+
                 if (!tempCaseNumber.equals(String.valueOf(r2)) && StringUtils.isNotEmpty(tempCaseNumber)) {
                     queryVo.setCid(cid);
                     queryVo.setMedrec(medrec);
@@ -167,59 +166,28 @@ public class QCTestController {
                     medrec = new ArrayList<>();
                     queryVo = new QueryVo();
                 }
-                if (r3.equals("入院记录") || r3.equals("首次病程录") || r3.equals("死亡病例讨论记录") || r3.equals("出院小结") || r3.equals("死亡记录") || r3.equals("病案首页")) {
+                if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
                     MedrecVo medrecVo = new MedrecVo();
-                    medrecVo.setTitle(r3);
+                    medrecVo.setTitle(label);
                     Map<String, Object> m = new HashMap<>();
-                    List<String> contentList = new ArrayList<>();
-                    contentList.add(r4);
-                    m.put("content", contentList);
+                    m.put("content", details);
                     medrecVo.setContent(m);
                     medrec.add(medrecVo);
-                } else if (r3.equals("查房记录") || r3.equals("会诊记录") || r3.equals("医嘱信息") || r3.equals("交接班记录") || r3.equals("输血记录")
-                        || r3.equals("术前讨论小结") || r3.equals("麻醉记录") || r3.equals("麻醉知情同意书") || r3.equals("麻醉术前访视记录") || r3.equals("麻醉术后访视记录") || r3.equals("手术知情同意书")
-                        || r3.equals("手术记录") || r3.equals("术后首次谈话及病程录") || r3.equals("疑难病例讨论记录") || r3.equals("手术风险评估表")
-                        || r3.equals("手术安全核查表") || r3.equals("抢救记录") || r3.equals("危急值记录") || r3.equals("死亡记录")
-                        || r3.equals("病危通知书") || r3.equals("转入记录") || r3.equals("转出记录") || r3.equals("阶段小结")
-                        ||r3.equals("病重通知书") || r3.equals("会诊申请单") || r3.equals("会诊结果单") || r3.equals("输血后效果评价")
-                        ||r3.equals("专科交接单") || r3.equals("转科记录") || r3.equals("病理检验送检单")) {
-                    /*if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
-                        MedrecVo medrecVo = new MedrecVo();
-                        medrecVo.setTitle(label);
-                        Map<String, Object> m = new HashMap<>();
-                        m.put("content", details);
-                        medrecVo.setContent(m);
-                        medrec.add(medrecVo);
-                        details = new ArrayList<>();
-                    }
-                    details.add(r4);*/
-                    int number = number(labels, r3);
-                    if(number > 1){
-                        for (MedrecVo mev:medrec) {
-                            String title = mev.getTitle();
-                            if(r3.equals(title)){
-                                Map<String, Object> content = mev.getContent();
-                                List contentList = (ArrayList)content.get("content");
-                                contentList.add(r4);
-                                content.put("content",contentList);
-                                mev.setContent(content);
-                            }
-                        }
-                    }else {
-                        MedrecVo medrecVo = new MedrecVo();
-                        medrecVo.setTitle(r3);
-                        Map<String, Object> m = new HashMap<>();
-                        List contentList = new ArrayList();
-                        contentList.add(r4);
-                        m.put("content", contentList);
-                        medrecVo.setContent(m);
-                        medrec.add(medrecVo);
-                    }
+                    details = new ArrayList<>();
                 }
-//                label = r3;
+                details.add(r4);
+                label = r3;
                 tempCaseNumber = r2;
             }
 
+            //最后一条记录
+            MedrecVo medrecVo = new MedrecVo();
+            medrecVo.setTitle(label);
+            Map<String, Object> m = new HashMap<>();
+            m.put("content", details);
+            medrecVo.setContent(m);
+            medrec.add(medrecVo);
+
             queryVo.setCid(cid);
             queryVo.setMedrec(medrec);
             queryVo.setInputCatalogueMap(inputCatalogueMap);