Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28030 -r28033 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28030) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28033) @@ -13555,14 +13555,15 @@ + "left join %s qmd on qmi.id=qmd.qualityMonitoringInstance_id " + "join %s fdio on fdi.id=fdio.formDefinitionItem_id " + "join %s fiov on fiov.formInstanceItem_id=fiItem.id and fiov.definitionItemOption_id=fdio.id " - + " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql + tousseNameSql + " group by fdi.name,fdio.value,fdi.orderNumber ", + + " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK + "')", QualityMonitoringInstance.class.getSimpleName(), FormDefinition.class.getSimpleName(), FormInstanceItem.class.getSimpleName(), FormDefinitionItem.class.getSimpleName(), QualityMonitoringGoods.class.getSimpleName(), FormDefinitionItemOption.class.getSimpleName(), FormInstanceOptionValue.class.getSimpleName()); + amoutSql += " and " + whereSql + tousseNameSql + " group by fdi.name,fdio.value,fdi.orderNumber "; ResultSet amountRs = null; try { amountRs = objectDao.executeSql(amoutSql);