Commit ae9392346de069490d8ab14d5ce198b26ef283e6
Exists in
master
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
ae93923
| ... | ... | @@ -376,13 +376,13 @@ |
| 376 | 376 | * 儿童生长统计 |
| 377 | 377 | * @return |
| 378 | 378 | */ |
| 379 | - @RequestMapping(method = RequestMethod.GET, value = "/getBabyGroupCount") | |
| 379 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyGrowthCount") | |
| 380 | 380 | @ResponseBody |
| 381 | 381 | @TokenRequired |
| 382 | - public BaseResponse getBabyGroupCount(@Valid BabyManageRequest babyManageRequest, | |
| 382 | + public BaseResponse getBabyGrowthCount(@Valid BabyManageRequest babyManageRequest, | |
| 383 | 383 | HttpServletRequest request) { |
| 384 | 384 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 385 | - return babyBookbuildingFacade.getBabyGroupCount(babyManageRequest, loginState.getId()); | |
| 385 | + return babyBookbuildingFacade.getBabyGrowthCount(babyManageRequest, loginState.getId()); | |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
| 389 | 389 | |
| 390 | 390 | |
| ... | ... | @@ -390,14 +390,14 @@ |
| 390 | 390 | * @param babyManageRequest |
| 391 | 391 | * @return |
| 392 | 392 | */ |
| 393 | - @RequestMapping(method = RequestMethod.GET, value = "/getBabyGroupRightCount") | |
| 393 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyGrowthRightList") | |
| 394 | 394 | @ResponseBody |
| 395 | 395 | @TokenRequired |
| 396 | - public BaseResponse getBabyGroupRightCount(@Valid BabyManageRequest babyManageRequest,HttpServletRequest request, | |
| 396 | + public BaseResponse getBabyGrowthRightList(@Valid BabyManageRequest babyManageRequest,HttpServletRequest request, | |
| 397 | 397 | @RequestParam("page") Integer page, |
| 398 | 398 | @RequestParam("limit") Integer limit){ |
| 399 | 399 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 400 | - return babyBookbuildingFacade.getBabyGroupRightCount(babyManageRequest,loginState.getId(),page,limit); | |
| 400 | + return babyBookbuildingFacade.getBabyGrowthRightList(babyManageRequest,loginState.getId(),page,limit); | |
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
ae93923
| ... | ... | @@ -2142,7 +2142,7 @@ |
| 2142 | 2142 | * @param userId |
| 2143 | 2143 | * @return |
| 2144 | 2144 | */ |
| 2145 | - public BaseResponse getBabyGroupCount(BabyManageRequest request, Integer userId) { | |
| 2145 | + public BaseResponse getBabyGrowthCount(BabyManageRequest request, Integer userId) { | |
| 2146 | 2146 | String hospitalId = ""; |
| 2147 | 2147 | //得到当前登录的医院id |
| 2148 | 2148 | if (userId != null) { |
| ... | ... | @@ -2201,7 +2201,7 @@ |
| 2201 | 2201 | * @param userId |
| 2202 | 2202 | * @return |
| 2203 | 2203 | */ |
| 2204 | - public BaseResponse getBabyGroupRightCount(BabyManageRequest request, Integer userId,Integer page,Integer limit) { | |
| 2204 | + public BaseResponse getBabyGrowthRightList(BabyManageRequest request, Integer userId,Integer page,Integer limit) { | |
| 2205 | 2205 | String hospitalId = ""; |
| 2206 | 2206 | //得到当前登录的医院id |
| 2207 | 2207 | if (userId != null) { |