Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r39628 -r40562
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 39628)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 40562)
@@ -1557,6 +1557,7 @@
 	doGetLodop();
 	var supplierName = printSummaryObj.supplierName?printSummaryObj.supplierName:" ";
 	var surgery = printSummaryObj.surgery?printSummaryObj.surgery:" ";
+	var sterileSupplyRecipient = printSummaryObj.sterileSupplyRecipient?printSummaryObj.sterileSupplyRecipient:" ";
 	var applicationTime = printSummaryObj.applicationTime?printSummaryObj.applicationTime.substring(0,10):" ";
 	var doctor = printSummaryObj.doctor?printSummaryObj.doctor:" ";
 	var remark = printSummaryObj.remark?printSummaryObj.remark:" ";
@@ -1619,7 +1620,7 @@
 		tableHtml += "<div class='label'>器械名称:</div><div class='l'>"+tousseName+"</div><br/>";
 		tableHtml += "<div class='label'>手术名称:</div><div class='l'>"+surgery+"</div><br/>";
 		tableHtml += "<div class='label'>接收时间:</div><div class='w'>"+applicationTime+"</div><div class='label3'>医生:</div><div class='t'>"+doctor+"</div><br/>";
-		
+		tableHtml += "<div class='label'>供应室接收人:</div><div class='l'>"+sterileSupplyRecipient+"</div><br/>";
 		tableHtml += "<div class='label4'>包含物:</div><div class='label5'>"+details+"</div><div class='label2'>包份数:</div><div class='label9'>"+splitNumber+"</div>";
 		
 		tableHtml += "<div class='t'>备注:</div><div class='label6'>"+remark+"</div><br/>";
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r40553 -r40562
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40553)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40562)
@@ -438,6 +438,8 @@
 enableForeignToussePartRecycle:true,
 //允许拆分小包进行部分二次回收和归还；
 enablePackageTypeSplitPartialSecondaryRecyclingAndReturn:true,
+//外来器械申请单的扩展字段
+expandFieldsOfForeignTousseApplicationForm : ['applicantScanBox','sterileSupplyRecipientBox'],
 //回收清点扩展字段配置
 expandFieldsConfigOfRecycling:[{"fieldName":"packageTypeSplit","displayText":"外来器械拆分小包"},{"fieldName":"lastRecyclingTime ","displayText":"上次回收时间"},{"fieldName":"tousseRemark","displayText":"备注"}],
 //启用第三方部门编码的功能
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r40551 -r40562
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40551)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40562)
@@ -85,6 +85,34 @@
 	}
 }
 
+function getUserByBarcode(barcode,barcodeBox,fullNameBox,idBox){
+	Ext4.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/web/userController/getUserByBarcode.mhtml',
+		params : {barcode : barcode},
+		async : false,
+		success : function(response, options) {
+			var result = Ext4.JSON.decode(response.responseText);
+			if(result.success){
+				top.Ext4.getCmp(barcodeBox).setValue('');
+				top.Ext4.getCmp(fullNameBox).setValue(result.fullName);
+				if(idBox){
+					top.Ext4.getCmp(idBox).setValue(result.id);
+				}
+			}else {
+				if(result.message){
+					showResult(result.message);
+				}else {
+					showResult('找不到该条码所对应的人员信息');
+				}
+				top.Ext4.getCmp(barcodeBox).setValue('');
+			}
+		},
+		failure : function(response, opts) {
+			showResult(response.responseText);
+		}
+	});
+}
+
 top.Ext4.define('foreignTousseTreeGrid',{
     extend: 'top.Ext4.tree.Panel',
     xtype: 'tree-grid',
@@ -1080,6 +1108,11 @@
 		reviewer =  top.Ext4.getCmp('reviewer').getValue();
 		reviewTime =  top.Ext4.getCmp('reviewTime').getValue();
 	}
+
+	var sterileSupplyRecipient = '';
+	if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.indexOf('sterileSupplyRecipientBox') >= 0){
+		sterileSupplyRecipient =  top.Ext4.getCmp('sterileSupplyRecipient').getValue();
+	}
 	
     //simon-edit
     var operationTimeStr=top.Ext4.getCmp('operationTime').getValue();
@@ -1128,6 +1161,7 @@
         	summary.operationTime = operationTime;
         	summary.doctor = doctor;
         	summary.supplierName = supplierName;
+			summary.sterileSupplyRecipient = sterileSupplyRecipient;
         	//供应商联系人
         	summary.supplierContactName = supplierContactName;
         	//供应商联系电话
@@ -3656,8 +3690,6 @@
 
 	var applicationTimeItems = [{
 		xtype : 'textfield',
-		width : '25%',
-		labelWidth :65,
 		fieldLabel : applicationTimeName,
 		id : 'applicationTime',
 		name : 'applicationTime',
@@ -3675,8 +3707,6 @@
 		}
 		applicationTimeItems = [{
 			xtype : 'datefield',
-			width : '25%',
-			labelWidth :65,
 			fieldLabel : applicationTimeName,
 			id : 'applicationTime',
 			name : 'applicationTime',
@@ -3689,6 +3719,11 @@
 		}]
 	}
 
+	var hasApplicantScanBox = false;
+	if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.indexOf('applicantScanBox') >= 0){
+		hasApplicantScanBox = true;
+	}
+
 	foreignTousseForm = new top.Ext4.form.Panel({
 		id : 'foreignToussForm',
 		frame : true,
@@ -3727,13 +3762,14 @@
 							labelWidth :70,
 							columnWidth :.25,
 							height:heightVal,
+							hidden:hasApplicantScanBox,
 							items : [{
 								xtype : 'textfield',
 								width : '25%',
 								fieldLabel : applicantName,
 								maxLength : '50',
-								id : 'applicant',
-								name : 'applicant',
+								id : hasApplicantScanBox?'applicant1':'applicant',
+								name : hasApplicantScanBox?'applicant1':'applicant',
 								allowBlank : false,
 								flex : 1,
 								readOnly : true,
@@ -3743,7 +3779,7 @@
 							}]
 						},{
 							layout : 'form',
-							labelWidth :60,
+							labelWidth :70,
 							columnWidth :.25,
 							height:heightVal,
 							items : applicationTimeItems
@@ -3768,6 +3804,62 @@
 							labelWidth :70,
 							columnWidth :.25,
 							height:heightVal,
+							hidden:!hasApplicantScanBox,
+							items : [{
+								xtype : 'textfield',
+								allowBlank : true,
+								readOnly:true,
+								flex : 1,
+								fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+							}]
+						},{
+							layout : 'form',
+							labelWidth :70,
+							columnWidth :.5,
+							height:heightVal,
+							hidden:!hasApplicantScanBox,
+							items : [{
+								xtype : 'textfield',
+								fieldLabel : '申请人条码',
+								id : 'applicantBarcode',
+								name : 'applicantBarcode',
+								flex : .67,
+								listeners:{
+									specialkey : function(field, e) {
+										if (e.getKey() == Ext.EventObject.ENTER) {
+											var applicantBarcode = top.Ext4.getCmp('applicantBarcode').getValue();
+											if(applicantBarcode == ''){
+												return
+											}
+											getUserByBarcode(applicantBarcode,'applicantBarcode','applicant');
+										}
+									}
+								}
+							}]
+						},
+						{
+							layout : 'form',
+							labelWidth :70,
+							columnWidth :.25,
+							height:heightVal,
+							hidden:!hasApplicantScanBox,
+							items : [{
+								xtype : 'textfield',
+								fieldLabel : applicantName,
+								maxLength : '50',
+								id : hasApplicantScanBox?'applicant':'applicant1',
+								name : hasApplicantScanBox?'applicant':'applicant1',
+								allowBlank : false,
+								flex : 1,
+								value : $Id('userName')?$Id('userName').value:'',
+								readOnly : true,
+								fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+							}]
+						},{
+							layout : 'form',
+							labelWidth :70,
+							columnWidth :.25,
+							height:heightVal,
 							hidden : !sstsConfig.enableReviewOfForeignTousseApplicationFunction,
 							items : [{
 								xtype : 'textfield',
@@ -4694,6 +4786,49 @@
 								flex : .67
 							}]
 						},{
+							layout : 'column',
+							columnWidth : 1,
+							id:'sterileSupplyRecipientBox',
+							hidden : !(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.indexOf('sterileSupplyRecipientBox') >= 0),
+							items : [{
+								layout : 'form',
+								columnWidth : .33,
+								items : [{
+									xtype : 'textfield',
+									fieldLabel : '供应室接收人条码',
+									id : 'sterileSupplyRecipientBarcode',
+									name : 'sterileSupplyRecipientBarcode',
+									flex : .67,
+									listeners:{
+										specialkey : function(field, e) {
+											if (e.getKey() == Ext.EventObject.ENTER) {
+												var sterileSupplyRecipientBarcode = top.Ext4.getCmp('sterileSupplyRecipientBarcode').getValue();
+												if(sterileSupplyRecipientBarcode == ''){
+													return
+												}
+												getUserByBarcode(sterileSupplyRecipientBarcode,'sterileSupplyRecipientBarcode','sterileSupplyRecipient','sterileSupplyRecipientId');
+											}
+										}
+									}
+								}]
+							},{
+								xtype:'hidden',
+								id:'sterileSupplyRecipientId',
+								name:'sterileSupplyRecipientId'
+							}, {
+								layout : 'form',
+								columnWidth : .33,
+								items : [{
+									xtype : 'textfield',
+									fieldLabel : '供应室接收人',
+									id : 'sterileSupplyRecipient',
+									name : 'sterileSupplyRecipient',
+									flex : .67,
+									readOnly : true,
+									fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+								}]
+							}]
+						},{
 							xtype:'hidden',
 							id:'hiddenReceiveMan',
 							name:'hiddenReceiveMan'
@@ -5060,6 +5195,11 @@
 					top.Ext4.getCmp("applyRecycleDifferentMsg").setValue(applyRecycleDifferentMsg);
 					top.Ext4.getCmp("applyRecycleDifferentMsgBox").show();
 				}
+				
+				if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.indexOf('sterileSupplyRecipientBox') >= 0){
+					top.Ext4.getCmp("sterileSupplyRecipient").setValue(action.result.data.sterileSupplyRecipient);
+					top.Ext4.getCmp("sterileSupplyRecipientId").setValue(action.result.data.sterileSupplyRecipientId);
+				}
 
 				top.Ext4.getCmp("hiddenReceiveMan").setValue(action.result.data.returneeOfSupplier);
 				top.Ext4.getCmp("hiddenReturnMan").setValue(action.result.data.returnMan);