diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index f426a45..5e1a3ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -152,11 +152,10 @@ public class ReportController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/checkInfo/export") @TokenRequired - public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, + public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, HttpServletRequest request, HttpServletResponse resp) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp); -// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java index dd19dbb..796dea8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java @@ -66,7 +66,7 @@ public interface IReportService extends IBaseService { void exportDoctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name, Integer userId, HttpServletResponse resp); - void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp); + void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp); BaseObjectResponse coupon(Map param); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 8724f94..ecb5b53 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -435,7 +435,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } @Override - public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) { + public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) { List params = new ArrayList<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); Map cnames = new LinkedHashMap<>(); @@ -451,7 +451,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService cnames.put("DOCTOR_NAME", "最后产检医生"); List> results = new ArrayList<>(); - List> list = reportDao.findList(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), params); + + BaseObjectResponse baseObjectResponse = getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, userId, 1, Integer.MAX_VALUE); + PageResult page = (PageResult) baseObjectResponse.getData(); + List> list = (List>) page.getGrid(); for (Map map : list) { results.add(map); }