dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9769
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-02-07 21:02:41 +0700
message:
  Add avg/min/max operators in Aggregate Query Builder (DONE).
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.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/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2013-02-07 13:44:38 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2013-02-07 14:02:41 +0000
@@ -29,7 +29,6 @@
 
 import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.AGGRERATION_COUNT;
 import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.AGGRERATION_SUM;
-import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.AGGRERATION_SUM_VALUE;
 import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.OBJECT_PATIENT;
 import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.OBJECT_PATIENT_ATTRIBUTE;
 import static org.hisp.dhis.caseaggregation.CaseAggregationCondition.OBJECT_PATIENT_PROGRAM_STAGE_PROPERTY;
@@ -240,8 +239,8 @@
         sql += "FROM patientdatavalue pdv ";
         sql += "    INNER JOIN programstageinstance psi  ";
         sql += "    ON psi.programstageinstanceid = pdv.programstageinstanceid ";
-        sql += "WHERE executiondate >= '" + DateUtils.getMediumDateString( period.getStartDate() ) + "'  ";
-        sql += "    AND executiondate>='" + DateUtils.getMediumDateString( period.getEndDate() )
+        sql += "WHERE executiondate >='" + DateUtils.getMediumDateString( period.getStartDate() ) + "'  ";
+        sql += "    AND executiondate <='" + DateUtils.getMediumDateString( period.getEndDate() )
             + "' AND pdv.dataelementid=" + aggregationCondition.getDeSum().getId();
 
         if ( aggregationCondition.getAggregationExpression() != null
@@ -250,7 +249,7 @@
             sql = sql + " AND pdv.programstageinstanceid in ( "
                 + convertCondition( aggregationCondition, orgunit, period ) + " ) ";
         }
-
+System.out.println("\n\n --- \n " + sql );
         Collection<Integer> ids = aggregationConditionStore.executeSQL( sql );
         return (ids == null) ? null : ids.iterator().next();
     }
@@ -767,7 +766,7 @@
 
         String condition = "pi.patientid ";
 
-        if ( operator.equals( AGGRERATION_SUM ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid ";
             condition = "psi.programstageinstanceid ";
@@ -797,7 +796,7 @@
             + "INNER JOIN patientdatavalue as pd ON psi.programstageinstanceid = pd.programstageinstanceid "
             + "INNER JOIN programinstance as pi ON pi.programinstanceid = psi.programinstanceid ";
 
-        if ( operator.equals( AGGRERATION_SUM ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid ";
             from = "FROM programstageinstance as psi "
@@ -820,7 +819,7 @@
         String sql = "SELECT distinct(pi.patientid) ";
         String from = "FROM patientattributevalue pi ";
 
-        if ( operator.equals( AGGRERATION_SUM ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid ";
             from = "FROM programstageinstance psi inner join programinstance pi "
@@ -838,7 +837,7 @@
         String where = "WHERE pi.organisationunitid=" + orgunitId + "  AND pi.registrationdate>= '" + startDate + "' "
             + "AND pi.registrationdate <= '" + endDate + "'";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid ";
             from = "FROM programstageinstance psi inner join programinstance pi "
@@ -856,7 +855,7 @@
     {
         String sql = "SELECT distinct(pi.patientid) FROM patient pi WHERE ";
 
-        if ( operator.equals( AGGRERATION_SUM ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid " + "FROM programstageinstance psi inner join programinstance pi "
                 + "on psi.programinstanceid=pi.programinstanceid "
@@ -881,7 +880,7 @@
         String sql = "SELECT distinct(pi.patientid) ";
         String from = "FROM programinstance pi INNER JOIN programstageinstance psi "
             + "ON psi.programinstanceid=pi.programinstanceid ";
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstance ";
             from = "FROM programstageinstance psi ";
@@ -899,7 +898,7 @@
     {
         String sql = "SELECT pi.patientid FROM programinstance as pi ";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid FROM programinstance as pi "
                 + "INNER JOIN programstageinstance psi ON psi.programinstanceid=pi.programinstanceid ";
@@ -915,7 +914,7 @@
         String sql = "SELECT distinct(pi.patientid) FROM programinstance as pi "
             + "inner join patient psi on psi.patientid=pi.patientid ";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             sql = "SELECT psi.programstageinstanceid FROM programinstance as pi "
                 + "INNER JOIN programstageinstance psi ON pi.programinstanceid=psi.programinstanceid ";
@@ -930,7 +929,7 @@
     {
         String select = "SELECT distinct(pi.patientid) ";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             select = "SELECT psi.programstageinstanceid ";
         }
@@ -946,7 +945,7 @@
     {
         String select = "SELECT distinct(pi.patientid) ";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             select = "SELECT psi.programstageinstanceid ";
         }
@@ -973,7 +972,7 @@
     {
         String select = "SELECT distinct(pi.patientid) ";
 
-        if ( operator.equals( AGGRERATION_SUM ) || operator.equals( AGGRERATION_SUM_VALUE ) )
+        if ( !operator.equals( AGGRERATION_COUNT ) )
         {
             select = "SELECT psi.programstageinstanceid ";
         }