Merge pull request #1641 from jecihjoy/openmrs-2.6.0-upgrade

Update referredAndLinkedSinceThreeMonthsAgo clients query to support platform 2.6
palladiumkenya · Aug 22, 2023 · acab982 · acab982
2 parents 789f81f + fc8061a
commit acab982
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...enyaemr/reporting/library/ETLReports/MOH731Greencard/ETLMoh731GreenCardCohortLibrary.java b/...enyaemr/reporting/library/ETLReports/MOH731Greencard/ETLMoh731GreenCardCohortLibrary.java
@@ -1193,8 +1193,8 @@ public CohortDefinition referredAndLinkedSinceThreeMonthsAgo() {
                 "from kenyaemr_etl.etl_hts_referral_and_linkage r\n" +
                 "where (r.ccc_number != '' or r.ccc_number IS NOT NULL)\n" +
                 "  and (r.facility_linked_to != '' or r.facility_linked_to IS NOT NULL)\n" +
-                "  and (r.art_start_date is not null or r.art_start_date != '')\n" +
-                "  and (r.enrollment_date is not null or r.enrollment_date != '')\n" +
+                "  and r.art_start_date is not null \n" +
+                "  and r.enrollment_date is not null \n" +
                 "  and r.visit_date between date_sub(date(DATE_SUB(date(:endDate), INTERVAL DAYOFMONTH(date(:endDate)) - 1 DAY)),\n" +
                 "                                    interval 3 MONTH) and date(:endDate);";
         SqlCohortDefinition cd = new SqlCohortDefinition();