diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index ee994d5..517afca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -80,6 +80,24 @@ public class BabyNutritionController extends BaseController { /** + * 小程序查询单个儿童膳食列表 + * @param page + * @param limit + * @param babyId + * @param request + * @return + */ + @RequestMapping(value = "/queryBabyAppNutritionList", method = RequestMethod.GET) + @ResponseBody + public BaseResponse queryBabyAppNutritionList(@RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam(required = false) String babyId, + HttpServletRequest request) { + return babyNutritionFacade.queryBabyNutritionList(babyId,page, limit, null, null, null,null, + null, null, null); + } + + /** * 查询营养记录 * * @param babyId diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index af199f4..3b8683d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -245,7 +245,12 @@ public class BabyNutritionFacade { */ public BaseResponse queryBabyNutritionList(String babyId,Integer page, Integer limit, String queryNo, String vcCardNo, String babyName, Integer userId, String recordTime, String interpretDoctorId, String settleStatus) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + String hospitalId = null; + if (userId != null) + { + hospitalId = autoMatchFacade.getHospitalId(userId); + } + List list = new ArrayList<>(); List babyIds = new ArrayList<>(); BaseListResponse objectResponse = new BaseListResponse(); @@ -272,12 +277,16 @@ public class BabyNutritionFacade { } BabyNutritionQuery babyQuery = new BabyNutritionQuery(); - babyQuery.setHospitalId(hospitalId); + babyQuery.setBabyIds(babyIds); if (StringUtils.isNotEmpty(babyId)) { babyQuery.setBabyId(babyId); } + else + { + babyQuery.setHospitalId(hospitalId); + } babyQuery.setLimit(limit); babyQuery.setPage(page);