dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11151
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-06 12:33:02 +0700
message:
  Error when to run aggregate tabular report.
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	2013-05-30 09:08:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-06-06 05:33:02 +0000
@@ -1215,7 +1215,7 @@
             sql += " UNION ";
         }
         sql = sql.substring( 0, sql.length() - 6 );
-        sql += ") ORDER BY orgunit asc ";
+        sql += " ORDER BY orgunit asc ";
         if ( limit != null )
         {
             sql += "LIMIT " + limit;
@@ -1306,7 +1306,7 @@
         }
 
         sql = sql.substring( 0, sql.length() - 6 ) + " ";
-        sql += " ) ORDER BY orgunit asc ";
+        sql += " ORDER BY orgunit asc ";
         if ( limit != null )
         {
             sql += "LIMIT " + limit;
@@ -1395,7 +1395,7 @@
             }
         }
 
-        sql = sql.substring( 0, sql.length() - 10 ) + " ) ";
+        sql = sql.substring( 0, sql.length() - 10 );
         if ( limit != null )
         {
             sql += " LIMIT " + limit;