Commit 5bc3a44af907df1e61e6d7d98b06e55009b24ece
1 parent
0cc498ff08
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 29 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
5bc3a44
| ... | ... | @@ -237,6 +237,18 @@ |
| 237 | 237 | return babyCheckFacade.queryBabyHealthStatus(birth, value, sex, type, dueDate, babyId, checkDate); |
| 238 | 238 | |
| 239 | 239 | } |
| 240 | + @RequestMapping(value = "/queryBabyHealthStatusMap", method = RequestMethod.GET) | |
| 241 | + @ResponseBody | |
| 242 | + public BaseObjectResponse queryBabyHealthStatusMap(@RequestParam(required = true) Double value, | |
| 243 | + @RequestParam(required = true) Integer sex, | |
| 244 | + @RequestParam(required = true) Integer type, | |
| 245 | + @RequestParam(required = true) String birth, | |
| 246 | + @RequestParam(required = false) String babyId, | |
| 247 | + @RequestParam(required = false) String dueDate, | |
| 248 | + @RequestParam(required = false) String checkDate) { | |
| 249 | + return babyCheckFacade.queryBabyHealthStatusMap(birth, value, sex, type, dueDate, babyId, checkDate); | |
| 250 | + | |
| 251 | + } | |
| 240 | 252 | |
| 241 | 253 | |
| 242 | 254 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
5bc3a44
| ... | ... | @@ -2058,15 +2058,29 @@ |
| 2058 | 2058 | |
| 2059 | 2059 | public BaseObjectResponse queryBabyHealthStatus(String birth, Double value, Integer sex, Integer type, String dueDate, String babyId, |
| 2060 | 2060 | String checkDate) { |
| 2061 | -// String res = ""; | |
| 2061 | + String res = ""; | |
| 2062 | + | |
| 2063 | + //体重 | |
| 2064 | + if (type == 0) { | |
| 2065 | + res = getGrowthValue(birth, value, sex, dueDate, babyId, checkDate); | |
| 2066 | + } else { | |
| 2067 | + res = getGrowthValue1(birth, value, sex, type, dueDate, checkDate); | |
| 2068 | + } | |
| 2069 | + | |
| 2070 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
| 2071 | + objectResponse.setData(res); | |
| 2072 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 2073 | + objectResponse.setErrormsg("成功"); | |
| 2074 | + return objectResponse; | |
| 2075 | + } | |
| 2076 | + public BaseObjectResponse queryBabyHealthStatusMap(String birth, Double value, Integer sex, Integer type, String dueDate, String babyId, | |
| 2077 | + String checkDate) { | |
| 2062 | 2078 | Map res = new HashMap(); |
| 2063 | 2079 | |
| 2064 | 2080 | //体重 |
| 2065 | 2081 | if (type == 0) { |
| 2066 | -// res = getGrowthValue(birth, value, sex, dueDate, babyId, checkDate); | |
| 2067 | 2082 | res = getGrowthValueMap(birth, value, sex, dueDate, babyId, checkDate); |
| 2068 | 2083 | } else { |
| 2069 | -// res = getGrowthValue1(birth, value, sex, type, dueDate, checkDate); | |
| 2070 | 2084 | res = getGrowthValue1Map(birth, value, sex, type, dueDate, checkDate); |
| 2071 | 2085 | } |
| 2072 | 2086 | |
| ... | ... | @@ -2076,7 +2090,6 @@ |
| 2076 | 2090 | objectResponse.setErrormsg("成功"); |
| 2077 | 2091 | return objectResponse; |
| 2078 | 2092 | } |
| 2079 | - | |
| 2080 | 2093 | |
| 2081 | 2094 | public String getGrowthValue(String birth, Double value, Integer sex, String dueDate, String babyId, String checkDate) { |
| 2082 | 2095 |