Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js
===================================================================
diff -u -r37453 -r38135
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 37453)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 38135)
@@ -104,7 +104,7 @@
 	var columns = [
 	    {header : "名称",width : 120,dataIndex : 'name', renderer : modifyRecord},
 	    {header : "条码",width : 110,dataIndex : 'barcode'}, 
-		{header : "所属科室",width : 110,dataIndex : 'department'}, 
+		{header : "所属科室",width : 250,dataIndex : 'department'}, 
 		{header : "使用状态",width : 120,dataIndex : 'useStatus'}, 
 	    {header : "联系人",width : 120,dataIndex : 'contact'}, 
 	    {header : "时间重叠",width : 120,dataIndex : 'conCurrent'}, 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp
===================================================================
diff -u -r31471 -r38135
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp	(.../rinserView.jsp)	(revision 31471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp	(.../rinserView.jsp)	(revision 38135)
@@ -26,6 +26,9 @@
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js?version=${svnRevision}"></script>
+<!-- 支持多选的下拉框 -->
+<script type="text/javascript" src="${ctx}/ext/js/multiSelectComboTop.js?version=${svnRevision}"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 
 <!-- 日期控件  -->
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r37461 -r38135
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 37461)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 38135)
@@ -70,11 +70,11 @@
 	
 	var departmentJsonStore = new Ext.data.Store({
 		proxy : new top.Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/rinserAction!getDepartmentInfo.do',
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomOrgUnitList.do',
 			method : "POST"
 		}),
 		reader : new top.Ext.data.JsonReader({
-			fields : [ "orgUnitCoding", "orgUnitName"]
+			fields : [ "orgUnitCoding", "orgUnitName", "id"]
 		})
 	});
 	
@@ -273,6 +273,10 @@
 			name : 'orgUnitCoding',
 			id : 'orgUnitCoding'
 		},{
+			xtype : 'hidden',
+			name : 'orgUnitIds',
+			id : 'orgUnitIds'
+		},{
 			layout : 'column',
 			items : [ {
 				columnWidth : 0.5,
@@ -337,25 +341,31 @@
 					minWidth : 177,
 					anchor : '95%'
 				},{
-					xtype : 'combo',
+					xtype : sstsConfig.enableRinserIsSharedByMultipleDepartments ? 'multiSelect' : 'combo', 
 					fieldLabel : "所属科室",
-					valueField : 'orgUnitCoding',
+					valueField : 'id',
 					displayField : 'orgUnitName',
 					store : departmentJsonStore,
-					forceSelection : true,
+					forceSelection : sstsConfig.enableRinserIsSharedByMultipleDepartments ? false : true,
 					allowBlank : false,
 					triggerAction : 'all',
 					name : "department",
 					id : "department",
+					separator: ';',
 					anchor : '95%',
 					editable : false,
 					listeners : {
 						select : function(combo, record, index) {
-							top.Ext.getCmp('orgUnitCoding').setValue((record.data.orgUnitCoding));
-							if(sstsConfig.enableRinserGroupFunction){
-								top.Ext.getCmp('rinserGroupId').setValue('');
-								top.Ext.getCmp('rinserGroupName').setValue('');
-								rinserGroupStore.load();
+							if(sstsConfig.enableRinserIsSharedByMultipleDepartments){
+								top.Ext.getCmp('orgUnitIds').setValue(combo.getCheckedValue());
+							}else {
+								top.Ext.getCmp('orgUnitCoding').setValue((record.data.orgUnitCoding));
+								top.Ext.getCmp('orgUnitIds').setValue((record.data.id));
+								if(sstsConfig.enableRinserGroupFunction){
+									top.Ext.getCmp('rinserGroupId').setValue('');
+									top.Ext.getCmp('rinserGroupName').setValue('');
+									rinserGroupStore.load();
+								}
 							}
 						}
 					}
@@ -761,6 +771,26 @@
 							top.Ext.getCmp('rinserGroupName').setValue((action.result.data.rinserGroupId));
 						}, 500);
 					}
+					if(sstsConfig.enableRinserIsSharedByMultipleDepartments){
+						var department = [];
+						var orgUnitCoding = [];
+						var orgUnitIds = [];
+						if(action.result.rinserDepartment && action.result.rinserDepartment.length > 0){
+							for(var i=0;i<action.result.rinserDepartment.length;i++){
+								var rinserDepartment = action.result.rinserDepartment;
+								department.push(rinserDepartment[i].name)
+								orgUnitCoding.push(rinserDepartment[i].orgUnitCoding)
+								orgUnitIds.push(rinserDepartment[i].id)
+							}
+							top.Ext.getCmp('department').setRawValue(department.join(';'));
+							top.Ext.getCmp('orgUnitCoding').setValue(orgUnitCoding.join(';'));
+							top.Ext.getCmp('orgUnitIds').setValue(orgUnitIds.join(';'));
+						}else {
+							top.Ext.getCmp('department').setRawValue(action.result.data.department);
+							top.Ext.getCmp('orgUnitCoding').setValue(action.result.data.orgUnitCoding);
+							top.Ext.getCmp('orgUnitIds').setValue(action.result.data.orgUnitIds);
+						}
+					}
 				}else{
 					foldersCompanyJsonStore.load();
 					departmentJsonStore.load();
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r37814 -r38135
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 37814)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 38135)
@@ -313,6 +313,8 @@
   showMaterialsAmountColumnOfDetailMonthReport : true,
   //启用外来器械包发货后可直接二次回收的功能
   enableSecondRecyclingAfterInvoiceFunction:true,
+  //允许多个科室共享使用同一台清洗机
+  enableRinserIsSharedByMultipleDepartments:true,
   //外来器械包申请单扩展列
   extendedColumnConfigOfForeignTousseApplicationForm:["packingState", "sterilizationState"]
 }
\ No newline at end of file