jiangjiazhi / regional-platform

Commit f561594f681d810d857d4081c9df59decab45702

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

隆化-儿童建档增加户籍地

Showing 6 changed files with 279 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.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/BabyBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java

...	...	@@ -858,6 +858,71 @@
858	858	*/
859	859	private List<String> lhEyeHighRisk;
860	860
	861	+ /********************************************/
	862	+
	863	+ //隆化-儿童建档户籍地
	864	+
	865	+ /**
	866	+ *省
	867	+ */
	868	+ private String babyProvinceId;
	869	+ /**
	870	+ *市
	871	+ */
	872	+ private String babyCityId;
	873	+ /**
	874	+ *县
	875	+ */
	876	+ private String babyAreaId;
	877	+ /**
	878	+ *乡镇街道
	879	+ */
	880	+ private String babyStreetId;
	881	+ /**
	882	+ *详细地址
	883	+ */
	884	+ private String babyAddress;
	885	+
	886	+ public String getBabyProvinceId() {
	887	+ return babyProvinceId;
	888	+ }
	889	+
	890	+ public void setBabyProvinceId(String babyProvinceId) {
	891	+ this.babyProvinceId = babyProvinceId;
	892	+ }
	893	+
	894	+ public String getBabyCityId() {
	895	+ return babyCityId;
	896	+ }
	897	+
	898	+ public void setBabyCityId(String babyCityId) {
	899	+ this.babyCityId = babyCityId;
	900	+ }
	901	+
	902	+ public String getBabyAreaId() {
	903	+ return babyAreaId;
	904	+ }
	905	+
	906	+ public void setBabyAreaId(String babyAreaId) {
	907	+ this.babyAreaId = babyAreaId;
	908	+ }
	909	+
	910	+ public String getBabyStreetId() {
	911	+ return babyStreetId;
	912	+ }
	913	+
	914	+ public void setBabyStreetId(String babyStreetId) {
	915	+ this.babyStreetId = babyStreetId;
	916	+ }
	917	+
	918	+ public String getBabyAddress() {
	919	+ return babyAddress;
	920	+ }
	921	+
	922	+ public void setBabyAddress(String babyAddress) {
	923	+ this.babyAddress = babyAddress;
	924	+ }
	925	+
861	926	public String getLhChuEyePositiveType() {
862	927	return lhChuEyePositiveType;
863	928	}

...	...	@@ -1574,6 +1574,13 @@
1574	1574	//滦平-儿童建档下次检查项
1575	1575	bm.setNextCheckItem(b.getNextCheckItem());
1576	1576
	1577	+ //隆化-儿童建档户籍地
	1578	+ bm.setBabyProvinceId(b.getBabyProvinceId());
	1579	+ bm.setBabyCityId(b.getBabyCityId());
	1580	+ bm.setBabyAreaId(b.getBabyAreaId());
	1581	+ bm.setBabyStreetId(b.getBabyStreetId());
	1582	+ bm.setBabyAddress(b.getBabyAddress());
	1583	+
1577	1584	return bm;
1578	1585	}
1579	1586
...	...	@@ -2001,6 +2008,12 @@
2001	2008	// }
2002	2009	}
2003	2010	result.setWcOtherHighRisk(model.getWcOtherHighRisk());
	2011	+ //隆化-儿童建档户籍地
	2012	+ result.setBabyProvinceId(model.getBabyProvinceId());
	2013	+ result.setBabyCityId(model.getBabyCityId());
	2014	+ result.setBabyAreaId(model.getBabyAreaId());
	2015	+ result.setBabyStreetId(model.getBabyStreetId());
	2016	+ result.setBabyAddress(model.getBabyAddress());
2004	2017	return result;
2005	2018	}
2006	2019

...	...	@@ -5526,6 +5526,10 @@
5526	5526	String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
5527	5527	model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);
5528	5528	result.setHomeAddress(homeAddress);
	5529	+ //隆化-儿童建档户籍地
	5530	+ String babyAddress = CommonsHelper.getResidence(model.getBabyProvinceId(), model.getBabyCityId(),
	5531	+ model.getBabyAreaId(), model.getBabyStreetId(), model.getBabyAddress(), basicConfigService);
	5532	+ result.setBabyAddress(babyAddress);
5529	5533	result.setMommyCertificateType(getBasicConfig(model.getMcertTypeId()));
5530	5534	result.setMommyLevel(getBasicConfig(model.getmLevelId()));
5531	5535

...	...	@@ -422,6 +422,70 @@
422	422
423	423	//滦平儿童建档下次检查项
424	424	private String nextCheckItem;
	425	+ /********************************************/
	426	+
	427	+ //隆化-儿童建档户籍地
	428	+
	429	+ /**
	430	+ *省
	431	+ */
	432	+ private String babyProvinceId;
	433	+ /**
	434	+ *市
	435	+ */
	436	+ private String babyCityId;
	437	+ /**
	438	+ *县
	439	+ */
	440	+ private String babyAreaId;
	441	+ /**
	442	+ *乡镇街道
	443	+ */
	444	+ private String babyStreetId;
	445	+ /**
	446	+ *详细地址
	447	+ */
	448	+ private String babyAddress;
	449	+
	450	+ public String getBabyProvinceId() {
	451	+ return babyProvinceId;
	452	+ }
	453	+
	454	+ public void setBabyProvinceId(String babyProvinceId) {
	455	+ this.babyProvinceId = babyProvinceId;
	456	+ }
	457	+
	458	+ public String getBabyCityId() {
	459	+ return babyCityId;
	460	+ }
	461	+
	462	+ public void setBabyCityId(String babyCityId) {
	463	+ this.babyCityId = babyCityId;
	464	+ }
	465	+
	466	+ public String getBabyAreaId() {
	467	+ return babyAreaId;
	468	+ }
	469	+
	470	+ public void setBabyAreaId(String babyAreaId) {
	471	+ this.babyAreaId = babyAreaId;
	472	+ }
	473	+
	474	+ public String getBabyStreetId() {
	475	+ return babyStreetId;
	476	+ }
	477	+
	478	+ public void setBabyStreetId(String babyStreetId) {
	479	+ this.babyStreetId = babyStreetId;
	480	+ }
	481	+
	482	+ public String getBabyAddress() {
	483	+ return babyAddress;
	484	+ }
	485	+
	486	+ public void setBabyAddress(String babyAddress) {
	487	+ this.babyAddress = babyAddress;
	488	+ }
425	489
426	490	public String getNextCheckItem() {
427	491	return nextCheckItem;

...	...	@@ -364,7 +364,70 @@
364	364
365	365	//滦平儿童建档下次检查项
366	366	private String nextCheckItem;
	367	+/********************************************/
367	368
	369	+ //隆化-儿童建档户籍地
	370	+
	371	+ /**
	372	+ *省
	373	+ */
	374	+ private String babyProvinceId;
	375	+ /**
	376	+ *市
	377	+ */
	378	+ private String babyCityId;
	379	+ /**
	380	+ *县
	381	+ */
	382	+ private String babyAreaId;
	383	+ /**
	384	+ *乡镇街道
	385	+ */
	386	+ private String babyStreetId;
	387	+ /**
	388	+ *详细地址
	389	+ */
	390	+ private String babyAddress;
	391	+
	392	+ public String getBabyProvinceId() {
	393	+ return babyProvinceId;
	394	+ }
	395	+
	396	+ public void setBabyProvinceId(String babyProvinceId) {
	397	+ this.babyProvinceId = babyProvinceId;
	398	+ }
	399	+
	400	+ public String getBabyCityId() {
	401	+ return babyCityId;
	402	+ }
	403	+
	404	+ public void setBabyCityId(String babyCityId) {
	405	+ this.babyCityId = babyCityId;
	406	+ }
	407	+
	408	+ public String getBabyAreaId() {
	409	+ return babyAreaId;
	410	+ }
	411	+
	412	+ public void setBabyAreaId(String babyAreaId) {
	413	+ this.babyAreaId = babyAreaId;
	414	+ }
	415	+
	416	+ public String getBabyStreetId() {
	417	+ return babyStreetId;
	418	+ }
	419	+
	420	+ public void setBabyStreetId(String babyStreetId) {
	421	+ this.babyStreetId = babyStreetId;
	422	+ }
	423	+
	424	+ public String getBabyAddress() {
	425	+ return babyAddress;
	426	+ }
	427	+
	428	+ public void setBabyAddress(String babyAddress) {
	429	+ this.babyAddress = babyAddress;
	430	+ }
368	431	public String getNextCheckItem() {
369	432	return nextCheckItem;
370	433	}

...	...	@@ -357,7 +357,71 @@
357	357
358	358	//滦平儿童建档下次检查项
359	359	private String nextCheckItem;
	360	+ /********************************************/
360	361
	362	+ //隆化-儿童建档户籍地
	363	+
	364	+ /**
	365	+ *省
	366	+ */
	367	+ private String babyProvinceId;
	368	+ /**
	369	+ *市
	370	+ */
	371	+ private String babyCityId;
	372	+ /**
	373	+ *县
	374	+ */
	375	+ private String babyAreaId;
	376	+ /**
	377	+ *乡镇街道
	378	+ */
	379	+ private String babyStreetId;
	380	+ /**
	381	+ *详细地址
	382	+ */
	383	+ private String babyAddress;
	384	+
	385	+ public String getBabyProvinceId() {
	386	+ return babyProvinceId;
	387	+ }
	388	+
	389	+ public void setBabyProvinceId(String babyProvinceId) {
	390	+ this.babyProvinceId = babyProvinceId;
	391	+ }
	392	+
	393	+ public String getBabyCityId() {
	394	+ return babyCityId;
	395	+ }
	396	+
	397	+ public void setBabyCityId(String babyCityId) {
	398	+ this.babyCityId = babyCityId;
	399	+ }
	400	+
	401	+ public String getBabyAreaId() {
	402	+ return babyAreaId;
	403	+ }
	404	+
	405	+ public void setBabyAreaId(String babyAreaId) {
	406	+ this.babyAreaId = babyAreaId;
	407	+ }
	408	+
	409	+ public String getBabyStreetId() {
	410	+ return babyStreetId;
	411	+ }
	412	+
	413	+ public void setBabyStreetId(String babyStreetId) {
	414	+ this.babyStreetId = babyStreetId;
	415	+ }
	416	+
	417	+ public String getBabyAddress() {
	418	+ return babyAddress;
	419	+ }
	420	+
	421	+ public void setBabyAddress(String babyAddress) {
	422	+ this.babyAddress = babyAddress;
	423	+ }
	424	+
361	425	public String getNextCheckItem() {
362	426	return nextCheckItem;
363	427	}
...	...	@@ -1505,7 +1569,12 @@
1505	1569	{
1506	1570	setWcOtherHighRisk(destModel.getWcOtherHighRisk());
1507	1571	}
1508		-
	1572	+ //隆化-儿童建档户籍地
	1573	+ setBabyProvinceId(destModel.getBabyProvinceId());
	1574	+ setBabyCityId(destModel.getBabyCityId());
	1575	+ setBabyAreaId(destModel.getBabyAreaId());
	1576	+ setBabyStreetId(destModel.getBabyStreetId());
	1577	+ setBabyAddress(destModel.getBabyAddress());
1509	1578	return this;
1510	1579	}
1511	1580