|
@@ -162,7 +162,25 @@ public class TaizhouDocTrans extends DocTrans {
|
|
|
inputInfo.getPageData().put("输血后效果评价", inputInfo.getClinicBloodEffectDocs().stream().map(i -> i.getPageData()).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) -> {
|
|
|
+ Date date1 = null, date2 = null;
|
|
|
+ if (map1.get("病历日期") != null) {
|
|
|
+ date1 = DateUtil.parseDate(map1.get("病历日期").toString(), "yyyy-MM-dd HH:mm");
|
|
|
+ }
|
|
|
+ if (map2.get("病历日期") != null) {
|
|
|
+ date2 = DateUtil.parseDate(map2.get("病历日期").toString(), "yyyy-MM-dd HH:mm");
|
|
|
+ }
|
|
|
+ long time1 = date1 == null ? 0 : date1.getTime();
|
|
|
+ long time2 = date2 == null ? 0 : date2.getTime();
|
|
|
+ return (int) (time1 - time2);
|
|
|
+ })
|
|
|
+ .collect(Collectors.toList())
|
|
|
+ );
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
|
|
|
inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|