Fixed Typo in SuppressedWithout EACs

Author: njorocs

api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/CaseSurveillanceReportBuilder.java

@@ -63,7 +63,7 @@ protected DataSetDefinition caseSurveillance() {
         cohortDsd.addColumn("HEI (6-8 weeks) without DNA PCR results", "", ReportUtils.map(publicHealthActionIndicatorLibrary.heiSixToEightWeeksMissingPCRTestsCs(), "startDate=${startDate},endDate=${endDate}"), "");
         cohortDsd.addColumn("HEI (24 months) without a final documented outcome", "", ReportUtils.map(publicHealthActionIndicatorLibrary.hei24MonthsUndocumentedOutcomeCs(), "startDate=${startDate},endDate=${endDate}"), "");
         cohortDsd.addColumn("Delayed viral load testing (Visited facility were eligible for vl but sample not taken)", "", ReportUtils.map(publicHealthActionIndicatorLibrary.delayedVLTestingZeroGracePeriod(), "startDate=${startDate},endDate=${endDate}"), "");
-        cohortDsd.addColumn("Virally Unsuppressed without Enhanced Adherence Counselling", "(No EAC past 2 weeks)", ReportUtils.map(publicHealthActionIndicatorLibrary.txCUrrUnsuppressedWithoutEACCs(), "startDate=${startDate},endDate=${endDate}"), "");
+        cohortDsd.addColumn("Virally Unsuppressed without Enhanced Adherence Counselling", "(No EAC past 2 weeks)", ReportUtils.map(publicHealthActionIndicatorLibrary.txCUrrUnsuppressedWithoutEACs(), "startDate=${startDate},endDate=${endDate}"), "");
 
         return cohortDsd;
 

api/src/main/java/org/openmrs/module/kenyaemr/reporting/library/ETLReports/publicHealthActionReport/PublicHealthActionCohortLibrary.java

@@ -907,7 +907,7 @@ public CohortDefinition unsuppressedWithoutEAC() {
      * @return the indicator
      */
 
-    public CohortDefinition unsuppressedWithoutEACCs() {
+    public CohortDefinition unsuppressedWithoutEACs() {
         String sqlQuery = "SELECT\n" +
                 "    b.patient_id AS unsuppressed_no_eac\n" +
                 "FROM (\n" +
@@ -941,37 +941,25 @@ public CohortDefinition unsuppressedWithoutEACCs() {
                 "      AND e.visit_date <= DATE(:endDate)\n" +
                 ");";
         SqlCohortDefinition cd = new SqlCohortDefinition();
-        cd.setName("allSuppressedWithoutEACCs");
+        cd.setName("allSuppressedWithoutEACs");
         cd.setQuery(sqlQuery);
         cd.addParameter(new Parameter("startDate", "Start Date", Date.class));
         cd.addParameter(new Parameter("endDate", "End Date", Date.class));
         cd.setDescription("Patients with unsuppressed without Enhanced Adherence Counseling");
         return cd;
     }
-	/**
-	 * Number of Tx Curr patients with unsuppressed VL result without Enhanced Adherence Counseling
-	 * @return the indicator
-	 */
-	public CohortDefinition txCUrrUnsuppressedWithoutEAC() {
-		CompositionCohortDefinition cd = new CompositionCohortDefinition();
-		cd.addParameter(new Parameter("startDate", "Start Date", Date.class));
-		cd.addParameter(new Parameter("endDate", "End Date", Date.class));
-		cd.addSearch("txcurr", ReportUtils.map(datimCohortLibrary.currentlyOnArt(), "startDate=${startDate},endDate=${endDate}"));
-		cd.addSearch("unsuppressedWithoutEAC", ReportUtils.map(unsuppressedWithoutEAC(), "startDate=${startDate},endDate=${endDate}"));
-		cd.setCompositionString("txcurr and unsuppressedWithoutEAC");
-		return cd;
-	}
+
     /**
      * Number of Tx Curr patients with unsuppressed VL result without Enhanced Adherence Counseling Case surverillance
      * @return the indicator
      */
-    public CohortDefinition txCUrrUnsuppressedWithoutEACCs() {
+    public CohortDefinition txCUrrUnsuppressedWithoutEACs() {
         CompositionCohortDefinition cd = new CompositionCohortDefinition();
         cd.addParameter(new Parameter("startDate", "Start Date", Date.class));
         cd.addParameter(new Parameter("endDate", "End Date", Date.class));
         cd.addSearch("txcurr", ReportUtils.map(datimCohortLibrary.currentlyOnArt(), "startDate=${startDate},endDate=${endDate}"));
-        cd.addSearch("unsuppressedWithoutEACCs", ReportUtils.map(unsuppressedWithoutEACCs(), "startDate=${startDate},endDate=${endDate}"));
-        cd.setCompositionString("txcurr and unsuppressedWithoutEACCs");
+        cd.addSearch("unsuppressedWithoutEACs", ReportUtils.map(unsuppressedWithoutEACs(), "startDate=${startDate},endDate=${endDate}"));
+        cd.setCompositionString("txcurr and unsuppressedWithoutEACs");
         return cd;
     }
 

api/src/main/java/org/openmrs/module/kenyaemr/reporting/library/ETLReports/publicHealthActionReport/PublicHealthActionIndicatorLibrary.java

@@ -71,13 +71,6 @@ public CohortIndicator unsuppressedWithValidVL() {
     public CohortIndicator unsuppressedWithoutValidVL() {
         return cohortIndicator("Unsuppressed VL result", ReportUtils.map(cohortLibrary.unsuppressedWithoutValidVL(), "startDate=${startDate},endDate=${endDate}"));
     }
-	/**
-	 * Number of patients with unsuppressed VL result without Enhanced Adherence Counseling
-	 * @return the indicator
-	 */
-	public CohortIndicator txCUrrUnsuppressedWithoutEAC() {
-		return cohortIndicator("Tx Curr Unsuppressed VL without EAC", ReportUtils.map(cohortLibrary.txCUrrUnsuppressedWithoutEAC(), "startDate=${startDate},endDate=${endDate}"));
-	}
 
     public CohortIndicator delayedVLTestingZeroGracePeriod() {
         return cohortIndicator("Tx Curr Due for VL sample not taken", ReportUtils.map(cohortLibrary.delayedVLTestingZeroGracePeriod(), "startDate=${startDate},endDate=${endDate}"));
@@ -87,8 +80,8 @@ public CohortIndicator delayedVLTestingZeroGracePeriod() {
      * Tx Curr with unsuppressed VL without EAC
      * @return
      */
-    public CohortIndicator txCUrrUnsuppressedWithoutEACCs() {
-        return cohortIndicator("Tx Curr with unsuppressed VL without EAC", ReportUtils.map(cohortLibrary.txCUrrUnsuppressedWithoutEACCs(), "startDate=${startDate},endDate=${endDate}"));
+    public CohortIndicator txCUrrUnsuppressedWithoutEACs() {
+        return cohortIndicator("Tx Curr with unsuppressed VL without EAC", ReportUtils.map(cohortLibrary.txCUrrUnsuppressedWithoutEACs(), "startDate=${startDate},endDate=${endDate}"));
     }
     /**
      * Number of undocumented LTFU patients