diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index b2fd5bb..56ab4e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1678,22 +1678,19 @@ public class BabyCheckFacade { Map map = new HashMap<>(); - List weightTitles = new LinkedList<>(); + List weightTitles = new LinkedList<>(); List weightValues = new LinkedList<>(); - List heightTitles = new LinkedList<>(); + List heightTitles = new LinkedList<>(); List heightValues = new LinkedList<>(); - List> tables = new LinkedList<>(); - - BabyModel babyModel = babyService.getOneBabyById(babyId); + List> tables = new LinkedList<>(); BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setYn(YnEnums.YES.getId()); query.setBuildId(babyId); //查询儿童的检查记录 List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.ASC); - if (CollectionUtils.isNotEmpty(checkModels)) { for (BabyCheckModel checkModel : checkModels) @@ -1702,21 +1699,15 @@ public class BabyCheckFacade { { if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()) || org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) { - int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),checkModel.getCheckDate()); - Map heightMap = new HashMap<>(); - heightMap.put("time",month); + Map heightMap = new HashMap<>(); if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())) { if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHeight()).matches()) { - if(heightTitles.contains(month)){ - int index = heightTitles.indexOf(month); - heightValues.set(index,checkModel.getHeight()); - }else { - heightTitles.add(month); - heightValues.add(checkModel.getHeight()); - } + heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + heightValues.add(checkModel.getHeight()); } + heightMap.put("time",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); heightMap.put("height", checkModel.getHeight()); } else @@ -1728,21 +1719,17 @@ public class BabyCheckFacade { { if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getWeight()).matches()) { - - if(weightTitles.contains(month)){//如果存在月的数据则更新对应索引的值 - int index = weightTitles.indexOf(month); - weightValues.set(index,checkModel.getWeight()); - }else { - weightTitles.add(month); - weightValues.add(checkModel.getWeight()); - } + weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + weightValues.add(checkModel.getWeight()); } + heightMap.put("time", DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); heightMap.put("weight",checkModel.getWeight()); } else { heightMap.put("weight", "--"); } + tables.add(heightMap); } } @@ -1755,9 +1742,7 @@ public class BabyCheckFacade { map.put("heightValues",heightValues); map.put("tables",tables); - if(babyModel!=null){ - map.put("sex",babyModel.getSex()); - } + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -} +} \ No newline at end of file