Skip to content

Commit

Permalink
Merge pull request #41 from UCSF-IGHS/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@alaboso
alaboso authored Jul 20, 2023
2 parents e5c9f20 + 1d8e0c8 commit c454aee
Show file tree
Hide file tree
Showing 8 changed files with 383 additions and 251 deletions.
69 changes: 68 additions & 1 deletion distro/configuration/ampathforms/covid_case_assessment_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}]
}
]
},
Expand All @@ -1992,7 +2051,15 @@
"readonly": "true"
}
]
}
},
"behaviours": [
{
"intent": "*",
"hide": {
"hideWhenExpression": "labOrderToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
}
}
]
}
],
"availableIntents": [
Expand Down
83 changes: 6 additions & 77 deletions distro/configuration/ampathforms/covid_lab_order_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -116,7 +45,7 @@
"intent": "COVID_LAB_ORDER_EMBED",
"required": "false",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -211,7 +140,7 @@
"intent": "COVID_LAB_ORDER_EMBED",
"required": "false",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -264,7 +193,7 @@
"intent": "COVID_LAB_ORDER_EMBED",
"required": "false",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -391,7 +320,7 @@
"intent": "COVID_LAB_ORDER_EMBED",
"required": "false",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -436,7 +365,7 @@
"intent": "COVID_LAB_ORDER_EMBED",
"required": "false",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down Expand Up @@ -512,7 +441,7 @@
{
"intent": "COVID_LAB_ORDER_EMBED",
"hide": {
"hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
"hideWhenExpression": "false"
}
}
]
Expand Down
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
Loading

0 comments on commit c454aee

Please sign in to comment.