From 40e6813e79f5bdc96e82a7d2adffeb7ea51787a1 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 23 Nov 2021 12:41:31 +0800 Subject: [PATCH] update --- .../platform/operate/web/controller/BabyHealthController.java | 6 +++--- .../com/lyms/platform/operate/web/facade/BabyHealthFacade.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java index 8f0840a..05382a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java @@ -139,15 +139,15 @@ public class BabyHealthController extends BaseController { /** * 儿童健康检查记录表 * @param id - * @param checkMonthAge + * @param monthAge * @return */ @ResponseBody @TokenRequired @RequestMapping(value = "/baby/check/chkRecordLst", method = RequestMethod.GET) public BaseResponse chkRecordLst(@RequestParam(value = "id", required = false) String id, - @RequestParam(value = "checkMonthAge", required = false) Integer checkMonthAge, HttpServletRequest request) { - return babyHealthFacade.chkRecordLst(id,checkMonthAge); + @RequestParam(value = "monthAge", required = false) Integer monthAge, HttpServletRequest request) { + return babyHealthFacade.chkRecordLst(id,monthAge); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 872317a..3adb11c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -1014,11 +1014,11 @@ public class BabyHealthFacade extends BaseServiceImpl { * @param checkMonthAge * @return */ - public BaseResponse chkRecordLst(String id, Integer checkMonthAge) { + public BaseResponse chkRecordLst(String id, Integer monthAge) { List> rest = new ArrayList>(); Criteria criteriaCheck = Criteria.where("buildId").in(id); - criteriaCheck.and("tcType").is(checkMonthAge);//查询的是检查套餐 + criteriaCheck.and("tcType").is(monthAge);//查询的是检查套餐 List babyCheckModelList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class); List babyEyeCheckList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class); @@ -1043,7 +1043,7 @@ public class BabyHealthFacade extends BaseServiceImpl { } BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();//耳筛 - query.setScreenDate(DateUtil.addMonth(birthDate,checkMonthAge)); + query.setScreenDate(DateUtil.addMonth(birthDate,monthAge)); List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query); if(babyPatientExtendEarScreens.size()>0){ rs.putAll(new BeanMap(babyPatientExtendEarScreens.get(0))); @@ -1052,7 +1052,7 @@ public class BabyHealthFacade extends BaseServiceImpl { // 新生儿访视模型 - BabyVisitModel babyVisitModel=mongoTemplate.findOne(new Query( Criteria.where("parentid").in(id).and("created").is(DateUtil.addMonth(birthDate,checkMonthAge))).with(new Sort(Sort.Direction.DESC, "created")), BabyVisitModel.class); + BabyVisitModel babyVisitModel=mongoTemplate.findOne(new Query( Criteria.where("parentid").in(id).and("created").is(DateUtil.addMonth(birthDate,monthAge))).with(new Sort(Sort.Direction.DESC, "created")), BabyVisitModel.class); rs.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); rs.putAll(new BeanMap(babyVisitModel)); -- 1.8.3.1