From 50b81e93e8a03242ed87f7025ed43f5379ba1a09 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Wed, 12 Jul 2023 07:12:33 -0500 Subject: [PATCH 1/7] add ui-select-extended test form --- .../ui_select_extended_test_v1.0.json | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 distro/configuration/ampathforms/ui_select_extended_test_v1.0.json diff --git a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json new file mode 100644 index 000000000..012599a3c --- /dev/null +++ b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json @@ -0,0 +1,61 @@ +{ + "name": "UI-Select-Extended Test", + "pages": [ + { + "label": "Page 1", + "sections": [ + { + "label": "Section 1", + "isExpanded": "true", + "questions": [ + { + "label": "Test Text", + "type": "obs", + "required": false, + "id": "test_text", + "questionOptions": { + "rendering": "text", + "concept": "161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "conceptMappings": [ + { + "relationship": "SAME-AS", + "type": "CIEL", + "value": "161011" + } + ], + "answers": [] + }, + "validators": [] + }, + { + "label": "Provider", + "type": "obs", + "id": "encounter_provider", + "questionOptions": { + "concept": "5619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "rendering": "ui-select-extended", + "datasource": "encounter-provider" + }, + "behaviours":[ + { + "intent":"*", + "required":"true", + "unspecified":"true", + "hide":{ + "hideWhenExpression":"false" + } + } + ] + } + ] + } + ] + } + ], + "processor": "EncounterFormProcessor", + "encounterType": "111c2104-991d-4b58-a30e-ce84bb275534", + "referencedForms": [], + "uuid": "4ba0e45a-a614-4b90-9b77-2b7ee26380bb", + "version": "1.0", + "description": "Test" + } \ No newline at end of file From caa9b2151e2edd0f3d9fd836b2a91be1d335bfa2 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Wed, 12 Jul 2023 08:16:50 -0500 Subject: [PATCH 2/7] add extra parameters --- .../ampathforms/ui_select_extended_test_v1.0.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json index 012599a3c..9bd9d9f61 100644 --- a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json +++ b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json @@ -1,5 +1,9 @@ { "name": "UI-Select-Extended Test", + "version": "1.0", + "published": true, + "retired": false, + "encounter": "UI select extended test", "pages": [ { "label": "Page 1", @@ -56,6 +60,5 @@ "encounterType": "111c2104-991d-4b58-a30e-ce84bb275534", "referencedForms": [], "uuid": "4ba0e45a-a614-4b90-9b77-2b7ee26380bb", - "version": "1.0", "description": "Test" } \ No newline at end of file From 42f272ccab6f352b7f4e3f498df2fdfd4e3a5c54 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Wed, 12 Jul 2023 09:25:11 -0500 Subject: [PATCH 3/7] add encounter type --- distro/configuration/encountertypes/encountertypes.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/configuration/encountertypes/encountertypes.csv b/distro/configuration/encountertypes/encountertypes.csv index 8436f3410..c87e55b4e 100644 --- a/distro/configuration/encountertypes/encountertypes.csv +++ b/distro/configuration/encountertypes/encountertypes.csv @@ -41,3 +41,4 @@ a221448d-512b-4750-84bf-d29be9f802b3,,HIV Program Status,To hold computed Obs fo 6dc5308d-27c9-4d49-b16f-2c5e3c759757,,Labor and Delivery,Labor and delivery visit by a mother,,, 4362fd2d-1866-4ea0-84ef-5e5da9627440,,Postnatal,Post natal visit by a mother,,, f3d92c68-27e3-4395-b002-5db5f3ca4ef7,,HIV Exposed Infant,HIV Exposed Infant encounter,,, +f9b52289-3d6d-4a87-ae45-d014d64c8693,,UI select extended test,UI select extended test,,, \ No newline at end of file From ca788de26aa0e6f35d837733176446677bfcc4e1 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Thu, 13 Jul 2023 01:21:34 -0500 Subject: [PATCH 4/7] add more test fields --- .../ui_select_extended_test_v1.0.json | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json index 9bd9d9f61..986231733 100644 --- a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json +++ b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json @@ -50,6 +50,65 @@ } } ] + }, + { + "label": "Concept", + "type": "obs", + "id": "concept_picker", + "questionOptions": { + "concept": "5624AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "rendering": "ui-select-extended", + "datasource": "concept-ds", + "isSearchable": "true" + }, + "behaviours":[ + { + "intent":"*", + "required":"true", + "unspecified":"true", + "hide":{ + "hideWhenExpression":"false" + } + } + ] + }, + { + "label": "Test Text 2", + "type": "obs", + "required": false, + "id": "test_text2", + "questionOptions": { + "rendering": "text", + "concept": "161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "conceptMappings": [ + { + "relationship": "SAME-AS", + "type": "CIEL", + "value": "161011" + } + ], + "answers": [] + }, + "validators": [] + }, + { + "label": "Test Text 3", + "type": "obs", + "required": false, + "id": "test_text3", + "questionOptions": { + "rendering": "text", + "concept": "161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "conceptMappings": [ + { + "relationship": "SAME-AS", + "type": "CIEL", + "value": "161011" + } + ], + "answers": [] + }, + "validators": [] } ] } From b8d62b9516ab7bf111d5ffb4ea3d72149b96b882 Mon Sep 17 00:00:00 2001 From: AJAL ODORA JONATHAN <43242517+ODORA0@users.noreply.github.com> Date: Sun, 16 Jul 2023 11:11:21 +0300 Subject: [PATCH 5/7] OHRI-1653 HIV Testing form Corrections --- .../ampathforms/hts_hiv_testing_v1.0.json | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/distro/configuration/ampathforms/hts_hiv_testing_v1.0.json b/distro/configuration/ampathforms/hts_hiv_testing_v1.0.json index 6f9b820a1..735ee3b95 100644 --- a/distro/configuration/ampathforms/hts_hiv_testing_v1.0.json +++ b/distro/configuration/ampathforms/hts_hiv_testing_v1.0.json @@ -50,7 +50,29 @@ "concept": "de32152d-93b0-412a-908a-20af0c46f215", "answers": [ { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "label": "No", + "conceptMappings": [ + { + "type": "PIH", + "value": "1066" + }, + { + "type": "PIH-Malawi", + "value": "1066" + }, + { + "type": "SNOMED-CT", + "value": "373067005" + }, + { + "type": "AMPATH", + "value": "1066" + } + ] + }, + { + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes", "conceptMappings": [ { @@ -76,24 +98,12 @@ ] }, { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", + "concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Unknown", "conceptMappings": [ { - "type": "PIH", - "value": "1066" - }, - { - "type": "PIH-Malawi", - "value": "1066" - }, - { - "type": "SNOMED-CT", - "value": "373067005" - }, - { - "type": "AMPATH", - "value": "1066" + "type": "HL7-MedicationDispenseStatus", + "value": "unknown" } ] } @@ -105,7 +115,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "isEmpty(eligibleHIVTesting) || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "false" } } ], @@ -141,7 +151,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "preTestCounsellingConducted !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "preTestCounsellingConducted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ], @@ -155,7 +165,7 @@ "concept": "1710AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "answers": [ { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes", "conceptMappings": [ { @@ -181,7 +191,7 @@ ] }, { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "No", "conceptMappings": [ { @@ -210,7 +220,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "isEmpty(eligibleHIVTesting) || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "false" } } ], @@ -224,7 +234,7 @@ "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "answers": [ { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes", "conceptMappings": [ { @@ -250,7 +260,7 @@ ] }, { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "No", "conceptMappings": [ { @@ -296,7 +306,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "isEmpty(hivTestConducted) || hivTestConducted !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "hivTestConducted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, "validators": [ { @@ -427,7 +437,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "hivTestConducted !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "hivTestConducted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ], @@ -517,7 +527,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "hivTestConducted !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'" + "hideWhenExpression": "hivTestConducted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] @@ -1161,7 +1171,7 @@ "required": "true", "unspecified": "false", "hide": { - "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' || hivTestConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || hivTestConducted === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] @@ -1618,7 +1628,7 @@ "required": "true", "unspecified": "false", "hide": { - "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' || hivTestConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || hivTestConducted === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] @@ -1857,7 +1867,7 @@ "required": "true", "unspecified": "false", "hide": { - "hideWhenExpression": "finalHIVTestResult !== '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || secondHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || firstHivTestRDTRepeatDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || thirdHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' || hivTestConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "finalHIVTestResult !== '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || secondHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || firstHivTestRDTRepeatDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || thirdHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hivTestConducted === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] @@ -1887,7 +1897,7 @@ ], "answers": [ { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes", "conceptMappings": [ { @@ -1913,7 +1923,7 @@ ] }, { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "No", "conceptMappings": [ { @@ -2428,7 +2438,7 @@ "required": "true", "unspecified": "false", "hide": { - "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594' || secondHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || firstHivTestRDTRepeatDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || thirdHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || eligibleHIVTesting !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' || hivTestConducted === '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "preTestCounselingConsent === '488b58ff-64f5-4f8a-8979-fa79940b1594' || preTestCounsellingConducted === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || secondHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || firstHivTestRDTRepeatDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || thirdHivTestDone === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] From cbe14ed8754f9cb88225d652d20f032864f49e32 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Thu, 20 Jul 2023 06:57:05 -0500 Subject: [PATCH 6/7] fix toggle for CD4 Lab results and Viral load lab results sub forms in the clinical visit form --- .../ampathforms/ct_cd4_lab_results_v1.0.json | 72 +--------- .../ampathforms/ct_clinical_visit_v2.0.json | 136 +++++++++++++++++- .../ct_viral_load_results_v1.0.json | 74 +--------- .../ui_select_extended_test_v1.0.json | 2 +- 4 files changed, 143 insertions(+), 141 deletions(-) diff --git a/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json b/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json index 1c53296b0..0455f0e4c 100644 --- a/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json +++ b/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json @@ -11,70 +11,6 @@ "label": "CD4 Lab Result", "isExpanded": "true", "questions": [ - { - "label": "CD4 Lab Results", - "type": "obs", - "questionOptions": { - "rendering": "toggle", - "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", - "toggleOptions": { - "labelTrue": "Yes", - "labelFalse": "No" - }, - "conceptMappings": [ - { - "type": "OCT", - "value": "LabOrdered" - } - ], - "answers": [ - { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", - "label": "Yes", - "conceptMappings": [ - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - } - ] - }, - { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", - "conceptMappings": [] - } - ] - }, - "id": "cd4Lab", - "behaviours": [ - { - "intent": "*", - "required": "false", - "hide": { - "hideWhenExpression": "true" - } - }, - { - "intent": "CD4_LAB_RESULTS_EMBED", - "required": "false", - "hide": { - "hideWhenExpression": "false" - } - } - ] - }, { "label": "Test Result Date", "type": "obs", @@ -108,7 +44,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -162,7 +98,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -190,7 +126,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -225,7 +161,7 @@ "required": "true", "unspecified": "true", "hide": { - "hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json index 451d58e3d..cf1dcc326 100644 --- a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json +++ b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json @@ -9067,6 +9067,120 @@ "id": "attendingClinicianName" } ] + }, + { + "label": "Lab Results", + "isExpanded": "true", + "questions": [ + { + "label": "CD4 Lab Results", + "type": "obs", + "questionOptions": { + "rendering": "toggle", + "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", + "toggleOptions": { + "labelTrue": "Yes", + "labelFalse": "No" + }, + "conceptMappings": [ + { + "type": "OCT", + "value": "LabOrdered" + } + ], + "answers": [ + { + "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "label": "Yes", + "conceptMappings": [ + { + "type": "CIEL", + "value": "1065" + }, + { + "type": "AMPATH", + "value": "1065" + }, + { + "type": "PIH", + "value": "1065" + }, + { + "type": "SNOMED CT", + "value": "CT: 373066001" + } + ] + }, + { + "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "label": "No", + "conceptMappings": [] + } + ] + }, + "id": "cd4LabResultsToggle", + "behaviours": [ + { + "intent": "*", + "required": "false" + } + ] + }, + { + "label": "Viral Lab Results", + "type": "obs", + "questionOptions": { + "rendering": "toggle", + "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", + "toggleOptions": { + "labelTrue": "Yes", + "labelFalse": "No" + }, + "conceptMappings": [ + { + "type": "OCT", + "value": "LabOrdered" + } + ], + "answers": [ + { + "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "label": "Yes", + "conceptMappings": [ + { + "type": "CIEL", + "value": "1065" + }, + { + "type": "AMPATH", + "value": "1065" + }, + { + "type": "PIH", + "value": "1065" + }, + { + "type": "SNOMED CT", + "value": "CT: 373066001" + } + ] + }, + { + "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "label": "No", + "conceptMappings": [] + } + ] + }, + "id": "viralLabResultsToggle", + "behaviours": [ + { + "intent": "*", + "required": "false" + } + ] + } + ] } ] }, @@ -9084,7 +9198,15 @@ "readonly": "false" } ] - } + }, + "behaviours": [ + { + "intent": "*", + "hide": { + "hideWhenExpression": "cd4LabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + } + } + ] }, { "label": "Lab results - Viral Load", @@ -9100,7 +9222,15 @@ "readonly": "false" } ] - } + }, + "behaviours": [ + { + "intent": "*", + "hide": { + "hideWhenExpression": "viralLabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + } + } + ] } ], "availableIntents": [ @@ -9115,4 +9245,4 @@ "encounterType": "cb0a65a7-0587-477e-89b9-cf2fd144f1d4", "encounter": "Clinical Visit", "allowUnspecifiedAll": true -} +} \ No newline at end of file diff --git a/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json b/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json index 8cfefa620..e1159b2c6 100644 --- a/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json +++ b/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json @@ -11,70 +11,6 @@ "label": "Viral Load", "isExpanded": "true", "questions": [ - { - "label": "Viral Load", - "type": "obs", - "questionOptions": { - "rendering": "toggle", - "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", - "toggleOptions": { - "labelTrue": "Yes", - "labelFalse": "No" - }, - "conceptMappings": [ - { - "type": "OCT", - "value": "LabOrdered" - } - ], - "answers": [ - { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", - "label": "Yes", - "conceptMappings": [ - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - } - ] - }, - { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", - "conceptMappings": [] - } - ] - }, - "id": "viralLoad", - "behaviours": [ - { - "intent": "*", - "required": "false", - "hide": { - "hideWhenExpression": "true" - } - }, - { - "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", - "required": "false", - "hide": { - "hideWhenExpression": "false" - } - } - ] - }, { "label": "Test Result Date", "type": "obs", @@ -107,7 +43,7 @@ "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", "required": "true", "hide": { - "hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -227,7 +163,7 @@ "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", "required": "true", "hide": { - "hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -326,7 +262,7 @@ "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", "required": "true", "hide": { - "hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -394,7 +330,7 @@ "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", "required": "true", "hide": { - "hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -428,7 +364,7 @@ "intent": "VIRAL_LOAD_LAB_RESULTS_EMBED", "required": "true", "hide": { - "hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] diff --git a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json index 986231733..86b375eb8 100644 --- a/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json +++ b/distro/configuration/ampathforms/ui_select_extended_test_v1.0.json @@ -36,7 +36,7 @@ "type": "obs", "id": "encounter_provider", "questionOptions": { - "concept": "5619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "4ce744c0-0e6f-46ed-99c8-7aa15a925fb7", "rendering": "ui-select-extended", "datasource": "encounter-provider" }, From 89bfadab925fc26168fdb371d3d07121e00e5484 Mon Sep 17 00:00:00 2001 From: kajambiya Date: Thu, 20 Jul 2023 08:05:51 -0500 Subject: [PATCH 7/7] fix lab order sub form in covid case assessment form --- .../covid_case_assessment_v1.0.json | 69 ++++++++++++++- .../ampathforms/covid_lab_order_v1.0.json | 83 ++----------------- 2 files changed, 74 insertions(+), 78 deletions(-) diff --git a/distro/configuration/ampathforms/covid_case_assessment_v1.0.json b/distro/configuration/ampathforms/covid_case_assessment_v1.0.json index a328fb9bf..fb504b3c5 100644 --- a/distro/configuration/ampathforms/covid_case_assessment_v1.0.json +++ b/distro/configuration/ampathforms/covid_case_assessment_v1.0.json @@ -1970,6 +1970,65 @@ ] } ] + }, + { + "label": "Lab Order Details", + "isExpanded": "true", + "questions": [ + { + "label": "Add Covid Lab Order?", + "type": "obs", + "questionOptions": { + "rendering": "toggle", + "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", + "toggleOptions": { + "labelTrue": "Yes", + "labelFalse": "No" + }, + "conceptMappings": [ + { + "type": "OCT", + "value": "LabOrdered" + } + ], + "answers": [ + { + "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "label": "Yes", + "conceptMappings": [ + { + "type": "CIEL", + "value": "1065" + }, + { + "type": "AMPATH", + "value": "1065" + }, + { + "type": "PIH", + "value": "1065" + }, + { + "type": "SNOMED CT", + "value": "CT: 373066001" + } + ] + }, + { + "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "label": "No", + "conceptMappings": [] + } + ] + }, + "id": "labOrderToggle", + "behaviours": [ + { + "intent": "*", + "required": "false" + } + ] + }] } ] }, @@ -1992,7 +2051,15 @@ "readonly": "true" } ] - } + }, + "behaviours": [ + { + "intent": "*", + "hide": { + "hideWhenExpression": "labOrderToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + } + } + ] } ], "availableIntents": [ diff --git a/distro/configuration/ampathforms/covid_lab_order_v1.0.json b/distro/configuration/ampathforms/covid_lab_order_v1.0.json index b644db8fb..b404b95dd 100644 --- a/distro/configuration/ampathforms/covid_lab_order_v1.0.json +++ b/distro/configuration/ampathforms/covid_lab_order_v1.0.json @@ -11,77 +11,6 @@ "label": "Lab Order Details", "isExpanded": "true", "questions": [ - { - "label": "Order Labs", - "type": "obs", - "questionOptions": { - "rendering": "toggle", - "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", - "toggleOptions": { - "labelTrue": "Yes", - "labelFalse": "No" - }, - "conceptMappings": [ - { - "type": "OCT", - "value": "LabOrdered" - } - ], - "answers": [ - { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", - "label": "Yes", - "conceptMappings": [ - { - "type": "CIEL", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" - } - ] - }, - { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", - "conceptMappings": [] - } - ] - }, - "id": "orderLabs", - "behaviours": [ - { - "intent": "*", - "required": "false", - "hide": { - "hideWhenExpression": "true" - } - }, - { - "intent": "COVID_LAB_ORDER_EMBED", - "required": "false", - "hide": { - "hideWhenExpression": "false" - } - }, - { - "intent": "COVID_LAB_ORDER_RESULT_EMBED", - "required": "false", - "hide": { - "hideWhenExpression": "true" - } - } - ] - }, { "label": "Order date", "type": "obs", @@ -116,7 +45,7 @@ "intent": "COVID_LAB_ORDER_EMBED", "required": "false", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -211,7 +140,7 @@ "intent": "COVID_LAB_ORDER_EMBED", "required": "false", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -264,7 +193,7 @@ "intent": "COVID_LAB_ORDER_EMBED", "required": "false", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -391,7 +320,7 @@ "intent": "COVID_LAB_ORDER_EMBED", "required": "false", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -436,7 +365,7 @@ "intent": "COVID_LAB_ORDER_EMBED", "required": "false", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ] @@ -512,7 +441,7 @@ { "intent": "COVID_LAB_ORDER_EMBED", "hide": { - "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'" + "hideWhenExpression": "false" } } ]