From 2fa5a80b2f22fe3ba093b82fcd5441f2d8eef502 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 16 Oct 2017 14:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E6=80=A7=E5=84=BF=E7=AB=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E5=85=A8=E9=83=A8=E5=84=BF=E7=AB=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E6=97=B6=E9=97=B4=E2=80=9D=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/BabyEyeCheckController.java | 8 ++++++-- .../lyms/platform/operate/web/service/BabyEyeCheckService.java | 2 +- .../operate/web/service/impl/BabyEyeCheckServiceImpl.java | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index 603b91b..3ae5ae1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -78,6 +78,9 @@ public class BabyEyeCheckController extends BaseController { * @param currentMonthStart/currentMonthEnd 当前月龄范围 * @param chechMonth 检查月龄 * @param positive 是否是阳性 + * @param bookStartDate 预约开始时间 + * @param bookEndDate 预约结束时间 + * @param positive 是否是阳性 * @param page * @param limit * @param request @@ -86,8 +89,9 @@ public class BabyEyeCheckController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(method = RequestMethod.GET) - public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request) { - return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit); + public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, + Date bookStartDate, Date bookEndDate) { + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index 6fd0f2a..8493cbc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -21,7 +21,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse delete(String id); - BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit); + BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate); BaseResponse query(Integer userId, String babyId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 4823640..8fc59e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -261,12 +261,15 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } @Override - public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit) { + public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate) { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); if(startDate != null && endDate != null) { criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } + if(bookStartDate != null && bookEndDate != null) { + criteria.and("nextCheckTime").gte(bookStartDate).lt(DateUtil.addDay(bookEndDate, 1)); + } if(org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); } -- 1.8.3.1