diff --git a/src/forms/family-members.json b/src/forms/family-members.json index bda0458..975cbf0 100644 --- a/src/forms/family-members.json +++ b/src/forms/family-members.json @@ -637,13 +637,10 @@ "type": "obs", "questionOptions": { "rendering": "text", - "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "conceptMappings": [ - { - "type": "CIEL", - "value": "164402" - } - ] + "calculate": { + "calculateExpression": "getIdentifier(patient, 'UAN')" + }, + "concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" }, "hide": { "hideWhenExpression": "artStarted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" diff --git a/src/forms/followup.json b/src/forms/followup.json index f7a9724..f25aa8e 100644 --- a/src/forms/followup.json +++ b/src/forms/followup.json @@ -191,31 +191,70 @@ "id": "eligibleDate" }, { - "label": "Why eligible (TI)", + "label": "Transferred-In (check this for all TI cases)", "type": "obs", "questionOptions": { - "calculate": { - "calculateExpression": "resolve(api.getLatestObs(patient.id, '613718f1-ecf2-4228-b9c2-6157d574bd0b', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding?" + "calculate": { + "calculateExpression": "resolve(api.getLatestObs(patient.id, 'cc2dfcbd-e099-47d5-b01c-74caa296ba3c', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding[0]?.code" }, - "rendering": "select", - "concept": "613718f1-ecf2-4228-b9c2-6157d574bd0b", + "rendering": "radio", + "concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c", "answers": [ { - "concept": "163329AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Test and Treatment" - + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" }, { - "concept": "dfec38ad-238a-4f4a-a52f-c96b6becdd26", - "label": "Clinical Staging" + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, + "behaviours": [ + { + "intent": "edit", + "questionOptions": { + "rendering": "radio", + "concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c", + "answers": [ + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + } + } + ], + "id": "transferredInCase" + }, + { + "label": "Why Eligible?", + "type": "obs", + "questionOptions": { + "calculate": { + "calculateExpression": "resolve(api.getLatestObs(patient.id, 'b7b1da64-22f4-4357-9eb8-493b43c02581', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding?" + }, + "rendering": "checkbox", + "concept": "b7b1da64-22f4-4357-9eb8-493b43c02581", + "answers": [ + { + "concept": "b52413a8-cc05-4ce3-8af9-b4a8deda0d1b", + "label": "Test and Treat", + "conceptMappings": [] }, { - "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Transfer in (Check this for all TI cases)" + "concept": "dfec38ad-238a-4f4a-a52f-c96b6becdd26", + "label": "Clinical Staging", + "conceptMappings": [] }, { "concept": "0b4ec9d0-d86a-4978-b3ad-0add037232d7", - "label": "Other (like TB, HBV, Pregnant)" + "label": "Other(like TB, HBV, Pregnant)", + "conceptMappings": [] } ] }, @@ -224,25 +263,23 @@ { "intent": "edit", "questionOptions": { - "rendering": "select", - "concept": "613718f1-ecf2-4228-b9c2-6157d574bd0b", + "rendering": "checkbox", + "concept": "b7b1da64-22f4-4357-9eb8-493b43c02581", "answers": [ { - "concept": "163329AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Test and Treatment" - + "concept": "b52413a8-cc05-4ce3-8af9-b4a8deda0d1b", + "label": "Test and Treat", + "conceptMappings": [] }, { "concept": "dfec38ad-238a-4f4a-a52f-c96b6becdd26", - "label": "Clinical Staging" - }, - { - "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Transfer in (Check this for all TI cases)" + "label": "Clinical Staging", + "conceptMappings": [] }, { "concept": "0b4ec9d0-d86a-4978-b3ad-0add037232d7", - "label": "Other (like TB, HBV, Pregnant)" + "label": "Other(like TB, HBV, Pregnant)", + "conceptMappings": [] } ] } @@ -5725,8 +5762,7 @@ "type": "obs", "questionOptions": { "rendering": "radio", - "concept": "159859AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - + "concept": "8ecc6d15-26dd-4840-8667-a517a93bea5f", "answers": [ { "concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", @@ -5736,6 +5772,10 @@ { "concept": "5e4fc757-0b14-49ae-b3b7-419666f41e15", "label": "Negative" + }, + { + "concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Unknown" } ] }, diff --git a/src/forms/hei-enrollment.json b/src/forms/hei-enrollment.json index eb53b6b..75edd05 100644 --- a/src/forms/hei-enrollment.json +++ b/src/forms/hei-enrollment.json @@ -940,29 +940,23 @@ ] }, { - "label": "Unique ART number", - "type": "obs", - "required": false, - "id": "artNumber", - "questionOptions": { - "rendering": "text", - "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "conceptMappings": [ - { - "relationship": "SAME-AS", - "type": "CIEL", - "value": "164402" - } - ], + "label": "Unique ART number", + "type": "obs", + "questionOptions": { + "rendering": "text", + "calculate": { + "calculateExpression": "getIdentifier(patient, 'UAN')" + }, + "concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "hide": { "hideWhenExpression": "mothersPmtct !== '1a259ed4-15b5-4e23-8382-972f89be84c8'" } - }, + }, "hide": { "hideWhenExpression": "mothersStatus != '6691e136-0289-4d2f-80bf-50ec816e121a'" }, - "validators": [] - } + "id": "artNumber" + } ] }, { @@ -1067,27 +1061,20 @@ "validators": [] }, { - "label": "If on ART, Unique ART number", - "type": "obs", - "required": false, - "id": "ifOnArt", + "label": "If on ART, Unique ART number", + "type": "obs", + "questionOptions": { + "rendering": "text", + "calculate": { + "calculateExpression": "getIdentifier(patient, 'UAN')" + }, + "concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + }, "hide": { "hideWhenExpression": "ifPositive != '95daa4f8-b45d-4dee-b5d0-5f9446d22c19' || fathersStatus == '160432AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, - "questionOptions": { - "rendering": "text", - "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "conceptMappings": [ - { - "relationship": "SAME-AS", - "type": "CIEL", - "value": "164402" - } - ], - "answers": [] - }, - "validators": [] - } + "id": "ifOnArt" + } ] }, { diff --git a/src/forms/intake-a.json b/src/forms/intake-a.json index dd3d63e..2dfcf40 100644 --- a/src/forms/intake-a.json +++ b/src/forms/intake-a.json @@ -1236,7 +1236,7 @@ "label": "To be enrolled as new Pre-ART client" }, { - "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c", "label": "To be enrolled as transferred in Pre-ART client" } ] diff --git a/src/forms/intake-b.json b/src/forms/intake-b.json index a834dc8..2d51f24 100644 --- a/src/forms/intake-b.json +++ b/src/forms/intake-b.json @@ -197,7 +197,7 @@ "label": "Toxoplasmosis of Brain" }, { - "concept": "d02a4fc0-8ef9-47f6-85d6-88c85a471baa", + "concept": "feba334d-46af-4ea6-a82c-fc5cde1ec9bf", "label": "Wasting Syndrome" }, { @@ -2176,9 +2176,14 @@ "label": "STI Symptoms", "conceptMappings": [] }, + { + "concept": "118789AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Dysphagia", + "conceptMappings": [] + }, { "concept": "125225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Dysphagia/Odynophagia, Swallowing Painful", + "label": "Odynophagia, Swallowing Painful", "conceptMappings": [] }, { @@ -3589,7 +3594,7 @@ "label": "HIV encephalopathy" }, { - "concept": "17e3f152-863b-4778-b7ed-341a5b1c907b", + "concept": "feba334d-46af-4ea6-a82c-fc5cde1ec9bf", "label": "HIV Wasting Syndrome" }, { @@ -3858,18 +3863,8 @@ "readonly": "true", "answers": [ { - "concept": "163329AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Test and Treatment", - "conceptMappings": [ - { - "type": "CIEL", - "value": "163329" - }, - { - "type": "CIEL", - "value": "163329" - } - ] + "concept": "b52413a8-cc05-4ce3-8af9-b4a8deda0d1b", + "label": "Test and Treatment" }, { "concept": "cd52d9c3-23b5-4394-872e-9e70c4e66728", diff --git a/src/forms/pre-exposure-followup.json b/src/forms/pre-exposure-followup.json index 73f58f3..02a3cf1 100644 --- a/src/forms/pre-exposure-followup.json +++ b/src/forms/pre-exposure-followup.json @@ -1029,7 +1029,7 @@ "label": "TO" }, { - "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c", "label": "Transfer in (Started in other Facility)" } ] diff --git a/src/forms/pre-exposure-screening.json b/src/forms/pre-exposure-screening.json index ab6b961..0117891 100644 --- a/src/forms/pre-exposure-screening.json +++ b/src/forms/pre-exposure-screening.json @@ -1666,31 +1666,14 @@ "id": "typeOfClient", "questionOptions": { "rendering": "select", - "concept": "166597AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "conceptMappings": [ - { - "relationship": "NARROWER-THAN", - "type": "SNOMED-CT", - "value": "363787002" - }, - { - "relationship": "SAME-AS", - "type": "CIEL", - "value": "166597" - }, - { - "relationship": "SAME-AS", - "type": "KenyaEMR", - "value": "164932" - } - ], + "concept": "da8c5265-2ab4-43f8-af66-ec1c9c8e9d4f", "answers": [ { "concept": "164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Newly Started (started in the facility)" }, { - "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c", "label": "Transfer In (started in another facility)" } ] @@ -1825,22 +1808,15 @@ { "label": "Unique identification code (UIC)", "type": "obs", - "required": false, - "id": "uniqueIdentificaitonCode", "questionOptions": { - "rendering": "number", - "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "conceptMappings": [ - { - "relationship": "SAME-AS", - "type": "CIEL", - "value": "164402" - } - ], - "answers": [] + "rendering": "text", + "calculate": { + "calculateExpression": "getIdentifier(patient, 'UAN')" + }, + "concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" }, - "validators": [] - } + "id": "uniqueIdentificaitonCode" + } ] } ] diff --git a/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx b/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx index 0a28796..f09df32 100644 --- a/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx +++ b/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx @@ -59,7 +59,7 @@ const columns = [ key: "typeOfClient", header: "Type of Client", getValue: (encounter) => { - return getData(encounter, "166597AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); + return getData(encounter, "da8c5265-2ab4-43f8-af66-ec1c9c8e9d4f"); }, }, {