Skip to content

Commit

Permalink
Adding VL fields to the encounter, Removing the VL fields from the la…
Browse files Browse the repository at this point in the history 
…b request form
  • Loading branch information
@Daphne210
Daphne210 committed Apr 11, 2024
1 parent ce3f9bb commit d3f55b4
Show file tree
Hide file tree
Showing 2 changed files with 164 additions and 58 deletions.
167 changes: 164 additions & 3 deletions ...c/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
"label": "Provider:",
"type": "encounterProvider",
"questionOptions": {
"rendering": "ui-select-extended"
"rendering": "encounter-provider"
},
"id": "encProvider "
},
{
"label": "Location:",
"type": "encounterLocation",
"questionOptions": {
"rendering": "ui-select-extended"
"rendering": "encounter-location"
},
"id": "encLocation"
}
Expand All @@ -51,6 +51,7 @@
"label": "Pregnancy",
"type": "obs",
"id": "pregnant",
"required": "true",
"questionOptions": {
"rendering": "checkbox",
"concept": "cd48b900-dd21-45ce-ae6b-b38ad2a3a695",
Expand Down Expand Up @@ -140,6 +141,7 @@
"label": "ANC No.",
"type": "obs",
"id": "anc_no",
"required": "true",
"questionOptions": {
"rendering": "number",
"concept": "c7231d96-34d8-4bf7-a509-c810f75e3329",
Expand Down Expand Up @@ -264,6 +266,7 @@
"label": "TB Status",
"type": "obs",
"id": "tb_status",
"required": "true",
"questionOptions": {
"rendering": "select",
"concept": "dce02aa1-30ab-102d-86b0-7a5022ba4115",
Expand Down Expand Up @@ -801,9 +804,10 @@
}
},
{
"label": "ART Adherence ",
"label": "ART Adherence",
"type": "obs",
"id": "art_adherence",
"required": true,
"questionOptions": {
"rendering": "radio",
"concept": "dce03b2f-30ab-102d-86b0-7a5022ba4115",
Expand Down Expand Up @@ -901,6 +905,161 @@
}
]
},
{
"label": "Viral Load",
"isExpanded": "true",
"questions": [
{
"label": "Tests Ordered",
"id": "tests_ordered",
"type": "testOrder",
"questionOptions": {
"rendering": "repeating",
"orderSettingUuid": "INPATIENT",
"orderType": "testorder",
"selectableOrders": [
{
"concept": "1eb05918-f50c-4cad-a827-3c78f296a10a",
"label": "VL",
"conceptMappings": []
}
]
}
},
{
"label": "Specimen ID",
"type": "obs",
"id": "specimen_id",
"required": "true",
"questionOptions": {
"rendering": "text",
"concept": "0f998893-ab24-4ee4-922a-f197ac5fd6e6",
"conceptMappings": [],
"answers": []
},
"validators": [],
"hide": {
"hideWhenExpression": "isEmpty(tests_ordered) || !tests_ordered.includes('1eb05918-f50c-4cad-a827-3c78f296a10a')"
}
},
{
"label": "Specimen source",
"type": "obs",
"id": "specimen_source",
"required": "true",
"questionOptions": {
"rendering": "select",
"concept": "159959AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"answers": [
{
"concept": "162403AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Ascitic fluid",
"conceptMappings": []
},
{
"concept": "159995AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Cerebrospinal fluid",
"conceptMappings": []
},
{
"concept": "159993AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Feces",
"conceptMappings": []
},
{
"concept": "1002AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Plasma",
"conceptMappings": []
},
{
"concept": "1001AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Serum",
"conceptMappings": []
},
{
"concept": "1004AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Sputum",
"conceptMappings": []
},
{
"concept": "159994AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Urine",
"conceptMappings": []
},
{
"concept": "1000AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Whole Blood Sample",
"conceptMappings": []
},
{
"concept": "a9ecc403-25b5-48c8-974f-815acc074328",
"label": "Dried Blood Spot",
"conceptMappings": []
},
{
"concept": "b123b9db-4d5e-4e64-8821-071b77dae457",
"label": "Swab Samples",
"conceptMappings": []
}
]
},
"hide": {
"hideWhenExpression": "isEmpty(tests_ordered) || !tests_ordered.includes('1eb05918-f50c-4cad-a827-3c78f296a10a')"
}
},
{
"label": "Indication for viral load testing",
"type": "obs",
"id": "indication_vl_testing",
"required": "true",
"questionOptions": {
"rendering": "select",
"concept": "59f36196-3ebe-4fea-be92-6fc9551c3a11",
"conceptMappings": [],
"answers": [
{
"concept": "67fab588-d3b0-4aa5-a165-ebd3b00b285b",
"label": "12 months after ART initiation",
"conceptMappings": []
},
{
"concept": "224c94e0-2b8b-4deb-892c-04151ee0e885",
"label": "6 months after ART initiation",
"conceptMappings": []
},
{
"concept": "f3cdf0b6-321a-493d-a7e8-9a2b2a077f72",
"label": "Suspected treatment failure",
"conceptMappings": []
},
{
"concept": "bab153f4-7679-4040-9716-6879dffef905",
"label": "Special Considerations",
"conceptMappings": []
},
{
"concept": "20ab2ec5-5390-4461-b85f-69bf650ce992",
"label": "Repeat (after IAC)",
"conceptMappings": []
},
{
"concept": "68b58a80-af4e-43a5-a70d-113747a6cbb7",
"label": "Routine",
"conceptMappings": []
},
{
"concept": "588ac57f-a4d0-47c2-9852-92502194ec4a",
"label": "1st ANC visit",
"conceptMappings": []
}
]
},
"hide": {
"hideWhenExpression": "isEmpty(tests_ordered) || !tests_ordered.includes('1eb05918-f50c-4cad-a827-3c78f296a10a')"
}
}
]
},
{
"label": "DSD Model",
"isExpanded": "true",
Expand Down Expand Up @@ -932,6 +1091,7 @@
{
"label": "Patient Categorization",
"type": "obs",
"required": "true",
"id": "patient_categorization",
"questionOptions": {
"rendering": "select",
Expand All @@ -954,6 +1114,7 @@
"label": "Approach",
"type": "obs",
"id": "approach",
"required": "true",
"questionOptions": {
"rendering": "select",
"concept": "73312fee-c321-11e8-a355-529269fb1459",
Expand Down
55 changes: 0 additions & 55 deletions ...rc/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@
"label": "Cd4",
"conceptMappings": []
},
{
"concept": "1eb05918-f50c-4cad-a827-3c78f296a10a",
"label": "VL",
"conceptMappings": []
},
{
"concept": "1643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Malaria RDT",
Expand Down Expand Up @@ -560,56 +555,6 @@
}
]
}
},
{
"label": "Indication for viral load testing",
"type": "obs",
"id": "indication_vl_testing",
"questionOptions": {
"rendering": "select",
"concept": "59f36196-3ebe-4fea-be92-6fc9551c3a11",
"conceptMappings": [],
"answers": [
{
"concept": "67fab588-d3b0-4aa5-a165-ebd3b00b285b",
"label": "12 months after ART initiation",
"conceptMappings": []
},
{
"concept": "224c94e0-2b8b-4deb-892c-04151ee0e885",
"label": "6 months after ART initiation",
"conceptMappings": []
},
{
"concept": "f3cdf0b6-321a-493d-a7e8-9a2b2a077f72",
"label": "Suspected treatment failure",
"conceptMappings": []
},
{
"concept": "bab153f4-7679-4040-9716-6879dffef905",
"label": "Special Considerations",
"conceptMappings": []
},
{
"concept": "20ab2ec5-5390-4461-b85f-69bf650ce992",
"label": "Repeat (after IAC)",
"conceptMappings": []
},
{
"concept": "68b58a80-af4e-43a5-a70d-113747a6cbb7",
"label": "Routine",
"conceptMappings": []
},
{
"concept": "588ac57f-a4d0-47c2-9852-92502194ec4a",
"label": "1st ANC visit",
"conceptMappings": []
}
]
},
"hide": {
"hideWhenExpression": "isEmpty(tests_ordered) || !tests_ordered.includes('1eb05918-f50c-4cad-a827-3c78f296a10a')"
}
}
]
}
Expand Down

0 comments on commit d3f55b4

Please sign in to comment.