Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java =================================================================== diff -u -r36732 -r36733 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 36732) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 36733) @@ -1770,9 +1770,11 @@ } sql.append("count(*) amount from "); sql.append(DeviceMaintenanceCusI.class.getSimpleName()); - sql.append(" d where d.maintenanceTime "); + sql.append(" d join "); + sql.append(FormInstance.class.getSimpleName()); + sql.append(" fi on fi.id=ci.id where d.maintenanceTime "); sql.append(betweenSql); - sql.append(" and d.deviceDepartCoding='"); + sql.append(" and fi.orgunitcoding='"); sql.append(orgUnitCoding); sql.append("' group by "); if(sterilizerMaintenanceMap != null || rinserMaintenanceMap != null){