Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
===================================================================
diff -u -r27343 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js	(.../changePosition.js)	(revision 27343)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js	(.../changePosition.js)	(revision 34739)
@@ -26,6 +26,25 @@
 	)
 });
 
+//领用人
+var userReader = new Ext.data.JsonReader( {
+	fields : [
+	    {name : 'id'},
+	    {name : 'name'},
+	    {name : 'fullName'},
+	    {name : 'orgUnitName'},
+	    {name : 'barcode'},
+	]
+});
+
+var departUsersStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/systemmanage/user/userAction!loadUsersBySearchString.do',
+		method : 'POST'
+	}),
+	reader : userReader
+});
+
 var wareHouseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
@@ -377,6 +396,22 @@
 		},
 		dataIndex:'button'
 	}]);
+
+	var tousseLocationManagement = '目的位置';
+	var recipient = '领用人';
+	if(sstsConfig.enableSurgicalInstrumentsManagement){
+		if(sstsConfig.aliasNameOfSurgicalInstrumentsManagement){
+			var aliasNameOfSurgicalInstrumentsManagement = sstsConfig.aliasNameOfSurgicalInstrumentsManagement || [];
+			for(var i=0;i<aliasNameOfSurgicalInstrumentsManagement.length;i++){
+				if(aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'tousseLocationManagement'){
+					tousseLocationManagement = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+				}
+				if(aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'recipient'){
+					recipient = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+				}
+			}
+		}
+	}
 	
 	var form = new top.Ext.FormPanel({
 		id : 'recyclingApplicationForm',
@@ -430,39 +465,18 @@
 						name : 'operator',
 						readOnly:true,
 						allowBlank : false,
-						anchor : '99%',
+						anchor : '95%',
 						value:$Id('userName').value,
 						cls:'fieldReadOnlyNoRemove'
 					}]
 				},{
 					layout : 'form',
-					labelWidth :70,
+					labelWidth :100,
 					columnWidth :.33,
-					hidden: true,
+					hidden : !(operation !== OPERATION_RETURN && isEnableTousseOpDestLocation == 'true'),
 					items : [{
-						xtype : 'datefieldWithMin',
-						fieldLabel : '登记时间',
-						id : 'sendTime',
-						name : 'sendTime',
-						allowBlank : false,
-						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-						format:'Y-m-d H:i',
-//						value:new Date(),
-						anchor : '99%',
-						listeners : {
-							render : function() {
-								setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'sendTime');  //（发货时间，取服务器时间 cjr）
-							}
-						}
-					}]
-				},{
-					layout : 'form',
-					labelWidth :70,
-					columnWidth :.33,
-					hidden : operation == OPERATION_RETURN,
-					items : [{
 						xtype : 'combo',
-						fieldLabel : '目的位置',
+						fieldLabel : tousseLocationManagement,
 						id : 'depart',
 						name : 'depart',
 						queryParam : 'spell',
@@ -475,11 +489,10 @@
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
-						allowBlank : operation == OPERATION_SIGN || operation == OPERATION_RETURN,
-						anchor : '99%',
+						allowBlank : !(operation !== OPERATION_RETURN && isEnableTousseOpDestLocation == 'true'),
+						anchor : '95%',
 						listeners:{
 							select:function(combo, record, index){
-								var deptCoding = record.data.departCode;
 								top.Ext.getCmp("destType").setValue(record.data.type);
 								top.Ext.getCmp("destId").setValue(record.data.id);
 							},
@@ -490,14 +503,35 @@
 					}]
 				},{
 					layout : 'form',
+					labelWidth :70,
+					columnWidth :.33,
+					hidden : !(operation !== OPERATION_RETURN && operation !== OPERATION_SIGN && isEnableTousseOpRecipient == 'true'),
+					items : [{
+						xtype : 'combo',
+						fieldLabel : recipient,
+						id : 'recipient',
+						name : 'recipient',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'fullName',
+						displayField : 'fullName',
+						store : departUsersStore,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						anchor : '95%'				
+					}]
+				},{
+					layout : 'form',
 					columnWidth : 1,
 					labelWidth :70,
 					items : [{
 						xtype : 'textarea',
 						fieldLabel : '备注',
 						id : 'remark',
 						name : 'remark',
-						anchor : '98.5%',
+						anchor : '97%',
 						height : 40
 					}]
 				}]
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js
===================================================================
diff -u -r33614 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js	(.../instrumentRoomGoodsManagement.js)	(revision 33614)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js	(.../instrumentRoomGoodsManagement.js)	(revision 34739)
@@ -358,7 +358,7 @@
 		}
 	},'-', {
 		text : '器械包签收',
-		hidden : !SSTS_InstrumentGoodsManagement,
+		hidden : !(SSTS_InstrumentGoodsManagement && isEnableTousseOpSign == 'true'),
 		iconCls : 'btn_ext_application_add',
 		handler : function() {
 			returnUrl('签收');
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r34727 -r34739
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 34727)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 34739)
@@ -496,7 +496,8 @@
 	hidden:!SSTS_InstrumentGoodsManagement || !enableSurgicalInstrumentsManagement,
 	children:[
 	    {hidden :SSTS_Tousse,text:"仪器班物品管理",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-	    {hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true}
+	    {hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :false,text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"干预管理",
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r34279 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 34279)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 34739)
@@ -21,6 +21,11 @@
     request.setAttribute("hospitalName", loginUser.getHospitalName());
     request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
     request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
+
+    //是否启用领用人
+    request.setAttribute("isEnableTousseOpRecipient",syscfg.getIsEnableTousseOpRecipient());
+    //是否启用目的位置
+    request.setAttribute("isEnableTousseOpDestLocation",syscfg.getIsEnableTousseOpDestLocation());
 %>
 <script type="text/javascript">
     var fontSize = '${fontSize}';
@@ -85,6 +90,8 @@
 	var xinHua = '<%= DeviceInterface.XINHUA %>';
 	var GETINGE = '<%= DeviceInterface.GETINGE %>';
 	var GETING_86_SERIES = '<%= DeviceInterface.GETING_86_SERIES %>';
+    var isEnableTousseOpRecipient = '<%=request.getAttribute("isEnableTousseOpRecipient")%>';
+    var isEnableTousseOpDestLocation = '<%=request.getAttribute("isEnableTousseOpDestLocation")%>';
 </script>
 <script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
===================================================================
diff -u -r33878 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js	(.../config.js)	(revision 33878)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js	(.../config.js)	(revision 34739)
@@ -198,6 +198,10 @@
   hiddenUserSyncButton:true,
   //扫码回收发货到了科室的包必须是已使用状态
   scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState:true,
+  //是否启用手术仪器管理，默认为不启用
+  enableSurgicalInstrumentsManagement:true,
+  //手术仪器管理别名配置
+  aliasNameOfSurgicalInstrumentsManagement:[ {"fieldName":"tousseLocationManagement","displayText":"器械包位置管理"}, {"fieldName":" recipient ","displayText":"领用人"}],
   //开启显示待发货物品的来源信息功能
   enableShowToSendGoodsSourcesInfo:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js	(revision 34739)
@@ -0,0 +1,104 @@
+var listStore;
+var unReturnTousseGird;
+
+Ext4.onReady(function () {
+	Ext4.QuickTips.init();
+	var pageSize = 20;
+
+	var columns = [
+		{ header: "仪器名称", dataIndex: 'tousseName', width: 150, sortable: false },
+		{ header: "器械包条码", dataIndex: 'barcode', width: 100, sortable: false },
+		{ header: "标识牌条码", dataIndex: '', width: 100, sortable: false },
+		{ header: "数量", dataIndex: 'invoiceAmount', width: 80, sortable: false },
+		{ header: "出库操作人", dataIndex: 'invoiceOperator', width: 80, sortable: false },
+		{ header: "签收操作人", dataIndex: 'signOperator', width: 80, sortable: false },
+		{ header: "领用人", dataIndex: 'invoiceRecipient', width: 80, sortable: false },
+		{ header: "目的位置", dataIndex: 'invoiceDestLocation', width: 120, sortable: false },
+		{ header: "操作时间", dataIndex: 'invoiceTime', width: 140, sortable: false }
+	];
+
+	listStore = Ext4.create('Ext.data.Store', {
+		pageSize: pageSize,
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadUnReturnTousseList.do',
+			reader: {
+				root: 'data',
+				totalProperty: 'rowCount'
+			},
+			actionMethods: {
+				read: 'POST'
+			}
+		},
+		fields: [
+			{ name: 'tousseName' },
+			{ name: 'barcode' },
+			{ name: '' },
+			{ name: 'invoiceAmount' },
+			{ name: 'invoiceOperator' },
+			{ name: 'signOperator' },
+			{ name: 'invoiceRecipient' },
+			{ name: 'invoiceDestLocation' },
+			{ name: 'invoiceTime' }
+		],
+		listeners: {
+			beforeload: function () {
+				if (Ext4.getCmp('spell')) {
+					listStore.proxy.extraParams.spell = Ext4.getCmp('spell').getValue();
+				}
+			}
+		},
+		autoLoad: true
+	});
+
+	unReturnTousseGird = new Ext4.grid.GridPanel({
+		title: '手术仪器未归还列表',
+		columns: columns,
+		frame: false,
+		autoScroll: false,
+		store: listStore,
+		tbar: ['->', {
+			xtype: 'textfield',
+			fieldLabel: '',
+			maxLength: '41',
+			width: 150,
+			id: 'spell',
+			name: 'spell',
+			emptyText: '输入仪器名称查询',
+			listeners: {
+				render: function (c) {
+					c.getEl().on('keypress', function (e, thiz) {
+						if (e.getKey() == 13) {
+							listStore.load();
+						}
+					});
+				}
+			}
+		}, {
+			text: '查询',
+			handler: function () {
+				listStore.load();
+			}
+		}],
+		dockedItems: [{
+			xtype: 'pagingtoolbar',
+			store: listStore,
+			id: 'pagingbar',
+			dock: 'bottom',
+			displayInfo: true
+		}],
+		viewConfig: {
+			autoFill: true
+		}
+	});
+
+	new Ext4.container.Viewport({
+		layout: 'border',
+		items: [{
+			region: 'center',
+			layout: 'fit',
+			items: [unReturnTousseGird]
+		}]
+	});
+
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp	(revision 34739)
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+<head>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>手术仪器未归还列表</title>
+</head>
+<body>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="unReturnTousseList.js?version=${svnRevision}"></script>
+</body>
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp
===================================================================
diff -u -r29513 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp	(.../changePosition.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp	(.../changePosition.jsp)	(revision 34739)
@@ -1,4 +1,6 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.position.TousseOperation"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.forgon.disinfectsystem.entity.tousseitem.TousseItem"%>
 <%@page import="java.util.Calendar"%>
@@ -33,7 +35,17 @@
 	cal.add(Calendar.DATE, -4);
 	String sixDaysAgo = sdf.format(cal.getTime());//6天前(近一周的起始日)
 	pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today);
-	
+
+    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+    SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+    //是否启用领用人
+    request.setAttribute("isEnableTousseOpRecipient",supplyRoomConfig.getIsEnableTousseOpRecipient());
+    //是否启用目的位置
+    request.setAttribute("isEnableTousseOpDestLocation",supplyRoomConfig.getIsEnableTousseOpDestLocation());
+    //是否启用签收
+    request.setAttribute("isEnableTousseOpSign",supplyRoomConfig.getIsEnableTousseOpSign());
+    //是否启用未归还提醒
+    request.setAttribute("isEnableTousseUnReturnWarn",supplyRoomConfig.getIsEnableTousseUnReturnWarn());
 %>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
@@ -84,6 +96,8 @@
  var operation = '${param.operation}';
  var OPERATION_SIGN = '<%=TousseOperation.OPERATION_SIGN%>';
  var OPERATION_RETURN = '<%=TousseOperation.OPERATION_RETURN%>';
+ var isEnableTousseOpRecipient = '<%=request.getAttribute("isEnableTousseOpRecipient")%>';
+ var isEnableTousseOpDestLocation = '<%=request.getAttribute("isEnableTousseOpDestLocation")%>';
 </script>
 
 <table height="100%;" width="100%" border="0" align="center"
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r32713 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 32713)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 34739)
@@ -1740,6 +1740,28 @@
 			});
 			// 流转记录
 			if (this.enableSurgicalInstrumentsManagement) {
+				var autoExpandColumn = 'destDepart';
+				if(isEnableTousseOpDestLocation == 'true'){
+					autoExpandColumn = 'destLocation';
+				}
+				if(isEnableTousseOpRecipient == 'true'){
+					autoExpandColumn = 'recipient';
+				}
+				var tousseLocationManagement = '目的位置';
+				var recipient = '领用人';
+				if(sstsConfig.enableSurgicalInstrumentsManagement){
+					if(sstsConfig.aliasNameOfSurgicalInstrumentsManagement){
+						var aliasNameOfSurgicalInstrumentsManagement = sstsConfig.aliasNameOfSurgicalInstrumentsManagement || [];
+						for(var i=0;i<aliasNameOfSurgicalInstrumentsManagement.length;i++){
+							if(aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'tousseLocationManagement'){
+								tousseLocationManagement = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+							}
+							if(aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'recipient'){
+								recipient = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+							}
+						}
+					}
+				}
 				tabsItemArr.push({
 					title: '<strong>流转记录</strong>',
 					items:[
@@ -1752,6 +1774,7 @@
 									    {name : 'operationTime'},
 									    {name : 'operation'},
 									    {name : 'destDepart'},
+										{name : 'recipient'},
 									    {name : 'destLocation'}
 									]
 								})
@@ -1761,12 +1784,13 @@
 				       		    {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 : 'destLocation',width : 200, menuDisabled: true}
+				    		    {header : tousseLocationManagement,dataIndex : 'destLocation',width : 100, menuDisabled: true,hidden:isEnableTousseOpDestLocation == 'false'},
+								{header : recipient,dataIndex : 'recipient',width : 100, menuDisabled: true,hidden:isEnableTousseOpRecipient == 'false'}
 				    		]),
 							enableHdMenu : false,
-							width : 900,
+							width : 780,
 							autoHeight : true,
-							autoExpandColumn : 'destLocation',
+							autoExpandColumn : autoExpandColumn,
 							frame : false,
 							viewConfig: {
 						        forceFit:true
@@ -2386,6 +2410,7 @@
 									operationTime : tousseOperationInfo.operationTime,  //流转记录_操作时间
 									destLocation : tousseOperationInfo.destLocation, //流转记录_操作位置
 									destDepart : tousseOperationInfo.destDepart, //流转记录_操作科室
+									recipient : tousseOperationInfo.recipient, //流转记录_操作人
 									operation : tousseOperationInfo.operation//流转记录_操作类型
 								});
 								top.Ext.getCmp('tousseOperation').getStore().add(tousseOperationData);
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp
===================================================================
diff -u -r31651 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp	(.../instrumentRoomGoodsManagement.jsp)	(revision 31651)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp	(.../instrumentRoomGoodsManagement.jsp)	(revision 34739)
@@ -1,4 +1,6 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -7,6 +9,11 @@
 <%
     String userName = AcegiHelper.getLoginUser().getUserFullName();
     request.setAttribute("userName",userName);
+
+    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+    SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+    //是否启用签收
+    request.setAttribute("isEnableTousseOpSign",supplyRoomConfig.getIsEnableTousseOpSign());
 %>
 <html>
 <head>
@@ -56,6 +63,7 @@
 SSTS_InstrumentGoodsManagement = true;
 </operation:authorize>
 var today = '<%=request.getAttribute("today")%>';
+var isEnableTousseOpSign = '<%=request.getAttribute("isEnableTousseOpSign")%>';
 </script>
 </head>
 <body>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r34694 -r34739
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 34694)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 34739)
@@ -2217,6 +2217,112 @@
 						}]
 					}
 					]
+				}, {
+					xtype: "fieldset",
+					title: '手术仪器参数设置',
+					layout: 'column',
+					width: itemWidth,
+					height: 70,
+					// columnWidth : 1,
+					labelWidth: 100,
+					hidden:!sstsConfig.enableSurgicalInstrumentsManagement,
+					items: [{
+						layout: 'form',
+						labelWidth: fontSize == 12 ? 180 : 220,
+						labelAlign: "right",
+						columnWidth: .25,
+						items: [{
+							xtype: 'combo',
+							fieldLabel: '是否启用领用人',
+							id: 'isEnableTousseOpRecipient',
+							name: 'isEnableTousseOpRecipient',
+							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%'
+						}]
+					},{
+						layout: 'form',
+						labelWidth: fontSize == 12 ? 180 : 220,
+						labelAlign: "right",
+						columnWidth: .25,
+						items: [{
+							xtype: 'combo',
+							fieldLabel: '是否启用目的位置',
+							id: 'isEnableTousseOpDestLocation',
+							name: 'isEnableTousseOpDestLocation',
+							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%'
+						}]
+					},{
+						layout: 'form',
+						labelWidth: fontSize == 12 ? 180 : 220,
+						labelAlign: "right",
+						columnWidth: .25,
+						items: [{
+							xtype: 'combo',
+							fieldLabel: '是否启用签收',
+							id: 'isEnableTousseOpSign',
+							name: 'isEnableTousseOpSign',
+							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%'
+						}]
+					},{
+						layout: 'form',
+						labelWidth: fontSize == 12 ? 180 : 220,
+						labelAlign: "right",
+						columnWidth: .25,
+						items: [{
+							xtype: 'combo',
+							fieldLabel: '是否启用未归还提醒',
+							id: 'isEnableTousseUnReturnWarn',
+							name: 'isEnableTousseUnReturnWarn',
+							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%'
+						}]
+					}]
 				}]
 			})
 		]
@@ -3223,6 +3329,19 @@
 							return false;
 						}
 					}
+
+					//KSDQDYRMYY-13
+					var isEnableTousseOpRecipient = '否';
+					var isEnableTousseOpDestLocation = '否';
+					var isEnableTousseOpSign = '否';
+					var isEnableTousseUnReturnWarn = '否';
+					if(sstsConfig.enableSurgicalInstrumentsManagement){
+						isEnableTousseOpRecipient = Ext.getCmp("isEnableTousseOpRecipient").getValue();
+						isEnableTousseOpDestLocation = Ext.getCmp("isEnableTousseOpDestLocation").getValue();
+						isEnableTousseOpSign = Ext.getCmp("isEnableTousseOpSign").getValue();
+						isEnableTousseUnReturnWarn = Ext.getCmp("isEnableTousseUnReturnWarn").getValue();
+					}
+
 					var foreignTousseAppEndTime = Ext.getCmp("foreignTousseAppEndTime").getValue();
 					var isFtOnlyImplantConvert = Ext.getCmp("isFtOnlyImplantConvert").getValue();
 					var unitName = Ext.getCmp("unitName").getValue();
@@ -3364,6 +3483,10 @@
 							noMergeApplicationTypes: noMergeApplicationTypes,
 							instrumentUseRateWorkingDay:instrumentUseRateWorkingDay,
 							mergeApplicationDepartArr: mergeApplicationDepartNameAndCodeArr, //自动合并申请单的科室编码和科室名称
+							isEnableTousseOpRecipient:isEnableTousseOpRecipient,
+							isEnableTousseOpDestLocation:isEnableTousseOpDestLocation,
+							isEnableTousseOpSign:isEnableTousseOpSign,
+							isEnableTousseUnReturnWarn:isEnableTousseUnReturnWarn,
 							receiptor: receiptor //自动签收发货单的签收人名字
 						},
 						success: function (response, options) {
@@ -3646,7 +3769,16 @@
 			Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
 			Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
 			Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);
-
+			if(sstsConfig.enableSurgicalInstrumentsManagement){
+				var isEnableTousseOpRecipient = (supplyRoomConfig.isEnableTousseOpRecipient == true || supplyRoomConfig.isEnableTousseOpRecipient == 'true')?'是':'否';
+				var isEnableTousseOpDestLocation = (supplyRoomConfig.isEnableTousseOpDestLocation == true || supplyRoomConfig.isEnableTousseOpDestLocation == 'true')?'是':'否';
+				var isEnableTousseOpSign = (supplyRoomConfig.isEnableTousseOpSign == true || supplyRoomConfig.isEnableTousseOpSign == 'true')?'是':'否';
+				var isEnableTousseUnReturnWarn = (supplyRoomConfig.isEnableTousseUnReturnWarn == true || supplyRoomConfig.isEnableTousseUnReturnWarn == 'true')?'是':'否';
+				Ext.getCmp('isEnableTousseOpRecipient').setValue(isEnableTousseOpRecipient);
+				Ext.getCmp('isEnableTousseOpDestLocation').setValue(isEnableTousseOpDestLocation);
+				Ext.getCmp('isEnableTousseOpSign').setValue(isEnableTousseOpSign);
+				Ext.getCmp('isEnableTousseUnReturnWarn').setValue(isEnableTousseUnReturnWarn);
+			}
 		}
 	});