Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r23484 -r23518 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23484) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23518) @@ -14107,6 +14107,7 @@ sql += "TousseDefinition t,materialinstance ms,materialdefinition m "; sql += "where r.id = cw.washanddisinfectrecord_id and cw.classifybasket_id = b.id and "; sql += "b.id = i.classifybasket_id and i.toussedefinition_id = t.id and t.id = ms.tousse_id and ms.materialdefinition_id = m.id "; + sql += "and i.itemType='"+ ClassifiedItem.TYPE_TOUSSE +"' "; sql += "and r.enddate between " + dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + " and "; sql += dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd")+ " and r.orgUnitCoding = '" + querySupplyRoom + "' group by i.id,m.type ";