jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 40e6813e79f5bdc96e82a7d2adffeb7ea51787a1

Authored by shiyang
1 parent ca4d41698d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 7 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java View file @ 40e6813
... ... @@ -139,15 +139,15 @@
139 139 /**
140 140 * 儿童健康检查记录表
141 141 * @param id
142   - * @param checkMonthAge
  142 + * @param monthAge
143 143 * @return
144 144 */
145 145 @ResponseBody
146 146 @TokenRequired
147 147 @RequestMapping(value = "/baby/check/chkRecordLst", method = RequestMethod.GET)
148 148 public BaseResponse chkRecordLst(@RequestParam(value = "id", required = false) String id,
149   - @RequestParam(value = "checkMonthAge", required = false) Integer checkMonthAge, HttpServletRequest request) {
150   - return babyHealthFacade.chkRecordLst(id,checkMonthAge);
  149 + @RequestParam(value = "monthAge", required = false) Integer monthAge, HttpServletRequest request) {
  150 + return babyHealthFacade.chkRecordLst(id,monthAge);
151 151 }
152 152  
153 153  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java View file @ 40e6813
... ... @@ -1014,11 +1014,11 @@
1014 1014 * @param checkMonthAge
1015 1015 * @return
1016 1016 */
1017   - public BaseResponse chkRecordLst(String id, Integer checkMonthAge) {
  1017 + public BaseResponse chkRecordLst(String id, Integer monthAge) {
1018 1018 List<Map<String, Object>> rest = new ArrayList<Map<String, Object>>();
1019 1019  
1020 1020 Criteria criteriaCheck = Criteria.where("buildId").in(id);
1021   - criteriaCheck.and("tcType").is(checkMonthAge);//查询的是检查套餐
  1021 + criteriaCheck.and("tcType").is(monthAge);//查询的是检查套餐
1022 1022 List<BabyCheckModel> babyCheckModelList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
1023 1023 List<BabyEyeCheck> babyEyeCheckList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class);
1024 1024  
... ... @@ -1043,7 +1043,7 @@
1043 1043 }
1044 1044  
1045 1045 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();//耳筛
1046   - query.setScreenDate(DateUtil.addMonth(birthDate,checkMonthAge));
  1046 + query.setScreenDate(DateUtil.addMonth(birthDate,monthAge));
1047 1047 List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query);
1048 1048 if(babyPatientExtendEarScreens.size()>0){
1049 1049 rs.putAll(new BeanMap(babyPatientExtendEarScreens.get(0)));
... ... @@ -1052,7 +1052,7 @@
1052 1052 // 新生儿访视模型
1053 1053  
1054 1054  
1055   - 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);
  1055 + 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);
1056 1056  
1057 1057 rs.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
1058 1058 rs.putAll(new BeanMap(babyVisitModel));