Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r34133 -r34148
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 34133)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 34148)
@@ -211,7 +211,6 @@
 			departGroup: departGroupValue,
 			reportName: 'departmentMonthDetail'
 		}
-
 		searchReport(url, params);
 	}
 
@@ -613,7 +612,6 @@
 				layout: 'form',
 				labelWidth: 120,
 				labelSeparator: '申请科室:',
-				id: "ddddd",
 				items: [{
 					xtype: 'multiSelect',
 					id: 'invoicePlanDepartSearch',
@@ -854,10 +852,23 @@
 			minWidth: 70,
 			iconCls: 'icon_set',
 			handler: function () {
+				Ext.getCmp('startTime').setValue(new Date(startTime));
+				Ext.getCmp('endTime').setValue(new Date(endTime));
+				$Id('goodsSearch').value = "";
+				Ext.getCmp('goodsSearch').setValue("");
+				Ext.getCmp('disposableGoodsType').setRawValue("");
+				Ext.getCmp('disposableGoodsType').setValue("");
+				Ext.getCmp('tousseType').setValue("全部");
+				Ext.getCmp('searchType').setValue("精确查询");
+				Ext.getCmp('batch').setValue("");
+				$Id('invoicePlanDepartSearch').value = "";
+				Ext.getCmp('invoicePlanDepartSearch').setValue("");
 				$Id('departSearch').value = "";
 				Ext.getCmp('departSearch').setValue("");
-				$Id('startTime').value = "";
-				$Id('endTime').value = "";
+				$Id('departGroup').value = "";
+				Ext.getCmp('departGroup').setValue("");
+				Ext.getCmp('showBatch').setValue("是");
+				Ext.getCmp('showSendTime').setValue("否");
 			}
 		}]
 	});
Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
===================================================================
diff -u -r34147 -r34148
--- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 34147)
+++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 34148)
@@ -111,7 +111,9 @@
             return count;
         },
         onBeforeQuery: function (qe) {
-            qe.query = qe.query.replace(new RegExp(RegExp.escape(this.getCheckedDisplay()) + '[ ' + this.separator + ']*'), '');
+            if (this.multiSelectIsClear) {
+                qe.query = qe.query.replace(new RegExp(RegExp.escape(this.getCheckedDisplay()) + '[ ' + this.separator + ']*'), '');
+            }
         },
         onRealBlur: function () {
             this.list.hide();
@@ -142,33 +144,34 @@
                 record.set(this.checkField, !record.get(this.checkField));
                 var va = [];
                 var snapshot = this.store.snapshot || this.store.data;
-                if (!record.get(this.checkField) && record.get(this.displayField) !== '全部' && this.getRawValue() == '全部') {
+                if (record.get(this.valueField) == 'all') {
+                    var checkField = record.get(this.checkField);
+                    if (checkField) {
+                        snapshot.each(function (r) {
+                            r.set(this.checkField, checkField);
+                            va.push(r.get(this.valueField));
+                        }, this);
+                        this.setValue(va.join(this.separator));
+                    } else {
+                        snapshot.each(function (r) {
+                            r.set(this.checkField, checkField);
+                            va = [];
+                        }, this);
+                        this.setRawValue('');
+                    }
+                    this.store.clearFilter();
+                } else {
                     snapshot.each(function (r) {
-                        if (r.get(this.displayField) !== '全部' && r.get('checked')) {
+                        if (r.get(this.valueField) !== 'all' && r.get('checked')) {
                             va.push(r.get(this.valueField));
                         }
                     }, this);
                     this.setValue(va.join(this.separator));
+                    if (va.length == 0) {
+                        this.setRawValue('');
+                    }
                     this.store.clearFilter();
                 }
-                if (this.store.isFiltered()) {
-                    this.doQuery(this.allQuery);
-                }
-                if (this.multi) {
-                    if (record.get("key") == "---" && record.get(this.checkField)) {
-                        this.setValue("---");
-                    }
-                    else {
-                        this.setValue(this.getCheckedValue());
-                    }
-                }
-                else {
-                    this.clearValue();
-                    this.value = record.get(this.valueField);
-                    this.setRawValue(record.get(this.displayField));
-                    this.list.hide();
-                }
-
                 this.fireEvent('select', this, record, index);
             }
         },