Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r35526 -r35529
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 35526)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 35529)
@@ -325,6 +325,8 @@
   enableWarehousePositionModule:true,
   //启用手术仪器管理和库位管理联动功能
   enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction:true,
+  //手术仪器管理别名配置
+  aliasNameOfSurgicalInstrumentsManagement:[{"fieldName":"invoiceOfOperation","displayText":"领出"}, {"fieldName":"invoiceTypeOfPDA","displayText":"领出"}],
   //发货计划背景颜色设定
   backgroudColorConfigOfInvoiceGoodsList : {
 	unsterilizedColor : { "className" : "my_row_white" , "color" : "#ffffff"},//未灭菌的颜色
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r35516 -r35529
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 35516)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 35529)
@@ -1813,17 +1813,19 @@
 									    {name : 'operation'},
 									    {name : 'destDepart'},
 										{name : 'recipient'},
-									    {name : 'destLocation'}
+									    {name : 'destLocation'},
+										{name : 'remark'}
 									]
 								})
 							}),
 							cm : new Ext.grid.ColumnModel([
 				       		    {header : "操作人",dataIndex : 'operator',width : 120, menuDisabled: true},
 				       		    {header : "操作时间",dataIndex : 'operationTime',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
 				    		    {header : "操作类型",dataIndex : 'operation',width : 60, menuDisabled: true},
-				    		    {header : "科室",dataIndex : 'destDepart',width : 200, menuDisabled: true},
+				    		    {header : "目的科室",dataIndex : 'destDepart',width : 200, menuDisabled: true},
 				    		    {header : tousseLocationManagement,dataIndex : 'destLocation',width : 100, menuDisabled: true,hidden:(isEnableTousseOpDestLocation == 'false' || isEnableTousseOpDestLocation == false)},
-								{header : recipient,dataIndex : 'recipient',width : 100, menuDisabled: true,hidden:(isEnableTousseOpRecipient == 'false' || isEnableTousseOpRecipient == false)}
+								{header : recipient,dataIndex : 'recipient',width : 100, menuDisabled: true,hidden:(isEnableTousseOpRecipient == 'false' || isEnableTousseOpRecipient == false)},
+								{header : "备注",dataIndex : 'remark',width : 200, menuDisabled: true}
 				    		]),
 							enableHdMenu : false,
 							width : 780,
@@ -2441,15 +2443,30 @@
 						//流转记录
 						if (this.enableSurgicalInstrumentsManagement) {
 							var tousseOperationInfoArray = result.tousseOperationJSONs;
+							var aliasNameOfSurgicalInstrumentsManagement = sstsConfig.aliasNameOfSurgicalInstrumentsManagement || [];
+							var newOperation = '';
+							if(aliasNameOfSurgicalInstrumentsManagement.length > 0){
+								for(var i=0;i<aliasNameOfSurgicalInstrumentsManagement.length;i++){
+									if(aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'invoiceOfOperation'){
+										newOperation = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+										break;
+									}
+								}
+							}
 							for(var j = 0;j < tousseOperationInfoArray.length ; j++){
 								var tousseOperationInfo = tousseOperationInfoArray[j];
+								var operation = tousseOperationInfo.operation;
+								if(operation == '发货' && newOperation !== ''){
+									operation = newOperation;
+								}
 								var tousseOperationData = new Ext.data.Record({
 									operator : tousseOperationInfo.operator,  //流转记录_操作人
 									operationTime : tousseOperationInfo.operationTime,  //流转记录_操作时间
 									destLocation : tousseOperationInfo.destLocation, //流转记录_操作位置
 									destDepart : tousseOperationInfo.destDepart, //流转记录_操作科室
 									recipient : tousseOperationInfo.recipient, //流转记录_操作人
-									operation : tousseOperationInfo.operation//流转记录_操作类型
+									operation : operation,//流转记录_操作类型
+									remark : tousseOperationInfo.remark
 								});
 								top.Ext.getCmp('tousseOperation').getStore().add(tousseOperationData);
 							}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r35528 -r35529
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35528)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35529)
@@ -2320,7 +2320,7 @@
 					title: '手术仪器参数设置',
 					layout: 'column',
 					width: itemWidth,
-					height: 70,
+					height: 90,
 					// columnWidth : 1,
 					labelWidth: 100,
 					hidden:!sstsConfig.enableSurgicalInstrumentsManagement,
@@ -2346,7 +2346,16 @@
 							allowBlank: true,
 							triggerAction: 'all',
 							value:'否',
-							anchor: '100%'
+							anchor: '100%',
+							listeners: {
+								select: function (combo, record, index) {
+									if(record.data.value == '是'){
+										Ext.getCmp("loginUserDefaultOpRecipientBox").show();
+									}else {
+										Ext.getCmp("loginUserDefaultOpRecipientBox").hide();
+									}
+								}
+							}
 						}]
 					},{
 						layout: 'form',
@@ -2420,6 +2429,32 @@
 							value:'否',
 							anchor: '100%'
 						}]
+					},{
+						layout: 'form',
+						labelWidth: fontSize == 12 ? 180 : 220,
+						labelAlign: "right",
+						columnWidth: .25,
+						id:'loginUserDefaultOpRecipientBox',
+						hidden:true,
+						items: [{
+							xtype: 'combo',
+							fieldLabel: '默认当前登录用户为领用人',
+							id: 'loginUserDefaultOpRecipient',
+							name: 'loginUserDefaultOpRecipient',
+							valueField: 'value',
+							displayField: 'value',
+							store: new Ext.data.SimpleStore({
+								fields: ['value'],
+								data: [['是'], ['否']]
+							}),
+							mode: 'local',
+							editable: false,
+							forceSelection: true,
+							allowBlank: true,
+							triggerAction: 'all',
+							value:'否',
+							anchor: '100%'
+						}]
 					}]
 				}, {
 					xtype: "fieldset",
@@ -3472,6 +3507,10 @@
 						isEnableTousseOpSign = Ext.getCmp("isEnableTousseOpSign").getValue();
 						isEnableTousseUnReturnWarn = Ext.getCmp("isEnableTousseUnReturnWarn").getValue();
 					}
+					var loginUserDefaultOpRecipient = '否';
+					if(Ext.getCmp('loginUserDefaultOpRecipient')){
+						loginUserDefaultOpRecipient = Ext.getCmp('loginUserDefaultOpRecipient').getValue();
+					}
 
 					var autoSignAfterPutInStorage = '否';
 					if(sstsConfig.enableWarehousePositionModule){
@@ -3636,6 +3675,7 @@
 							isEnableTousseOpDestLocation:isEnableTousseOpDestLocation,
 							isEnableTousseOpSign:isEnableTousseOpSign,
 							isEnableTousseUnReturnWarn:isEnableTousseUnReturnWarn,
+							loginUserDefaultOpRecipient:loginUserDefaultOpRecipient,
 							dashboardsRefreshFrequency:dashboardsRefreshFrequency,
 							autoSignAfterPutInStorage:autoSignAfterPutInStorage,
 							noOperationTime:noOperationTime,
@@ -3946,6 +3986,11 @@
 				Ext.getCmp('isEnableTousseOpSign').setValue(isEnableTousseOpSign);
 				Ext.getCmp('isEnableTousseUnReturnWarn').setValue(isEnableTousseUnReturnWarn);
 			}
+			if(supplyRoomConfig.isEnableTousseOpRecipient == true || supplyRoomConfig.isEnableTousseOpRecipient == 'true'){
+				Ext.getCmp('loginUserDefaultOpRecipientBox').show();
+				var loginUserDefaultOpRecipient = (supplyRoomConfig.loginUserDefaultOpRecipient == true || supplyRoomConfig.loginUserDefaultOpRecipient == 'true')?'是':'否';
+				Ext.getCmp('loginUserDefaultOpRecipient').setValue(loginUserDefaultOpRecipient);
+			}
 			if(sstsConfig.enableWarehousePositionModule){
 				Ext.getCmp('autoSignAfterPutInStorage').setValue(supplyRoomConfig.autoSignAfterPutInStorage);
 			}