Skip to content

Commit

Permalink
Merge pull request #39 from kajambiya/dev
Browse files Browse the repository at this point in the history 
OHRI-1650, OHRI-1651 fix toggle for CD4 Lab results and Viral load lab results sub forms i…
  • Loading branch information
@kajambiya
kajambiya authored Jul 20, 2023
2 parents 8cc0195 + cbe14ed commit 328f815
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 141 deletions.
72 changes: 4 additions & 68 deletions distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -108,7 +44,7 @@
"required": "true",
"unspecified": "true",
"hide": {
"hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -162,7 +98,7 @@
"required": "true",
"unspecified": "true",
"hide": {
"hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -190,7 +126,7 @@
"required": "true",
"unspecified": "true",
"hide": {
"hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -225,7 +161,7 @@
"required": "true",
"unspecified": "true",
"hide": {
"hideWhenExpression": "cd4Lab == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down
136 changes: 133 additions & 3 deletions distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
]
}
]
},
Expand All @@ -9084,7 +9198,15 @@
"readonly": "false"
}
]
}
},
"behaviours": [
{
"intent": "*",
"hide": {
"hideWhenExpression": "cd4LabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
}
}
]
},
{
"label": "Lab results - Viral Load",
Expand All @@ -9100,7 +9222,15 @@
"readonly": "false"
}
]
}
},
"behaviours": [
{
"intent": "*",
"hide": {
"hideWhenExpression": "viralLabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
}
}
]
}
],
"availableIntents": [
Expand All @@ -9115,4 +9245,4 @@
"encounterType": "cb0a65a7-0587-477e-89b9-cf2fd144f1d4",
"encounter": "Clinical Visit",
"allowUnspecifiedAll": true
}
}
74 changes: 5 additions & 69 deletions distro/configuration/ampathforms/ct_viral_load_results_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -107,7 +43,7 @@
"intent": "VIRAL_LOAD_LAB_RESULTS_EMBED",
"required": "true",
"hide": {
"hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -227,7 +163,7 @@
"intent": "VIRAL_LOAD_LAB_RESULTS_EMBED",
"required": "true",
"hide": {
"hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -326,7 +262,7 @@
"intent": "VIRAL_LOAD_LAB_RESULTS_EMBED",
"required": "true",
"hide": {
"hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -394,7 +330,7 @@
"intent": "VIRAL_LOAD_LAB_RESULTS_EMBED",
"required": "true",
"hide": {
"hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -428,7 +364,7 @@
"intent": "VIRAL_LOAD_LAB_RESULTS_EMBED",
"required": "true",
"hide": {
"hideWhenExpression": "viralLoad == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion distro/configuration/ampathforms/ui_select_extended_test_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 328f815

Please sign in to comment.