=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java' --- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-08-30 10:00:42 +0000 @@ -503,7 +503,7 @@ // Aggregation // --------------------------------------------------------------------- - if ( _orgunitIds.size() > 0 ) + if ( !orgunitIds.isEmpty() ) { insertAggregateValue( caseExpression, caseOperator, dataelementId, optionComboId, deSumId, orgunitIds, period ); @@ -776,7 +776,7 @@ sql = sql .replace( CaseAggregationCondition.MINUS_DATAELEMENT_OPERATOR + "_" + key, minus2SQLMap.get( key ) ); } - + return sql + " ) "; }