diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java index 19999b5..d3b0d81 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java @@ -37,6 +37,15 @@ public class BabyNutritionService { return babyNutritionDao.queryBabyNutritions(query.addOrder(Sort.Direction.DESC, "created")); } + public List queryBabyNutritions(BabyNutritionQuery babyQuery,String sortkey,Sort.Direction sort){ + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + return babyNutritionDao.queryBabyNutritions(query.addOrder(sort, sortkey)); + } + public int queryBabyNutritionCount(BabyNutritionQuery babyQuery){ return babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery()); 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 5530eac..c94fa49 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 @@ -83,7 +83,7 @@ public class BabyNutritionFacade { BabyNutritionQuery babyQuery = new BabyNutritionQuery(); babyQuery.setBabyId(babyId); - List models = babyNutritionService.queryBabyNutritions(babyQuery); + List models = babyNutritionService.queryBabyNutritions(babyQuery,"nutritiTime", Sort.Direction.ASC); if (CollectionUtils.isNotEmpty(models)) { for (BabyNutritionModel model : models)