jiangjiazhi / regional-platform

Authored by wangbo about 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 2 additions and 3 deletions

...	...	@@ -47,19 +47,18 @@
47	47	* @param endDate
48	48	* @param exportType 1 = 孕期优惠券使用统计详情导出， 2 = 产后优惠券使用统计详情导出， 3 = 儿童优惠券使用统计详情导出
49	49	* @param response
50		-
51	50	* @param couponType
52	51	*/
53	52	@ResponseBody
54	53	@TokenRequired
55	54	@RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET)
56	55	public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type,
57		- String couponType, Integer exportType) {
	56	+ String couponType, Integer exportType, String doctor, String key) {
58	57
59	58	String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
60	59	Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
61	60	"endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", 4,
62		- "couponType", couponType, "exportType", exportType);
	61	+ "couponType", couponType, "exportType", exportType, "doctor", doctor, "key", key);
63	62	orgCouponService.exportCouponInfo(param, response);
64	63	}
65	64

No preview for this file type