=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2013-04-21 18:28:51 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2013-04-21 19:11:49 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.dataelement.DataElement.DOMAIN_TYPE_AGGREGATE; import static org.hisp.dhis.system.util.TextUtils.getQuotedCommaDelimitedString; import java.util.ArrayList; @@ -165,6 +166,7 @@ "left join categoryoptioncombo co on dv.categoryoptioncomboid=co.categoryoptioncomboid " + "left join period pe on dv.periodid=pe.periodid " + "where de.valuetype='" + valueType + "' " + + "and de.domaintype='" + DOMAIN_TYPE_AGGREGATE + "' " + "and pe.startdate >= '" + start + "' " + "and pe.startdate <= '" + end + "' " + "and dv.value is not null " +