liquanyu / regional-platform

Download as
Browse Code »

Commit 2fa5a80b2f22fe3ba093b82fcd5441f2d8eef502

Authored by litao@lymsh.com
1 parent b5e5825922
Exists in master and in 1 other branch dev

阳性儿童管理和全部儿童管理页面增加“预约时间”搜索条件

Showing 3 changed files with 11 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java View file @ 2fa5a80
... ... @@ -78,6 +78,9 @@
78 78 * @param currentMonthStart/currentMonthEnd 当前月龄范围
79 79 * @param chechMonth 检查月龄
80 80 * @param positive 是否是阳性
  81 + * @param bookStartDate 预约开始时间
  82 + * @param bookEndDate 预约结束时间
  83 + * @param positive 是否是阳性
81 84 * @param page
82 85 * @param limit
83 86 * @param request
... ... @@ -86,8 +89,9 @@
86 89 @ResponseBody
87 90 @TokenRequired
88 91 @RequestMapping(method = RequestMethod.GET)
89   - 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) {
90   - return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit);
  92 + 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,
  93 + Date bookStartDate, Date bookEndDate) {
  94 + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate);
91 95 }
92 96  
93 97 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ 2fa5a80
... ... @@ -21,7 +21,7 @@
21 21  
22 22 BaseResponse delete(String id);
23 23  
24   - 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);
  24 + 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);
25 25  
26 26 BaseResponse query(Integer userId, String babyId);
27 27  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 2fa5a80
... ... @@ -261,11 +261,14 @@
261 261 }
262 262  
263 263 @Override
264   - 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) {
  264 + 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) {
265 265 String hospitalId = autoMatchFacade.getHospitalId(userId);
266 266 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
267 267 if(startDate != null && endDate != null) {
268 268 criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
  269 + }
  270 + if(bookStartDate != null && bookEndDate != null) {
  271 + criteria.and("nextCheckTime").gte(bookStartDate).lt(DateUtil.addDay(bookEndDate, 1));
269 272 }
270 273 if(org.apache.commons.lang.StringUtils.isNotBlank(doctor)) {
271 274 criteria.and("doctor").is(doctor);