shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 3 changed files with 12 additions and 6 deletions

...	...	@@ -151,6 +151,7 @@
151	151	//设置接收时间
152	152	model.setReceived(new Date());
153	153	model.setRecDoctor(userId + "");
	154	+ model.setModified(new Date());
154	155	applyOrderService.updateByParentId(referralApplyOrderQuery1, model);
155	156	}
156	157	}

...	...	@@ -500,15 +500,19 @@
500	500	ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult();
501	501	String zhuanchu = orderModel.getOutHospitalId();
502	502	String zhuanru = orderModel.getTransferredHospital();
503		- Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
504	503	String zhuanCName = "";
505	504	String zhuanRname = "";
506		- if (null != zhuanc) {
507		- zhuanCName = zhuanc.getName();
	505	+ if(NumberUtils.isNumber(zhuanchu)) {
	506	+ Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
	507	+ if (null != zhuanc) {
	508	+ zhuanCName = zhuanc.getName();
	509	+ }
508	510	}
509		- Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
510		- if (null != zhuanc1) {
511		- zhuanRname = zhuanc1.getName();
	511	+ if(NumberUtils.isNumber(zhuanru)){
	512	+ Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
	513	+ if (null != zhuanc1) {
	514	+ zhuanRname = zhuanc1.getName();
	515	+ }
512	516	}
513	517	applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
514	518	if (NumberUtils.isNumber(orderModel.getApplyDoctor())) {

...	...	@@ -238,6 +238,7 @@
238	238	//设置接收时间
239	239	model1.setReceived(new Date());
240	240	model1.setRecDoctor(userId + "");
	241	+ model1.setModified(new Date());
241	242	applyOrderService.updateByParentId(referralApplyOrderQuery1, model1);
242	243	}
243	244	}