Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r37406 -r37453
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 37406)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 37453)
@@ -5412,13 +5412,14 @@
 }
 
 //获取供应室store
-function getSupplyRoomStore(domID) {
+function getSupplyRoomStore(domID,defaultValue) {
     var supplyRoomStore = new Ext.data.SimpleStore({
-        fields: ['departCode', 'name']
+        fields: ['departCode', 'name', 'orgUnitId']
     });
     var supplyRoomRecord = Ext.data.Record.create([
         { name: 'departCode', type: 'string' },
-        { name: 'name', type: 'string' }
+        { name: 'name', type: 'string' },
+        { name: 'orgUnitId', type: 'string' }
     ]);
     /**
      * “供应室combo”的store,仅用于普通的ajax请求的数据源
@@ -5431,7 +5432,7 @@
         baseParams: { type: "12" },
         reader: new Ext.data.JsonReader({
             fields: [
-                { name: 'id', mapping: 'id' },
+                { name: 'orgUnitId', mapping: 'orgUnitId' },
                 { name: 'departCode', mapping: 'departId' },
                 { name: 'name', mapping: 'name' }
             ]
@@ -5453,23 +5454,46 @@
                         //如果没有查看其它供应室权限时,只显示是当前用户的科室
                         if (SSTS_View_All_Supply_Room_Report) {
                             if (departCodeTemp == currentOrgUnitCoding) {
-                                supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name }));
+                                supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name, 'orgUnitId': supplyRoomData.orgUnitId }));
                                 currentOrgUnitIsSupplyRoom = true;
                             }
                         } else {
-                            supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name }));
+                            supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name, 'orgUnitId': supplyRoomData.orgUnitId }));
                             if (departCodeTemp == currentOrgUnitCoding) {
                                 currentOrgUnitIsSupplyRoom = true;
                             }
                         }
                     }
                 }
                 if (supplyRoomStore.getCount() > 1) {
-                    supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL }));
+                    supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL, 'orgUnitId': ALL }));
                 }
-                //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
-                if (currentOrgUnitIsSupplyRoom) {
-                    Ext.getCmp(domID).setValue(currentOrgUnitCoding);
+                if(defaultValue){
+                    if(defaultValue == 'all'){
+                        if(Ext.getCmp(domID)){
+                            Ext.getCmp(domID).setValue('全部');
+                        }
+                        if(top.Ext.getCmp(domID)){
+                            top.Ext.getCmp(domID).setValue('全部');
+                        }
+                    }else {
+                        if(Ext.getCmp(domID)){
+                            Ext.getCmp(domID).setValue(defaultValue);
+                        }
+                        if(top.Ext.getCmp(domID)){
+                            top.Ext.getCmp(domID).setValue(defaultValue);
+                        }
+                    }
+                }else {
+                    //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
+                    if (currentOrgUnitIsSupplyRoom) {
+                        if(Ext.getCmp(domID)){
+                            Ext.getCmp(domID).setValue(currentOrgUnitCoding);
+                        }
+                        if(top.Ext.getCmp(domID)){
+                            top.Ext.getCmp(domID).setValue(currentOrgUnitCoding);
+                        }
+                    }
                 }
             }
         }