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 3601b9a..f853d08 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 @@ -43,8 +43,8 @@ public class NewbornVisitControoler extends BaseController { @RequestMapping(method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) { - return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit); + public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit,String dueOrg) { + return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit,dueOrg); } /** 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 e20c37d..9fd01a0 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 @@ -13,7 +13,7 @@ public interface INewbornVisitService extends IBaseService { BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit); - BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit); + BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg); void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key); 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 44183e5..450aaf3 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 @@ -181,12 +181,15 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit } @Override - public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) { + public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg) { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0"); if(startDate != null && endDate != null) { criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } + if(StringUtils.isNotBlank(dueOrg)) { + criteria.and("dueOrg").is(dueOrg); + } if(StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); }