jiangjiazhi / regional-platform

Commit 4b74aaed055a9e8d9550e8e78e78e8adf7910690

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

为了全局展示：村villageRegister字段拼接到Address详细字段中

Showing 1 changed file with 15 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java

...	...	@@ -1841,6 +1841,14 @@
1841	1841
1842	1842	//孕妇居住地
1843	1843	patient.setAddressRegister(yunRequest.getPregnantCensusAddr());
	1844	+
	1845	+ //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中
	1846	+ if(StringUtils.isNotEmpty(yunRequest.getVillageRegister())){
	1847	+ patient.setAddressRegister(yunRequest.getVillageRegister()+yunRequest.getPregnantCensusAddr());
	1848	+ }
	1849	+ //增加村字段，出生证明需要用必填
	1850	+ patient.setVillageRegister(yunRequest.getVillageRegister());
	1851	+
1844	1852	patient.setProvinceRegisterId(yunRequest.getPregnantCensusProvinceId());
1845	1853	patient.setCityRegisterId(yunRequest.getPregnantCensusCityId());
1846	1854	patient.setAreaRegisterId(yunRequest.getPregnantCensusAreaId());
1847	1855
...	...	@@ -2005,9 +2013,7 @@
2005	2013	patient.setPatientVerifName(yunRequest.getPatientVerifName());
2006	2014	patient.setHusVerifType(yunRequest.getHusVerifType());
2007	2015	patient.setLiveCardNo(yunRequest.getLiveCardNo());
2008		- patient.setVillageRegister(yunRequest.getVillageRegister());
2009	2016
2010		-
2011	2017	return patient;
2012	2018	}
2013	2019
...	...	@@ -2110,6 +2116,12 @@
2110	2116	result.setPregnantCensusAreaId(p.getAreaRegisterId());
2111	2117	result.setPregnantCensusStreetId(p.getStreetRegisterId());
2112	2118	result.setPregnantCensusAddr(p.getAddressRegister());
	2119	+ //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中
	2120	+ if(StringUtils.isNotEmpty(p.getVillageRegister())){
	2121	+ result.setPregnantCensusAddr(p.getVillageRegister()+p.getAddressRegister());
	2122	+ }
	2123	+ //增加村字段，出生证明需要用必填
	2124	+ result.setVillageRegister(p.getVillageRegister());
2113	2125
2114	2126	result.setPregnantLiveProvinceId(p.getProvinceId());
2115	2127	result.setPregnantLiveCityId(p.getCityId());
...	...	@@ -2118,6 +2130,7 @@
2118	2130	result.setPregnantLiveAddr(p.getAddress());
2119	2131
2120	2132
	2133	+
2121	2134	result.setChildbirthAddr(p.getAddressPostRest());
2122	2135	result.setChildbirthProvinceId(p.getProvincePostRestId());
2123	2136	result.setChildbirthCityId(p.getCityPostRestId());
...	...	@@ -2199,7 +2212,6 @@
2199	2212	result.setHusVerifType(p.getHusVerifType());
2200	2213	result.setHusbandName(p.getHusbandName());
2201	2214	result.setLiveCardNo(p.getLiveCardNo());
2202		- result.setVillageRegister(p.getVillageRegister());
2203	2215
2204	2216	return result;
2205	2217	}