From ce3f9bba751a737ebbe5cc25eebd2fbbf6f3cc13 Mon Sep 17 00:00:00 2001
From: Daphne <89844768+Daphne210@users.noreply.github.com>
Date: Thu, 11 Apr 2024 10:27:29 +0300
Subject: [PATCH] U4X-528: Adding missing skip logics to the clinical
assessment form & indication for VL testing on the Lab Request Form for VL
test order only (#478)
---
...MIS-TB-003-TBClientCard-EnrollmentPage.xml | 2 +-
...HivCareArtCard-ClinicalAssessmentPage.json | 42 ++++++++++-----
...-GENERAL-LABORATORY-TEST-REQUEST-FORM.json | 54 ++++++++++++++++++-
3 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-TB-003-TBClientCard-EnrollmentPage.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-TB-003-TBClientCard-EnrollmentPage.xml
index 1fd3051c0..3c0ff494b 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-TB-003-TBClientCard-EnrollmentPage.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-TB-003-TBClientCard-EnrollmentPage.xml
@@ -838,7 +838,7 @@
-
diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
index 986779ebb..02cde3088 100644
--- a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
+++ b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
@@ -333,7 +333,10 @@
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "validators": [],
+ "hide": {
+ "hideWhenExpression": "isEmpty(tb_status) || tb_status !== 'dcdaa6b4-30ab-102d-86b0-7a5022ba4115'"
+ }
},
{
"label": "Reg No.",
@@ -345,7 +348,10 @@
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "validators": [],
+ "hide": {
+ "hideWhenExpression": "isEmpty(tb_status) || tb_status !== 'dcdaa6b4-30ab-102d-86b0-7a5022ba4115'"
+ }
},
{
"label": "TB Stop Date",
@@ -357,7 +363,10 @@
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "validators": [],
+ "hide": {
+ "hideWhenExpression": "isEmpty(tb_status) || tb_status !== '031d9b15-62d5-4f73-a374-5503f0421427'"
+ }
},
{
"label": "TPT Status",
@@ -407,7 +416,9 @@
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "hide": {
+ "hideWhenExpression": "isEmpty(tpt_status) || tpt_status !== 'dcdaaae4-30ab-102d-86b0-7a5022ba4115'"
+ }
},
{
"label": "TPT Date Completed",
@@ -419,19 +430,23 @@
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "hide": {
+ "hideWhenExpression": "isEmpty(tpt_status) || tpt_status !== '160035AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+ }
},
{
"label": "TPT Side Effects",
"type": "obs",
- "id": "tpt_date_completed",
+ "id": "tpt_side_effects",
"questionOptions": {
"rendering": "text",
"concept": "23a6dc6e-ac16-4fa6-8029-155522548d04",
"conceptMappings": [],
"answers": []
},
- "validators": []
+ "hide": {
+ "hideWhenExpression": "isEmpty(tpt_status) || tpt_status !== 'dcda4d59-30ab-102d-86b0-7a5022ba4115'"
+ }
},
{
"label": "Signs and Symptoms",
@@ -748,6 +763,9 @@
"conceptMappings": []
}
]
+ },
+ "hide": {
+ "hideWhenExpression": "hep_b_status !== '159971AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
}
},
{
@@ -783,9 +801,9 @@
}
},
{
- "label": "ART - adherence ",
+ "label": "ART Adherence ",
"type": "obs",
- "id": "art-adherence",
+ "id": "art_adherence",
"questionOptions": {
"rendering": "radio",
"concept": "dce03b2f-30ab-102d-86b0-7a5022ba4115",
@@ -807,9 +825,9 @@
"validators": []
},
{
- "label": "Why Poor/Fair",
+ "label": "Why Poor/Fair Adherence",
"type": "obs",
- "id": "why-poor-fair",
+ "id": "why_poor_fair",
"questionOptions": {
"rendering": "multiCheckbox",
"concept": "dce045a4-30ab-102d-86b0-7a5022ba4115",
@@ -878,7 +896,7 @@
},
"validators": [],
"hide": {
- "hideWhenExpression": "isEmpty(art-adherence) || art-adherence != 'dcdf1708-30ab-102d-86b0-7a5022ba4115'"
+ "hideWhenExpression": "isEmpty(art_adherence) || art_adherence == 'dcdf1708-30ab-102d-86b0-7a5022ba4115'"
}
}
]
diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json b/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
index aa861e780..5df41ab31 100644
--- a/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
+++ b/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
@@ -1,5 +1,5 @@
{
- "name": "HMIS LAB 001:General Laboratory Test Request",
+ "name": "HMIS LAB 001:General Laboratory Test Request v2",
"version": "4.0.0",
"description": "A request for Lab test to Lab",
"encounterType": "214e27a1-606a-4b1e-a96e-d736c87069d5",
@@ -56,7 +56,7 @@
"questions": [
{
"label": "Tests Ordered",
- "id": "order1",
+ "id": "tests_ordered",
"type": "testOrder",
"questionOptions": {
"rendering": "repeating",
@@ -560,6 +560,56 @@
}
]
}
+ },
+ {
+ "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')"
+ }
}
]
}