Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r41411 -r41413
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 41411)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 41413)
@@ -891,9 +891,77 @@
 			text: ''
 		})
 	});
-	
+
+	//GDSKQYY-23：结算科室筛选
+	var settleAccountsDepartRecord = Ext.data.Record.create([
+		{name: 'id', type: 'string'},
+		{name: 'name', type: 'string'}
+	]);
+	var settleAccountsDepartStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do?showDisableOrgUnit=false',
+			method: "POST"
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [{ name: 'id', mapping: 'id' },
+		{ name: 'name', mapping: 'name' }]),
+		listeners:{
+			load :function (thiz,records,options){
+				if(settleAccountsDepartStore.getCount() > 1){
+					settleAccountsDepartStore.insert(0 , new settleAccountsDepartRecord({'id':'','name':'全部'}));
+				}
+			}
+		}
+	})
 	var tbar = [];
-	tbar.push('->',{
+	tbar.push('结算科室筛选：', {
+        xtype: 'combo',
+        fieldLabel: '',
+		queryParam: 'spell',
+		minChars: 0,
+        id: 'settleAccountsDepart',
+        name: 'settleAccountsDepart',
+        valueField: 'name',
+        displayField: 'name',
+        store: settleAccountsDepartStore,
+       	forceSelection: false,
+		lazyInit: true,
+		triggerAction: 'all',
+		typeAhead: false,
+		width: 100,
+		matchFieldWidth: false,
+		listWidth:200,
+		allowBlank: true,
+        value: '全部',
+        listeners: {
+            select: function (combo, record, index) {
+				var barcodeArr = [];
+				var root = top.Ext.getCmp('basketTreePanel').getRootNode();
+				root.eachChild(function (child) {
+					var barcode = child.attributes.barcode || '';
+					if(barcode !== ''){
+						barcodeArr.push(barcode);
+					}
+				});
+                var loader = pendingWashAndDisinfectColumnTree.getLoader();
+				loader.baseParams.settleAccountsDepartCoding = record.data.id;
+				if(barcodeArr.length > 0){
+					loader.baseParams.excludeContainerBarcodes = barcodeArr.join(';');
+				}else {
+					loader.baseParams.excludeContainerBarcodes = ''
+				}
+				myMask = new top.Ext.LoadMask(top.Ext.getBody(), {
+					msg: '正在加载，请稍候！',
+					removeMask: true
+				});
+				myMask.show();
+				loader.load(pendingWashAndDisinfectColumnTree.root, function() {
+					myMask.hide();
+				});
+            }
+        }
+    },'-', '->',{
         iconCls: 'btn_ext_add_tousse',
         text: '一键载入',
         handler: function (_this) {