Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r24023 -r24024
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 24023)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 24024)
@@ -20549,7 +20549,7 @@
 		//包类型的查询条件
 		String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", StringTools.toCollectionIgnoreNullAndBlank(tousseTypes.trim() , ", ")) : "";
 		//包定义的查询条件
-		String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and trdi.tousseDefinitionId=" + tousseDefinitionId : "";
+		String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and td.ancestorId=" + tousseDefinitionId : "";
 		//时间过滤
 		String dateCondition = "and " + dateQueryAdapter.dateAreaSql("trdr.operateDate", startDate, endDate, true);
 		String sql = "select trdr.orgUnitName,td.tousseType,trdi.tousseName,sum(trdi.amount) amount "
@@ -20610,7 +20610,7 @@
 		//包类型的查询条件
 		String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", StringTools.toCollectionIgnoreNullAndBlank(tousseTypes.trim() , ", ")) : "";
 		//包定义的查询条件
-		String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and trdi.tousseDefinitionId=" + tousseDefinitionId : "";
+		String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and td.ancestorId=" + tousseDefinitionId : "";
 		//时间过滤
 		String dateCondition = "and " + dateQueryAdapter.dateAreaSql("trdr.operateDate", startDate, endDate, true);
 		String sql = "select trdr.orgUnitName,td.tousseType,trdi.tousseName,amount,case when bd.barcode is not null then bd.barcode else trdi.scanBarcode end barcode "