Commit 2c9aebe958d2e52011c941d17c487603a3455922
1 parent
1f635b75cd
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 2 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
View file @
2c9aebe
... | ... | @@ -41,7 +41,6 @@ |
41 | 41 | |
42 | 42 | /** |
43 | 43 | * 建档统计 |
44 | - * @param statistType 1=占比 2=环比 | |
45 | 44 | * @param statistVal 1=月 2=季度 3=半年 4=年 |
46 | 45 | * @param ageType 1=全部年龄 2=20岁以下 3=20-30岁 4=30-40岁 5=40岁以上 |
47 | 46 | * @param patientType 建档孕周 1=孕早期 2=孕中期 3=孕晚期 |
... | ... | @@ -50,7 +49,7 @@ |
50 | 49 | @ResponseBody |
51 | 50 | @TokenRequired |
52 | 51 | @RequestMapping(value = "/patients", method = RequestMethod.GET) |
53 | - public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer statistVal, | |
52 | + public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistVal, | |
54 | 53 | Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) { |
55 | 54 | return reportService.patients(provinceId, cityId, areaId, streetId, 1, statistVal, ageType, patientType, startDate, endDate, getUserId(request)); |
56 | 55 | } |
... | ... | @@ -67,7 +66,7 @@ |
67 | 66 | @RequestMapping(value = "/patients/export", method = RequestMethod.GET) |
68 | 67 | public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType, |
69 | 68 | Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) { |
70 | - reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType == null ? ageType : ageType + 1, patientType, startDate, endDate, getUserId(request), response); | |
69 | + reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); | |
71 | 70 | // reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response); |
72 | 71 | } |
73 | 72 |