=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-02-14 08:31:39 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-02-20 09:12:19 +0000 @@ -768,16 +768,16 @@ sql = "SELECT pi.patientid "; } - sql += "FROM patient as pi "; + sql += "FROM patient as pi WHERE "; if ( propertyName.equals( PROPERTY_AGE ) ) { - sql += "' AND (( 12 * ( EXTRACT(YEAR FROM '" + startDate + "' ) - EXTRACT(YEAR FROM birthdate ) ) ) + " + sql += "(( 12 * ( EXTRACT(YEAR FROM '" + startDate + "' ) - EXTRACT(YEAR FROM birthdate ) ) ) + " + "EXTRACT( MONTH FROM '" + startDate + "' ) - EXTRACT( MONTH FROM birthdate ) )" + " "; } else { - sql += "' AND pi." + propertyName + " "; + sql += " pi." + propertyName + " "; } return sql;