jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 10 additions and 13 deletions

...	...	@@ -14,10 +14,7 @@
14	14	import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
15	15	import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
16	16	import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
17		-import com.lyms.platform.operate.web.result.ApplyOrderOutResult;
18		-import com.lyms.platform.operate.web.result.BabyApplyOrderResult;
19		-import com.lyms.platform.operate.web.result.ReferralApplyOrderResult;
20		-import com.lyms.platform.operate.web.result.SieveApplyOrderResult;
	17	+import com.lyms.platform.operate.web.result.*;
21	18	import com.lyms.platform.permission.model.Organization;
22	19	import com.lyms.platform.permission.model.Users;
23	20	import com.lyms.platform.permission.service.OrganizationService;
...	...	@@ -370,6 +367,10 @@
370	367	applyOrderResult.setApplyDoctor(users.getName());
371	368	}
372	369	}
	370	+ HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(orderModel.getParentId(), true);
	371	+ applyOrderResult.setrRisk(highScoreResult.gethighRiskStr());
	372	+ applyOrderResult.setScore(highScoreResult.getScore());
	373	+ applyOrderResult.setrLevel(highScoreResult.getLevelStr());
373	374	data.add(applyOrderResult);
374	375	}
375	376	}

...	...	@@ -30,7 +30,7 @@
30	30	//高危等级
31	31	private String rLevel;
32	32	//风险因素
33		- private List<String> rRisk;
	33	+ private String rRisk;
34	34	private Integer score=0;
35	35	//病情描述
36	36	private String diseaseDesc;
37	37
38	38
...	...	@@ -225,17 +225,14 @@
225	225	this.rLevel = rLevel;
226	226	}
227	227
228		- public List<String> getrRisk() {
229		- if(CollectionUtils.isEmpty(rRisk)){
230		- List<String> list = new ArrayList<>();
231		- list.add("-");
232		- return list;
	228	+ public String getrRisk() {
	229	+ if(null==rRisk){
	230	+ return SPIT;
233	231	}
234		-
235	232	return rRisk;
236	233	}
237	234
238		- public void setrRisk(List<String> rRisk) {
	235	+ public void setrRisk(String rRisk) {
239	236	this.rRisk = rRisk;
240	237	}
241	238
...	...	@@ -284,7 +281,6 @@
284	281	int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
285	282	this.dueWeek= StringUtils.dueWeek(days);
286	283	}
287		- setrRisk(destModel.getrRisk());
288	284	setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
289	285	setApplyDoctor(destModel.getApplyDoctor());
290	286	setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated()));