dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6787
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-04-27 20:36:22 +0700
message:
  (patient) cleanup.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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 = "