Merge pull request #517 from nelsonhomo/SESP-315

SESP-315: Include cd4 semi quantitativo

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/queries/TxNewQueries.java

@@ -11,7 +11,7 @@ class QUERY {
             + "SELECT p.patient_id, pg.patient_program_id, MIN(ps.start_date) as minStateDate  FROM patient p  "
             + "inner join patient_program pg on p.patient_id=pg.patient_id "
             + "inner join patient_state ps on pg.patient_program_id=ps.patient_program_id "
-            + "WHERE pg.voided=0 and ps.voided=0 and p.voided=0 and pg.program_id=2 and location_id=:location  and ps.start_date BETWEEN :startDate and :endDate "
+            + "WHERE pg.voided=0 and ps.voided=0 and p.voided=0 and pg.program_id=2 and location_id=:location  and ps.start_date <=:endDate "
             + "GROUP BY pg.patient_program_id) minState "
             + "inner join patient_state ps on ps.patient_program_id=minState.patient_program_id "
             + "where ps.start_date=minState.minStateDate and ps.state=29 and ps.voided=0 ";
@@ -24,7 +24,7 @@ class QUERY {
                 + "INNER JOIN obs obsTrans ON e.encounter_id=obsTrans.encounter_id AND obsTrans.voided=0 AND obsTrans.concept_id=1369 AND obsTrans.value_coded=1065 "
                 + "INNER JOIN obs obsTarv ON e.encounter_id=obsTarv.encounter_id AND obsTarv.voided=0 AND obsTarv.concept_id=6300 AND obsTarv.value_coded=6276 "
                 + "INNER JOIN obs obsData ON e.encounter_id=obsData.encounter_id AND obsData.voided=0 AND obsData.concept_id=23891 "
-                + "WHERE p.voided=0 AND e.voided=0 AND e.encounter_type=53 AND obsData.value_datetime BETWEEN :startDate AND :endDate AND e.location_id=:location GROUP BY p.patient_id "
+                + "WHERE p.voided=0 AND e.voided=0 AND e.encounter_type=53 AND obsData.value_datetime<=:endDate AND e.location_id=:location GROUP BY p.patient_id "
                 + ") tr GROUP BY tr.patient_id ";
 
     public static final String findPatientsWhoAreNewlyEnrolledOnART =

api/src/main/java/org/openmrs/module/eptsreports/reporting/reports/SetupMERQuarterly.java

@@ -82,12 +82,12 @@ public String getExcelDesignUuid() {
 
   @Override
   public String getName() {
-    return "PEPFAR MER 2.7 Quarterly";
+    return "PEPFAR MER 2.8 Quarterly";
   }
 
   @Override
   public String getDescription() {
-    return "PEPFAR MER 2.7 Quarterly";
+    return "PEPFAR MER 2.8 Quarterly";
   }
 
   @Override
@@ -149,8 +149,8 @@ public List<ReportDesign> constructReportDesigns(final ReportDefinition reportDe
       reportDesign =
           this.createXlsReportDesign(
               reportDefinition,
-              "PEPFAR_MER_2.7_Quarterly.xls",
-              "PEPFAR MER 2.7 Quarterly",
+              "PEPFAR_MER_2.8_Quarterly.xls",
+              "PEPFAR MER 2.8 Quarterly",
               this.getExcelDesignUuid(),
               null);
       final Properties props = new Properties();