|
@@ -4,9 +4,11 @@ import com.google.common.collect.Lists;
|
|
import com.lantone.qc.pub.model.InputInfo;
|
|
import com.lantone.qc.pub.model.InputInfo;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.model.vo.QueryVo;
|
|
import com.lantone.qc.pub.model.vo.QueryVo;
|
|
|
|
+import com.lantone.qc.pub.util.DateUtil;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
import com.lantone.qc.trans.DocTrans;
|
|
import com.lantone.qc.trans.DocTrans;
|
|
|
|
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -241,6 +243,18 @@ public class TaizhouDocTrans extends DocTrans {
|
|
.stream()
|
|
.stream()
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
|
|
.map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
|
|
.map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().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());
|
|
.collect(Collectors.toList());
|
|
if (ListUtil.isNotEmpty(pdPageDataList)) {
|
|
if (ListUtil.isNotEmpty(pdPageDataList)) {
|
|
inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
|
|
inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
|