jiangjiazhi / regional-platform

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 39 additions and 6 deletions

...	...	@@ -80,6 +80,8 @@
80	80	private String ultrasonicExamination;
81	81	// 诊断
82	82	private String diagnosis;
	83	+ // 诊断其他
	84	+ private String diagOther;
83	85	//处理意见
84	86	private String treatOpinion;
85	87
...	...	@@ -99,6 +101,14 @@
99	101
100	102	//操作人
101	103	private Integer operator;
	104	+
	105	+ public String getDiagOther() {
	106	+ return diagOther;
	107	+ }
	108	+
	109	+ public void setDiagOther(String diagOther) {
	110	+ this.diagOther = diagOther;
	111	+ }
102	112
103	113	public Integer getOperator() {
104	114	return operator;

...	...	@@ -2779,6 +2779,12 @@
2779	2779	diagnosis = "-";
2780	2780	}
2781	2781	map.put("diagnosis", diagnosis);
	2782	+ map.put("diagOther", data.getDiagOther());
	2783	+ if(StringUtils.isEmpty(data.getDiagOther())){
	2784	+ map.put("diagOther", diagnosis);
	2785	+ }
	2786	+
	2787	+
2782	2788	map.put("treatOpinion", data.getTreatOpinion());
2783	2789	map.put("dirOpinion", data.getDirOpinion());
2784	2790

1	1	package com.lyms.platform.operate.web.request;
2	2
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4		-import com.lyms.platform.common.core.annotation.form.FormParam;
5	4	import com.lyms.platform.common.core.annotation.form.Form;
	5	+import com.lyms.platform.common.core.annotation.form.FormParam;
6	6	import com.lyms.platform.common.utils.DateUtil;
7	7	import com.lyms.platform.common.utils.JsonUtil;
8	8	import com.lyms.platform.pojo.PostReviewModel;
9	9	import org.hibernate.validator.constraints.NotEmpty;
10	10
11		-import java.io.Serializable;
12	11	import java.util.List;
13	12	import java.util.Map;
14	13
...	...	@@ -83,6 +82,8 @@
83	82	private String ultrasonicExamination;
84	83	// 诊断
85	84	private List diagnosis;
	85	+ // 诊断其他
	86	+ private String diagOther;
86	87	//处理意见
87	88	private String treatOpinion;
88	89
...	...	@@ -101,6 +102,14 @@
101	102
102	103	private Integer couponType;
103	104
	105	+ public String getDiagOther() {
	106	+ return diagOther;
	107	+ }
	108	+
	109	+ public void setDiagOther(String diagOther) {
	110	+ this.diagOther = diagOther;
	111	+ }
	112	+
104	113	public String getCouponCode() {
105	114	return couponCode;
106	115	}
...	...	@@ -353,6 +362,7 @@
353	362	public PostReviewModel convertToDataModel() {
354	363	PostReviewModel postReviewModel=new PostReviewModel();
355	364	postReviewModel.setId(id);
	365	+ postReviewModel.setDiagOther(diagOther);
356	366	postReviewModel.setParentId(parentId);
357	367	postReviewModel.setDay(day);
358	368	postReviewModel.setHealthStatus(healthStatus);

...	...	@@ -2,12 +2,9 @@
2	2
3	3	import com.lyms.platform.common.utils.DateUtil;
4	4	import com.lyms.platform.common.utils.JsonUtil;
5		-import com.lyms.platform.pojo.MaternalDeliverModel;
6		-import com.lyms.platform.pojo.Patients;
7	5	import com.lyms.platform.pojo.PostReviewModel;
8	6
9	7	import java.io.Serializable;
10		-import java.util.Date;
11	8	import java.util.List;
12	9	import java.util.Map;
13	10
...	...	@@ -76,6 +73,8 @@
76	73	private String ultrasonicExamination;
77	74	// 诊断
78	75	private List diagnosis;
	76	+ //诊断其他
	77	+ private String diagOther;
79	78	//处理意见
80	79	private String treatOpinion;
81	80
...	...	@@ -98,6 +97,14 @@
98	97	this.yl = yl;
99	98	}
100	99
	100	+ public String getDiagOther() {
	101	+ return diagOther;
	102	+ }
	103	+
	104	+ public void setDiagOther(String diagOther) {
	105	+ this.diagOther = diagOther;
	106	+ }
	107	+
101	108	public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
102	109	setId(postReviewModel.getId());
103	110	setParentId(postReviewModel.getParentId());
...	...	@@ -119,7 +126,7 @@
119	126	setTraceElement(postReviewModel.getTraceElement());
120	127	setBoneDensity(postReviewModel.getBoneDensity());
121	128	setUltrasonicExamination(postReviewModel.getUltrasonicExamination());
122		-
	129	+ setDiagOther(postReviewModel.getDiagOther());
123	130	setTreatOpinion(postReviewModel.getTreatOpinion());
124	131	setDirOpinion(postReviewModel.getDirOpinion());
125	132