From 3f61ac808885b656ff78c41272cf29bcec8828cd Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 14 Dec 2017 10:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=97=E5=8F=B7=E6=94=B9=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/BloodSugarServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 d589ac4..b988089 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 @@ -266,6 +266,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } } for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) { + boolean flag = true; for (Map.Entry> entry : weekAvgMapTemp.entrySet()) { weekAvgMap.put("name", bloodSugarEnums.getName()); if(entry.getKey() == bloodSugarEnums.getId()) { @@ -273,10 +274,12 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga Integer dayCount = (Integer) map.get("dayCount"); Double sugarCount = (Double) map.get("sugarCount"); weekAvgMap.put("value", sugarCount / dayCount); - } else { - weekAvgMap.put("value", "--"); + flag = false; } } + if(flag) { + weekAvgMap.put("value", "--"); + } } // 月平均 @@ -295,6 +298,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } } for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) { + boolean flag = true; for (Map.Entry> entry : monthAvgTemp.entrySet()) { weekAvgMap.put("name", bloodSugarEnums.getName()); if(entry.getKey() == bloodSugarEnums.getId()) { @@ -302,10 +306,12 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga Integer dayCount = (Integer) map.get("dayCount"); Double sugarCount = (Double) map.get("sugarCount"); weekAvgMap.put("value", sugarCount / dayCount); - } else { - weekAvgMap.put("value", "--"); + flag = false; } } + if(flag) { + weekAvgMap.put("value", "--"); + } } -- 1.8.3.1