Commit df0ccbd05f86716cda8e6c22974c2101d6da8702
1 parent
5d07c8f220
Exists in
master
and in
6 other branches
儿童身高曲线图还原到历史
Showing 1 changed file with 13 additions and 28 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
df0ccbd
| ... | ... | @@ -1678,22 +1678,19 @@ |
| 1678 | 1678 | |
| 1679 | 1679 | Map<String,Object> map = new HashMap<>(); |
| 1680 | 1680 | |
| 1681 | - List<Integer> weightTitles = new LinkedList<>(); | |
| 1681 | + List<String> weightTitles = new LinkedList<>(); | |
| 1682 | 1682 | List<String> weightValues = new LinkedList<>(); |
| 1683 | 1683 | |
| 1684 | - List<Integer> heightTitles = new LinkedList<>(); | |
| 1684 | + List<String> heightTitles = new LinkedList<>(); | |
| 1685 | 1685 | List<String> heightValues = new LinkedList<>(); |
| 1686 | 1686 | |
| 1687 | - List<Map<String,Object>> tables = new LinkedList<>(); | |
| 1687 | + List<Map<String,String>> tables = new LinkedList<>(); | |
| 1688 | 1688 | |
| 1689 | - BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 1690 | - | |
| 1691 | 1689 | BabyCheckModelQuery query = new BabyCheckModelQuery(); |
| 1692 | 1690 | query.setYn(YnEnums.YES.getId()); |
| 1693 | 1691 | query.setBuildId(babyId); |
| 1694 | 1692 | //查询儿童的检查记录 |
| 1695 | 1693 | List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.ASC); |
| 1696 | - | |
| 1697 | 1694 | if (CollectionUtils.isNotEmpty(checkModels)) |
| 1698 | 1695 | { |
| 1699 | 1696 | for (BabyCheckModel checkModel : checkModels) |
| 1700 | 1697 | |
| 1701 | 1698 | |
| ... | ... | @@ -1702,21 +1699,15 @@ |
| 1702 | 1699 | { |
| 1703 | 1700 | if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()) || org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) |
| 1704 | 1701 | { |
| 1705 | - int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),checkModel.getCheckDate()); | |
| 1706 | - Map<String,Object> heightMap = new HashMap<>(); | |
| 1707 | - heightMap.put("time",month); | |
| 1702 | + Map<String,String> heightMap = new HashMap<>(); | |
| 1708 | 1703 | if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())) |
| 1709 | 1704 | { |
| 1710 | 1705 | if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHeight()).matches()) |
| 1711 | 1706 | { |
| 1712 | - if(heightTitles.contains(month)){ | |
| 1713 | - int index = heightTitles.indexOf(month); | |
| 1714 | - heightValues.set(index,checkModel.getHeight()); | |
| 1715 | - }else { | |
| 1716 | - heightTitles.add(month); | |
| 1717 | - heightValues.add(checkModel.getHeight()); | |
| 1718 | - } | |
| 1707 | + heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); | |
| 1708 | + heightValues.add(checkModel.getHeight()); | |
| 1719 | 1709 | } |
| 1710 | + heightMap.put("time",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); | |
| 1720 | 1711 | heightMap.put("height", checkModel.getHeight()); |
| 1721 | 1712 | } |
| 1722 | 1713 | else |
| 1723 | 1714 | |
| 1724 | 1715 | |
| ... | ... | @@ -1728,21 +1719,17 @@ |
| 1728 | 1719 | { |
| 1729 | 1720 | if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getWeight()).matches()) |
| 1730 | 1721 | { |
| 1731 | - | |
| 1732 | - if(weightTitles.contains(month)){//如果存在月的数据则更新对应索引的值 | |
| 1733 | - int index = weightTitles.indexOf(month); | |
| 1734 | - weightValues.set(index,checkModel.getWeight()); | |
| 1735 | - }else { | |
| 1736 | - weightTitles.add(month); | |
| 1737 | - weightValues.add(checkModel.getWeight()); | |
| 1738 | - } | |
| 1722 | + weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); | |
| 1723 | + weightValues.add(checkModel.getWeight()); | |
| 1739 | 1724 | } |
| 1725 | + heightMap.put("time", DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); | |
| 1740 | 1726 | heightMap.put("weight",checkModel.getWeight()); |
| 1741 | 1727 | } |
| 1742 | 1728 | else |
| 1743 | 1729 | { |
| 1744 | 1730 | heightMap.put("weight", "--"); |
| 1745 | 1731 | } |
| 1732 | + | |
| 1746 | 1733 | tables.add(heightMap); |
| 1747 | 1734 | } |
| 1748 | 1735 | } |
| ... | ... | @@ -1755,9 +1742,7 @@ |
| 1755 | 1742 | map.put("heightValues",heightValues); |
| 1756 | 1743 | |
| 1757 | 1744 | map.put("tables",tables); |
| 1758 | - if(babyModel!=null){ | |
| 1759 | - map.put("sex",babyModel.getSex()); | |
| 1760 | - } | |
| 1745 | + | |
| 1761 | 1746 | return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 1762 | 1747 | } |
| 1763 | 1748 | } |