diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums2.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums2.java new file mode 100644 index 0000000..f1bb11d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums2.java @@ -0,0 +1,46 @@ +package com.lyms.platform.common.enums; + +/** + * 血糖时间段枚举 + */ +public enum BloodSugarEnums2 { + + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h") ,H(8, "夜间"), I(9, "睡前"); + + BloodSugarEnums2(Integer id, String name) { + this.id = id; + this.name = name; + } + + private Integer id; + private String name; + + public static String getName(Integer id) { + if(id == null) { + return null; + } + BloodSugarEnums2[] values = BloodSugarEnums2.values(); + for (BloodSugarEnums2 value : values) { + if (value.getId() == id) { + return value.getName(); + } + } + return null; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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 57507dd..592c295 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.service.BloodSugarService; import com.lyms.platform.common.enums.BloodSugarEnums; +import com.lyms.platform.common.enums.BloodSugarEnums2; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; @@ -146,14 +147,14 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if(type == bloodSugar.getBloodSugarType()) { bloodSugarAxis.add(0, bloodSugar.getBloodSugar()); } - for (BloodSugarEnums sugarEnums : BloodSugarEnums.values()) { + for (BloodSugarEnums2 sugarEnums : BloodSugarEnums2.values()) { if(sugarEnums.getId() == (bloodSugar.getBloodSugarType())) { temp.put(sugarEnums.getId(), bloodSugar.getBloodSugar()); } } } } - for (BloodSugarEnums sugarEnums : BloodSugarEnums.values()) { + for (BloodSugarEnums2 sugarEnums : BloodSugarEnums2.values()) { if(!temp.containsKey(sugarEnums.getId())) { temp.put(sugarEnums.getId(), "--"); } @@ -255,7 +256,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga Date date = new Date(); List> weekAvgMap = new ArrayList<>(); Map> weekAvgMapTemp = new LinkedHashMap<>(); - Date weekStart = DateUtil.addWeek(date, -1); + 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())) { @@ -292,7 +294,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga // 月平均 List> monthAvgMap = new ArrayList<>(); Map> monthAvgTemp = new LinkedHashMap<>(); - Date monthStart = DateUtil.addMonth(date, -1); +// Date monthStart = DateUtil.addMonth(date, -1); + Date monthStart = DateUtil.getYmdDate(DateUtil.addDay(DateUtil.addMonth(date, -1), 1)); List bloodSugarsMonth = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId).and("created").gte(monthStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); for (BloodSugar bloodSugar : bloodSugarsMonth) { if(monthAvgTemp.containsKey(bloodSugar.getBloodSugarType())) {