=== 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-03-05 08:00:04 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-03-06 08:58:47 +0000 @@ -829,7 +829,7 @@ return select + "FROM programinstance as pi INNER JOIN programstageinstance psi " + "ON pi.programinstanceid = psi.programinstanceid WHERE pi.programid=" + programId + " " - + "AND psi.organisationunitid = '" + orgunitId + "AND pi.enrollmentdate >= '" + startDate + + "AND psi.organisationunitid = " + orgunitId + " AND pi.enrollmentdate >= '" + startDate + "' AND pi.enrollmentdate <= '" + endDate + "' "; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-05 11:09:36 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-06 08:58:47 +0000 @@ -266,5 +266,5 @@ get_report_as_pdf =Download as PDF set_complete_status = Set complete status orgunit_provided_service = Organisation unit provided service -how_to_search_tabular_report = Quotes (") match phrases.Character values support %%, %=, %= and =. Numeric values support >=, >, <=, <, = and != operators. +how_to_search_tabular_report = Quotes (") match phrases. Text values support %%, %=, %= and =. Numeric values support >=, >, <=, <, = and != operators. syntax_error_in_search_value = Syntax error is in search value \ No newline at end of file