jiangjiazhi / regional-platform

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 52 additions and 0 deletions

...	...	@@ -539,6 +539,23 @@
539	539	//中医指导
540	540	private String tcmGuide;
541	541
	542	+ /**
	543	+ * 围场-儿童建档和儿童体检添加字段
	544	+ */
	545	+ //儿童高危-其它高危
	546	+ private String otherHighRisk;
	547	+
	548	+ public String getOtherHighRisk() {
	549	+ return otherHighRisk;
	550	+ }
	551	+
	552	+ public void setOtherHighRisk(String otherHighRisk) {
	553	+ this.otherHighRisk = otherHighRisk;
	554	+ }
	555	+
	556	+ /********************************************/
	557	+
	558	+
542	559	public Integer getCheckDay() {
543	560	return checkDay;
544	561	}
...	...	@@ -2435,6 +2452,7 @@
2435	2452	", alotExercise='" + alotExercise + '\'' +
2436	2453	", fineExercise='" + fineExercise + '\'' +
2437	2454	", tcmGuide='" + tcmGuide + '\'' +
	2455	+ ", otherHighRisk='" + otherHighRisk + '\'' +
2438	2456	'}';
2439	2457	}
2440	2458	}

...	...	@@ -576,6 +576,7 @@
576	576	model.setZhipJoint(request.getZhipJoint());
577	577	model.setYhipJoint(request.getYhipJoint());
578	578	model.setTcmGuide(request.getTcmGuide());
	579	+ model.setOtherHighRisk(request.getOtherHighRisk());
579	580
580	581	return model;
581	582	}

...	...	@@ -2518,6 +2518,8 @@
2518	2518	map.put("ssy", ssy); // 血压
2519	2519	map.put("szy", szy); // 血压
2520	2520	map.put("yn", data.getYn()); //
	2521	+ //围场孕妇产检新加字段nt
	2522	+ map.put("wcNt",data.getWcNt());
2521	2523
2522	2524	br.setErrorcode(ErrorCodeConstants.SUCCESS);
2523	2525	br.setErrormsg("成功");
2524	2526
...	...	@@ -6172,7 +6174,10 @@
6172	6174	model.setCheckDiagnoseLevel(diagnoseList);
6173	6175	model.setHandlSuggest(checkModel.getHandlSuggest());
6174	6176	model.setGuideSuggest(checkModel.getGuideSuggest());
	6177	+ //隆化新加中医指导
6175	6178	model.setTcmGuide(checkModel.getTcmGuide());
	6179	+ //围场新加其它高危
	6180	+ model.setOtherHighRisk(checkModel.getOtherHighRisk());
6176	6181
6177	6182	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor())) {
6178	6183

...	...	@@ -499,9 +499,23 @@
499	499	*/
500	500	private String tcmGuide;
501	501
	502	+ /**
	503	+ * 围场-儿童建档和儿童体检添加字段
	504	+ */
	505	+ //儿童高危-其它高危
	506	+ private String otherHighRisk;
	507	+ /********************************************/
	508	+
502	509	//儿童疾病
503	510	private List<String> diseases;
504	511
	512	+ public String getOtherHighRisk() {
	513	+ return otherHighRisk;
	514	+ }
	515	+
	516	+ public void setOtherHighRisk(String otherHighRisk) {
	517	+ this.otherHighRisk = otherHighRisk;
	518	+ }
505	519
506	520	public String getTcmGuide() {
507	521	return tcmGuide;

...	...	@@ -706,7 +706,21 @@
706	706	/新增字段中医指导/
707	707	//中医指导
708	708	private String tcmGuide;
	709	+ /**
	710	+ * 围场-儿童建档和儿童体检添加字段
	711	+ */
	712	+ //儿童高危-其它高危
	713	+ private String otherHighRisk;
709	714
	715	+ public String getOtherHighRisk() {
	716	+ return otherHighRisk;
	717	+ }
	718	+
	719	+ public void setOtherHighRisk(String otherHighRisk) {
	720	+ this.otherHighRisk = otherHighRisk;
	721	+ }
	722	+
	723	+ /********************************************/
710	724
711	725	public String getTcmGuide() {
712	726	return tcmGuide;