=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-04-27 10:44:52 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-04-27 13:36:22 +0000 @@ -257,21 +257,6 @@ + "INNER JOIN programstageinstance psi ON pdv.programstageinstanceid=psi.programstageinstanceid " + "INNER JOIN programinstance pi ON pi.programinstanceid=psi.programinstanceid "; - /* if ( !programStage.getProgram().getAnonymous() ) - { - condition += " INNER JOIN patient p ON p.patientid = pi.patientid "; - if ( searchingAttrKeys != null ) - { - condition += "INNER JOIN patientattributevalue as pav ON pav.patientid = p.patientid " - + "INNER JOIN patientattribute as pa ON pa.patientattributeid = pav.patientattributeid "; - } - if ( searchingIdenKeys != null ) - { - condition += "INNER JOIN patientidentifier as pid ON pid.patientid = p.patientid " - + "INNER JOIN patientidentifiertype as pit ON pid.patientidentifiertypeid = pit.patientidentifiertypeid "; - } - } */ - condition += " WHERE psi.executiondate >= '" + DateUtils.getMediumDateString( startDate ) + "' AND psi.executiondate <= '" + DateUtils.getMediumDateString( endDate ) + "' " + " AND psi.organisationunitid in " + splitListHelper( orgunitIds ) + " AND psi.programstageid = "