Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r27743 -r30243
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 27743)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 30243)
@@ -109,7 +109,6 @@
 		var materialName = Ext.getCmp('maerialName').getRawValue();
 		var tousseName = Ext.getCmp('tousseName').getRawValue();
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();
-		
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -209,7 +208,13 @@
 		});
 		formDefinitionStore.on("beforeload", function(thiz, options) {
 			thiz.baseParams["formType"] = Ext.getCmp('monitoringType').getValue();
-			thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
+			if(Ext.getCmp('querySupplyRoom').getRawValue() == '全部'){
+				thiz.baseParams["showAll "] = true;
+				thiz.baseParams["querySupplyRoom"] = '';
+			}else {
+				thiz.baseParams["showAll "] = false;
+				thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
+			}
 		});
 		
 		var materialDefinitionStore = new Ext.data.Store({
@@ -366,6 +371,7 @@
 									all.set(combo.checkField, false);
 								}
 								combo.setValue(combo.getCheckedValue());
+								formDefinitionStore.load()
 							}
 						}
 					}]
Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
===================================================================
diff -u -r22162 -r30243
--- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 22162)
+++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 30243)
@@ -79,8 +79,12 @@
     },  
     getCheckedDisplay: function ()   
     {  
-        var re = new RegExp(this.separator, "g");  
-        return this.getCheckedValue(this.displayField).replace(re, this.separator + ' ');  
+        var re = new RegExp(this.separator, "g");
+        if(this.getCheckedValue(this.displayField).indexOf('全部') == -1){
+            return this.getCheckedValue(this.displayField).replace(re, this.separator + ' '); 
+        }else {
+            return '全部'
+        }
     },  
     getCheckedValue: function (field)   
     {  
@@ -126,13 +130,18 @@
   
         Ext.each(rva, function (v)   
         {  
-            snapshot.each(function (r)   
-            {  
-                if (v === r.get(this.displayField))   
-                {  
+            if(v == '全部'){
+                snapshot.each(function (r){  
                     va.push(r.get(this.valueField));  
-                }  
-            }, this);  
+                }, this);  
+            }else {
+                snapshot.each(function (r)  {  
+                    if (v === r.get(this.displayField)) {  
+                        va.push(r.get(this.valueField));  
+                    }
+                }, this);  
+            }
+            
         }, this);  
         this.setValue(va.join(this.separator));  
         this.store.clearFilter();