jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 3 other branches

Showing 2 changed files with 23 additions and 0 deletions

...	...	@@ -206,6 +206,8 @@
206	206	private IBasicConfigDao basicConfigDao;
207	207	@Autowired
208	208	private AuthenticationFacade authenticationFacade;
	209	+ @Autowired
	210	+ private CommunityConfigService communityConfigService;
209	211
210	212
211	213	public static final String syncToV2Url = PropertiesUtils.getPropertyValue("sync_to_v2_url");
...	...	@@ -1685,6 +1687,16 @@
1685	1687	result.setHospitalId(String.valueOf(org.getId()));
1686	1688	}
1687	1689	}
	1690	+
	1691	+ String comm = "未分配";
	1692	+ if(StringUtils.isNotEmpty(pat.getCommunityId())){
	1693	+ CommunityConfig communityConfig = communityConfigService.getCommunityById(pat.getCommunityId());
	1694	+ if(null != communityConfig){
	1695	+ comm = communityConfig.getName();
	1696	+ }
	1697	+ }
	1698	+
	1699	+ result.setCouponCommunity(comm);
1688	1700	result.setFmTime(DateUtil.getyyyy_MM_dd(pat.getFmDate()));
1689	1701	result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
1690	1702	result.setId(pat.getId());

...	...	@@ -34,6 +34,17 @@
34	34	//1孕妇 3产妇
35	35	private Integer type;
36	36
	37	+ //领劵社区
	38	+ private String couponCommunity;
	39	+
	40	+ public String getCouponCommunity() {
	41	+ return couponCommunity;
	42	+ }
	43	+
	44	+ public void setCouponCommunity(String couponCommunity) {
	45	+ this.couponCommunity = couponCommunity;
	46	+ }
	47	+
37	48	public String getFmTime() {
38	49	return fmTime;
39	50	}