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 0fc7076..db9a405 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 @@ -41,7 +41,6 @@ public class ReportController extends BaseController { /** * 建档统计 - * @param statistType 1=占比 2=环比 * @param statistVal 1=月 2=季度 3=半年 4=年 * @param ageType 1=全部年龄 2=20岁以下 3=20-30岁 4=30-40岁 5=40岁以上 * @param patientType 建档孕周 1=孕早期 2=孕中期 3=孕晚期 @@ -50,7 +49,7 @@ public class ReportController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/patients", method = RequestMethod.GET) - public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer statistVal, + public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistVal, Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) { return reportService.patients(provinceId, cityId, areaId, streetId, 1, statistVal, ageType, patientType, startDate, endDate, getUserId(request)); } @@ -67,7 +66,7 @@ public class ReportController extends BaseController { @RequestMapping(value = "/patients/export", method = RequestMethod.GET) public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) { - reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType == null ? ageType : ageType + 1, patientType, startDate, endDate, getUserId(request), response); + reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); // reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response); }