=== 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 2011-03-31 01:55:06 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2011-06-16 08:52:01 +0000 @@ -488,12 +488,12 @@ private String getConditionForPatientAttribute( int attributeId, int orgunitId, String startDate, String endDate ) { - return "distinct(pi.patientid) FROM programstageinstance as psi " + return "SELECT distinct(pi.patientid) FROM programstageinstance as psi " + "INNER JOIN programstage as ps ON psi.programstageid = ps.programstageid " + "INNER JOIN patientdatavalue as pd ON psi.programstageinstanceid = pd.programstageinstanceid " + "INNER JOIN programinstance as pi ON pi.programinstanceid = psi.programinstanceid " + "INNER JOIN patientattributevalue as pav ON pav.patientid = pi.patientid " - + "WHERE pa.patientattributevalueid = " + attributeId + " " + " AND pd.organisationunitid = " + orgunitId + + "WHERE pav.patientattributeid = " + attributeId + " " + " AND pd.organisationunitid = " + orgunitId + " " + " AND psi.executionDate >= '" + startDate + "' AND psi.executionDate <= '" + endDate + "' " + "AND pav.value "; }