Merge branch 'dev-template' into dev

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouConsultationDocTrans.java

@@ -136,7 +136,7 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     // 会诊结果映射字段
     private List<String> consultationResults_keyContrasts = Lists.newArrayList(
             "会诊诊断=当前诊断",
-            "事件日期1(会诊申请日期)=会诊申请日期",
+            "事件日期1(会诊申请日期)=申请日期",
             "医生=医师签名",
             "本人姓名=姓名",
             "病史描述=病史回顾描述",

trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouDocTrans.java

@@ -212,7 +212,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "事件日期", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(crePageDataList)) {
                 inputInfo.getPageData().put("会诊记录", crePageDataList);
@@ -222,7 +222,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "事件日期", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(caPageDataList)) {
                 inputInfo.getPageData().put("会诊申请单", caPageDataList);
@@ -232,7 +232,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "事件日期1(会诊申请日期)", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(crsPageDataList)) {
                 inputInfo.getPageData().put("会诊结果单", crsPageDataList);