Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
===================================================================
diff -u -r25223 -r25228
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js	(.../statisticalWorkloadView.js)	(revision 25223)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js	(.../statisticalWorkloadView.js)	(revision 25228)
@@ -24,7 +24,7 @@
 	var jasperreportName = isStrengthen ? 'strengthenStatisticalWorkload.jasper' : 'statisticalWorkload.jasper';
 	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
-		msg: '正在加载，请稍候！',
+		msg: '正在查询中...，请稍候！',
 		removeMask: true
 	});
 	myMask.show();
@@ -73,12 +73,13 @@
       	listeners:{
       		beforeload : function(){
       			loadMask = new Ext.LoadMask(Ext.getBody(), {
-      				msg: '正在加载，请稍候！',removeMask: true
+      				msg: '正在加载供应室...，请稍候！',removeMask: true
       			});
       			loadMask.show();
       		},
       		load :function (thiz,records,options ){
       			loadMask.hide();
+      			var currentOrgUnitIsSupplyRoom = false;
       			if(records && records.length > 0){
       				for (var i = 0; i < records.length; i++) {
       					var supplyRoomData = records[i].data;
@@ -87,15 +88,23 @@
       					if(SSTS_View_All_Supply_Room_Report){
       						if(departCodeTemp == currentOrgUnitCoding){
       							supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name}));
+      							currentOrgUnitIsSupplyRoom = true;
       						}
       					}else{
       						supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name}));
+      						if(departCodeTemp == currentOrgUnitCoding){
+      							currentOrgUnitIsSupplyRoom = true;
+      						}
       					}
       				}
       			}
       			if(supplyRoomStore.getCount() > 1){
       				supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL}));
       			}
+      			//最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
+      			if(currentOrgUnitIsSupplyRoom){
+      				Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
+      			}
       		}
       	}
     });