From 2359c203d3a74e89bb1f28d2ee3dbe10a02f1aa4 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 20 Dec 2017 15:21:08 +0800 Subject: [PATCH] paix --- .../lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index f0d03ab..c4ec471 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -257,7 +257,6 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga List> weekAvgMap = new ArrayList<>(); Map> weekAvgMapTemp = new LinkedHashMap<>(); Date weekStart = DateUtil.getYmdDate(DateUtil.addDay(DateUtil.addWeek(date, -1), 1)); - System.out.println(weekStart.toLocaleString()); List bloodSugarsWeek = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId).and("created").gte(weekStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); for (BloodSugar bloodSugar : bloodSugarsWeek) { if(weekAvgMapTemp.containsKey(bloodSugar.getBloodSugarType())) { @@ -330,6 +329,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga monthAvgMap.add(monthMap); } + CollectionUtils.sortListByMapKeyWithDate(restList, "craeted"); return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet, "monthAvgMap", monthAvgMap, "weekAvgMap", weekAvgMap); } -- 1.8.3.1