=== 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-10 05:52:52 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-02-10 08:00:11 +0000 @@ -880,11 +880,11 @@ return "SELECT distinct(p.patientid) FROM programinstance as pi " + "INNER JOIN programstageinstance psi " - + "ON pi.programinstanceid = psi.programinstanceid" + + "ON pi.programinstanceid = psi.programinstanceid " + "INNER JOIN patient as p ON pi.patientid = p.patientid " + "WHERE psi.programstageid=" + programStageId + " " + "AND psi.executiondate >= '" + startDate - + "' AND psi.executiondate <= '" + endDate + "' "; + + "' AND psi.executiondate <= '" + endDate + "' AND p.organisationunitid = " + orgunitId + " "; } private String getSQL( String aggregateOperator, List conditions, List operators )