PrEP Screening and Followup Grid Columns updated

CDC-HIS · Feb 5, 2024 · 85f39d5 · 85f39d5
1 parent 9f9825e
commit 85f39d5
Showing 3 changed files with 95 additions and 19 deletions.
diff --git a/src/forms/pre-exposure-screening/pre-exposure-screening.json b/src/forms/pre-exposure-screening/pre-exposure-screening.json
@@ -1496,6 +1496,7 @@
               "label": "Number of first dose day provided",
               "type": "obs",
 							"required": "true",
+              "id": "doseDays",
 							"questionOptions": {
 								"rendering": "select",
 								"concept": "f3911009-1a8f-42ee-bdfc-1e343c2839aa",

diff --git a/src/pages/pre-exposure/tabs/pre-exposure-followup.component.tsx b/src/pages/pre-exposure/tabs/pre-exposure-followup.component.tsx
@@ -14,34 +14,68 @@ import styles from "../../../root.scss";
 
 const columns = [
   {
-    key: "finalResult",
-    header: "Final Test Result",
+    key: "followupDate",
+    header: "Follow-up Date",
     getValue: (encounter) => {
-      return getData(encounter, "e16b0068-b6a2-46b7-aba9-e3be00a7b4ab");
+      return getData(encounter, "5c118396-52dc-4cac-8860-e6d8e4a7f296");
+    },
+  },
+  {
+    key: "finalTestResult",
+    header: "HIV Test Result",
+    getValue: (encounter) => {
+      return getData(encounter, "40d1c129-5373-4005-95b1-409e56db9743");
+    },
+  },
+  {
+    key: "symptomsOfHIVInfection",
+    header: "Sign of HIV?",
+    getValue: (encounter) => {
+      return getData(encounter, "402e8f8c-0931-4e6a-9d53-962ab9519d4d");
+    },
+  },
+  {
+    key: "linkageToHivCare",
+    header: "Linkage to HIV Care",
+    getValue: (encounter) => {
+      return getData(encounter, "02776be4-f96e-40d9-9615-2db00cae6df5");
+    },
+  },
+  {
+    key: "isClientPregnant",
+    header: "Pregnant/BreastFeeding?",
+    getValue: (encounter) => {
+      return getData(encounter, "5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
     },
   },
   {
     key: "followupStatus",
-    header: "Followup status",
+    header: "Follow-up Status",
     getValue: (encounter) => {
       return getData(encounter, "222f64a8-a603-4d2e-b70e-2d90b622bb04");
     },
   },
   {
-    key: "dispensedDose",
-    header: "Dispensed dose",
+    key: "prepRegimen",
+    header: "PrEP Regimen",
+    getValue: (encounter) => {
+      return getData(encounter, "722ff3de-e2d1-4df4-8d05-ca881dc7073b");
+    },
+  },
+  {
+    key: "arvDispensedInDays",
+    header: "Dose Days",
     getValue: (encounter) => {
       return getData(encounter, "f3911009-1a8f-42ee-bdfc-1e343c2839aa");
     },
   },
   {
     key: "nextVisitDate",
-    header: "Next visit date",
+    header: "Next Visit Date",
     getValue: (encounter) => {
-      return getData(encounter, "c596f199-4d76-4eca-b3c4-ffa631c0aee9", true);
+      return getData(encounter, "c596f199-4d76-4eca-b3c4-ffa631c0aee9");
     },
   },
-  ,
   {
     key: "actions",
     header: "Actions",

diff --git a/src/pages/pre-exposure/tabs/pre-exposure-screening.component.tsx b/src/pages/pre-exposure/tabs/pre-exposure-screening.component.tsx
@@ -10,6 +10,20 @@ import styles from "../../../root.scss";
 import { fetchIdentifiers } from "../../../api/api";
 
 const columns = [
+  {
+    key: "screeningDate",
+    header: "Screening Date",
+    getValue: (encounter) => {
+      return getData(encounter, "bd09b775-0294-4775-9615-964d98e06a4f");
+    },
+  },
+  {
+    key: "referredFrom",
+    header: "Referred From",
+    getValue: (encounter) => {
+      return getData(encounter, "e2fc6b60-70e8-4a87-a164-fb175c788330");
+    },
+  },
   {
     key: "hivTestResult",
     header: "HIV Test Result",
@@ -18,27 +32,54 @@ const columns = [
     },
   },
   {
-    key: "stiScreeningResult",
-    header: "STI Screening Result",
+    key: "pregnancyStatus",
+    header: "Pregnant?",
+    getValue: (encounter) => {
+      return getData(encounter, "5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+    },
+  },
+  {
+    key: "selfIdentifyingSexWorker",
+    header: "Self-Identified FSW",
+    getValue: (encounter) => {
+      return getData(encounter, "160579AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+    },
+  },
+  {
+    key: "doYouHaveHIVPositivePartner",
+    header: "HIV+ Partner",
+    getValue: (encounter) => {
+      return getData(encounter, "1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+    },
+  },
+  {
+    key: "typeOfClient",
+    header: "Type of Client",
+    getValue: (encounter) => {
+      return getData(encounter, "166597AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+    },
+  },
+  {
+    key: "prepStartDate",
+    header: "PrEP Start Date",
     getValue: (encounter) => {
-      return getData(encounter, "7a643a93-3f11-4ad0-acfa-b15f2d7c8ddc");
+      return getData(encounter, "163526AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
     },
   },
   {
-    key: "hepititisBTestResult",
-    header: "Hepititis B Test Result",
+    key: "prepPrescribed",
+    header: "PrEP Regimen",
     getValue: (encounter) => {
-      return getData(encounter, "1322AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+      return getData(encounter, "51c2429d-21d7-4319-a27d-7a9b10b8759c");
     },
   },
   {
-    key: "prepStarted",
-    header: "PrEP Started",
+    key: "doseDays",
+    header: "Dose Days",
     getValue: (encounter) => {
-      return getData(encounter, "3b4bc0b2-acbb-4fb5-82eb-6f0479915862");
+      return getData(encounter, "f3911009-1a8f-42ee-bdfc-1e343c2839aa");
     },
   },
-  ,
   {
     key: "actions",
     header: "Actions",