jiangjiazhi / regional-platform

Authored by shiyang over 2 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 24 additions and 12 deletions

...	...	@@ -757,7 +757,7 @@
757	757	//儿童健康检查表单编号
758	758	private String childHealthExamFormNo;
759	759	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
760		- private String visitType;
	760	+ private Integer visitType;
761	761	//选项指标记录
762	762	private List<Object> recordChoice;
763	763
764	764
...	...	@@ -817,11 +817,11 @@
817	817	this.childHealthExamFormNo = childHealthExamFormNo;
818	818	}
819	819
820		- public String getVisitType() {
	820	+ public Integer getVisitType() {
821	821	return visitType;
822	822	}
823	823
824		- public void setVisitType(String visitType) {
	824	+ public void setVisitType(Integer visitType) {
825	825	this.visitType = visitType;
826	826	}
827	827

...	...	@@ -2878,6 +2878,7 @@
2878	2878	model.setFollowupVisitDoctorName(checkModel.getFollowupVisitDoctorName());
2879	2879	model.setChildHealthExamFormNo(checkModel.getChildHealthExamFormNo());
2880	2880	model.setVisitType(checkModel.getVisitType());
	2881	+ model.setRecordChoice(checkModel.getRecordChoice());
2881	2882	return model;
2882	2883
2883	2884	}

...	...	@@ -726,7 +726,7 @@
726	726	//儿童健康检查表单编号
727	727	private String childHealthExamFormNo;
728	728	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
729		- private String visitType;
	729	+ private Integer visitType;
730	730	//选项指标记录
731	731	private List<Object> recordChoice;
732	732
733	733
734	734
...	...	@@ -786,13 +786,14 @@
786	786	this.childHealthExamFormNo = childHealthExamFormNo;
787	787	}
788	788
789		- public String getVisitType() {
	789	+ public Integer getVisitType() {
790	790	return visitType;
791	791	}
792	792
793		- public void setVisitType(String visitType) {
	793	+ public void setVisitType(Integer visitType) {
794	794	this.visitType = visitType;
795	795	}
	796	+
796	797	public String getSf() {
797	798	return sf;
798	799	}

...	...	@@ -990,7 +990,7 @@
990	990	//儿童健康检查表单编号
991	991	private String childHealthExamFormNo;
992	992	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
993		- private String visitType;
	993	+ private Integer visitType;
994	994	//选项指标记录
995	995	private List<Object> recordChoice;
996	996
997	997
...	...	@@ -1050,11 +1050,11 @@
1050	1050	this.childHealthExamFormNo = childHealthExamFormNo;
1051	1051	}
1052	1052
1053		- public String getVisitType() {
	1053	+ public Integer getVisitType() {
1054	1054	return visitType;
1055	1055	}
1056	1056
1057		- public void setVisitType(String visitType) {
	1057	+ public void setVisitType(Integer visitType) {
1058	1058	this.visitType = visitType;
1059	1059	}
1060	1060

...	...	@@ -55,7 +55,9 @@
55	55	//儿童健康检查表单编号
56	56	private String childHealthExamFormNo;
57	57	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
58		- private String visitType;
	58	+ private Integer visitType;
	59	+ //选项指标记录
	60	+ private List<Object> recordChoice;
59	61
60	62	public Integer getIsAppCreate() {
61	63	return isAppCreate;
62	64
63	65
...	...	@@ -105,12 +107,20 @@
105	107	this.childHealthExamFormNo = childHealthExamFormNo;
106	108	}
107	109
108		- public String getVisitType() {
	110	+ public Integer getVisitType() {
109	111	return visitType;
110	112	}
111	113
112		- public void setVisitType(String visitType) {
	114	+ public void setVisitType(Integer visitType) {
113	115	this.visitType = visitType;
	116	+ }
	117	+
	118	+ public List<Object> getRecordChoice() {
	119	+ return recordChoice;
	120	+ }
	121	+
	122	+ public void setRecordChoice(List<Object> recordChoice) {
	123	+ this.recordChoice = recordChoice;
114	124	}
115	125
116	126	public String getEljy() {