Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r32781 -r33028
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 32781)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 33028)
@@ -82,6 +82,14 @@
 		if(invoicePlanDepartSearch == "全部" || invoicePlanDepartSearch == ''){
 			invoicePlanDepartCoding = "";
 		}
+		
+
+		var departGroupRawValue = Ext.getCmp('departGroup').getRawValue();
+		var departGroupValue = Ext.getCmp('departGroup').getValue();
+		if(departGroupRawValue == '全部' || departGroupRawValue == '' || departGroupRawValue.trim() == ''){
+			departGroupValue = '';
+		}
+		
 		var showBatchValue = $Id('showBatch').value;
 		var showBatch = true;
 		if(showBatchValue == '否'){
@@ -177,6 +185,7 @@
 			patternOfReport:patternOfReport,
 			goodsNameSearch:goodsSearch,
 			showBatch : showBatch,
+			departGroup: departGroupValue,
 			reportName:'departmentMonthDetail'
 		}
 
@@ -248,6 +257,11 @@
 			)
 		});
 	}
+	//科室分组Store
+	var departGroupStore = new Ext.data.SimpleStore({
+		fields : ['id', 'shift','departCode' ],
+		url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadDepartGroup.do?needAll=false'
+	});
 	var tousseTypeStore = new Ext.data.SimpleStore( {
 		fields : ['value'],
 		data : [ ['全部'],['全部器械包'],['器械包'],['敷料包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'],['高值耗材'],['自动扣减物品'],['收费项目'] ]
@@ -563,31 +577,17 @@
 					triggerAction : 'all',
 					anchor : '95%',
 					listeners: {
-						select: function (combo, record, index) {
-							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
-							/*
-							if (record.get('name') == ALL) {
-								if (record.get('checked')) {
-									combo.selectAll();
-								} else {
-									combo.deselectAll();
-								}
+						change :function(field,newVal,oldVal){
+							if(newVal == "" && Ext.getCmp('departSearch').getRawValue() == ""){
+								Ext.getCmp('departGroup').setDisabled(false);
+							}else{
+								Ext.getCmp('departGroup').setDisabled(true);
 							}
-							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
-							var selectAll = true;
-							combo.store.each(function(record) {
-								if (record.get('name') != ALL && !record.get(this.checkField)) {
-									selectAll = false;
-									return;
-								}
-							}, combo);
-							var all = combo.store.getAt(0);
-							if (selectAll) {
-								all.set(combo.checkField, true);
-							} else {
-								all.set(combo.checkField, false);
+    					},
+						blur:function(that){
+							if(Ext.getCmp('invoicePlanDepartSearch').getRawValue() == "" && Ext.getCmp('departSearch').getRawValue() == ''){
+								Ext.getCmp('departGroup').setDisabled(false);
 							}
-							combo.setValue(combo.getCheckedValue());*/
 						}
 					}
 				}]
@@ -610,37 +610,59 @@
 					triggerAction : 'all',
 					anchor : '95%',
 					listeners: {
-						select: function (combo, record, index) {
-							/*
-							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
-							if (record.get('name') == ALL) {
-								if (record.get('checked')) {
-									combo.selectAll();
-								} else {
-									combo.deselectAll();
-								}
+						change :function(field,newVal,oldVal){
+							if(newVal == "" && Ext.getCmp('invoicePlanDepartSearch').getRawValue() == ""){
+								Ext.getCmp('departGroup').setDisabled(false);
+							}else{
+								Ext.getCmp('departGroup').setDisabled(true);
 							}
-							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
-							var selectAll = true;
-							combo.store.each(function(record) {
-								if (record.get('name') != ALL && !record.get(this.checkField)) {
-									selectAll = false;
-									return;
-								}
-							}, combo);
-							var all = combo.store.getAt(0);
-							if (selectAll) {
-								all.set(combo.checkField, true);
-							} else {
-								all.set(combo.checkField, false);
+    					},
+						blur:function(that){
+							if(Ext.getCmp('invoicePlanDepartSearch').getRawValue() == "" && Ext.getCmp('departSearch').getRawValue() == ''){
+								Ext.getCmp('departGroup').setDisabled(false);
 							}
-							combo.setValue(combo.getCheckedValue());*/
 						}
 					}
 				}]
 			},{
 				columnWidth : .25,
 				layout : 'form',
+				labelWidth : 120,
+				labelSeparator : '科室分组:',
+				items : [{
+					xtype : 'multiSelect',
+					id : 'departGroup',
+					name : 'departGroup',
+					valueField : 'id',
+					displayField : 'shift',
+					minChars : 0,
+					queryParam : 'spell',
+					allowBlank : true,
+					store : departGroupStore,
+					mode : 'remote',
+					triggerAction : 'all',
+					anchor : '95%',
+					listeners: {
+						change :function(field,newVal,oldVal){
+							if(newVal == ""){
+								Ext.getCmp('invoicePlanDepartSearch').setDisabled(false);
+								Ext.getCmp('departSearch').setDisabled(false);
+							}else{
+								Ext.getCmp('invoicePlanDepartSearch').setDisabled(true);
+								Ext.getCmp('departSearch').setDisabled(true);
+							}
+    					},
+						blur:function(that){
+							if(Ext.getCmp('departGroup').getRawValue() == ''){
+								Ext.getCmp('invoicePlanDepartSearch').setDisabled(false);
+								Ext.getCmp('departSearch').setDisabled(false);
+							}
+						}
+					}
+				}]
+			},{
+				columnWidth : .25,
+				layout : 'form',
 				labelWidth : 150,
 				items : [{
 					xtype : 'combo',