jiangjiazhi / regional-platform

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 66 additions and 1 deletions

...	...	@@ -22,6 +22,10 @@
22	22	private String id;
23	23	//女性/男性ID
24	24	private String parentId;
	25	+ // 1妇科检查，男性检查拒绝，2不拒绝
	26	+ private String jczt;
	27	+ //加上绝经 1否 2 是
	28	+ private String fkjjState;
25	29	//婚检时间
26	30	private Date premaritalUpTime;
27	31	//医院ID
...	...	@@ -1518,6 +1522,22 @@
1518	1522
1519	1523	public String getYinDao() {
1520	1524	return yinDao;
	1525	+ }
	1526	+
	1527	+ public String getJczt() {
	1528	+ return jczt;
	1529	+ }
	1530	+
	1531	+ public void setJczt(String jczt) {
	1532	+ this.jczt = jczt;
	1533	+ }
	1534	+
	1535	+ public String getFkjjState() {
	1536	+ return fkjjState;
	1537	+ }
	1538	+
	1539	+ public void setFkjjState(String fkjjState) {
	1540	+ this.fkjjState = fkjjState;
1521	1541	}
1522	1542
1523	1543	public void setYinDao(String yinDao) {

...	...	@@ -471,7 +471,8 @@
471	471	checkupResult.setRepSign(result.getRepSign());
472	472	checkupResult.setGuidSign(result.getGuidSign());
473	473	checkupResult.setUserSign(result.getUserSign());
474		-
	474	+ checkupResult.setJczt(result.getJczt());
	475	+ checkupResult.setFkjjState(result.getFkjjState());
475	476	return checkupResult;
476	477	}
477	478
...	...	@@ -653,6 +654,9 @@
653	654	}
654	655	checkup.setDeliverStatus(addRequest.getDeliverStatus());
655	656	}
	657	+ checkup.setJczt(addRequest.getJczt());
	658	+ checkup.setFkjjState(addRequest.getFkjjState());
	659	+
656	660	//血缘关系
657	661	checkup.setIsBloodshed(addRequest.getIsBloodshed());
658	662	//血缘详情

...	...	@@ -13,6 +13,11 @@
13	13	@Form
14	14	public class PremaritalCheckupAddRequest {
15	15
	16	+ // 1妇科检查，男性检查拒绝，2不拒绝
	17	+ private String jczt;
	18	+ //加上绝经 1否 2 是
	19	+ private String fkjjState;
	20	+
16	21	private String id;
17	22	//女性/男性ID
18	23	private String parentId;
...	...	@@ -1949,6 +1954,22 @@
1949	1954
1950	1955	public String getVolumeLeft() {
1951	1956	return volumeLeft;
	1957	+ }
	1958	+
	1959	+ public String getJczt() {
	1960	+ return jczt;
	1961	+ }
	1962	+
	1963	+ public void setJczt(String jczt) {
	1964	+ this.jczt = jczt;
	1965	+ }
	1966	+
	1967	+ public String getFkjjState() {
	1968	+ return fkjjState;
	1969	+ }
	1970	+
	1971	+ public void setFkjjState(String fkjjState) {
	1972	+ this.fkjjState = fkjjState;
1952	1973	}
1953	1974
1954	1975	public void setVolumeLeft(String volumeLeft) {

...	...	@@ -420,6 +420,26 @@
420	420	//用户签名
421	421	private String userSign;
422	422
	423	+ // 1妇科检查，男性检查拒绝，2不拒绝
	424	+ private String jczt;
	425	+ //加上绝经 1否 2 是
	426	+ private String fkjjState;
	427	+
	428	+ public String getJczt() {
	429	+ return jczt;
	430	+ }
	431	+
	432	+ public void setJczt(String jczt) {
	433	+ this.jczt = jczt;
	434	+ }
	435	+
	436	+ public String getFkjjState() {
	437	+ return fkjjState;
	438	+ }
	439	+
	440	+ public void setFkjjState(String fkjjState) {
	441	+ this.fkjjState = fkjjState;
	442	+ }
423	443
424	444	public String getBaseSign() {
425	445	return baseSign;