jiangjiazhi / regional-platform | GitLab

Commit 52dcf623d369a0af8d346cc58c4e8e22cd950794

Authored by liquanyu over 4 years ago

1 parent ca9ac9b5b6

Exists in master and in 6 other branches

大同档案增加字段

Showing 3 changed files with 23 additions and 0 deletions

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/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -1882,6 +1882,7 @@
1882	1882	patient.setHmarriageStatus(yunRequest.getHmarriageStatus());
1883	1883	patient.setHealthStatus(yunRequest.getHealthStatus());
1884	1884	patient.setSmoke(yunRequest.getSmoke());
	1885	+ patient.setHmarriageAge(yunRequest.getHmarriageAge());
1885	1886	patient.setSmokeNum(yunRequest.getSmokeNum());
1886	1887	patient.setDrinkWine(yunRequest.getDrinkWine());
1887	1888	patient.setHlevelTypeId(yunRequest.getHlevelTypeId());

...	...	@@ -424,7 +424,17 @@
424	424
425	425	//其他
426	426	private String other;
	427	+ //丈夫年龄
	428	+ private Integer hmarriageAge;
427	429
	430	+
	431	+ public Integer getHmarriageAge() {
	432	+ return hmarriageAge;
	433	+ }
	434	+
	435	+ public void setHmarriageAge(Integer hmarriageAge) {
	436	+ this.hmarriageAge = hmarriageAge;
	437	+ }
428	438
429	439	public Integer getMarriageAge() {
430	440	return marriageAge;

...	...	@@ -387,6 +387,18 @@
387	387	//其他
388	388	private String other;
389	389
	390	+
	391	+ //结婚年龄
	392	+ private Integer hmarriageAge;
	393	+
	394	+ public Integer getHmarriageAge() {
	395	+ return hmarriageAge;
	396	+ }
	397	+
	398	+ public void setHmarriageAge(Integer hmarriageAge) {
	399	+ this.hmarriageAge = hmarriageAge;
	400	+ }
	401	+
390	402	public Integer getMarriageAge() {
391	403	return marriageAge;
392	404	}