厦门 顺序修改

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDocTrans.java

@@ -152,7 +152,14 @@ public class XiamenDocTrans extends DocTrans {
         }
 
         if (ListUtil.isNotEmpty(inputInfo.getClinicalBloodDocs())) {
-            inputInfo.getPageData().put("输血/血制品病程记录", inputInfo.getClinicalBloodDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "输血/血制品病程记录",
+                    inputInfo.getClinicalBloodDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
             inputInfo.setClinicalBloodDocs(inputInfo.getClinicalBloodDocs().stream().filter(i -> StringUtil.isNotBlank(i.getText()) && !i.getText().contains("输白蛋白")).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getClinicBloodEffectDocs())) {
@@ -161,29 +168,79 @@ public class XiamenDocTrans extends DocTrans {
                     inputInfo.getClinicBloodEffectDocs()
                             .stream()
                             .map(i -> i.getPageData())
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm"))
-                            .collect(Collectors.toList()));
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getCrisisValueReportDocs())) {
-            inputInfo.getPageData().put("危急值记录", inputInfo.getCrisisValueReportDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "危急值记录",
+                    inputInfo.getCrisisValueReportDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
-            inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "病危通知书",
+                    inputInfo.getCriticallyIllNoticeDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getSeriouslyIllNoticeDocs())) {
-            inputInfo.getPageData().put("病重通知书", inputInfo.getSeriouslyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "病重通知书",
+                    inputInfo.getSeriouslyIllNoticeDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
-            inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "疑难病例讨论记录",
+                    inputInfo.getDifficultCaseDiscussDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getDutyShiftSystemDocs())) {
-            inputInfo.getPageData().put("值班交接制度", inputInfo.getDutyShiftSystemDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "值班交接制度",
+                    inputInfo.getDutyShiftSystemDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getRescueDocs())) {
-            inputInfo.getPageData().put("抢救记录", inputInfo.getRescueDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "抢救记录",
+                    inputInfo.getRescueDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getStagesSummaryDocs())) {
-            inputInfo.getPageData().put("阶段小结", inputInfo.getStagesSummaryDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "阶段小结",
+                    inputInfo.getStagesSummaryDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getThreeLevelWardDocs())) {
             inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
@@ -193,6 +250,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(crPd)) {
                 inputInfo.getPageData().put("会诊记录", crPd);
@@ -202,6 +260,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(caPd)) {
                 inputInfo.getPageData().put("会诊申请单", caPd);
@@ -211,6 +270,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(ctPd)) {
                 inputInfo.getPageData().put("会诊结果单", ctPd);
@@ -221,6 +281,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(odPageDataList)) {
                 inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
@@ -230,6 +291,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(orPageDataList)) {
                 inputInfo.getPageData().put("手术记录", orPageDataList);
@@ -239,6 +301,7 @@ public class XiamenDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(pdPageDataList)) {
                 inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
@@ -252,6 +315,7 @@ public class XiamenDocTrans extends DocTrans {
                                 .stream()
                                 .filter(i -> i != null)
                                 .map(i -> i.getPageData())
+                                .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                                 .collect(Collectors.toList())
                 );
             }
@@ -263,6 +327,7 @@ public class XiamenDocTrans extends DocTrans {
                                 .stream()
                                 .filter(i -> i != null)
                                 .map(i -> i.getPageData())
+                                .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy-MM-dd HH:mm:ss"))
                                 .collect(Collectors.toList())
                 );
             }