jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 14 additions and 11 deletions

...	...	@@ -152,7 +152,8 @@
152	152	}
153	153	String tips = visitFacade.getFindTips(model.getId(),Boolean.TRUE);
154	154	String addr= CommonsHelper.getFullAddress(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getAddress(), basicConfigService);
155		- data.add(result.convertToResult(model, comm, tips,addr));
	155	+ String restAddr=CommonsHelper.getFullAddress(model.getProvincePostRestId(), model.getCityPostRestId(), model.getAreaPostRestId(), model.getAddressPostRest(), basicConfigService);
	156	+ data.add(result.convertToResult(model, comm, tips,addr,restAddr));
156	157	}
157	158	}
158	159

...	...	@@ -38,7 +38,16 @@
38	38	}
39	39
40	40	private String fullAddr;
	41	+ private String restFullAddr;
41	42
	43	+ public String getRestFullAddr() {
	44	+ return restFullAddr;
	45	+ }
	46	+
	47	+ public void setRestFullAddr(String restFullAddr) {
	48	+ this.restFullAddr = restFullAddr;
	49	+ }
	50	+
42	51	public String getCommunityId() {
43	52	return communityId;
44	53	}
...	...	@@ -138,16 +147,9 @@
138	147	return this;
139	148	}
140	149
141		- public PuerperaResult convertToResult(Patients model,String comm,String tips,String addr) {
142		- /* String addr = "";
143		- if (StringUtils.isNotEmpty(model.getAddress())) {
144		- try {
145		- Map map = JsonUtil.str2Obj(model.getAddress(), Map.class);
146		- addr = map.get("d").toString();
147		- } catch (Exception e) {
148		- addr = "";
149		- }
150		- }*/
	150	+ public PuerperaResult convertToResult(Patients model,String comm,String tips,String addr,String restFullAddr) {
	151	+
	152	+ setRestFullAddr(restFullAddr);
151	153	setFullAddr(addr);
152	154	setAddress(model.getAddress());
153	155	setId(model.getId());