Commit 3f61ac808885b656ff78c41272cf29bcec8828cd
1 parent
35c303ed3c
Exists in
master
and in
6 other branches
逗号改括号
Showing 1 changed file with 10 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
View file @
3f61ac8
| ... | ... | @@ -266,6 +266,7 @@ |
| 266 | 266 | } |
| 267 | 267 | } |
| 268 | 268 | for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) { |
| 269 | + boolean flag = true; | |
| 269 | 270 | for (Map.Entry<Integer, Map<String, Object>> entry : weekAvgMapTemp.entrySet()) { |
| 270 | 271 | weekAvgMap.put("name", bloodSugarEnums.getName()); |
| 271 | 272 | if(entry.getKey() == bloodSugarEnums.getId()) { |
| 272 | 273 | |
| ... | ... | @@ -273,10 +274,12 @@ |
| 273 | 274 | Integer dayCount = (Integer) map.get("dayCount"); |
| 274 | 275 | Double sugarCount = (Double) map.get("sugarCount"); |
| 275 | 276 | weekAvgMap.put("value", sugarCount / dayCount); |
| 276 | - } else { | |
| 277 | - weekAvgMap.put("value", "--"); | |
| 277 | + flag = false; | |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | + if(flag) { | |
| 281 | + weekAvgMap.put("value", "--"); | |
| 282 | + } | |
| 280 | 283 | } |
| 281 | 284 | |
| 282 | 285 | // 月平均 |
| ... | ... | @@ -295,6 +298,7 @@ |
| 295 | 298 | } |
| 296 | 299 | } |
| 297 | 300 | for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) { |
| 301 | + boolean flag = true; | |
| 298 | 302 | for (Map.Entry<Integer, Map<String, Object>> entry : monthAvgTemp.entrySet()) { |
| 299 | 303 | weekAvgMap.put("name", bloodSugarEnums.getName()); |
| 300 | 304 | if(entry.getKey() == bloodSugarEnums.getId()) { |
| 301 | 305 | |
| ... | ... | @@ -302,9 +306,11 @@ |
| 302 | 306 | Integer dayCount = (Integer) map.get("dayCount"); |
| 303 | 307 | Double sugarCount = (Double) map.get("sugarCount"); |
| 304 | 308 | weekAvgMap.put("value", sugarCount / dayCount); |
| 305 | - } else { | |
| 306 | - weekAvgMap.put("value", "--"); | |
| 309 | + flag = false; | |
| 307 | 310 | } |
| 311 | + } | |
| 312 | + if(flag) { | |
| 313 | + weekAvgMap.put("value", "--"); | |
| 308 | 314 | } |
| 309 | 315 | } |
| 310 | 316 |