=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java' --- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-20 07:03:51 +0000 +++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-22 15:22:59 +0000 @@ -159,7 +159,7 @@ { String col = statementBuilder.columnQuote( item.getItemId() ); - String joinClause = item.hasFilter() ? "inner join" : "full outer join"; //TODO left join? + String joinClause = item.hasFilter() ? "inner join" : "left join"; sql += joinClause + " trackedentityattributevalue as " + col + " " + @@ -205,7 +205,7 @@ if ( params.hasProgram() ) { sql += - hlp.whereAnd() + " exists ( select trackedentityinstanceid from programinstance pi " + + hlp.whereAnd() + " exists (select trackedentityinstanceid from programinstance pi " + "where pi.trackedentityinstanceid=tei.trackedentityinstanceid " + "and pi.programid = " + params.getProgram().getId() + ") "; }