jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 120 additions and 1 deletions

...	...	@@ -1537,6 +1537,13 @@
1537	1537	model.setOutcome(babyMode.getOutcome());
1538	1538	}
1539	1539	}
	1540	+ /秦皇岛儿保检查使用/
	1541	+ model.setExercise(checkModel.getExercise());
	1542	+ model.setLanguage(checkModel.getLanguage());
	1543	+ model.setSocialContact(checkModel.getSocialContact());
	1544	+ model.setAlotExercise(checkModel.getAlotExercise());
	1545	+ model.setFineExercise(checkModel.getFineExercise());
	1546	+
1540	1547	model.setTcType(checkModel.getTcType());
1541	1548	model.setCnqk(checkModel.getCnqk());
1542	1549	model.setMtcnNum(checkModel.getMtcnNum());

...	...	@@ -5207,6 +5207,13 @@
5207	5207	//根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
5208	5208	checkModel.distOldTcType(babyModel);
5209	5209
	5210	+ /秦皇岛儿保检查使用/
	5211	+ model.setExercise(checkModel.getExercise());
	5212	+ model.setLanguage(checkModel.getLanguage());
	5213	+ model.setSocialContact(checkModel.getSocialContact());
	5214	+ model.setAlotExercise(checkModel.getAlotExercise());
	5215	+ model.setFineExercise(checkModel.getFineExercise());
	5216	+
5210	5217	model.setTcType(checkModel.getTcType());
5211	5218	model.setBabyName(babyModel.getName());
5212	5219	model.setBabyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));

...	...	@@ -8,7 +8,20 @@
8	8	* Created by Administrator on 2016/6/21.
9	9	*/
10	10	public class BabyCheckPageResult {
	11	+ /秦皇岛修改的儿保检查内容/
	12	+ //运动
	13	+ private String exercise ;
	14	+ //语言
	15	+ private String language;
	16	+ //社交
	17	+ private String socialContact;
	18	+ //大运动
	19	+ private String alotExercise ;
	20	+ //精细运动
	21	+ private String fineExercise ;
11	22
	23	+
	24	+
12	25	// 检查套餐<JCTCEnums>
13	26	private Integer tcType;
14	27
...	...	@@ -512,6 +525,46 @@
512	525
513	526
514	527	private List<String> messages;
	528	+
	529	+ public String getExercise() {
	530	+ return exercise;
	531	+ }
	532	+
	533	+ public void setExercise(String exercise) {
	534	+ this.exercise = exercise;
	535	+ }
	536	+
	537	+ public String getLanguage() {
	538	+ return language;
	539	+ }
	540	+
	541	+ public void setLanguage(String language) {
	542	+ this.language = language;
	543	+ }
	544	+
	545	+ public String getSocialContact() {
	546	+ return socialContact;
	547	+ }
	548	+
	549	+ public void setSocialContact(String socialContact) {
	550	+ this.socialContact = socialContact;
	551	+ }
	552	+
	553	+ public String getAlotExercise() {
	554	+ return alotExercise;
	555	+ }
	556	+
	557	+ public void setAlotExercise(String alotExercise) {
	558	+ this.alotExercise = alotExercise;
	559	+ }
	560	+
	561	+ public String getFineExercise() {
	562	+ return fineExercise;
	563	+ }
	564	+
	565	+ public void setFineExercise(String fineExercise) {
	566	+ this.fineExercise = fineExercise;
	567	+ }
515	568
516	569	public String getCheckOtherDiagnose() {
517	570	return checkOtherDiagnose;

...	...	@@ -9,7 +9,19 @@
9	9	public class BabyCheckResult {
10	10	private String id;
11	11
	12	+ //运动
	13	+ private String exercise ;
	14	+ //语言
	15	+ private String language;
	16	+ //社交
	17	+ private String socialContact;
	18	+ //大运动
	19	+ private String alotExercise ;
	20	+ //精细运动
	21	+ private String fineExercise ;
12	22
	23	+
	24	+
13	25	// 血红蛋白券
14	26	private String hemoglobinCoupon;
15	27
...	...	@@ -410,7 +422,47 @@
410	422	private Integer endCase;
411	423	private String outcome;
412	424
413		- /*增加眼科检查项*/
	425	+ /秦皇岛修改的儿保检查内容/
	426	+ public String getExercise() {
	427	+ return exercise;
	428	+ }
	429	+
	430	+ public void setExercise(String exercise) {
	431	+ this.exercise = exercise;
	432	+ }
	433	+
	434	+ public String getLanguage() {
	435	+ return language;
	436	+ }
	437	+
	438	+ public void setLanguage(String language) {
	439	+ this.language = language;
	440	+ }
	441	+
	442	+ public String getSocialContact() {
	443	+ return socialContact;
	444	+ }
	445	+
	446	+ public void setSocialContact(String socialContact) {
	447	+ this.socialContact = socialContact;
	448	+ }
	449	+
	450	+ public String getAlotExercise() {
	451	+ return alotExercise;
	452	+ }
	453	+
	454	+ public void setAlotExercise(String alotExercise) {
	455	+ this.alotExercise = alotExercise;
	456	+ }
	457	+
	458	+ public String getFineExercise() {
	459	+ return fineExercise;
	460	+ }
	461	+
	462	+ public void setFineExercise(String fineExercise) {
	463	+ this.fineExercise = fineExercise;
	464	+ }
	465	+/*增加眼科检查项*/
414	466
415	467	/**
416	468	* 眼外观