Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32967 -r33010
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32967)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33010)
@@ -5872,8 +5872,10 @@
 					+ " group by rr.depart,rr.settleAccountsDepart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber"+ groupByMaterialAmountAtThatTime +",dgbs.expDate,"+returnGoodsTousseDefinitionId+ dgbsOfSupplierNameSql +") ";
 		
 		String supplyRoomTousseTypeSql = "";
-		if(StringUtils.isBlank(typeSearch) || typeSearch.contains(TYPE_AUTO_DEDUCTION) && !typeSearch.contains("一次性物品")){
-			supplyRoomTousseTypeSql = String.format(" and rr.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION);
+		if(!(StringUtils.isBlank(typeSearch) || typeSearch.contains("一次性物品"))){
+			if(typeSearch.contains(TYPE_AUTO_DEDUCTION)){
+				supplyRoomTousseTypeSql = String.format(" and rr.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION);
+			}
 		}
 		String supplyRoomDiposableGoodsSql = " union all (select "+ sumRriAmountSql +" rr.depart,rr.depart as settleaccountsdepart "+ dgbsOfSupplierNameSql + noQueryIntegralSql +",rri.goodsName,sum(rri.amount),"
 				+"sum(rri.price*rri.amount) as settlementprice,sum(rri.price*rri.amount) as settlementDiscountPrice,rri.type as type,dgbs.batchNumber as batchNumber,dgbs.expDate,0 as tousseDefinitionId "