jiangjiazhi / regional-platform

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 9 additions and 5 deletions

...	...	@@ -521,11 +521,15 @@
521	521	List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
522	522	referralApplyOrderResult.setScreenResult(screenList);
523	523
	524	+
	525	+ Map<String,Object> recDoctorMap = new HashMap<>();
524	526	//接诊医生
525	527	if (NumberUtils.isNumber(referralApplyOrderModel.getRecDoctor())) {
	528	+ recDoctorMap.put("id",referralApplyOrderModel.getRecDoctor());
526	529	Users users = usersService.getUsers(NumberUtils.toInt(referralApplyOrderModel.getRecDoctor()));
527	530	if (null != users) {
528		- referralApplyOrderResult.setRecDoctor(users.getName());
	531	+ recDoctorMap.put("name",users.getName());
	532	+ referralApplyOrderResult.setRecDoctor(recDoctorMap);
529	533	}
530	534	}
531	535	}

...	...	@@ -69,17 +69,17 @@
69	69	//转入医院
70	70	private String zhuanRname;
71	71	//接诊医生
72		- private String recDoctor;
	72	+ private Map recDoctor;
73	73	//目前诊断
74	74	private List diagnosis;
75	75	//其他诊断
76	76	private String otherDiagn;
77	77
78		- public String getRecDoctor() {
	78	+ public Map getRecDoctor() {
79	79	return recDoctor;
80	80	}
81	81
82		- public void setRecDoctor(String recDoctor) {
	82	+ public void setRecDoctor(Map recDoctor) {
83	83	this.recDoctor = recDoctor;
84	84	}
85	85