Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r19683 -r19707
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 19683)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 19707)
@@ -1411,8 +1411,8 @@
 		String hqlCondition = sqlCondition;
 		//器械包类型
 		if(StringUtils.isNotBlank(tousseType)){
-			sqlCondition += " and tousseDefinition_id in (select id from TousseDefinition where tousseType = '" + dateSqlCondition + "')";
-			hqlCondition += " and tousseDefinition.tousseType = '" + dateSqlCondition + "'";
+			sqlCondition += " and tousseDefinition_id in (select id from TousseDefinition where tousseType = '" + tousseType + "')";
+			hqlCondition += " and tousseDefinition.tousseType = '" + tousseType + "'";
 		}
 		try {
 			List<TousseInstance> waitWasteTousseInstanceList = 
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r19683 -r19707
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19683)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19707)
@@ -630,6 +630,16 @@
         TousseInstanceTableManager.findWarningTousseGoodsTableList,
         null 
     );
+
+	//加载数据时增加进度条的提示
+	var store = grid.getStore();
+	store.on("beforeload", function(thiz, options) {
+		Ext.getBody().mask("正在加载中,请稍候...");
+	});
+	
+	store.on("load", function(thiz, options) {
+		Ext.getBody().unmask();
+	});
     
     var viewport = new Ext.Viewport({
         layout:'border',