Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33309 -r33336
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33309)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33336)
@@ -9476,7 +9476,7 @@
 		}
 		String recySql = String.format("select td.name,sum(ri.amount) amount "
 				+ " from RecyclingItem ri inner join RecyclingRecord rr on ri.recyclingRecord_id=rr.id "
-				+ " join TousseDefinition td on td.id=ri.tousseDefinitionId "
+				+ " join TousseDefinition td on td.id=ri.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID "
 				+ tousseDefinitionJoinSterilisationJoin
 				+ " left join OrgUnit ou on ou.orgUnitCoding=rr.orgUnitCoding "
 				+ " where rr.recyclingTime between "+ dateQueryAdapter.dateAdapter(startDate)
@@ -9518,7 +9518,7 @@
 		String invoiceSql = String.format(" select ii.tousseName,sum(ii.amount) amount "
 				+ "from Invoice i inner "
 				+ "join InvoiceItem ii on i.id=ii.invoice_id "
-				+ " join TousseDefinition td on ii.tousseDefinitionId=td.id "
+				+ " join TousseDefinition td on ii.tousseDefinitionId=td.id join TousseDefinition tdc on tdc.id=td.ancestorID "
 				+ tousseDefinitionJoinSterilisationJoin
 				+ "where i.sendTime between "+ dateQueryAdapter.dateAdapter(startDate)
 				+" and "+ dateQueryAdapter.dateAdapter(endDate)
@@ -9559,7 +9559,7 @@
 		String signedSql = String.format("select ti.tousseName,count(*) amount from SignRecord sr "
 				+ " join OrgUnit ou on ou.orgUnitCoding=sr.departCode "
 				+ " join TousseInstance ti on ti.signRecordId=sr.id "
-				+ " join TousseDefinition td on td.id=ti.tousseDefinition_id "
+				+ " join TousseDefinition td on td.id=ti.tousseDefinition_id join TousseDefinition tdc on tdc.id=td.ancestorID "
 				+ tousseDefinitionJoinSterilisationJoin
 				+ " where ti.signedDate between "+ dateQueryAdapter.dateAdapter(startDate)
 				+ " and "+ dateQueryAdapter.dateAdapter(endDate)