POC-583: Stop display of the Reminder To Start TPT when the Client is…

… on TB Treatment (#1347)
AMPATH · Nov 16, 2023 · 00029c2 · 00029c2
1 parent c8ab41b
commit 00029c2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/app/reporting-framework/json-reports/clinical-reminder-report.json b/app/reporting-framework/json-reports/clinical-reminder-report.json
@@ -229,6 +229,36 @@
       "alias": "latest_CD4_Date",
       "column": "ls.cd4_1_date"
     },
+    {
+      "type": "simple_column",
+      "alias": "ipt_start_date",
+      "column": "ls.ipt_start_date"
+    },
+    {
+      "type": "simple_column",
+      "alias": "ipt_stop_date",
+      "column": "ls.ipt_stop_date"
+    },
+    {
+      "type": "simple_column",
+      "alias": "on_ipt",
+      "column": "ls.on_ipt"
+    },
+    {
+      "type": "simple_column",
+      "alias": "ipt_completion_date",
+      "column": "ls.ipt_completion_date"
+    },
+    {
+      "type": "simple_column",
+      "alias": "tb_tx_start_date",
+      "column": "ls.tb_tx_start_date"
+    },
+    {
+      "type": "simple_column",
+      "alias": "tb_tx_end_date",
+      "column": "ls.tb_tx_end_date"
+    },
     {
       "type": "simple_column",
       "alias": "on_tb_tx",

diff --git a/service/patient-reminder.service.js b/service/patient-reminder.service.js
@@ -463,7 +463,8 @@ function TPTReminders(data) {
   if (
     calculateAge(data.birth_date) >= 1 &&
     !data.ipt_start_date &&
-    !data.on_tb_tx
+    !data.on_tb_tx &&
+    !(data.tb_tx_start_date && !data.tb_tx_end_date)
   ) {
     reminders.push({
       message: