jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 32 additions and 2 deletions

...	...	@@ -26,8 +26,9 @@
26	26	private Integer yn;
27	27
28	28	private String buildId;
	29	+ //其它诊断
	30	+ private List<String> otherDiagnose;
29	31
30		-
31	32	//儿保检查时间
32	33	private Date checkDate;
33	34	//月龄下拉框
...	...	@@ -470,6 +471,14 @@
470	471	private String alotExercise ;
471	472	//精细运动
472	473	private String fineExercise ;
	474	+
	475	+ public List<String> getOtherDiagnose() {
	476	+ return otherDiagnose;
	477	+ }
	478	+
	479	+ public void setOtherDiagnose(List<String> otherDiagnose) {
	480	+ this.otherDiagnose = otherDiagnose;
	481	+ }
473	482
474	483	public String getExercise() {
475	484	return exercise;

...	...	@@ -214,6 +214,7 @@
214	214	model.setEndCaseTime(new Date());
215	215	}*/
216	216	//新加字段
	217	+ model.setOtherDiagnose(request.getOtherDiagnose());
217	218	model.setCorrectAge(request.getCorrectAge());
218	219	model.setTcType(request.getTcType());
219	220	model.setCnqk(request.getCnqk());
...	...	@@ -1537,6 +1538,7 @@
1537	1538	model.setOutcome(babyMode.getOutcome());
1538	1539	}
1539	1540	}
	1541	+ model.setOtherDiagnose(checkModel.getOtherDiagnose());
1540	1542	model.setTcType(checkModel.getTcType());
1541	1543	model.setCnqk(checkModel.getCnqk());
1542	1544	model.setMtcnNum(checkModel.getMtcnNum());

...	...	@@ -320,6 +320,8 @@
320	320	/****诊断指导**/
321	321	//诊断
322	322	private List<String> diagnose;
	323	+ //其它诊断
	324	+ private List<String> otherDiagnose;
323	325	//处理意见
324	326	private String handlSuggest;
325	327	//指导意见
...	...	@@ -433,6 +435,14 @@
433	435	*/
434	436	private String socialContactIA;
435	437	private String socialContactDQ;
	438	+
	439	+ public List<String> getOtherDiagnose() {
	440	+ return otherDiagnose;
	441	+ }
	442	+
	443	+ public void setOtherDiagnose(List<String> otherDiagnose) {
	444	+ this.otherDiagnose = otherDiagnose;
	445	+ }
436	446
437	447	public String getSocialContact() {
438	448	return socialContact;

...	...	@@ -8,8 +8,9 @@
8	8	*/
9	9	public class BabyCheckResult {
10	10	private String id;
	11	+ //其它诊断
	12	+ private List<String> otherDiagnose;
11	13
12		-
13	14	// 血红蛋白券
14	15	private String hemoglobinCoupon;
15	16
...	...	@@ -436,6 +437,14 @@
436	437
437	438	private Integer okSize;
438	439	private Integer abnormalSize;
	440	+
	441	+ public List<String> getOtherDiagnose() {
	442	+ return otherDiagnose;
	443	+ }
	444	+
	445	+ public void setOtherDiagnose(List<String> otherDiagnose) {
	446	+ this.otherDiagnose = otherDiagnose;
	447	+ }
439	448
440	449	public Integer getOkSize() {
441	450	return okSize;