Merge branch 'AMPATH:master' into POC-570

AMPATH · Nov 20, 2023 · 5d067d4 · 5d067d4
2 parents b1ed82f + 00029c2
commit 5d067d4
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
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/programs/patient-program-config.json b/programs/patient-program-config.json
@@ -4444,23 +4444,23 @@
           {
             "uuid": "8d5b2be0-c2cc-11de-8d13-0010c6dffd0f",
             "display": "ADULTRETURN",
-            "allowedIf": "!isViremicHighVL && age > 24",
+            "allowedIf": "age > 24",
             "errors": {
               "viremiaError": "To access clinical forms kindly fill Enhanced Adherence Encounter Form"
             }
           },
           {
             "uuid": "4e7553b4-373d-452f-bc89-3f4ad9a01ce7",
             "display": "YOUTHRETURN",
-            "allowedIf": "!isViremicHighVL && age >= 10 && age <= 24",
+            "allowedIf": "age >= 10 && age <= 24",
             "errors": {
               "viremiaError": "To access clinical forms kindly fill Enhanced Adherence Encounter Form"
             }
           },
           {
             "uuid": "8d5b3108-c2cc-11de-8d13-0010c6dffd0f",
             "display": "PEDSRETURN",
-            "allowedIf": "!isViremicHighVL && age <= 14",
+            "allowedIf": "age <= 14",
             "errors": {
               "viremiaError": "To access clinical forms kindly fill Enhanced Adherence Encounter Form"
             }

diff --git a/programs/scope-builder.service.js b/programs/scope-builder.service.js
@@ -29,7 +29,13 @@ function buildScope(dataDictionary) {
     'db2bdd7c-5fe6-4ea3-adc1-d2d8dfb3d658',
     '17c97881-90e5-43c8-b8a3-cc0322f89a89',
     'e9f515c2-7c48-4099-ac76-41db9977f96f',
-    'f7aabb83-7915-4c24-88b2-bcde8b3a9977'
+    'f7aabb83-7915-4c24-88b2-bcde8b3a9977',
+    '08feae7c-1352-11df-a1f1-0026b9348838',
+    '1ce5034b-f05d-46b6-910f-fc959e091641',
+    '29124daf-6422-4896-b70e-daad3b252c9d',
+    '08fec42a-1352-11df-a1f1-0026b9348838',
+    'a36c86bb-7ca3-4319-8674-28c66ba14deb',
+    '345514ae-8f37-42fc-9bbe-993828c2910d'
   ].includes(dataDictionary.intendedVisitLocationUuid);
   if (dataDictionary.patient) {
     buildPatientScopeMembers(scope, dataDictionary.patient);
@@ -93,7 +99,13 @@ function buildScope(dataDictionary) {
       'db2bdd7c-5fe6-4ea3-adc1-d2d8dfb3d658',
       '17c97881-90e5-43c8-b8a3-cc0322f89a89',
       'e9f515c2-7c48-4099-ac76-41db9977f96f',
-      'f7aabb83-7915-4c24-88b2-bcde8b3a9977'
+      'f7aabb83-7915-4c24-88b2-bcde8b3a9977',
+      '08feae7c-1352-11df-a1f1-0026b9348838',
+      '1ce5034b-f05d-46b6-910f-fc959e091641',
+      '29124daf-6422-4896-b70e-daad3b252c9d',
+      '08fec42a-1352-11df-a1f1-0026b9348838',
+      'a36c86bb-7ca3-4319-8674-28c66ba14deb',
+      '345514ae-8f37-42fc-9bbe-993828c2910d'
     ].includes(dataDictionary.intendedVisitLocationUuid);
   }
 

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: