jiangjiazhi / regional-platform

Commit 1b1310e5bd4e5938e4892d9ecc774f49a55a1be8

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

孕妇建档增加丈夫居住地模块

Showing 5 changed files with 230 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -133,6 +133,16 @@
133	133	private String hcityRegisterId;
134	134	private String hareaRegisterId;
135	135	private String hstreetRegisterId;
	136	+ /**
	137	+ * 丈夫居住地
	138	+ */
	139	+ private String hprovinceId;
	140	+ private String hcityId;
	141	+ private String hareaId;
	142	+ private String hstreetId;
	143	+ private String hvillage;
	144	+ private String haddress;
	145	+
136	146	/****add by lqy end *******/
137	147	/**
138	148	* 孕妇户籍地址
...	...	@@ -427,6 +437,54 @@
427	437
428	438	//秦皇岛-有居住证填写字段
429	439	private String liveCardNo;
	440	+
	441	+ public String getHprovinceId() {
	442	+ return hprovinceId;
	443	+ }
	444	+
	445	+ public void setHprovinceId(String hprovinceId) {
	446	+ this.hprovinceId = hprovinceId;
	447	+ }
	448	+
	449	+ public String getHcityId() {
	450	+ return hcityId;
	451	+ }
	452	+
	453	+ public void setHcityId(String hcityId) {
	454	+ this.hcityId = hcityId;
	455	+ }
	456	+
	457	+ public String getHareaId() {
	458	+ return hareaId;
	459	+ }
	460	+
	461	+ public void setHareaId(String hareaId) {
	462	+ this.hareaId = hareaId;
	463	+ }
	464	+
	465	+ public String getHstreetId() {
	466	+ return hstreetId;
	467	+ }
	468	+
	469	+ public void setHstreetId(String hstreetId) {
	470	+ this.hstreetId = hstreetId;
	471	+ }
	472	+
	473	+ public String getHvillage() {
	474	+ return hvillage;
	475	+ }
	476	+
	477	+ public void setHvillage(String hvillage) {
	478	+ this.hvillage = hvillage;
	479	+ }
	480	+
	481	+ public String getHaddress() {
	482	+ return haddress;
	483	+ }
	484	+
	485	+ public void setHaddress(String haddress) {
	486	+ this.haddress = haddress;
	487	+ }
430	488
431	489	public String getLiveCardNo() {
432	490	return liveCardNo;

...	...	@@ -1886,6 +1886,14 @@
1886	1886	patient.setHcityRegisterId("");
1887	1887	patient.setHareaRegisterId("");
1888	1888	patient.setHstreetRegisterId("");
	1889	+ //丈夫居住地
	1890	+ patient.setHprovinceId("");
	1891	+ patient.setHcityId("");
	1892	+ patient.setHareaId("");
	1893	+ patient.setHstreetId("");
	1894	+ patient.setHvillage("");
	1895	+ patient.setHaddress("");
	1896	+
1889	1897	patient.setHlevelTypeId("");
1890	1898	patient.setHusbandBirth(null);
1891	1899	if (StringUtils.isNotEmpty(yunRequest.getId()))
...	...	@@ -1929,6 +1937,19 @@
1929	1937	patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId());
1930	1938	patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId());
1931	1939	patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId());
	1940	+ //丈夫居住地
	1941	+ patient.setHprovinceId(yunRequest.getHprovinceId());
	1942	+ patient.setHcityId(yunRequest.getHcityId());
	1943	+ patient.setHareaId(yunRequest.getHareaId());
	1944	+ patient.setHstreetId(yunRequest.getHstreetId());
	1945	+ patient.setHaddress(yunRequest.getHaddress());
	1946	+ //增加村字段这里为了全局展示拼接到Address详细字段中
	1947	+ if(StringUtils.isNotEmpty(yunRequest.getHvillage())){
	1948	+ patient.setHaddress(yunRequest.getHvillage()+yunRequest.getHaddress());
	1949	+ }
	1950	+ //村字段，出生证明需要用必填
	1951	+ patient.setHvillage(yunRequest.getHvillage());
	1952	+
1932	1953	patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId());
1933	1954	}
1934	1955
...	...	@@ -2163,6 +2184,28 @@
2163	2184	result.setHusbandCityRegisterId(p.getHcityRegisterId());
2164	2185	result.setHusbandAreaRegisterId(p.getHareaRegisterId());
2165	2186	result.setHusbandStreetRegisterId(p.getHstreetRegisterId());
	2187	+
	2188	+ //丈夫居住地
	2189	+ result.setHprovinceId(p.getHprovinceId());
	2190	+ result.setHcityId(p.getHcityId());
	2191	+ result.setHareaId(p.getHareaId());
	2192	+ result.setHstreetId(p.getHstreetId());
	2193	+ String hvillage="";//村
	2194	+ String haddress="";//详细地址
	2195	+ if(StringUtils.isNotEmpty(p.getHaddress())){
	2196	+ haddress=p.getHaddress();
	2197	+ }
	2198	+ //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。
	2199	+ if (StringUtils.isNotEmpty(p.getHvillage())) {
	2200	+ hvillage=p.getHvillage();
	2201	+ if(StringUtils.isNotEmpty(haddress) &&
	2202	+ haddress.length()>hvillage.length()){
	2203	+ haddress=haddress.substring(hvillage.length());
	2204	+ }
	2205	+ }
	2206	+ result.setHvillage(hvillage);
	2207	+ result.setHaddress(haddress);
	2208	+
2166	2209
2167	2210	result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus()));
2168	2211	result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));

...	...	@@ -468,6 +468,10 @@
468	468	map.put("hregister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(),
469	469	data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(),
470	470	basicConfigService));
	471	+ //丈夫居住地
	472	+ map.put("hresidence", CommonsHelper.getResidence(data.getHprovinceId(), data.getHcityId(),
	473	+ data.getHareaId(), data.getHstreetId(), data.getHaddress(),
	474	+ basicConfigService));
471	475
472	476	/* 院内信息 */
473	477	map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses()));

...	...	@@ -74,19 +74,8 @@
74	74
75	75	//秦皇岛-有居住证填写字段
76	76	private String liveCardNo;
77		- /**
78		- * 村
79		- */
80		- private String villageRegister;
81	77
82		- public String getVillageRegister() {
83		- return villageRegister;
84		- }
85	78
86		- public void setVillageRegister(String villageRegister) {
87		- this.villageRegister = villageRegister;
88		- }
89		-
90	79	public String getLiveCardNo() {
91	80	return liveCardNo;
92	81	}
...	...	@@ -340,6 +329,10 @@
340	329	private String pregnantCensusCityId;
341	330	private String pregnantCensusAreaId;
342	331	private String pregnantCensusStreetId;
	332	+ /**
	333	+ * 母亲居住地-村
	334	+ */
	335	+ private String villageRegister;
343	336
344	337
345	338	//户籍地址
...	...	@@ -390,6 +383,15 @@
390	383	private String husbandAreaRegisterId;
391	384	private String husbandStreetRegisterId;
392	385
	386	+ /**
	387	+ * 丈夫居住地
	388	+ */
	389	+ private String hprovinceId;
	390	+ private String hcityId;
	391	+ private String hareaId;
	392	+ private String hstreetId;
	393	+ private String hvillage;
	394	+ private String haddress;
393	395	/*********丈夫信息*********/
394	396
395	397	/*********院内信息*********/
...	...	@@ -519,6 +521,62 @@
519	521	private String other;
520	522	//丈夫年龄
521	523	private Integer hmarriageAge;
	524	+
	525	+ public String getVillageRegister() {
	526	+ return villageRegister;
	527	+ }
	528	+
	529	+ public void setVillageRegister(String villageRegister) {
	530	+ this.villageRegister = villageRegister;
	531	+ }
	532	+
	533	+ public String getHprovinceId() {
	534	+ return hprovinceId;
	535	+ }
	536	+
	537	+ public void setHprovinceId(String hprovinceId) {
	538	+ this.hprovinceId = hprovinceId;
	539	+ }
	540	+
	541	+ public String getHcityId() {
	542	+ return hcityId;
	543	+ }
	544	+
	545	+ public void setHcityId(String hcityId) {
	546	+ this.hcityId = hcityId;
	547	+ }
	548	+
	549	+ public String getHareaId() {
	550	+ return hareaId;
	551	+ }
	552	+
	553	+ public void setHareaId(String hareaId) {
	554	+ this.hareaId = hareaId;
	555	+ }
	556	+
	557	+ public String getHstreetId() {
	558	+ return hstreetId;
	559	+ }
	560	+
	561	+ public void setHstreetId(String hstreetId) {
	562	+ this.hstreetId = hstreetId;
	563	+ }
	564	+
	565	+ public String getHvillage() {
	566	+ return hvillage;
	567	+ }
	568	+
	569	+ public void setHvillage(String hvillage) {
	570	+ this.hvillage = hvillage;
	571	+ }
	572	+
	573	+ public String getHaddress() {
	574	+ return haddress;
	575	+ }
	576	+
	577	+ public void setHaddress(String haddress) {
	578	+ this.haddress = haddress;
	579	+ }
522	580
523	581	public String getIsYyzyfmHospital() {
524	582	return isYyzyfmHospital;

...	...	@@ -341,6 +341,14 @@
341	341	private String husbandAreaRegisterId;
342	342	private String husbandStreetRegisterId;
343	343
	344	+ //居住地
	345	+ private String hprovinceId;
	346	+ private String hcityId;
	347	+ private String hareaId;
	348	+ private String hstreetId;
	349	+ private String hvillage;
	350	+ private String haddress;
	351	+
344	352	/*********丈夫信息*********/
345	353
346	354	/*********院内信息*********/
...	...	@@ -459,6 +467,54 @@
459	467
460	468	public void setVillageRegister(String villageRegister) {
461	469	this.villageRegister = villageRegister;
	470	+ }
	471	+
	472	+ public String getHprovinceId() {
	473	+ return hprovinceId;
	474	+ }
	475	+
	476	+ public void setHprovinceId(String hprovinceId) {
	477	+ this.hprovinceId = hprovinceId;
	478	+ }
	479	+
	480	+ public String getHcityId() {
	481	+ return hcityId;
	482	+ }
	483	+
	484	+ public void setHcityId(String hcityId) {
	485	+ this.hcityId = hcityId;
	486	+ }
	487	+
	488	+ public String getHareaId() {
	489	+ return hareaId;
	490	+ }
	491	+
	492	+ public void setHareaId(String hareaId) {
	493	+ this.hareaId = hareaId;
	494	+ }
	495	+
	496	+ public String getHstreetId() {
	497	+ return hstreetId;
	498	+ }
	499	+
	500	+ public void setHstreetId(String hstreetId) {
	501	+ this.hstreetId = hstreetId;
	502	+ }
	503	+
	504	+ public String getHvillage() {
	505	+ return hvillage;
	506	+ }
	507	+
	508	+ public void setHvillage(String hvillage) {
	509	+ this.hvillage = hvillage;
	510	+ }
	511	+
	512	+ public String getHaddress() {
	513	+ return haddress;
	514	+ }
	515	+
	516	+ public void setHaddress(String haddress) {
	517	+ this.haddress = haddress;
462	518	}
463	519
464	520	public String getLiveCardNo() {