From e76a299da1578ccec37cf209e7ef77b040a0da84 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 26 Jul 2017 10:11:42 +0800 Subject: [PATCH] bug --- .../platform/operate/web/service/impl/NewbornServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index c43c5db..dfb076c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -147,6 +147,10 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit if(StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); } + if(StringUtils.isNotBlank(key)) { + Criteria c = new Criteria(); + mongoUtil.findField(PersonModel.class, c, "id"); + } PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit); List newbornVisits = (List) pageResult.getGrid(); List> restMap = new ArrayList<>(); @@ -170,12 +174,13 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit } temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class)); temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class)); -// Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor())); + restMap.add(temp); + // Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor())); // temp.put("doctorName", users == null ? null : users.getName()); } } - return RespBuilder.buildSuccess(newbornVisits); + return RespBuilder.buildSuccess(restMap); } @Override -- 1.8.3.1