Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32759 -r32763
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32759)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32763)
@@ -5526,8 +5526,8 @@
 		}
 		if (StringUtils.isNotBlank(typeSearch)) {
 			typeFilterSql = String.format(" and (%s)", SqlUtils.getStringFieldInLargeCollectionsPredicate("ii.tousseType", allTousseType));
-			returnGoodsItemPredicate = String.format(" ri.tousseDefinition_id in (select id from TousseDefinition where %s) ", SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseType", allTousseType));
-			returnGoodsFilterSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.type", returnGoodType);
+			returnGoodsItemPredicate += String.format(" and ri.tousseDefinition_id in (select id from TousseDefinition where %s) ", SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseType", allTousseType));
+			returnGoodsFilterSql += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.type", returnGoodType);
 			if(!typeSearch.contains("一次性物品") && !typeSearch.contains(DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS)){
 				outEntryFilterSql += " and 1=2 ";
 			}else if(!typeSearch.contains("一次性物品") && typeSearch.contains(DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS)){