Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r27605 -r28050
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 27605)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 28050)
@@ -2373,8 +2373,10 @@
 		addReturnTousseItemToTree('',tousseName,1,price);
 		return;
 	}
-	var departCoding = tousseInstance.settleAccountsDepartCode;
-	var depart = tousseInstance.settleAccountsDepart;
+//	var departCoding = tousseInstance.settleAccountsDepartCode;
+//	var depart = tousseInstance.settleAccountsDepart;
+	var departCoding = tousseInstance.location2;
+	var depart = tousseInstance.locationForDisplay2;
 	if(isUndefinedOrNullOrEmpty(departCoding)){
 		departCoding = tousseInstance.location;
 		depart = tousseInstance.locationForDisplay;
@@ -2557,10 +2559,14 @@
 	node.attributes.amount = 1;
 	node.attributes.barcode = tousseInstance.barcode;
 	// 科室编码
-	node.attributes.departCoding = tousseInstance.location;
-	node.attributes.location = tousseInstance.location;
-	node.attributes.settleAccountsDepartCode = tousseInstance.settleAccountsDepartCode;
-	node.attributes.settleAccountsDepart = tousseInstance.settleAccountsDepart;
+	var tousseInstanceLocation = tousseInstance.location2 ? tousseInstance.location2 : tousseInstance.location;
+	var tousseInstanceLocationForDisplay = tousseInstance.locationForDisplay2 ? tousseInstance.locationForDisplay2 : tousseInstance.locationForDisplay;
+	node.attributes.departCoding = tousseInstanceLocation;
+	node.attributes.location = tousseInstanceLocation;
+//	node.attributes.settleAccountsDepartCode = tousseInstance.settleAccountsDepartCode;
+//	node.attributes.settleAccountsDepart = tousseInstance.settleAccountsDepart;
+	node.attributes.settleAccountsDepartCode = tousseInstanceLocation;
+	node.attributes.settleAccountsDepart = tousseInstanceLocationForDisplay;
 	node.attributes.recordId = 0;
 	node.attributes.tousseInstance = tousseInstance;
 	return node;