diff --git a/src/forms/followup/followup.json b/src/forms/followup/followup.json index 7942ff3d..3b81d716 100644 --- a/src/forms/followup/followup.json +++ b/src/forms/followup/followup.json @@ -1803,11 +1803,11 @@ "answers": [ { "concept": "159468AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Physically able to work" + "label": "Working" }, { "concept": "160026AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Patient ambulatory" + "label": "Ambulatory" }, { "concept": "162752AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", diff --git a/src/forms/intake-a/intake-a.json b/src/forms/intake-a/intake-a.json index 4b54f34f..03afb2e5 100644 --- a/src/forms/intake-a/intake-a.json +++ b/src/forms/intake-a/intake-a.json @@ -456,7 +456,7 @@ "validators": [] }, { - "label": "Occupation", + "label": "Marital Status", "type": "obs", "required": false, "id": "childsCareGiverMaritalStatus", diff --git a/src/pages/post-exposure/tabs/post-exposure-followup.component.tsx b/src/pages/post-exposure/tabs/post-exposure-followup.component.tsx index cc4fcf6f..0e6a3286 100644 --- a/src/pages/post-exposure/tabs/post-exposure-followup.component.tsx +++ b/src/pages/post-exposure/tabs/post-exposure-followup.component.tsx @@ -38,6 +38,20 @@ const columns = [ return getData(encounter, "21ea1d83-acd7-4c99-b4cc-33a90e6dd7d7"); }, }, + { + key: "sideEffect", + header: "Side Effect", + getValue: (encounter) => { + return getData(encounter, "164377AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); + }, + }, + { + key: "remark", + header: "Remark", + getValue: (encounter) => { + return getData(encounter, "161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); + }, + }, { key: "actions", header: "Actions", diff --git a/src/pages/post-exposure/tabs/post-exposure-registration.component.tsx b/src/pages/post-exposure/tabs/post-exposure-registration.component.tsx index 13c66533..63e1bc42 100644 --- a/src/pages/post-exposure/tabs/post-exposure-registration.component.tsx +++ b/src/pages/post-exposure/tabs/post-exposure-registration.component.tsx @@ -32,13 +32,26 @@ const columns = [ }, }, { - key: "eligible", - header: "Eligible", + key: "sourcePerson", + header: "Source Person Status", getValue: (encounter) => { - return getData(encounter, "78dc1be4-4668-4170-b994-fc5e9a697e56"); + return getData(encounter, "dc23b554-65b1-479a-aeeb-b47dc9fc2f7e"); }, - } - , + }, + { + key: "pepRegimen", + header: "PEP Regimen", + getValue: (encounter) => { + return getData(encounter, "17c0da08-509d-483f-905c-01c0c9ddd72a"); + }, + }, + { + key: "timeBetweenExposure", + header: "Time b/n Exposure & PEP", + getValue: (encounter) => { + return getData(encounter, "0885bb1e-6a2e-47d0-a597-8e8da07e4e59"); + }, + }, { key: "actions", header: "Actions",