Commit 2e4cf829a5175747417305d1021a69ef035b633c
1 parent
448d03d482
Exists in
master
and in
6 other branches
儿童营养
Showing 2 changed files with 10 additions and 1 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java
View file @
2e4cf82
| ... | ... | @@ -37,6 +37,15 @@ |
| 37 | 37 | return babyNutritionDao.queryBabyNutritions(query.addOrder(Sort.Direction.DESC, "created")); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | + public List<BabyNutritionModel> queryBabyNutritions(BabyNutritionQuery babyQuery,String sortkey,Sort.Direction sort){ | |
| 41 | + MongoQuery query = babyQuery.convertToQuery(); | |
| 42 | + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { | |
| 43 | + babyQuery.mysqlBuild(babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery())); | |
| 44 | + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); | |
| 45 | + } | |
| 46 | + return babyNutritionDao.queryBabyNutritions(query.addOrder(sort, sortkey)); | |
| 47 | + } | |
| 48 | + | |
| 40 | 49 | public int queryBabyNutritionCount(BabyNutritionQuery babyQuery){ |
| 41 | 50 | |
| 42 | 51 | return babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
2e4cf82
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | |
| 84 | 84 | BabyNutritionQuery babyQuery = new BabyNutritionQuery(); |
| 85 | 85 | babyQuery.setBabyId(babyId); |
| 86 | - List<BabyNutritionModel> models = babyNutritionService.queryBabyNutritions(babyQuery); | |
| 86 | + List<BabyNutritionModel> models = babyNutritionService.queryBabyNutritions(babyQuery,"nutritiTime", Sort.Direction.ASC); | |
| 87 | 87 | if (CollectionUtils.isNotEmpty(models)) |
| 88 | 88 | { |
| 89 | 89 | for (BabyNutritionModel model : models) |