Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r37418 -r37435 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 37418) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 37435) @@ -408,7 +408,7 @@ .format("select %s %s %s %s %s %s %s " + getWashMaterialAmountSqlFromItemTypeIsMaterialWithoutTousseDefinition(obj.extraJoinCondition) + " and wr.endDate %s %s %s and %s %s %s and wr.washMaterialAmount <> 0 %s " - + "%s %s ", + + " %s %s %s ", getDatePeriodSelectSql(obj.monthlyStr), getAmountSelectSql(obj, amountSelectSql), obj.selectUserName ? selectUserNameSql : "", @@ -422,6 +422,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ci.orgUnitName", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, + obj.tousseTypeAndPackageSizeSql, obj.extraQuery, getGroupByDatePeriodSql(obj.monthlyStr), obj.extraGroupBy);