From 66773b8b9f1d21d2a55eea786ab3ffb187800afe Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 15 Jun 2017 18:36:18 +0800 Subject: [PATCH] update code --- .../lyms/platform/operate/web/facade/LisFacade.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index e86575e..7266060 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -548,7 +548,7 @@ public class LisFacade { query.setPage(page); query.setLimit(limit); query.setNeed("true"); - query.setSort(" CHECK_TIME,ID ASC "); + query.setSort(" CHECK_TIME,ID DESC "); query.setPhones(phones); query.setVcCardNos(vcCardNos); @@ -556,8 +556,23 @@ public class LisFacade { query.setHospitalIds(hosptalIds); Map hospitalNames = getHospitalNames(hosptalIds); - lises = lisService.queryLisDataByQuery(query); + // 排序 + Collections.sort(lises, new Comparator() { + public int compare(Object a, Object b) { + if (((LisReportModel) a).getCheckTime() == null) { + return -1; + } + if (((LisReportModel) b).getCheckTime() == null) { + return -1; + } + if (((LisReportModel) a).getCheckTime().before(((LisReportModel) a).getCheckTime())) { + return 1; + } + return -1; + } + }); + if (CollectionUtils.isNotEmpty(lises)) { for(LisReportModel lisReportModel : lises) -- 1.8.3.1