diff --git a/src/forms/family-members/1.0.json b/src/forms/family-members/1.0.json index 8f7dd2fd..ff2a429f 100644 --- a/src/forms/family-members/1.0.json +++ b/src/forms/family-members/1.0.json @@ -294,15 +294,6 @@ }, "id": "hasFamilyMember" }, - { - "label": "Family member details", - "type": "obsGroup", - "questionOptions": { - "rendering": "repeating", - "concept": "23ad6d16-d8a5-46fa-ac98-dfab4db06d1a" - }, - "id": "group", - "questions": [ { "label": "Relationship type", "type": "obs", @@ -399,57 +390,34 @@ { "label": "Gender", "type": "obs", + "required": false, + "id": "familyMemberGender", "questionOptions": { "rendering": "radio", - "concept": "ec4ceae1-36cf-40eb-8b68-67f8145ef324", + "concept": "1533AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "conceptMappings": [ + { + "relationship": "SAME-AS", + "type": "LOINC", + "value": "72143-4" + }, + { + "relationship": "SAME-AS", + "type": "CIEL", + "value": "1533" + } + ], "answers": [ { "concept": "1534AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Male", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "248153007" - }, - { - "type": "SNOMED-CT", - "value": "248153007" - }, - { - "type": "PIH", - "value": "2843" - }, - { - "type": "PIH", - "value": "2843" - } - ] + "label": "Male" }, { "concept": "1535AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Female", - "conceptMappings": [ - { - "type": "PIH", - "value": "2844" - }, - { - "type": "SNOMED-CT", - "value": "248152002" - }, - { - "type": "SNOMED-CT", - "value": "248152002" - }, - { - "type": "PIH", - "value": "2844" - } - ] + "label": "Female" } ] - }, - "id": "familyMemberGender" + } }, { "label": "Health status", @@ -480,127 +448,22 @@ { "label": "Counseled for HIV", "type": "obs", + "required": false, + "id": "counselledForHIV", "questionOptions": { "rendering": "radio", - "concept": "de32152d-93b0-412a-908a-20af0c46f215", + "concept": "ff9eccda-485e-4044-ad92-414e97b279c0", "answers": [ { "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - } - ] + "label": "Yes" }, { "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH", - "value": "1066" - } - ] - }, - { - "concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Unknown", - "conceptMappings": [ - { - "type": "AMPATH", - "value": "1067" - }, - { - "type": "CIEL", - "value": "1067" - }, - { - "type": "SNOMED-CT", - "value": "261665006" - }, - { - "type": "PIH", - "value": "1067" - }, - { - "type": "org.openmrs.module.mdrtb", - "value": "UNKNOWN" - }, - { - "type": "AMPATH", - "value": "1067" - }, - { - "type": "PIH", - "value": "1067" - }, - { - "type": "SNOMED CT", - "value": "CT: 261665006" - } - ] + "label": "No" } ] - }, - "id": "counselledForHIV" + } }, { "label": "Counselation date", @@ -1097,8 +960,6 @@ }, "id": "remark" } - ] - } ] } ] diff --git a/src/forms/followup/2.1.json b/src/forms/followup/2.1.json index 47c85477..59d6bea1 100644 --- a/src/forms/followup/2.1.json +++ b/src/forms/followup/2.1.json @@ -3208,125 +3208,19 @@ "label": "TB screened ?", "type": "obs", "questionOptions": { - "rendering": "radio", - "concept": "f8868467-bd15-4576-9da8-bfb8ef64ea17", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "171126009" - }, - { - "type": "OCT", - "value": "TuberculosisScreening" - }, - { - "type": "CIEL", - "value": "164800" - }, - { - "type": "SNOMED-CT", - "value": "171126009" - } - ], - "answers": [ - { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - } - ] - }, - { - "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "PIH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "CIEL", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - } - ] - } - ] - }, + "rendering": "radio", + "concept": "feebf47b-c11e-4fa7-bb4b-1a9fc444bcc9", + "answers": [ + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, "id": "tbScreened" }, { @@ -6592,7 +6486,7 @@ "type": "obs", "questionOptions": { "rendering": "eth-date", - "concept": "c541f044-4cdb-4302-b15c-b9901b22f20e", + "concept": "beeede36-cae4-4f6e-b4b9-e39e37353a82", "weeksList": "" }, "hide": { @@ -10116,26 +10010,23 @@ "label": "Stage of HIV disclosure for child", "type": "obs", "questionOptions": { - "rendering": "radio", - "concept": "573f93e2-12f6-483e-aa6e-14e9b76b311a", - "answers": [ - { - "concept": "761c9ffb-8a75-44c6-bad3-b62cd700d41c", - "label": "DS1", - "conceptMappings": [] - }, - { - "concept": "13784dde-37e1-4e40-b224-dbc9701bc605", - "label": "DS2", - "conceptMappings": [] - }, - { - "concept": "708acbc1-d493-499c-b3e7-67abd685a943", - "label": "DS3", - "conceptMappings": [] - } - ] - }, + "rendering": "radio", + "concept": "685eaed5-b695-499e-96c5-d9ce95d8b7df", + "answers": [ + { + "concept": "f0b327f3-0566-43a3-9514-18c7c0eec1ea", + "label": "DS1" + }, + { + "concept": "f8f8edc0-ae0a-4ad3-9b8b-a0130bba1340", + "label": "DS2" + }, + { + "concept": "c0dceb55-b133-47e4-a131-3c9fd377dbfc", + "label": "DS3" + } + ] + }, "hide": { "hideWhenExpression": "age > 15" }, @@ -10151,107 +10042,19 @@ "label": "Is the client enrolled to OTZ program", "type": "obs", "questionOptions": { - "rendering": "radio", - "concept": "bb251925-c706-420a-a1d1-58fa2b0e0a7e", - "answers": [ - { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - } - ] - }, - { - "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "PIH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "CIEL", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - } - ] - } - ] - }, + "rendering": "radio", + "concept": "d61f6440-5d4a-4389-a162-61c1ba13963e", + "answers": [ + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, "hide": { "hideWhenExpression": "age < 15" }, @@ -10718,107 +10521,19 @@ "label": "Is CxCa screening counselling given ?", "type": "obs", "questionOptions": { - "rendering": "radio", - "concept": "d22184d3-be1d-43f0-834b-3cedd0b0f6bf", - "answers": [ - { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - } - ] - }, - { - "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "PIH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "CIEL", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - } - ] - } - ] - }, + "rendering": "radio", + "concept": "fc5ec0e6-8e56-4a23-8bf9-fbe464da12c7", + "answers": [ + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, "id": "isCxCaCounsellingGiven" }, { @@ -10836,111 +10551,23 @@ "id": "dateCxCaCounsellingGiven" }, { - "label": "Accepted cervical cancer screenin *", + "label": "Accepted cervical cancer screening *", "type": "obs", "required": "true", "questionOptions": { - "rendering": "radio", - "concept": "fa3c067f-89f3-4e34-a388-b1fb8b7c3cb2", - "answers": [ - { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "SNOMED-CT", - "value": "373066001" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - }, - { - "type": "PIH-Malawi", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - } - ] - }, - { - "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "PIH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "CIEL", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "AMPATH", - "value": "1066" - } - ] - } - ] - }, + "rendering": "radio", + "concept": "1b1dc36e-fe65-4f4b-8304-09fbd9c106ad", + "answers": [ + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, "hide": { "hideWhenExpression": "isCxCaCounsellingGiven !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, @@ -10952,7 +10579,7 @@ "required": "true", "questionOptions": { "rendering": "eth-date", - "concept": "8cb69148-cdce-448e-90c6-f582b5c169da", + "concept": "c7ecf767-325a-41c2-80a7-79c91762ab3e", "weeksList": "" }, "hide": { @@ -11088,45 +10715,25 @@ "type": "obs", "required": "true", "questionOptions": { - "rendering": "radio", - "concept": "e5e99fc7-ff2d-4306-aefd-b87a07fc9ab4", - "conceptMappings": [ - { - "type": "OCT", - "value": "CervicalCancerScreeening_ConvSet" - } - ], - "answers": [ - { - "concept": "165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Yes", - "conceptMappings": [ - { - "type": "CIEL", - "value": "165619" - }, - { - "type": "SNOMED-CT", - "value": "268543007" - } - ] - }, - { - "concept": "165618AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "4461000175108" - }, - { - "type": "CIEL", - "value": "165618" - } - ] - } - ] - }, + "rendering": "radio", + "concept": "01c546b4-e08a-4c0c-82ef-d387cab6bbbf", + "conceptMappings": [ + { + "type": "OCT", + "value": "CervicalCancerScreeening_ConvSet" + } + ], + "answers": [ + { + "concept": "165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Yes" + }, + { + "concept": "165618AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No" + } + ] + }, "hide": { "hideWhenExpression": "acceptedCervicalCancerScreening !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, @@ -11137,26 +10744,23 @@ "type": "obs", "required": "true", "questionOptions": { - "rendering": "select", - "concept": "9bd94bd2-059c-4273-8b6b-31a8e02c6f02", - "answers": [ - { - "concept": "3a8bb4b4-7496-415d-a327-57ae3711d4eb", - "label": "1st time screening", - "conceptMappings": [] - }, - { - "concept": "13c3ee77-4e7c-4224-ae40-0b2727932a0f", - "label": "Re-Screening after previous negative result", - "conceptMappings": [] - }, - { - "concept": "3f4a6148-39c1-4980-81c6-6d703367c4a6", - "label": "Post-treatment follow-up screening", - "conceptMappings": [] - } - ] - }, + "rendering": "select", + "concept": "2c6f75a8-f35c-4671-939e-ebcc680c48a0", + "answers": [ + { + "concept": "165269AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "1st time screening" + }, + { + "concept": "95b18d5a-c722-4312-bb29-d561f909e596", + "label": "Re-Screening after previous negative result" + }, + { + "concept": "d4fd9773-8886-487e-aa59-9a0dd7fb948c", + "label": "Post-treatment follow-up screening" + } + ] + }, "hide": { "hideWhenExpression": "screeningDone !== '165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, @@ -11167,67 +10771,23 @@ "type": "obs", "required": "true", "questionOptions": { - "rendering": "select", - "concept": "53ff5cd0-0f37-4190-87b1-9eb439a15e94", - "answers": [ - { - "concept": "9580690a-0e84-451a-ada9-c4478d999dc2", - "label": "HPV DNA screening & VIA triage", - "conceptMappings": [] - }, - { - "concept": "8304ffef-ac7b-425c-af3b-6ddc4d052ca8", - "label": "VIA", - "conceptMappings": [] - }, - { - "concept": "885AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Cytology", - "conceptMappings": [ - { - "type": "SNOMED-CT", - "value": "90226004" - }, - { - "type": "AMPATH", - "value": "885" - }, - { - "type": "AMPATH", - "value": "41" - }, - { - "type": "CIEL", - "value": "885" - }, - { - "type": "AMPATH", - "value": "41" - }, - { - "type": "CIEL", - "value": "885" - }, - { - "type": "IMO-ProcedureIT", - "value": "1064218" - }, - { - "type": "IMO-ProcedureIT", - "value": "1064218" - }, - { - "type": "AMPATH", - "value": "885" - }, - { - "type": "SNOMED-CT", - "value": "90226004" - } - ] - } - ] - }, + "rendering": "select", + "concept": "c842a287-f94c-48ee-a370-bd6540a0d1af", + "answers": [ + { + "concept": "d3989991-4f6d-4336-9f84-cb4208d39ae6", + "label": "HPV DNA screening & VIA triage" + }, + { + "concept": "19cdb2fa-e25f-48bd-9e86-b00a72f9b4e1", + "label": "VIA" + }, + { + "concept": "885AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Cytology" + } + ] + }, "hide": { "hideWhenExpression": "screeningDone !== '165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, @@ -11321,7 +10881,7 @@ "type": "obs", "questionOptions": { "rendering": "eth-date", - "concept": "2a7bb0f3-1f7a-4815-9ee6-363d504637e1", + "concept": "8b57d62c-c9a3-454a-b1af-929ca69603ce", "weeksList": "" }, "hide": { @@ -11667,7 +11227,7 @@ "required": "true", "questionOptions": { "rendering": "eth-date", - "concept": "b7158b64-a1c8-43bc-a907-0962f202e1bd", + "concept": "f46c7ed3-65c3-451c-a8e1-4c615f795db1", "weeksList": "" }, "hide": { @@ -11927,51 +11487,27 @@ "label": "Colposcopy exam finding", "type": "obs", "questionOptions": { - "rendering": "select", - "concept": "9096a18e-c009-4f4c-b0ba-0605e0f16578", - "answers": [ - { - "concept": "1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Normal / Negative", - "conceptMappings": [ - { - "type": "AMPATH", - "value": "1115" - }, - { - "type": "SNOMED-CT", - "value": "17621005" - }, - { - "type": "AMPATH", - "value": "1115" - }, - { - "type": "SNOMED-CT", - "value": "17621005" - }, - { - "type": "CIEL", - "value": "1115" - }, - { - "type": "CIEL", - "value": "1115" - } - ] - }, - { - "concept": "7fe8d523-fb0d-4435-9c77-547342b1a04f", - "label": "Low grade SIL / Positive", - "conceptMappings": [] - }, - { - "concept": "0e663529-b62f-4680-b886-bc37ca008d60", - "label": "High Grade SIL / Suspicious cancer", - "conceptMappings": [] - } - ] - }, + "rendering": "select", + "concept": "93bf2a3e-1675-44c9-b7ee-b8ba9cb32b22", + "answers": [ + { + "concept": "1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Normal / Negative" + }, + { + "concept": "f0f52e6c-56fa-44c6-a81e-a3a7ac8548c4", + "label": "Low grade SIL / Positive" + }, + { + "concept": "7276fa8a-3bab-4bd7-b647-8e9c8536ef30", + "label": "High Grade SIL / Suspicious cancer" + }, + { + "concept": "1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Not done" + } + ] + }, "hide": { "hideWhenExpression": "hpvScreeningResult !== '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && viaScreeningResult !== '7bc7c4f3-a636-478d-8a3f-65116093e37a' && viaScreeningResult !== 'be297cab-5ae6-4e7c-8657-b82730b7b8f1' && cytologyResult !== '145822AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && cytologyResult !== '912a5c48-8b07-4fd7-b2c3-ccb94fde7c68'" }, @@ -11991,7 +11527,7 @@ "type": "obs", "questionOptions": { "rendering": "select", - "concept": "3a8bb4b4-7496-415d-a327-57ae3711d4eb", + "concept": "c7ca4fc7-8944-4824-84b0-c299d59a89c0", "answers": [ { "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", diff --git a/src/forms/intake-a/2.0.json b/src/forms/intake-a/2.0.json index f0881103..99188016 100644 --- a/src/forms/intake-a/2.0.json +++ b/src/forms/intake-a/2.0.json @@ -1231,28 +1231,25 @@ { "label": "Reason for referral", "type": "obs", + "id": "reason_for_referral", "questionOptions": { "rendering": "radio", - "concept": "2cb28f68-0277-48d7-8b38-8e6cf38a30a9", + "concept": "5f34e705-3574-4b44-b455-d815962026a1", "answers": [ { - "concept": "30458643-b575-4a93-98e8-06a1011633ca", - "label": "To be enrolled as transferred in ART client", - "conceptMappings": [] + "concept": "159811AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "To be enrolled as transferred in ART client" }, { - "concept": "cf055224-fe93-432b-8934-5a11a98ce999", - "label": "To be enrolled as new Pre-ART client", - "conceptMappings": [] + "concept": "164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "To be enrolled as new Pre-ART client" }, { - "concept": "cc786035-c6cf-49ac-b4fb-c849ea07eb33", - "label": "To be enrolled as transferred in Pre-ART client", - "conceptMappings": [] + "concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "To be enrolled as transferred in Pre-ART client" } ] - }, - "id": "reason_for_referral" + } } ] } @@ -1368,15 +1365,18 @@ "label": "Gender", "type": "obs", "required": false, + "id": "careGiverGender", "questionOptions": { "rendering": "radio", - "concept": "ec4ceae1-36cf-40eb-8b68-67f8145ef324", + "concept": "1533AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "conceptMappings": [ { + "relationship": "SAME-AS", "type": "LOINC", "value": "72143-4" }, { + "relationship": "SAME-AS", "type": "CIEL", "value": "1533" } @@ -1391,8 +1391,7 @@ "label": "Female" } ] - }, - "id": "careGiverGender" + } }, { "label": "Relationship", diff --git a/src/forms/phdp/1.0.json b/src/forms/phdp/1.0.json index e3b97227..23448599 100644 --- a/src/forms/phdp/1.0.json +++ b/src/forms/phdp/1.0.json @@ -8,16 +8,6 @@ "label": "Issues Addressed", "isExpanded": "true", "questions": [ - - { - "label": "Group 1", - "type": "obsGroup", - "questionOptions": { - "rendering": "group", - "concept": "246831e5-65e8-411f-aac9-57adcc4fb12c" - }, - "id": "group1", - "questions": [ { "label": "Date", "type": "obs", @@ -49,76 +39,55 @@ { "label": "Issues Addressed", "type": "obs", + "required": false, + "id": "issuesAddressed", "questionOptions": { - "rendering": "checkbox", - "concept": "bbcdc4d4-8e9e-41ab-b197-2b5d97c1a7e0", - "answers": [ - { - "concept": "861a38bc-69cf-48f5-86a5-220d9c92c557", - "label": "Basic HIV & TB Transmission Education", - "conceptMappings": [] - }, - { - "concept": "00c38fb5-f6d3-4ecd-933d-84b8e7a2bc8b", - "label": "Prevention: Abstinence, Safer Sex, Condoms", - "conceptMappings": [] - }, - { - "concept": "379e9981-09db-495e-8809-ed3f5ecea7ae", - "label": "Positive Living", - "conceptMappings": [] - }, - { - "concept": "088303a1-8e4d-436e-b919-e3813f400221", - "label": "Progression of Disease", - "conceptMappings": [] - }, - { - "concept": "fbc970ba-044c-4d48-8114-0d6538560987", - "label": "Available Treatment/ Prophylaxis CPT, IPT,FPT", - "conceptMappings": [] - }, - { - "concept": "53b65b6b-2f57-4955-997c-f7fe8b2e17f8", - "label": "Education on Essentials of ART", - "conceptMappings": [] - }, - { - "concept": "5dd7af11-8660-44ed-82e2-d9c259d381d7", - "label": "Why Complete Adherence Needed", - "conceptMappings": [] - }, - { - "concept": "7cf784f8-8995-4f0d-adf4-3a4911174548", - "label": "Explain Dose, When to Take", - "conceptMappings": [] - }, - { - "concept": "c747f426-b251-4c21-aced-30e48fda4a19", - "label": "What Side Effects & How to Manage", - "conceptMappings": [] - }, - { - "concept": "54bea05b-ccb7-457f-adda-3477c1ff69ec", - "label": "What to Do If One Forgets Dose", - "conceptMappings": [] - } - ] - }, - "id": "issuesAddressed" - } - - ] - }, - { - "label": "Group 2", - "type": "obsGroup", - "questionOptions": { - "rendering": "repeating", - "concept": "23ad6d16-d8a5-46fa-ac98-dfab4db06d1a" - }, - "id": "group2", - "questions": [ + "rendering": "checkbox", + "concept": "5e8e03b1-d6ad-4362-a99a-f610af940f57", + "answers": [ + { + "concept": "bca15fd1-2449-4eb2-9be5-576a5da654a8", + "label": "What to do if one forgets dose" + }, + { + "concept": "7c7c22aa-9ec8-4806-b196-fa654febedfa", + "label": "What side effects and How to manage" + }, + { + "concept": "5226a9de-0171-45ea-bd2d-6479cde1647a", + "label": "Why complete adherence needed" + }, + { + "concept": "8b428610-e187-49dd-a00a-1d1317c2c129", + "label": "Progression of disease" + }, + { + "concept": "92f0adc7-b087-4cc2-97d7-bc9706659cfc", + "label": "Prevention: Abstinence, Safer sex and Condoms" + }, + { + "concept": "35c006b3-6ff3-4155-a367-8a50e37109ea", + "label": "Positive living" + }, + { + "concept": "b5a43c78-660c-4fb4-9488-01ed5c2ceaaa", + "label": "Explain dose, When to take" + }, + { + "concept": "a4674c1b-af47-4c9b-a8e7-d1c6efc6103a", + "label": "Education on essentials of ART" + }, + { + "concept": "6c5fd1d8-8b2a-43e8-a5f6-d3aac54f72b5", + "label": "Basic HIV and TB transmission education" + }, + { + "concept": "7e2703cc-bb5a-4f16-80c4-a14c51f6fd93", + "label": "Available treatment/Prophylaxis CPT, IPT, FPT" + } + ] + } + }, { "label": "Conclusion", "type": "obs", @@ -128,9 +97,6 @@ }, "id": "conclusion" } - - ] - } ] } ] diff --git a/src/forms/pre-exposure-followup/1.0.json b/src/forms/pre-exposure-followup/1.0.json index a18f6a4f..94abfd4d 100644 --- a/src/forms/pre-exposure-followup/1.0.json +++ b/src/forms/pre-exposure-followup/1.0.json @@ -5,7 +5,7 @@ "label": "Followup", "sections": [ { - "label": "Reapeat HIV Test", + "label": "Repeat HIV Test", "isExpanded": "true", "questions": [ { @@ -79,7 +79,7 @@ "id": "finalTestResult", "questionOptions": { "rendering": "select", - "concept": "e16b0068-b6a2-46b7-aba9-e3be00a7b4ab", + "concept": "40d1c129-5373-4005-95b1-409e56db9743", "conceptMappings": [], "answers": [ { @@ -87,8 +87,8 @@ "label": "Positive" }, { - "concept": "5e4fc757-0b14-49ae-b3b7-419666f41e15", - "label": "Negative result" + "concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Negative" } ] } diff --git a/src/forms/re-test/1.0.json b/src/forms/re-test/1.0.json index 524950e1..bb5a9f46 100644 --- a/src/forms/re-test/1.0.json +++ b/src/forms/re-test/1.0.json @@ -422,7 +422,7 @@ "type": "obs", "questionOptions": { "rendering": "text", - "concept": "07b06c66-7eaa-40d0-b9a5-1cbf167e97b6" + "concept": "a0285e3d-0ded-4dd2-9e4c-8588de3a052d" }, "hide": { "hideWhenExpression": "entryPoint !== '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"