diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 8f61a72..37ab22d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -680,6 +680,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService setReport(tzMap, weights, antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), antExChuModels.get(antExChuModels.size() - 1).getHeight())); } + CollectionUtils.sortListByMapKeyWithDateYmd(restList, "checkTime"); + return RespBuilder.buildSuccess("tabList", restList, "xyMap", xyMap, "tzMap", tzMap); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index 3136379..e6c43d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -243,4 +243,14 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt }); } } + + public static void sortListByMapKeyWithDateYmd(List> list, final String key) { + if(CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(key)) { + Collections.sort(list, new Comparator>() { + public int compare(Map o1, Map o2) { + return new Long(DateUtil.parseYMD((String) o1.get(key)).getTime() - DateUtil.parseYMDHMS((String) o2.get(key)).getTime()).intValue(); + } + }); + } + } }