=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java 2010-03-27 22:59:06 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java 2010-03-28 15:31:41 +0000 @@ -109,13 +109,13 @@ final String sql = "SELECT COUNT(completed) FROM ( " + - "SELECT COUNT(sourceid) AS sources " + + "SELECT sourceid, COUNT(sourceid) AS sources " + "FROM datavalue " + "JOIN dataelementoperand USING (dataelementid, categoryoptioncomboid) " + "JOIN datasetoperands USING (dataelementoperandid) " + "WHERE periodid = " + periodId + " " + deadlineCriteria + "AND sourceid IN (" + childrenIds + ") " + - "AND datasetid = " + dataSetId + ") AS completed " + + "AND datasetid = " + dataSetId + " GROUP BY sourceid) AS completed " + "WHERE completed.sources = " + compulsoryElements; return statementManager.getHolder().queryForInteger( sql );