jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 40 additions and 9 deletions

...	...	@@ -758,6 +758,16 @@
758	758	private String childHealthExamFormNo;
759	759	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
760	760	private String visitType;
	761	+ //选项指标记录
	762	+ private List<Object> recordChoice;
	763	+
	764	+ public List<Object> getRecordChoice() {
	765	+ return recordChoice;
	766	+ }
	767	+
	768	+ public void setRecordChoice(List<Object> recordChoice) {
	769	+ this.recordChoice = recordChoice;
	770	+ }
761	771
762	772	public Integer getIsAppCreate() {
763	773	return isAppCreate;

...	...	@@ -744,7 +744,7 @@
744	744	//建立儿童保健手册时间
745	745	private String childrenBookBuildDate;
746	746	//选项指标记录
747		- private List<String> recordChoice;
	747	+ private List<Object> recordChoice;
748	748
749	749
750	750	public Integer getIsAppCreate() {
751	751
...	...	@@ -763,11 +763,11 @@
763	763	this.childrenBookBuildDate = childrenBookBuildDate;
764	764	}
765	765
766		- public List<String> getRecordChoice() {
	766	+ public List<Object> getRecordChoice() {
767	767	return recordChoice;
768	768	}
769	769
770		- public void setRecordChoice(List<String> recordChoice) {
	770	+ public void setRecordChoice(List<Object> recordChoice) {
771	771	this.recordChoice = recordChoice;
772	772	}
773	773

...	...	@@ -808,6 +808,7 @@
808	808	model.setFollowupVisitDoctorName(request.getFollowupVisitDoctorName());
809	809	model.setChildHealthExamFormNo(request.getChildHealthExamFormNo());
810	810	model.setVisitType(request.getVisitType());
	811	+ model.setRecordChoice(request.getRecordChoice());
811	812
812	813	return model;
813	814	}

...	...	@@ -527,7 +527,7 @@
527	527	//建立儿童保健手册时间
528	528	private String childrenBookBuildDate;
529	529	//选项指标记录
530		- private List<String> recordChoice;
	530	+ private List<Object> recordChoice;
531	531
532	532	public Integer getIsAppCreate() {
533	533	return isAppCreate;
534	534
...	...	@@ -545,11 +545,11 @@
545	545	this.childrenBookBuildDate = childrenBookBuildDate;
546	546	}
547	547
548		- public List<String> getRecordChoice() {
	548	+ public List<Object> getRecordChoice() {
549	549	return recordChoice;
550	550	}
551	551
552		- public void setRecordChoice(List<String> recordChoice) {
	552	+ public void setRecordChoice(List<Object> recordChoice) {
553	553	this.recordChoice = recordChoice;
554	554	}
555	555

...	...	@@ -727,6 +727,16 @@
727	727	private String childHealthExamFormNo;
728	728	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
729	729	private String visitType;
	730	+ //选项指标记录
	731	+ private List<Object> recordChoice;
	732	+
	733	+ public List<Object> getRecordChoice() {
	734	+ return recordChoice;
	735	+ }
	736	+
	737	+ public void setRecordChoice(List<Object> recordChoice) {
	738	+ this.recordChoice = recordChoice;
	739	+ }
730	740
731	741	public Integer getIsAppCreate() {
732	742	return isAppCreate;

...	...	@@ -991,6 +991,16 @@
991	991	private String childHealthExamFormNo;
992	992	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
993	993	private String visitType;
	994	+ //选项指标记录
	995	+ private List<Object> recordChoice;
	996	+
	997	+ public List<Object> getRecordChoice() {
	998	+ return recordChoice;
	999	+ }
	1000	+
	1001	+ public void setRecordChoice(List<Object> recordChoice) {
	1002	+ this.recordChoice = recordChoice;
	1003	+ }
994	1004
995	1005	public Integer getIsAppCreate() {
996	1006	return isAppCreate;

...	...	@@ -458,7 +458,7 @@
458	458	//建立儿童保健手册时间
459	459	private String childrenBookBuildDate;
460	460	//选项指标记录
461		- private List<String> recordChoice;
	461	+ private List<Object> recordChoice;
462	462
463	463	public Integer getIsAppCreate() {
464	464	return isAppCreate;
465	465
...	...	@@ -476,11 +476,11 @@
476	476	this.childrenBookBuildDate = childrenBookBuildDate;
477	477	}
478	478
479		- public List<String> getRecordChoice() {
	479	+ public List<Object> getRecordChoice() {
480	480	return recordChoice;
481	481	}
482	482
483		- public void setRecordChoice(List<String> recordChoice) {
	483	+ public void setRecordChoice(List<Object> recordChoice) {
484	484	this.recordChoice = recordChoice;
485	485	}
486	486