diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java index de9c576..2e56c50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java @@ -50,14 +50,14 @@ public class NewbornVisitControoler extends BaseController { /** * 新生儿访视查询 - * @param pid + * @param babyId * @return */ @RequestMapping(value = "/query", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse query(HttpServletRequest request, String pid) { - return visitService.query(getUserId(request), pid); + public BaseObjectResponse query(HttpServletRequest request, String babyId) { + return visitService.query(getUserId(request), babyId); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java index bbb8f4d..ad1e08e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java @@ -16,5 +16,5 @@ public interface INewbornVisitService extends IBaseService { void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key); - BaseObjectResponse query(Integer userId, String pid); + BaseObjectResponse query(Integer userId, String babyId); } 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 f8af49d..82aff66 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 @@ -222,9 +222,9 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit } @Override - public BaseObjectResponse query(Integer userId, String pid) { + public BaseObjectResponse query(Integer userId, String babyId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - List newbornVisits = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)) + List newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").is(hospitalId)) .with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class); List> rest = new ArrayList<>(); for (NewbornVisit newbornVisit : newbornVisits) {