jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 7 additions and 5 deletions

...	...	@@ -152,11 +152,10 @@
152	152	*/
153	153	@RequestMapping(method = RequestMethod.GET, value = "/checkInfo/export")
154	154	@TokenRequired
155		- public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number,
	155	+ public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number,
156	156	String name, HttpServletRequest request, HttpServletResponse resp) {
157	157	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
158	158	reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp);
159		-// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp);
160	159	}
161	160
162	161

...	...	@@ -66,7 +66,7 @@
66	66
67	67	void exportDoctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name, Integer userId, HttpServletResponse resp);
68	68
69		- void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp);
	69	+ void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp);
70	70
71	71	BaseObjectResponse coupon(Map<String, Object> param);
72	72

...	...	@@ -435,7 +435,7 @@
435	435	}
436	436
437	437	@Override
438		- public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) {
	438	+ public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) {
439	439	List<Object> params = new ArrayList<>();
440	440	String hospitalId = autoMatchFacade.getHospitalId(userId);
441	441	Map<String, String> cnames = new LinkedHashMap<>();
...	...	@@ -451,7 +451,10 @@
451	451	cnames.put("DOCTOR_NAME", "最后产检医生");
452	452
453	453	List<Map<String,Object>> results = new ArrayList<>();
454		- List<Map<String, Object>> list = reportDao.findList(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), params);
	454	+
	455	+ BaseObjectResponse baseObjectResponse = getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, userId, 1, Integer.MAX_VALUE);
	456	+ PageResult page = (PageResult) baseObjectResponse.getData();
	457	+ List<Map<String, Object>> list = (List<Map<String, Object>>) page.getGrid();
455	458	for (Map<String, Object> map : list) {
456	459	results.add(map);
457	460	}