=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java' --- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-10-04 15:48:07 +0000 +++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-10-11 14:27:16 +0000 @@ -1000,8 +1000,13 @@ private String getConditionForProgramStage( String programStageId, Collection orgunitIds ) { String sql = " EXISTS ( SELECT _psi.programstageinstanceid FROM programstageinstance _psi " - + "WHERE _psi.programstageinstanceid=psi.programstageinstanceid " + "AND _psi.programstageid=" - + programStageId + " AND _psi.executiondate >= '" + PARAM_PERIOD_START_DATE + + "WHERE _psi.programstageinstanceid=psi.programstageinstanceid "; + if ( !programStageId.equals( IN_CONDITION_GET_ALL ) ) + { + sql += "AND _psi.programstageid=" + programStageId; + } + + sql+= " AND _psi.executiondate >= '" + PARAM_PERIOD_START_DATE + "' AND _psi.executiondate <= '" + PARAM_PERIOD_END_DATE + "' AND _psi.organisationunitid in (" + TextUtils.getCommaDelimitedString( orgunitIds ) + ") "; === modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java' --- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2014-10-07 15:18:38 +0000 +++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2014-10-11 14:27:16 +0000 @@ -168,7 +168,6 @@ message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_ORGUNIT_NAME, organisationunitName ); message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DAYS_SINCE_DUE_DATE, daysSinceDueDate ); - SchedulingProgramObject schedulingProgramObject = new SchedulingProgramObject(); schedulingProgramObject.setProgramStageInstanceId( programstageinstanceid ); schedulingProgramObject.setPhoneNumber( rs.getString( "phonenumber" ) );