Commit 6cc114c3e5fec4d612cfb097bee557edfd3c7a23
1 parent
b66e860366
Exists in
master
and in
6 other branches
儿童
Showing 1 changed file with 2 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
View file @
6cc114c
| ... | ... | @@ -191,7 +191,7 @@ |
| 191 | 191 | Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); |
| 192 | 192 | flag = true; |
| 193 | 193 | } |
| 194 | - PageResult pageResult = findMongoPage(BabyModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 194 | + PageResult pageResult = findMongoPage(BabyModel.class, new Query(criteria).with(new Sort(Sort.Direction.ASC, "vcCardNo")), page, limit); | |
| 195 | 195 | List<BabyModel> babykModelsList = (List<BabyModel>) pageResult.getGrid(); |
| 196 | 196 | List<Map<String, Object>> grid = new ArrayList<>(); |
| 197 | 197 | |
| ... | ... | @@ -199,6 +199,7 @@ |
| 199 | 199 | for (BabyModel babyModel : babykModelsList) { |
| 200 | 200 | Map<String, Object> row = new HashMap<>(); |
| 201 | 201 | Map<String, Object> babyMap = new HashMap<>(); |
| 202 | + babyMap.put("vcCardNo", babyModel.getVcCardNo()); | |
| 202 | 203 | babyMap.put("babyName", babyModel.getName()); |
| 203 | 204 | // babyMap.put("sex", babyModel.getSex()); |
| 204 | 205 | babyMap.put("sex", SexEnum.getTextById(babyModel.getSex())); |