jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 28c184782c32630d01916a76cc37648ead455371

Authored by jiangjiazhi
2 parents 3b890dd0a8 38a2ae493e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java View file @ 28c1847
... ... @@ -44,7 +44,7 @@
44 44 @RequestMapping(value = "/patients", method = RequestMethod.GET)
45 45 public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer statistVal,
46 46 Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) {
47   - return reportService.patients(provinceId, cityId, areaId, streetId, statistType, statistVal, ageType, patientType, startDate, endDate, getUserId(request));
  47 + return reportService.patients(provinceId, cityId, areaId, streetId, 1, statistVal, ageType, patientType, startDate, endDate, getUserId(request));
48 48 }
49 49  
50 50 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 28c1847
... ... @@ -1849,7 +1849,7 @@
1849 1849 Map<String, Object> map = new HashMap<>();
1850 1850  
1851 1851 map.put("genRemark", data.getGenRemark());
1852   - map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses()));
  1852 + map.put("lastMenses", DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
1853 1853  
1854 1854 /* 基本信息 */
1855 1855 //孕妇基本信息