Merge pull request #448 from jembi/COM-997

COM-997 Include only patients with TB suspected in TB report
jembi · Mar 18, 2021 · 9ceba2e · 9ceba2e
2 parents bb0005c + a15df61
commit 9ceba2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/openmrs/apps/reports/GEORGETOWN_TB_REPORT/sql/georgetownTbReport.sql b/openmrs/apps/reports/GEORGETOWN_TB_REPORT/sql/georgetownTbReport.sql
@@ -17,4 +17,4 @@ SELECT
 FROM patient p, (SELECT @a:= 0) AS a
 WHERE
     getDateTBPosDiagnose(p.patient_id) IS NOT NULL AND
-    getObsCodedValue(p.patient_id, "f0447183-d13f-463d-ad0f-1f45b99d97cc") LIKE "Yes%";
+    getObsCodedValue(p.patient_id, "61931c8b-0637-40f9-97dc-07796431dd3b") = "Suspected / Probable";
diff --git a/...test/java/org/jembi/bahmni/report_testing/georgetown_reports/GeorgetownTBReportTests.java b/...test/java/org/jembi/bahmni/report_testing/georgetown_reports/GeorgetownTBReportTests.java
@@ -74,6 +74,12 @@ public void patientThatIsScreenedAndTBPositive_shouldBeIncludedToTheReport() thr
             ConceptEnum.YES,
             encounterId);
 
+        testDataGenerator.tbForm.setTBScreeningResult(
+            patientId,
+            new LocalDateTime(2020, 1, 6, 10, 0),
+            ConceptEnum.SUSPECTED_PROBABLE,
+            encounterId);
+
         testDataGenerator.tbForm.setMTBConfirmation(
             patientId,
             new LocalDateTime(2020, 1, 6, 10, 0),