jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3e56183b64566bd7c98e46d55ef5c2f450caac92

Authored by litao@lymsh.com
1 parent 2fa5a80b2f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

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

Showing 3 changed files with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java View file @ 3e56183
... ... @@ -97,8 +97,8 @@
97 97 @ResponseBody
98 98 @TokenRequired
99 99 @RequestMapping(value = "/export", method = RequestMethod.GET)
100   - public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response) {
101   - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response);
  100 + public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate) {
  101 + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate);
102 102 }
103 103  
104 104 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ 3e56183
... ... @@ -27,6 +27,6 @@
27 27  
28 28 BaseResponse listInit();
29 29  
30   - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response);
  30 + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate);
31 31 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 3e56183
... ... @@ -542,8 +542,8 @@
542 542 }
543 543  
544 544 @Override
545   - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response) {
546   - BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE);
  545 + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate) {
  546 + BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate);
547 547 PageResult pageResult = (PageResult) rest.getObject();
548 548 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
549 549 Map<String, String> cnames = new LinkedHashMap<>();