Commit e76a299da1578ccec37cf209e7ef77b040a0da84
1 parent
3f3f69d0c2
Exists in
master
and in
6 other branches
bug
Showing 1 changed file with 7 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
e76a299
| ... | ... | @@ -147,6 +147,10 @@ |
| 147 | 147 | if(StringUtils.isNotBlank(doctor)) { |
| 148 | 148 | criteria.and("doctor").is(doctor); |
| 149 | 149 | } |
| 150 | + if(StringUtils.isNotBlank(key)) { | |
| 151 | + Criteria c = new Criteria(); | |
| 152 | + mongoUtil.findField(PersonModel.class, c, "id"); | |
| 153 | + } | |
| 150 | 154 | PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit); |
| 151 | 155 | List<NewbornVisit> newbornVisits = (List<NewbornVisit>) pageResult.getGrid(); |
| 152 | 156 | List<Map<String, Object>> restMap = new ArrayList<>(); |
| 153 | 157 | |
| ... | ... | @@ -170,12 +174,13 @@ |
| 170 | 174 | } |
| 171 | 175 | temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class)); |
| 172 | 176 | temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class)); |
| 173 | -// Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor())); | |
| 177 | + restMap.add(temp); | |
| 178 | + // Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor())); | |
| 174 | 179 | // temp.put("doctorName", users == null ? null : users.getName()); |
| 175 | 180 | } |
| 176 | 181 | |
| 177 | 182 | } |
| 178 | - return RespBuilder.buildSuccess(newbornVisits); | |
| 183 | + return RespBuilder.buildSuccess(restMap); | |
| 179 | 184 | } |
| 180 | 185 | |
| 181 | 186 | @Override |