jiangjiazhi / regional-platform

Commit fe1cba4da27d070914ffd65c27e405a476175503

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 262 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -393,6 +393,65 @@
393	393	//体积右
394	394	private String volumeRight;
395	395
	396	+ // 邮编
	397	+ private String mailNo;
	398	+ // 视力左右
	399	+ private String shiliLeft;
	400	+ private String shiliRight;
	401	+
	402	+ // 听力左右
	403	+ private String tingliLeft;
	404	+ private String tingliRight;
	405	+ // 语言
	406	+ private String yuyan;
	407	+
	408	+ public String getMailNo() {
	409	+ return mailNo;
	410	+ }
	411	+
	412	+ public void setMailNo(String mailNo) {
	413	+ this.mailNo = mailNo;
	414	+ }
	415	+
	416	+ public String getShiliLeft() {
	417	+ return shiliLeft;
	418	+ }
	419	+
	420	+ public void setShiliLeft(String shiliLeft) {
	421	+ this.shiliLeft = shiliLeft;
	422	+ }
	423	+
	424	+ public String getShiliRight() {
	425	+ return shiliRight;
	426	+ }
	427	+
	428	+ public void setShiliRight(String shiliRight) {
	429	+ this.shiliRight = shiliRight;
	430	+ }
	431	+
	432	+ public String getTingliLeft() {
	433	+ return tingliLeft;
	434	+ }
	435	+
	436	+ public void setTingliLeft(String tingliLeft) {
	437	+ this.tingliLeft = tingliLeft;
	438	+ }
	439	+
	440	+ public String getTingliRight() {
	441	+ return tingliRight;
	442	+ }
	443	+
	444	+ public void setTingliRight(String tingliRight) {
	445	+ this.tingliRight = tingliRight;
	446	+ }
	447	+
	448	+ public String getYuyan() {
	449	+ return yuyan;
	450	+ }
	451	+
	452	+ public void setYuyan(String yuyan) {
	453	+ this.yuyan = yuyan;
	454	+ }
396	455
397	456	public String getVolumeLeft() {
398	457	return volumeLeft;

...	...	@@ -439,6 +439,14 @@
439	439	checkupResult.setHunqianHealth(result.getHunqianHealth());
440	440	checkupResult.setGuidanceResults(result.getGuidanceResults());
441	441
	442	+
	443	+ checkupResult.setMailNo(result.getMailNo());
	444	+ checkupResult.setShiliRight(result.getShiliRight());
	445	+ checkupResult.setShiliLeft(result.getShiliLeft());
	446	+ checkupResult.setTingliLeft(result.getTingliLeft());
	447	+ checkupResult.setTingliRight(result.getTingliRight());
	448	+ checkupResult.setYuyan(result.getYuyan());
	449	+
442	450	return checkupResult;
443	451	}
444	452
...	...	@@ -851,6 +859,14 @@
851	859	checkup.setZhiDaoYiJian(addRequest.getZhiDaoYiJian());
852	860	checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
853	861
	862	+ checkup.setMailNo(addRequest.getMailNo());
	863	+ checkup.setShiliRight(addRequest.getShiliRight());
	864	+ checkup.setShiliLeft(addRequest.getShiliLeft());
	865	+ checkup.setTingliLeft(addRequest.getTingliLeft());
	866	+ checkup.setTingliRight(addRequest.getTingliRight());
	867	+ checkup.setYuyan(addRequest.getYuyan());
	868	+
	869	+
854	870	/* 基础数据 */
855	871	checkup.setYn(YnEnums.YES.getId());
856	872	checkup.setModified(new Date());
...	...	@@ -2127,6 +2143,13 @@
2127	2143	checkupResult.setGaoWanZuo(result.getGaoWanZuo());//睾丸左
2128	2144	checkupResult.setGaoWanYou(result.getGaoWanYou());//睾丸右
2129	2145	checkupResult.setSpouseCertificateTypeId(result.getSpouseCertificateTypeId());//证件类型
	2146	+
	2147	+ checkupResult.setMailNo(result.getMailNo());
	2148	+ checkupResult.setShiliRight(result.getShiliRight());
	2149	+ checkupResult.setShiliLeft(result.getShiliLeft());
	2150	+ checkupResult.setTingliLeft(result.getTingliLeft());
	2151	+ checkupResult.setTingliRight(result.getTingliRight());
	2152	+ checkupResult.setYuyan(result.getYuyan());
2130	2153
2131	2154	return checkupResult;
2132	2155	}

...	...	@@ -402,6 +402,66 @@
402	402
403	403	private Integer sexType;
404	404
	405	+ // 邮编
	406	+ private String mailNo;
	407	+ // 视力左右
	408	+ private String shiliLeft;
	409	+ private String shiliRight;
	410	+
	411	+ // 听力左右
	412	+ private String tingliLeft;
	413	+ private String tingliRight;
	414	+ // 语言
	415	+ private String yuyan;
	416	+
	417	+ public String getMailNo() {
	418	+ return mailNo;
	419	+ }
	420	+
	421	+ public void setMailNo(String mailNo) {
	422	+ this.mailNo = mailNo;
	423	+ }
	424	+
	425	+ public String getShiliLeft() {
	426	+ return shiliLeft;
	427	+ }
	428	+
	429	+ public void setShiliLeft(String shiliLeft) {
	430	+ this.shiliLeft = shiliLeft;
	431	+ }
	432	+
	433	+ public String getShiliRight() {
	434	+ return shiliRight;
	435	+ }
	436	+
	437	+ public void setShiliRight(String shiliRight) {
	438	+ this.shiliRight = shiliRight;
	439	+ }
	440	+
	441	+ public String getTingliLeft() {
	442	+ return tingliLeft;
	443	+ }
	444	+
	445	+ public void setTingliLeft(String tingliLeft) {
	446	+ this.tingliLeft = tingliLeft;
	447	+ }
	448	+
	449	+ public String getTingliRight() {
	450	+ return tingliRight;
	451	+ }
	452	+
	453	+ public void setTingliRight(String tingliRight) {
	454	+ this.tingliRight = tingliRight;
	455	+ }
	456	+
	457	+ public String getYuyan() {
	458	+ return yuyan;
	459	+ }
	460	+
	461	+ public void setYuyan(String yuyan) {
	462	+ this.yuyan = yuyan;
	463	+ }
	464	+
405	465	public Map<String, Object> getMaritalBingHistory() {
406	466	return maritalBingHistory;
407	467	}

...	...	@@ -373,6 +373,66 @@
373	373	//证件类型
374	374	private String spouseCertificateTypeId;
375	375
	376	+ // 邮编
	377	+ private String mailNo;
	378	+ // 视力左右
	379	+ private String shiliLeft;
	380	+ private String shiliRight;
	381	+
	382	+ // 听力左右
	383	+ private String tingliLeft;
	384	+ private String tingliRight;
	385	+ // 语言
	386	+ private String yuyan;
	387	+
	388	+ public String getMailNo() {
	389	+ return mailNo;
	390	+ }
	391	+
	392	+ public void setMailNo(String mailNo) {
	393	+ this.mailNo = mailNo;
	394	+ }
	395	+
	396	+ public String getShiliLeft() {
	397	+ return shiliLeft;
	398	+ }
	399	+
	400	+ public void setShiliLeft(String shiliLeft) {
	401	+ this.shiliLeft = shiliLeft;
	402	+ }
	403	+
	404	+ public String getShiliRight() {
	405	+ return shiliRight;
	406	+ }
	407	+
	408	+ public void setShiliRight(String shiliRight) {
	409	+ this.shiliRight = shiliRight;
	410	+ }
	411	+
	412	+ public String getTingliLeft() {
	413	+ return tingliLeft;
	414	+ }
	415	+
	416	+ public void setTingliLeft(String tingliLeft) {
	417	+ this.tingliLeft = tingliLeft;
	418	+ }
	419	+
	420	+ public String getTingliRight() {
	421	+ return tingliRight;
	422	+ }
	423	+
	424	+ public void setTingliRight(String tingliRight) {
	425	+ this.tingliRight = tingliRight;
	426	+ }
	427	+
	428	+ public String getYuyan() {
	429	+ return yuyan;
	430	+ }
	431	+
	432	+ public void setYuyan(String yuyan) {
	433	+ this.yuyan = yuyan;
	434	+ }
	435	+
376	436	public String getSpouseCertificateTypeId() {
377	437	return spouseCertificateTypeId;
378	438	}

...	...	@@ -378,6 +378,66 @@
378	378	//程度
379	379	private String degree;
380	380
	381	+ // 邮编
	382	+ private String mailNo;
	383	+ // 视力左右
	384	+ private String shiliLeft;
	385	+ private String shiliRight;
	386	+
	387	+ // 听力左右
	388	+ private String tingliLeft;
	389	+ private String tingliRight;
	390	+ // 语言
	391	+ private String yuyan;
	392	+
	393	+ public String getMailNo() {
	394	+ return mailNo;
	395	+ }
	396	+
	397	+ public void setMailNo(String mailNo) {
	398	+ this.mailNo = mailNo;
	399	+ }
	400	+
	401	+ public String getShiliLeft() {
	402	+ return shiliLeft;
	403	+ }
	404	+
	405	+ public void setShiliLeft(String shiliLeft) {
	406	+ this.shiliLeft = shiliLeft;
	407	+ }
	408	+
	409	+ public String getShiliRight() {
	410	+ return shiliRight;
	411	+ }
	412	+
	413	+ public void setShiliRight(String shiliRight) {
	414	+ this.shiliRight = shiliRight;
	415	+ }
	416	+
	417	+ public String getTingliLeft() {
	418	+ return tingliLeft;
	419	+ }
	420	+
	421	+ public void setTingliLeft(String tingliLeft) {
	422	+ this.tingliLeft = tingliLeft;
	423	+ }
	424	+
	425	+ public String getTingliRight() {
	426	+ return tingliRight;
	427	+ }
	428	+
	429	+ public void setTingliRight(String tingliRight) {
	430	+ this.tingliRight = tingliRight;
	431	+ }
	432	+
	433	+ public String getYuyan() {
	434	+ return yuyan;
	435	+ }
	436	+
	437	+ public void setYuyan(String yuyan) {
	438	+ this.yuyan = yuyan;
	439	+ }
	440	+
381	441	public String getPosition() {
382	442	return position;
383	443	}