shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 2 changed files with 12 additions and 4 deletions

...	...	@@ -333,8 +333,11 @@
333	333	Patients patients = patientsService.findOnePatientById(list.get(0).getParentId());
334	334	String zhuanchu = list.get(0).getOutHospitalId();
335	335	String zhuanru = list.get(0).getTransferredHospital();
	336	+ Map map1 = new HashMap();
336	337	zhuanCName=zhuanchu;
337	338	zhuanRname=zhuanru;
	339	+ map1.put("id","");
	340	+ map1.put("name",zhuanRname);
338	341	if (NumberUtils.isNumber(zhuanchu)) {
339	342	Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
340	343	if (null != zhuanc) {
341	344
...	...	@@ -346,10 +349,16 @@
346	349	Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
347	350	if (null != zhuanc1) {
348	351	zhuanRname = zhuanc1.getName();
	352	+ map1.put("id",zhuanc1.getId());
	353	+ map1.put("name",zhuanRname);
349	354	}
350	355	}
351	356
352	357	referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
	358	+
	359	+
	360	+ referralApplyOrderResult.setTransferredHospital(map1);
	361	+
353	362	Map map = new HashMap();
354	363	if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) {
355	364	Users users = usersService.getUsers(Integer.valueOf(list.get(0).getApplyDoctor()));

...	...	@@ -47,7 +47,7 @@
47	47	//高危评分
48	48	private Integer score;
49	49	//转入医院
50		- private String transferredHospital;
	50	+ private Map transferredHospital;
51	51	//转出医院id
52	52	private String outHospitalId;
53	53
54	54
...	...	@@ -228,11 +228,11 @@
228	228	this.transferredDisease = transferredDisease;
229	229	}
230	230
231		- public String getTransferredHospital() {
	231	+ public Map getTransferredHospital() {
232	232	return transferredHospital;
233	233	}
234	234
235		- public void setTransferredHospital(String transferredHospital) {
	235	+ public void setTransferredHospital(Map transferredHospital) {
236	236	this.transferredHospital = transferredHospital;
237	237	}
238	238
...	...	@@ -256,7 +256,6 @@
256	256	setTransferMode(destModel.getTransferMode());
257	257
258	258
259		- setTransferredHospital(destModel.getTransferredHospital());
260	259	setZhuanCName(zhuanCName);
261	260	setZhuanRname(zhuanRname);
262	261	if(null!=patients){