Commit 4ab7c94a91e3edc757170485242bf9032bb74c26
1 parent
a19c0c4dc2
Exists in
master
and in
6 other branches
修改儿保检查bug
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
4ab7c94
| ... | ... | @@ -813,9 +813,11 @@ |
| 813 | 813 | map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); |
| 814 | 814 | map.put("mName", babyModel.getMname()); |
| 815 | 815 | map.put("mCardNo", babyModel.getMcertNo()); |
| 816 | - map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); | |
| 816 | + //map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); | |
| 817 | + | |
| 817 | 818 | map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 818 | 819 | } |
| 820 | + map.put("checkMonthAge", babyCheckModel.getCheckMonth() + "月龄"); | |
| 819 | 821 | map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); |
| 820 | 822 | map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); |
| 821 | 823 | if (null != babyCheckModel.getHighRisk()) { |
| 822 | 824 | |
| ... | ... | @@ -907,9 +909,10 @@ |
| 907 | 909 | map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); |
| 908 | 910 | map.put("mName", babyModel.getMname()); |
| 909 | 911 | map.put("mCardNo", babyModel.getMcertNo()); |
| 910 | - map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); | |
| 912 | + //map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); | |
| 911 | 913 | map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 912 | 914 | } |
| 915 | + map.put("checkMonthAge", babyCheckModel.getCheckMonth() + "月龄"); | |
| 913 | 916 | map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); |
| 914 | 917 | map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); |
| 915 | 918 | if (null != babyCheckModel.getHighRisk()) { |
| 916 | 919 | |
| ... | ... | @@ -926,11 +929,8 @@ |
| 926 | 929 | map.put("weight", babyCheckModel.getWeight()); |
| 927 | 930 | list.add(map); |
| 928 | 931 | } |
| 929 | - | |
| 930 | 932 | pageResult.setGrid(list); |
| 931 | 933 | return RespBuilder.buildSuccess(pageResult); |
| 932 | - | |
| 933 | - | |
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | public void getBabyCheckList(String[] ids, PersonModel personModel, List<Map<String, String>> list) { |