Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r40418 -r40549
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 40418)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 40549)
@@ -266,16 +266,22 @@
 	}
 	var returneeOfSupplier = '';
 	var returnMan = '';
+	var returneeOfSupplierPhoneNumber = '';
 	if (top.Ext.getCmp('returneeOfSupplier1')) {
-		returneeOfSupplier = top.Ext.getCmp('returneeOfSupplier1').getValue() || '';
+		returneeOfSupplier = top.Ext.getCmp('returneeOfSupplier1').getRawValue() || '';
 	}
 	if (top.Ext.getCmp('returnMan1')) {
 		returnMan = top.Ext.getCmp('returnMan1').getValue() || '';
 	}
+	if(displayRecipientPhoneNumber == '是'){
+		returneeOfSupplierPhoneNumber = top.Ext.getCmp('returneeOfSupplierPhoneNumber').getValue() || '';
+	}
+
 	var params = { 
 		ids: ids, 
 		returnType: returnType, 
 		returneeOfSupplier1: returneeOfSupplier, 
+		returneeOfSupplierPhoneNumber:returneeOfSupplierPhoneNumber,
 		returnMan1: returnMan
 	}
 	//DGSDBZXYY-239：新增字段“是否齐全”
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r40530 -r40549
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40530)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40549)
@@ -440,9 +440,30 @@
 			root: 'data'
 		},[
 			{name : 'id',mapping : 'id'}, 
-			{name : 'contactName',mapping : 'contactName'}
-		])
+			{name : 'contactName',mapping : 'contactName'},
+			{name : 'phoneNumber',mapping : 'phoneNumber'}
+		]),
+		listeners:{
+			beforeload: function(store, operation, eOpts){
+				var supplierName = top.Ext.getCmp("supplierName1");
+				if(supplierName != null){
+					supplierContactStore.baseParams.supplierName = supplierName.getValue() || '';
+				}
+			},
+			load:function(store, records) {
+				if(records.length > 0) {
+					console.log(records)
+					for(var i=0;i<records.length;i++){
+						if(records[i].data.contactName == supplierContactName){
+							top.Ext.getCmp("returneeOfSupplierPhoneNumber").setValue(records[i].data.phoneNumber);
+							break;
+						}
+					}
+				}
+			}
+		}
 	});
+	supplierContactStore.load();
 	/**** 供应室归还人 store ****/
 	var returnManStore = new top.Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
@@ -683,8 +704,26 @@
 				forceSelection:false,
 				value:supplierContactName,
 				anchor : "100%",
-				store : supplierContactStore
+				store : supplierContactStore,
+				listeners:{
+					select: function(combo, records, eOpts){
+						top.Ext.getCmp("returneeOfSupplierPhoneNumber").setValue(records.get("phoneNumber"))
+					}
+				}
 			}
+		},{
+			columnWidth : 1,
+			layout : 'form',
+			hidden: displayRecipientPhoneNumber == '否',
+			items : {
+				xtype: 'textfield',
+				fieldLabel : '联系电话',
+				id : 'returneeOfSupplierPhoneNumber',
+				name : 'returneeOfSupplierPhoneNumber',
+				allowBlank : true,
+				disabled : syncReturnRecipientInfo == '不启用',
+				anchor : "100%"
+			}
 		}]
 	});
 
@@ -703,7 +742,7 @@
 			text:'确认',
 			handler : function() {
 				var returnMan1 = top.Ext.getCmp('returnMan1').getValue() || '';
-				var returneeOfSupplier1 = top.Ext.getCmp('returneeOfSupplier1').getValue() || '';
+				var returneeOfSupplier1 = top.Ext.getCmp('returneeOfSupplier1').getRawValue() || '';
 				if(returnMan1 == ''){
 					showResult('请选择供应室归还人');
 					return
@@ -715,7 +754,7 @@
 						return
 					}
 				}
-				if(returneeOfSupplier1 == ''){
+				if(returneeOfSupplier1 == '' && syncReturnRecipientInfo !== '启用'){
 					showResult('请选择厂家接收人');
 					return
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r40410 -r40549
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40410)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40549)
@@ -1868,7 +1868,7 @@
 					title: '外来器械参数设置',
 					layout: 'column',
 					width: itemWidth,
-					height: 160,
+					height: 180,
 					// columnWidth : 1,
 					labelWidth: 95,
 					items: [
@@ -2262,6 +2262,54 @@
 								allowBlank: true,
 								allowNegative: false
 							}]
+						}, {
+							layout: 'form',
+							labelWidth: 250,
+							columnWidth: .25,
+							hidden:!sstsConfig.enableReturneeOfForeignTousseSupplier,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: '显示归还接收人联系电话',
+								id: 'displayRecipientPhoneNumber',
+								name: 'displayRecipientPhoneNumber',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['是'], ['否']]
+								}),
+								value: '否',
+								forceSelection: true,
+								allowBlank: true,
+								triggerAction: 'all'
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 250,
+							columnWidth: .25,
+							hidden:!sstsConfig.enableReturneeOfForeignTousseSupplier,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: '归还时同步归还接收人信息',
+								id: 'syncReturnRecipientInfo',
+								name: 'syncReturnRecipientInfo',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['启用'], ['不启用']]
+								}),
+								value: '不启用',
+								forceSelection: true,
+								allowBlank: true,
+								triggerAction: 'all'
+							}]
 						}
 					]
 				},
@@ -4210,6 +4258,13 @@
 					if (sstsConfig.foreignTousseAddWeight) {
 						ftMaxWeight = Ext.getCmp("ftMaxWeight").getValue();
 					}
+					//ZSYY-429：新增同步归还接收人信息和显示归还接收人联系电话
+					var displayRecipientPhoneNumber = '';
+					var syncReturnRecipientInfo = '';
+					if(sstsConfig.enableReturneeOfForeignTousseSupplier){
+						displayRecipientPhoneNumber = Ext.getCmp("displayRecipientPhoneNumber").getValue();
+						syncReturnRecipientInfo = Ext.getCmp("syncReturnRecipientInfo").getValue();
+					}
 					var unitName = Ext.getCmp("unitName").getValue();
 					var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue();
 					var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue();
@@ -4353,6 +4408,8 @@
 							pdaHandoverSignature: pdaHandoverSignature,
 							saveFtaModPatientInfoRemark: saveFtaModPatientInfoRemark,
 							ftMaxWeight: ftMaxWeight,
+							displayRecipientPhoneNumber: displayRecipientPhoneNumber,
+							syncReturnRecipientInfo: syncReturnRecipientInfo,
 							ftDefaultSterilingMethod: ftDefaultSterilingMethod,//
 							ftPrintOrgSource: ftPrintOrgSource,
 							ftPrintAmount: ftPrintAmount,
@@ -4776,6 +4833,11 @@
 			Ext.getCmp('pdaHandoverSignature').setValue(supplyRoomConfig.pdaHandoverSignature || pdahandoversignature_enableAndNotEmpty);
 			Ext.getCmp('saveFtaModPatientInfoRemark').setValue(supplyRoomConfig.saveFtaModPatientInfoRemark);
 			Ext.getCmp('ftMaxWeight').setValue(supplyRoomConfig.ftMaxWeight);
+			//ZSYY-429：新增同步归还接收人信息和显示归还接收人联系电话
+			if(sstsConfig.enableReturneeOfForeignTousseSupplier){
+				Ext.getCmp('displayRecipientPhoneNumber').setValue(supplyRoomConfig.displayRecipientPhoneNumber);
+				Ext.getCmp('syncReturnRecipientInfo').setValue(supplyRoomConfig.syncReturnRecipientInfo);
+			}
 			Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
 			Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
 			Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r40302 -r40549
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 40549)
@@ -35,6 +35,7 @@
     
     SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
     SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+
     
     if (firstSupplyRoomConfig != null){
 	    String supplyRoomCoding = firstSupplyRoomConfig.getOrgUnitCoding();
@@ -62,6 +63,11 @@
 
 	String foreignTousseIsSecondRecycle = sysParamsObj.getForeignTousseIsSecondRecycle();
 	request.setAttribute("foreignTousseIsSecondRecycle", foreignTousseIsSecondRecycle);
+
+	String displayRecipientPhoneNumber = sysParamsObj.getDisplayRecipientPhoneNumber();
+	String syncReturnRecipientInfo = sysParamsObj.getSyncReturnRecipientInfo();
+	request.setAttribute("displayRecipientPhoneNumber", displayRecipientPhoneNumber);
+	request.setAttribute("syncReturnRecipientInfo", syncReturnRecipientInfo);
 %>
 <html>
 <head>
@@ -175,6 +181,8 @@
 	var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>';
 	var isEnableTousseOpRecipient = '<%=isEnableTousseOpRecipient%>';
 	var foreignTousseIsSecondRecycle = '<%=foreignTousseIsSecondRecycle%>';
+	var displayRecipientPhoneNumber = '<%=displayRecipientPhoneNumber%>';
+	var syncReturnRecipientInfo = '<%=syncReturnRecipientInfo%>';
 </script>
 <%@ include file="/disinfectsystem/print/print.jsp"%>
 <!--[if !IE]><!-->