Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r37373 -r37418 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 37373) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 37418) @@ -481,7 +481,8 @@ && !obj.extraQuery.contains("ci.") && !obj.extraQuery.contains("td.") && !obj.extraQuery.contains("tdc.") - && !obj.extraGroupBy.contains("tdc.")) { + && !obj.extraGroupBy.contains("tdc.") + && (StringUtils.isBlank(obj.tousseTypeAndPackageSizeSql) || !obj.tousseTypeAndPackageSizeSql.contains("td"))) { amountSql += " union all "; amountSql += String.format("select %s %s %s %s %s %s %s " + getWashMaterialAmountSqlFromTousseTypeIsMaterial(obj.extraJoinCondition)