Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
===================================================================
diff -u -r17226 -r19618
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 17226)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 19618)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -43,6 +44,18 @@
     	warningType = allFlag;
     }
     
+    //所有的器械包类型
+    var tousseTypeDataArray = [
+        ['全部',''],
+        ['<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>','<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>','<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_DRESSING %>','<%=TousseDefinition.PACKAGE_TYPE_DRESSING %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_FOREIGN %>','<%=TousseDefinition.PACKAGE_TYPE_FOREIGN %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_SPLIT %>','<%=TousseDefinition.PACKAGE_TYPE_SPLIT %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_CUSTOM %>','<%=TousseDefinition.PACKAGE_TYPE_CUSTOM %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY %>','<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY %>']
+    ];
+    
 var System_TousseGoods_delete = true;
 <operation:authorize ifAnyGranted="SSTS_SystemWarning_TousseGoods_delete">
 System_TousseGoods_delete = false;
@@ -79,10 +92,11 @@
 </object>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_type" name="parm_s_type" value="">
-    <input type="hidden" id="parm_s_type2" name="parm_s_type2" value="">
     <input type="hidden" id="parm_s_department" name="parm_s_department" value="">
     <input type="hidden" id="parm_s_startTime" name="parm_s_startTime" value="">
     <input type="hidden" id="parm_s_endTime" name="parm_s_endTime" value="">
+    <!-- 器械包类型 -->
+    <input type="hidden" id="parm_s_tousseType" name="parm_s_tousseType" value="">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r19555 -r19618
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 19555)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 19618)
@@ -646,6 +646,7 @@
 		sqlBuilder.append(" and " + SqlBuilder.build_IN_Statement("status", SqlBuilder.IN, 
 				TousseInstance.STATUS_STERILED) + "))");
 
+		//告警类型
 		String type = sqlWhereParamMap.get("type");
 		Date now = new Date();
 		String startTime = sqlWhereParamMap.get("startTime");
@@ -665,6 +666,11 @@
 				setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
 				break;
 		}
+		//器械包类型
+		String tousseType = sqlWhereParamMap.get("tousseType");
+		if(StringUtils.isNotBlank(tousseType)){
+			sqlBuilder.append(" AND po.tousseDefinition.tousseType = '").append(tousseType).append("'");
+		}
 		String sql = sqlBuilder.toString();
 		return gridManager.renderGrid(parameterMap,
 				TousseInstance.class.getSimpleName(), sql,
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r19555 -r19618
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19555)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19618)
@@ -470,7 +470,9 @@
         ]}
     );
     
-    var tbar = [{
+    //第一行工具栏
+    var tbarForFirstRow = new Ext.Toolbar ({
+		items : [{
         text : '查看所有科室',
         id:'lookAllDepartment',
         hidden:System_TousseGoods_look,
@@ -504,6 +506,31 @@
         }
     },'-',{
         xtype : 'label',
+    	text : '器械包类型：'
+    },{
+        xtype : 'combo',
+        id : 'tousseType',
+        name : 'tousseType',
+        valueField : 'value',
+        displayField : 'text',
+        store : new Ext.data.SimpleStore({
+            fields : ['text','value'],
+            data : tousseTypeDataArray
+        }),
+        forceSelection : true,
+        mode : 'local',
+        editable:false,
+        triggerAction : 'all',
+        width : 120,
+        value : '',
+        listeners : {
+            select : function(combo,record,index ){
+                $Id('parm_s_tousseType').value = combo.getValue();
+                grid.dwrReload();
+            }
+        }
+    },'-',{
+        xtype : 'label',
     	text : '开始时间：'
     },{
 		xtype : 'datefieldWithMin',
@@ -535,7 +562,12 @@
 		handler : function() {
 			grid.dwrReload();
 		}
-	},'-',{
+	}]
+    });
+    
+    //第行行工具栏
+    var tbarForSecondRow = new Ext.Toolbar ({
+		items : [{
         text : '废弃',
         iconCls : 'btn_ext_application_del',
         id:'deleteTousseGoods',
@@ -569,11 +601,12 @@
 		text : '导出',
 		iconCls : 'btn_ext_download',
 		handler : function(){exportExcel(grid)}
-	}];
+	}]});
     
     grid = new Ext.ux.ForgonPageGrid({
+    	id:'warningGrid',
         title : '器械包物品告警列表',
-        tbar : tbar,
+        tbar : tbarForFirstRow,
         pageSize : 20,
         defaultSortField : 'validUntil',
         defaultSortDirection : 'ASC',
@@ -584,7 +617,13 @@
         columns : columns,
         renderTo : Ext.getBody(),  //之所以不写'gridDiv'是因为不知道为何用他会导致该页面在第二次打开之后无数据显示的bug
         autoExpandColumn : 'operationRemark',
-        frame : false
+        frame : false,
+        listeners: {
+			render : function() {
+				//第一行工具栏直接指定,第二行工具栏在grid渲染时再渲染到grid第二行工具栏
+				tbarForSecondRow.render(Ext.getCmp('warningGrid').tbar);
+			}
+        }
     },
         readerDetail,
         TousseInstanceTableManager.findWarningTousseGoodsTableList,