diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHeartModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHeartModel.java index 8f516b2..f020765 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHeartModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHeartModel.java @@ -17,7 +17,7 @@ public class BabyHeartModel extends BaseModel { private String id; private String babyId; - // 1 72小时内检查 42天检查 + // 1 72小时 2 42天检查 private Integer type; //心脏听诊 private String heartTz; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHeartSieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHeartSieveController.java index 7a2f246..5d80d69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHeartSieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHeartSieveController.java @@ -114,7 +114,7 @@ public class BabyHeartSieveController extends BaseController{ } @TokenRequired @ResponseBody - @RequestMapping(value = "/queryBabyHeartReviewList",method = RequestMethod.POST) + @RequestMapping(value = "/queryBabyHeartReviewList",method = RequestMethod.GET) public BaseResponse queryBabyHeartReviewList(@RequestParam(value = "queryNo", required = false) String queryNo, @RequestParam(value = "checkDate", required = false) String checkDate, @RequestParam("page") Integer page, @@ -123,7 +123,12 @@ public class BabyHeartSieveController extends BaseController{ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyHeartSieveFacede.queryBabyHeartReviewList(queryNo,checkDate,page,limit, loginState.getId()); } - + @TokenRequired + @ResponseBody + @RequestMapping(value = "/queryBabyHeartReviewRecords/{babyId}",method = RequestMethod.GET) + public BaseResponse queryBabyHeartReviewRecords(@PathVariable("babyId") String babyId,HttpServletRequest request) { + return babyHeartSieveFacede.queryBabyHeartReviewRecords(babyId); + } @TokenRequired @ResponseBody @RequestMapping(value = "/queryBabyHeartReviewById/{id}",method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHeartSieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHeartSieveFacede.java index ab626c8..cd8d67f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHeartSieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHeartSieveFacede.java @@ -309,6 +309,25 @@ public class BabyHeartSieveFacede { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(one); } + public BaseResponse queryBabyHeartReviewRecords(String babyId) { + List datas = new ArrayList<>(); + Query query = new Query(); + query.addCriteria(Criteria.where("babyId").is(babyId)); + List reviewModels = mongoTemplate.find(query, BabyHeartReviewModel.class); + if (CollectionUtils.isNotEmpty(reviewModels)) + { + for(BabyHeartReviewModel reviewModel : reviewModels) + { + Map data = new HashMap(); + data.put("id",reviewModel.getId()); + data.put("checkDate",DateUtil.getyyyy_MM_dd(reviewModel.getCheckDate())); + datas.add(data); + } + } + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS) + .setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(datas); + } public BaseResponse queryBabyHeartReviewView(String id) { Query query = new Query();