From 4a0ac03ee34ca3eb4370fabb5eae006789f219dd Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 2 Jan 2018 15:56:48 +0800 Subject: [PATCH] bbbbbb --- .../operate/web/service/impl/BloodSugarServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 b1b3e79..0dacc68 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 @@ -251,8 +251,15 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); Set dayCountSet = new HashSet<>(); Set monthCountSet = new HashSet<>(); + Set monthCountSet2 = new TreeSet<>(new Comparator() { + @Override + public int compare(String o1, String o2) { + return o1.compareTo(o2); + } + }); for (BloodSugar bloodSugar : bloodSugars) { monthCountSet.add(DateUtil.getMonth(bloodSugar.getCreated())+""); + monthCountSet2.add(DateUtil.getyyyy_mm(bloodSugar.getCreated())); dayCountSet.add(DateUtil.getyyyy_MM_dd(bloodSugar.getCreated())); if(bloodSugar.getBloodSugarType() == type) { @@ -344,15 +351,6 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga CollectionUtils.sortListByMapKeyWithDate(restList, "craeted"); - Set monthCountSet2 = new HashSet<>(); - for (String s : monthCountSet) { - if(s.length() == 1) { - monthCountSet2.add("0" + s); - } else { - monthCountSet2.add(s); - } - } - return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet2, "monthAvgMap", monthAvgMap, "weekAvgMap", weekAvgMap); } -- 1.8.3.1