jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 84 additions and 0 deletions

...	...	@@ -81,6 +81,11 @@
81	81	private Integer liYi;
82	82	//子女(个数)
83	83	private Integer childrenNum;
	84	+ //陵城定制子
	85	+ private Integer childrenNumZ;
	86	+ //陵城定制女
	87	+ private Integer childrenNumN;
	88	+
84	89	//家族近亲婚配(1: 有 2: 无)
85	90	private Integer nextOfKin;
86	91	/* 有的情况下会选择以下条件 */
...	...	@@ -836,6 +841,22 @@
836	841
837	842	public void setRenLiu(Integer renLiu) {
838	843	this.renLiu = renLiu;
	844	+ }
	845	+
	846	+ public Integer getChildrenNumZ() {
	847	+ return childrenNumZ;
	848	+ }
	849	+
	850	+ public void setChildrenNumZ(Integer childrenNumZ) {
	851	+ this.childrenNumZ = childrenNumZ;
	852	+ }
	853	+
	854	+ public Integer getChildrenNumN() {
	855	+ return childrenNumN;
	856	+ }
	857	+
	858	+ public void setChildrenNumN(Integer childrenNumN) {
	859	+ this.childrenNumN = childrenNumN;
839	860	}
840	861
841	862	public Integer getChildrenNum() {

...	...	@@ -273,6 +273,9 @@
273	273	checkupResult.setSangOu(result.getSangOu());
274	274	checkupResult.setLiYi(result.getLiYi());
275	275	checkupResult.setChildrenNum(result.getChildrenNum());
	276	+ checkupResult.setChildrenNumZ(result.getChildrenNumZ());
	277	+ checkupResult.setChildrenNumN(result.getChildrenNumN());
	278	+
276	279	checkupResult.setNextOfKin(result.getNextOfKin());
277	280	checkupResult.setParents(result.getParents());
278	281	checkupResult.setGrandparent(result.getGrandparent());
...	...	@@ -713,6 +716,8 @@
713	716	checkup.setMaternalGrandparents(addRequest.getMaternalGrandparents());
714	717
715	718	checkup.setChildrenNum(addRequest.getChildrenNum());
	719	+ checkup.setChildrenNumZ(addRequest.getChildrenNumZ());
	720	+ checkup.setChildrenNumN(addRequest.getChildrenNumN());
716	721	/**
717	722	* start 遵化新增字段
718	723	*
...	...	@@ -1792,6 +1797,8 @@
1792	1797	}
1793	1798	checkupResult.setNextOfKin(nextOfKin);
1794	1799	checkupResult.setChildrenNum(result.getChildrenNum() == null ? "" : result.getChildrenNum() + UnitConstants.REN);
	1800	+ checkupResult.setChildrenNumZ(result.getChildrenNumZ() == null ? "" : result.getChildrenNumZ() + UnitConstants.REN);
	1801	+ checkupResult.setChildrenNumN(result.getChildrenNumN() == null ? "" : result.getChildrenNumN() + UnitConstants.REN);
1795	1802	/**
1796	1803	* start 遵化新增字段
1797	1804	*

...	...	@@ -86,6 +86,10 @@
86	86	private Integer liuchan;
87	87	//子女(个数)
88	88	private Integer childrenNum;
	89	+ private Integer childrenNumZ;
	90	+ private Integer childrenNumN;
	91	+
	92	+
89	93	//家族近亲婚配(1: 有 2: 无)
90	94	private Integer nextOfKin;
91	95	/* 有的情况下会选择以下条件 */
...	...	@@ -626,6 +630,14 @@
626	630	this.id = id;
627	631	}
628	632
	633	+ public Integer getChildrenNumN() {
	634	+ return childrenNumN;
	635	+ }
	636	+
	637	+ public void setChildrenNumN(Integer childrenNumN) {
	638	+ this.childrenNumN = childrenNumN;
	639	+ }
	640	+
629	641	public String getParentId() {
630	642	return parentId;
631	643	}
...	...	@@ -1181,6 +1193,14 @@
1181	1193
1182	1194	public Integer getXiongKuo() {
1183	1195	return xiongKuo;
	1196	+ }
	1197	+
	1198	+ public Integer getChildrenNumZ() {
	1199	+ return childrenNumZ;
	1200	+ }
	1201	+
	1202	+ public void setChildrenNumZ(Integer childrenNumZ) {
	1203	+ this.childrenNumZ = childrenNumZ;
1184	1204	}
1185	1205
1186	1206	public void setXiongKuo(Integer xiongKuo) {

...	...	@@ -96,6 +96,8 @@
96	96	private String nextOfKin;
97	97	//子女(个数)
98	98	private String childrenNum;
	99	+ private String childrenNumZ;
	100	+ private String childrenNumN;
99	101
100	102
101	103	//既往婚育史(1: 有 2: 无)
...	...	@@ -1035,6 +1037,22 @@
1035	1037
1036	1038	public String getRuFangFaYu() {
1037	1039	return ruFangFaYu;
	1040	+ }
	1041	+
	1042	+ public String getChildrenNumZ() {
	1043	+ return childrenNumZ;
	1044	+ }
	1045	+
	1046	+ public void setChildrenNumZ(String childrenNumZ) {
	1047	+ this.childrenNumZ = childrenNumZ;
	1048	+ }
	1049	+
	1050	+ public String getChildrenNumN() {
	1051	+ return childrenNumN;
	1052	+ }
	1053	+
	1054	+ public void setChildrenNumN(String childrenNumN) {
	1055	+ this.childrenNumN = childrenNumN;
1038	1056	}
1039	1057
1040	1058	public void setRuFangFaYu(String ruFangFaYu) {

...	...	@@ -66,6 +66,8 @@
66	66	private Integer liYi;
67	67	//子女(个数)
68	68	private Integer childrenNum;
	69	+ private Integer childrenNumZ;
	70	+ private Integer childrenNumN;
69	71	//家族近亲婚配(1: 有 2: 无)
70	72	private Integer nextOfKin;
71	73	/* 有的情况下会选择以下条件 */
...	...	@@ -1282,6 +1284,22 @@
1282	1284
1283	1285	public void setHouJie(Integer houJie) {
1284	1286	this.houJie = houJie;
	1287	+ }
	1288	+
	1289	+ public Integer getChildrenNumZ() {
	1290	+ return childrenNumZ;
	1291	+ }
	1292	+
	1293	+ public void setChildrenNumZ(Integer childrenNumZ) {
	1294	+ this.childrenNumZ = childrenNumZ;
	1295	+ }
	1296	+
	1297	+ public Integer getChildrenNumN() {
	1298	+ return childrenNumN;
	1299	+ }
	1300	+
	1301	+ public void setChildrenNumN(Integer childrenNumN) {
	1302	+ this.childrenNumN = childrenNumN;
1285	1303	}
1286	1304
1287	1305	public String getHouJieDetails() {