Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r19311 -r19683
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 19311)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 19683)
@@ -239,11 +239,12 @@
 	 * 废弃全部器械包物品(器械包告警页面的废弃全部按钮调用)
 	 * @param orgUnitCoding 当前登录用户所在科室
 	 * @param warningType 即将过期的器械包物品与已过期的器械包物品
+	 * @param tousseType 器械包类型
 	 * @param reason 废弃原因
 	 * @param userName 废弃人-当前登录用户
 	 * @return
 	 */
-	public boolean deleteAllExpiredTousseGoods(String orgUnitCoding,String warningType,String reason,String userName);
+	public boolean deleteAllExpiredTousseGoods(String orgUnitCoding,String warningType,String tousseType,String reason,String userName);
 	
 	/**
 	 * 验证器械包是否被召回
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r19618 -r19683
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19618)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 19683)
@@ -53,10 +53,11 @@
     }
     if(window.confirm('是否确定要全部废弃？')){
     	var warningType = Ext.getCmp('warningType').getValue();
+    	var tousseType = Ext.getCmp('tousseType').getValue();
 	    var remark = showSelectTousseDiscardCauseWin();
 	    Ext.Ajax.request({
 	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteAllTousseGoods.do',
-	        params : {reason:remark,warningType : warningType,department:department},
+	        params : {reason:remark,warningType : warningType , tousseType : tousseType,department:department},
 	        success : function(response, options) {
 	            showResult("废弃成功!");
 	            grid.dwrReload();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r19555 -r19683
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 19555)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 19683)
@@ -1372,7 +1372,7 @@
 	
 	@Override
 	public boolean deleteAllExpiredTousseGoods(String orgUnitCoding,
-			String warningType ,String reason,String userName) {
+			String warningType,String tousseType ,String reason,String userName) {
 		boolean isCommandExecutedSuccessfully = true;
 		String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 
@@ -1407,9 +1407,16 @@
 					+ ")";
 		}
 
+		//hql语法的条件
+		String hqlCondition = sqlCondition;
+		//器械包类型
+		if(StringUtils.isNotBlank(tousseType)){
+			sqlCondition += " and tousseDefinition_id in (select id from TousseDefinition where tousseType = '" + dateSqlCondition + "')";
+			hqlCondition += " and tousseDefinition.tousseType = '" + dateSqlCondition + "'";
+		}
 		try {
 			List<TousseInstance> waitWasteTousseInstanceList = 
-				objectDao.findBySql(TousseInstance.class.getSimpleName(),sqlCondition);
+				objectDao.findBySql(TousseInstance.class.getSimpleName(),hqlCondition);
 			if(CollectionUtils.isNotEmpty(waitWasteTousseInstanceList)){
 				List<GoodsStock> goodsStockList = new ArrayList<>();
 				//更新器械包库存
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r19643 -r19683
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 19643)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 19683)
@@ -1205,11 +1205,12 @@
 		//需要查询的科室编码(如果有传入要查询的科室编码则以此作为查询条件,否则查询当前用户所属科室的告警数据)
 		String queryDepartCode = StringUtils.isNotBlank(departCodeOfSelect) ? departCodeOfSelect : departCodeOfCurrentUser;
 		String warningType = StrutsParamUtils.getPraramValue("warningType", "");
+		String tousseType = StrutsParamUtils.getPraramValue("tousseType", "");
 		String reason = StrutsParamUtils.getPraramValue("reason", "");
 		String userName = AcegiHelper.getLoginUser()
 				.getUserFullName();
 		tousseInstanceManager.deleteAllExpiredTousseGoods(queryDepartCode,
-				warningType,reason,userName);
+				warningType , tousseType,reason,userName);
 	}
 	
 	@SuppressWarnings({ "static-access"})