jiangjiazhi / regional-platform

Commit 10338fcf874c829489ae123ac9c7e9b69bffe5c5

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加是否通知

Showing 3 changed files with 21 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.common.result.BaseObjectResponse;
9	9	import com.lyms.platform.common.result.BaseResponse;
10	10	import com.lyms.platform.common.utils.Assert;
	11	+import com.lyms.platform.common.utils.JsonUtil;
11	12	import com.lyms.platform.operate.web.request.PostReviewQueryRequest;
12	13	import com.lyms.platform.operate.web.request.PostReviewRequest;
13	14	import com.lyms.platform.operate.web.result.PostReviewListResult;
...	...	@@ -41,6 +42,8 @@
41	42	private MatDeliverService matDeliverService;
42	43	@Autowired
43	44	private AutoMatchFacade autoMatchFacade;
	45	+ @Autowired
	46	+ private AntenatalExaminationFacade examinationFacade;
44	47
45	48	public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) {
46	49	if (StringUtils.isEmpty(postReviewRequest.getId())) {
47	50
...	...	@@ -93,10 +96,16 @@
93	96	public BaseResponse findById(String id) {
94	97	PostReviewModel postReviewModel = postReviewService.findOneById(id);
95	98
96		-
97	99	Assert.notNull(postReviewModel, "没有对应的数据.");
98	100	PostReviewResult postReviewResult = new PostReviewResult();
99	101	postReviewResult.convertToResult(postReviewModel);
	102	+ try {
	103	+ if(StringUtils.isNotEmpty(postReviewModel.getDiagnosis())){
	104	+ List list = JsonUtil.toList(postReviewModel.getDiagnosis(), List.class);
	105	+ postReviewResult.setDiagnosis(examinationFacade.queryRisk(list));
	106	+ }
	107	+ } catch (Exception e) {
	108	+ }
100	109	return new BaseObjectResponse().setData(postReviewResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
101	110	}
102	111	}

...	...	@@ -8,6 +8,7 @@
8	8	import org.hibernate.validator.constraints.NotEmpty;
9	9
10	10	import java.io.Serializable;
	11	+import java.util.List;
11	12	import java.util.Map;
12	13
13	14	/**
...	...	@@ -77,7 +78,7 @@
77	78	//超声检查
78	79	private String ultrasonicExamination;
79	80	// 诊断
80		- private String diagnosis;
	81	+ private List diagnosis;
81	82	//处理意见
82	83	private String treatOpinion;
83	84
84	85
...	...	@@ -125,11 +126,11 @@
125	126	this.checkTime = checkTime;
126	127	}
127	128
128		- public String getDiagnosis() {
	129	+ public List getDiagnosis() {
129	130	return diagnosis;
130	131	}
131	132
132		- public void setDiagnosis(String diagnosis) {
	133	+ public void setDiagnosis(List diagnosis) {
133	134	this.diagnosis = diagnosis;
134	135	}
135	136
...	...	@@ -324,7 +325,9 @@
324	325	postReviewModel.setTraceElement(traceElement);
325	326	postReviewModel.setBoneDensity(boneDensity);
326	327	postReviewModel.setUltrasonicExamination(ultrasonicExamination);
327		- postReviewModel.setDiagnosis(diagnosis);
	328	+ if(null!=diagnosis){
	329	+ postReviewModel.setDiagnosis(JsonUtil.obj2JsonString(diagnosis));
	330	+ }
328	331	postReviewModel.setTreatOpinion(treatOpinion);
329	332	postReviewModel.setDirOpinion(dirOpinion);
330	333	postReviewModel.setProdDoctor(prodDoctor);

...	...	@@ -74,7 +74,7 @@
74	74	//超声检查
75	75	private String ultrasonicExamination;
76	76	// 诊断
77		- private String diagnosis;
	77	+ private List diagnosis;
78	78	//处理意见
79	79	private String treatOpinion;
80	80
...	...	@@ -109,7 +109,7 @@
109	109	setTraceElement(postReviewModel.getTraceElement());
110	110	setBoneDensity(postReviewModel.getBoneDensity());
111	111	setUltrasonicExamination(postReviewModel.getUltrasonicExamination());
112		- setDiagnosis(postReviewModel.getDiagnosis());
	112	+
113	113	setTreatOpinion(postReviewModel.getTreatOpinion());
114	114	setDirOpinion(postReviewModel.getDirOpinion());
115	115	setProdDoctor(postReviewModel.getProdDoctor());
116	116
...	...	@@ -151,11 +151,11 @@
151	151	this.checkTime = checkTime;
152	152	}
153	153
154		- public String getDiagnosis() {
	154	+ public List getDiagnosis() {
155	155	return diagnosis;
156	156	}
157	157
158		- public void setDiagnosis(String diagnosis) {
	158	+ public void setDiagnosis(List diagnosis) {
159	159	this.diagnosis = diagnosis;
160	160	}
161	161