首頁 探索 說明
註冊 登入
java
/
qc
2
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

厦门 顺序修改

rengb 4 年之前
父節點
6a4d3a21dc
當前提交
05f0af6ce3
共有 1 個文件被更改，包括 17 次插入 和 17 次删除
分割檢視 顯示文件統計
  1. 17 17
      trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDocTrans.java

+ 17 - 17
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDocTrans.java
查看文件 

@@ -157,7 +157,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getClinicalBloodDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .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()));
 
@@ -168,7 +168,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getClinicBloodEffectDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -178,7 +178,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getCrisisValueReportDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -188,7 +188,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getCriticallyIllNoticeDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -198,7 +198,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getSeriouslyIllNoticeDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -208,7 +208,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getDifficultCaseDiscussDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -218,7 +218,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getDutyShiftSystemDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -228,7 +228,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getRescueDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -238,7 +238,7 @@ public class XiamenDocTrans extends DocTrans {
 
                     inputInfo.getStagesSummaryDocs()
 
                             .stream()
 
                             .map(i -> i.getPageData())
 
-                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
+                            .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                             .collect(Collectors.toList())
 
             );
 
         }
 
@@ -250,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(crPd)) {
 
                 inputInfo.getPageData().put("会诊记录", crPd);
 
@@ -260,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(caPd)) {
 
                 inputInfo.getPageData().put("会诊申请单", caPd);
 
@@ -270,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(ctPd)) {
 
                 inputInfo.getPageData().put("会诊结果单", ctPd);
 
@@ -281,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(odPageDataList)) {
 
                 inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
 
@@ -291,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(orPageDataList)) {
 
                 inputInfo.getPageData().put("手术记录", orPageDataList);
 
@@ -301,7 +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"))
 
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                     .collect(Collectors.toList());
 
             if (ListUtil.isNotEmpty(pdPageDataList)) {
 
                 inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
 
@@ -315,7 +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"))
 
+                                .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                                 .collect(Collectors.toList())
 
                 );
 
             }
 
@@ -327,7 +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"))
 
+                                .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm:ss"))
 
                                 .collect(Collectors.toList())
 
                 );
 
             }