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 5128c8a..f426a45 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 @@ -61,7 +61,6 @@ public class ReportController extends BaseController { * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 * @return */ -// @RequestMapping(method = RequestMethod.GET, value = "/getCheckNumber") @RequestMapping(method = RequestMethod.GET, value = "/getCheckStatistics") @ResponseBody @TokenRequired @@ -69,9 +68,32 @@ public class ReportController extends BaseController { Integer startWeek, Integer endWeek, Integer childBirth, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return reportService.getCheckNumber(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId()); -// return reportService.areaCountFacade(startDate, endDate, startWeek, endWeek, childBirth, 753); } + /** + * 孕产妇明细查看 + * + * @param startDate 建档开始时间 + * @param endDate 建档结束时间 + * @param startWeek 孕周开始时间 + * @param endWeek 孕周结束时间 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @param number 检查次数 + * @param currentPage 当前页 + * @param pageSize 每页显示的数量 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/checkInfo") +// @RequestMapping(method = RequestMethod.GET, value = "/getCheckNumberInfo") + @TokenRequired + @ResponseBody + public BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, + Integer currentPage, Integer pageSize, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return reportService.getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, loginState.getId(), currentPage, pageSize); + } + + @@ -90,9 +112,9 @@ public class ReportController extends BaseController { HttpServletRequest request, HttpServletResponse resp) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId(), resp); -// reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, 753, resp); } + /** * 孕产妇明细查看 * @@ -107,7 +129,7 @@ public class ReportController extends BaseController { * @param pageSize 每页显示的数量 * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/checkInfo") +// @RequestMapping(method = RequestMethod.GET, value = "/checkInfo") @TokenRequired @ResponseBody public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, 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 75df522..dd19dbb 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 @@ -79,4 +79,6 @@ public interface IReportService extends IBaseService { BaseObjectResponse patient(Integer userId, String s, String provinceId, String cityId, String year); BaseObjectResponse getCheckNumber(Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer childBirth, Integer userId); + + BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize); } 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 70d5a86..8d9d29a 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 @@ -1205,6 +1205,21 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService return rest; } + @Override + public BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize) { + Map restMap = (Map) getCheckNumber(startDate, endDate, startWeek, endWeek, childBirth, id).getData(); + Map> pidMap = (Map>) restMap.get("pidMap"); + if(number == null) { /** 为null就查询总数 */ + number = 0; + } + List ids = CollectionUtils.getPageIds(pidMap.get(number), currentPage, pageSize); + System.out.println(ids); + + + + return null; + } + private List> getCheckNumerGrid(List> datas, List yData, Map> pidMap) { /** key = pid, value = 初诊复诊记录 */ Map>> userCheckInfo = new HashMap<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index 23d9bea..1744fc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -1,6 +1,5 @@ package com.lyms.platform.operate.web.utils; -import com.lyms.platform.pojo.Patients; import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; @@ -160,4 +159,10 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt return list; } + public static List getPageIds(List data, Integer page, Integer limit) { + Integer startIndex = (page - 1) * limit; + Integer endIndex = startIndex + limit; + return data.subList(startIndex, endIndex); + } + }