Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js
===================================================================
diff -u -r32946 -r33668
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js	(.../summaryUseRecordTypeForDoctorAccountingDepartView.js)	(revision 32946)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js	(.../summaryUseRecordTypeForDoctorAccountingDepartView.js)	(revision 33668)
@@ -11,6 +11,7 @@
 	var departSearch = $Id('departSearch').value;
 	var accountingDepartOfChiefSurgeon = $Id('accountingDepartOfChiefSurgeon').value;
 	var goodsSearch = $Id('goodsSearch').value;
+	var goodsType = $Id('goodsType').value;
 	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
@@ -27,6 +28,7 @@
 		departSearch : departSearch,
 		departOfpatientSearch : accountingDepartOfChiefSurgeon,
 		goodsSearch : goodsSearch,
+		goodsType : goodsType,
 		reportName:'summaryUseRecordForGoods'
 	}
 
@@ -70,8 +72,12 @@
    			root : 'data'
    		},comboGoodsRecord)
    	});
+	//物品类型
+	var goodsTypeStore = new Ext.data.SimpleStore( {
+		fields : ['value'],
+		data : [ ['全部'],['全部器械包'],['器械包'],['敷料包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'],['高值耗材'] ]
+	});
 	
-	
 	var dt = new Date();
 	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
 		
@@ -86,13 +92,13 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',
-		height : 110,
+		height : 130,
 		items : [{
 			layout : 'column',
 			labelWidth : 80,
 			items : [{
 				layout:'form',
-				width:280,
+				columnWidth:.25,
 				items:[{
 					xtype : 'datefieldWithMin',
 					fieldLabel : '开始日期',
@@ -107,7 +113,7 @@
 				}]
 			},{
 				layout:'form',
-				width:280,
+				columnWidth:.25,
 				items:[{
 					xtype : 'datefieldWithMin',
 					fieldLabel : '结束日期',
@@ -122,7 +128,7 @@
 				}]
 			},{
 				layout:'form',
-				width:260,
+				columnWidth:.25,
 				labelWidth:60,
 				items:[{
 					xtype : 'combo',
@@ -147,7 +153,7 @@
 				}]
 			},{
 				layout:'form',
-				width:280,
+				columnWidth:.25,
 				labelWidth:140,
 				items:[{
 					xtype : 'combo',
@@ -170,14 +176,14 @@
 				}]
 			},{
 				layout:'form',
-				width:300,
+				columnWidth:.25,
 				labelWidth:60,
 				items:[{
 					xtype : 'combo',
 					id : 'goodsSearch',
 					name : 'goodsSearch',
 					queryParam : 'spell',
-					fieldLabel : '物品',
+					fieldLabel : '物品名称',
 					minChars : 0,
 					valueField : 'id',
 					displayField : 'name',
@@ -197,6 +203,25 @@
 						}
 					}
 				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:60,
+				items : [{
+					xtype : 'combo',
+					fieldLabel : '物品类型',
+					id : 'goodsType',
+					name : 'goodsType',
+					valueField : 'value',
+					displayField : 'value',
+					store : goodsTypeStore,
+					forceSelection : true,
+					value:'',
+					editable : false,
+					mode : 'local',
+					triggerAction : 'all',
+					anchor : '95%'
+				}]
 			}]
 		}],
 		buttons:[{