jiangjiazhi / regional-platform

Authored by litao about 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 7 additions and 7 deletions

...	...	@@ -15,7 +15,7 @@
15	15
16	16	BaseObjectResponse validate(String code, Integer type, String hospitalId);
17	17
18		- BaseObjectResponse findList(String userId, String hospitalId);
	18	+ BaseObjectResponse findList(String userId, String hospitalId, String url);
19	19
20	20	BaseObjectResponse use(String hospitalId, String code, Integer userId);
21	21

...	...	@@ -18,7 +18,6 @@
18	18	import org.slf4j.Logger;
19	19	import org.slf4j.LoggerFactory;
20	20	import org.springframework.beans.factory.annotation.Autowired;
21		-import org.springframework.beans.factory.annotation.Value;
22	21	import org.springframework.data.domain.Sort;
23	22	import org.springframework.data.mongodb.core.MongoTemplate;
24	23	import org.springframework.data.mongodb.core.query.Criteria;
...	...	@@ -37,9 +36,6 @@
37	36
38	37	private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class);
39	38
40		- @Value("${or.code.url}")
41		- private String url;
42		-
43	39	/** 1 = 孕妇 */
44	40	private static final String PREGNANT_WOMAN = "1";
45	41
...	...	@@ -395,7 +391,7 @@
395	391	}
396	392
397	393	@Override
398		- public BaseObjectResponse findList(String userId, String hospitalId) {
	394	+ public BaseObjectResponse findList(String userId, String hospitalId, String url) {
399	395	Map<String, Object> param = new HashMap<>();
400	396	param.put("userId", userId);
401	397	param.put("hospitalId", hospitalId);

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
8	8	import com.lyms.platform.permission.service.CouponService;
9	9	import org.springframework.beans.factory.annotation.Autowired;
	10	+import org.springframework.beans.factory.annotation.Value;
10	11	import org.springframework.stereotype.Controller;
11	12	import org.springframework.web.bind.annotation.PathVariable;
12	13	import org.springframework.web.bind.annotation.RequestMapping;
...	...	@@ -30,6 +31,9 @@
30	31	@Autowired
31	32	AutoMatchFacade autoMatchFacade;
32	33
	34	+ @Value("${or.code.url}")
	35	+ private String url;
	36	+
33	37	/**
34	38	* 创建用户产检券
35	39	* @param userId
...	...	@@ -54,7 +58,7 @@
54	58	@RequestMapping(method = RequestMethod.GET, value = "/{userId}/{hospitalId}")
55	59	@ResponseBody
56	60	public BaseObjectResponse list(@PathVariable String userId, @PathVariable String hospitalId) {
57		- return couponService.findList(userId, hospitalId);
	61	+ return couponService.findList(userId, hospitalId, url);
58	62	}
59	63
60	64