Commit 7b0edfe05c36e1db4a062426e6eacd9b029beaec
1 parent
590aa8ea33
Exists in
master
and in
6 other branches
访视相关bug修复
Showing 2 changed files with 7 additions and 5 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java
View file @
7b0edfe
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
7b0edfe
| ... | ... | @@ -177,12 +177,12 @@ |
| 177 | 177 | Criteria c = new Criteria(); |
| 178 | 178 | c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); |
| 179 | 179 | List<BabyModel> babyModels = mongoUtil.findField(BabyModel.class, c, "id"); |
| 180 | - if(CollectionUtils.isNotEmpty(babyModels)) { | |
| 180 | +// if(CollectionUtils.isNotEmpty(babyModels)) { | |
| 181 | 181 | List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class); |
| 182 | 182 | criteria.and("babyId").in(babyIds); |
| 183 | - } | |
| 183 | +// } | |
| 184 | 184 | } |
| 185 | - PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit); | |
| 185 | + PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); | |
| 186 | 186 | List<NewbornVisit> newbornVisits = (List<NewbornVisit>) pageResult.getGrid(); |
| 187 | 187 | List<Map<String, Object>> restMap = new ArrayList<>(); |
| 188 | 188 | for (NewbornVisit visit : newbornVisits) { |