shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 2 changed files with 19 additions and 0 deletions

...	...	@@ -521,6 +521,12 @@
521	521	applyOrderResult.setApplyDoctor(users.getName());
522	522	}
523	523	}
	524	+ if (NumberUtils.isNumber(orderModel.getRecDoctor())) {
	525	+ Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getRecDoctor()));
	526	+ if (null != users) {
	527	+ applyOrderResult.setRecDoctor(users.getName());
	528	+ }
	529	+ }
524	530	HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
525	531	applyOrderResult.setrRisk(highScoreResult.gethighRiskStr());
526	532	applyOrderResult.setScore(highScoreResult.getScore());

...	...	@@ -49,6 +49,8 @@
49	49	private String applyDoctor;
50	50	//接收日期
51	51	private String received;
	52	+ //接收医生
	53	+ private String recDoctor;
52	54	private String cardNo;
53	55	//联系方式
54	56	private String phone;
...	...	@@ -112,6 +114,14 @@
112	114	return cardNo;
113	115	}
114	116
	117	+ public String getRecDoctor() {
	118	+ return recDoctor;
	119	+ }
	120	+
	121	+ public void setRecDoctor(String recDoctor) {
	122	+ this.recDoctor = recDoctor;
	123	+ }
	124	+
115	125	public void setCardNo(String cardNo) {
116	126	this.cardNo = cardNo;
117	127	}
...	...	@@ -312,6 +322,9 @@
312	322	setPid(destModel.getPid());
313	323	if(null!=destModel.getDueWeek()){
314	324	setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
	325	+ }
	326	+ if(null!=destModel.getReceived()){
	327	+ setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived()));
315	328	}
316	329	setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
317	330	setApplyDoctor(destModel.getApplyDoctor());