Commit 1dbdf9551ab4e70e2b1ad77f76cc3c35af3b71de
1 parent
2c25ccd81f
Exists in
master
and in
6 other branches
儿童报告
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
1dbdf95
| ... | ... | @@ -391,12 +391,13 @@ |
| 391 | 391 | map1.put("contents",configModel.getContentOne()); |
| 392 | 392 | list.add(map); |
| 393 | 393 | } |
| 394 | + //热量计算 | |
| 394 | 395 | data.put("foods",list); |
| 395 | 396 | } |
| 396 | 397 | |
| 397 | - //每日所需营养素 | |
| 398 | - List<String> yys = getYys(month); | |
| 399 | 398 | |
| 399 | + List<String> yys = getYys(month); | |
| 400 | + //每日所需营养素 | |
| 400 | 401 | data.put("yys",yys); |
| 401 | 402 | |
| 402 | 403 | } |
| ... | ... | @@ -553,7 +554,7 @@ |
| 553 | 554 | } |
| 554 | 555 | } |
| 555 | 556 | } |
| 556 | - data.put("items", items); | |
| 557 | + data.put("yysitems", items); | |
| 557 | 558 | |
| 558 | 559 | List<Map> wlysitems = new ArrayList<>(); |
| 559 | 560 | if (CollectionUtils.isNotEmpty(wlysMapList)) |