|
@@ -225,6 +225,18 @@ public class TaizhouDocTrans extends DocTrans {
|
|
|
.stream()
|
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
|
|
|
.map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
|
|
|
+ .sorted((map1, map2) -> {
|
|
|
+ Date date1 = null, date2 = null;
|
|
|
+ if (map1.get("手术日期") != null) {
|
|
|
+ date1 = DateUtil.parseDate(map1.get("手术日期").toString(), "yyyy/MM/dd");
|
|
|
+ }
|
|
|
+ if (map2.get("手术日期") != null) {
|
|
|
+ date2 = DateUtil.parseDate(map2.get("手术日期").toString(), "yyyy/MM/dd");
|
|
|
+ }
|
|
|
+ long time1 = date1 == null ? 0 : date1.getTime();
|
|
|
+ long time2 = date2 == null ? 0 : date2.getTime();
|
|
|
+ return (int) (time1 - time2);
|
|
|
+ })
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(odPageDataList)) {
|
|
|
inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
|