Skip to content

Commit

Permalink
Merge pull request mohuganda#550 from Daphne210/U4X-611-hepatitis-b-r…
Browse files Browse the repository at this point in the history 
…esults-shouldnot-appear-if-the-test-is-not-taken

U4X-611: Cleaning up the clinical assessment and psychosocial forms
  • Loading branch information
@jabahum
jabahum authored Jul 3, 2024
2 parents f33669c + 44568a8 commit 7260435
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 38 deletions.
74 changes: 40 additions & 34 deletions ...rces/jsonforms/HMIS-ACP-003-HivCareArtCard-HealthEducationAndPsychosocialSupportPage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
},
{
"concept": "e9332f1e-3af5-499a-b5ea-5c196cdf24c2",
"label": "HEALTH EDUCATION HOME BASED CARE"
"label": "Health Education Home Based Care"
},
{
"concept": "865811ad-796f-48c2-b575-1f530122c408",
"label": "Health Facility"
},
{
"concept": "159928AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "school"
"label": "School"
}
]
},
Expand All @@ -56,23 +56,23 @@
"answers": [
{
"concept": "c14695ca-6f11-4f1c-9af5-8f3bd5ddb3a3",
"label": "Alcohol and Substance Abuse"
"label": "Harmful Habits (Alcohol and Substance Abuse)"
},
{
"concept": "dcde3d87-30ab-102d-86b0-7a5022ba4115",
"label": "ANXIETY"
"label": "Fear/Anxiety"
},
{
"concept": "1b532410-60c4-4514-be80-12ee3d8224a7",
"label": "Bereavement"
},
{
"concept": "6cec43a1-1f3c-42ab-844a-c3f786ec06f2",
"label": "Denial"
"label": "Denial/Coping with results"
},
{
"concept": "b9884d17-08a1-430b-b003-3b79d467a9f0",
"label": "Dysfunctional Family"
"label": "Dysfunctional Family/Client Support System"
},
{
"concept": "f6e863c5-1e09-445a-a714-fe4a2255ae64",
Expand All @@ -92,23 +92,23 @@
},
{
"concept": "c8c6939c-a36b-4ee0-8c6e-85c6a259a0eb",
"label": "Poverty"
"label": "Economic Challenges/Poverty"
},
{
"concept": "fbc8c14f-8348-4acc-abd7-f14df60eff2d",
"label": "Risky Sexual Behavior"
"label": "Risky Sexual Behaviors"
},
{
"concept": "762cfa56-2d56-4e89-912a-3f61bf4c23e8",
"label": "Spiritual Issues"
},
{
"concept": "dcdee9a8-30ab-102d-86b0-7a5022ba4115",
"label": "STIGMA"
"label": "Stigma & Discrimination"
},
{
"concept": "0e36d228-8f19-407b-ad0b-b8b5bc4d3ba8",
"label": "Stress"
"label": "Anger/Stress"
},
{
"concept": "421dbf80-169b-4f02-a285-295d21ff64e9",
Expand All @@ -132,24 +132,24 @@
"label": "ART Literacy"
},
{
"concept": "b465e067-a447-44a6-afc2-b4cdfe8189bc",
"label": "HEALTH EDUCATION ART READY"
"concept": "a5e7ff4b-99b9-402a-b03e-3b90679ee23a",
"label": "Adherence preparation and plan"
},
{
"concept": "0df2a7db-caed-4351-925c-8e45a3621504",
"label": "Mild hypertension"
"concept": "b465e067-a447-44a6-afc2-b4cdfe8189bc",
"label": "Ready to start Art & initiation"
},
{
"concept": "012c5218-25d7-4cd0-aad5-1f028d9404ad",
"label": "Not ready to start and initiate"
"concept": "14626aed-049a-48b1-afca-aedd7fd9a57f",
"label": "Not ready to start & initiate"
},
{
"concept": "bd4f0efb-8a43-4e5c-9048-eda47b675bb7",
"label": "Ongoing Adherence counselling and support"
},
{
"concept": "497bb6d8-f648-49f7-a3fa-d84708a8ce57",
"label": "Severe hypertension"
"label": "Intensive Adherence counselling & support"
}
]
},
Expand All @@ -166,7 +166,7 @@
"answers": [
{
"concept": "e6284961-f3fa-43be-aa05-8463dab5dbf1",
"label": "More than two weeks in pleasurable activities"
"label": "More than two weeks loss of interest in pleasurable activities"
},
{
"concept": "5f22ca76-bead-43fc-8d70-92479c658b38",
Expand Down Expand Up @@ -195,7 +195,7 @@
},
{
"concept": "c5160b00-0641-4742-8672-97081379a92d",
"label": "Emotional or Psyschosocial Harm"
"label": "Emotional or Psychological Harm"
},
{
"concept": "1490AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
Expand Down Expand Up @@ -224,11 +224,11 @@
"answers": [
{
"concept": "dcd695dc-30ab-102d-86b0-7a5022ba4115",
"label": "YES"
"label": "Yes"
},
{
"concept": "dcd69c06-30ab-102d-86b0-7a5022ba4115",
"label": "NO"
"label": "No"
}
]
},
Expand Down Expand Up @@ -269,15 +269,18 @@
},
{
"concept": "f56e8d46-5b2f-488b-861a-94a89d16adf6",
"label": "Non-suppressed"
"label": "Non-suppressed viral load"
},
{
"concept": "0251af24-dc19-4d68-a2bb-4b3f3867b949",
"label": "Not In School"
"label": "Not in School"
}
]
},
"validators": []
"validators": [],
"hide": {
"hideWhenExpression": "age > '20'"
}
},
{
"label": "OVC Assessment",
Expand All @@ -298,7 +301,7 @@
},
{
"concept": "160737AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Not assessed"
"label": "Not yet assessed"
},
{
"concept": "513d3a81-68d2-44f4-88a3-8dc74b5e1249",
Expand All @@ -310,7 +313,10 @@
}
]
},
"validators": []
"validators": [],
"hide": {
"hideWhenExpression": "age > '20'"
}
},
{
"label": "PHDP Components",
Expand All @@ -331,23 +337,23 @@
},
{
"concept": "0815c786-5994-49e4-aa07-28b662b0e428",
"label": "Family plannign counselling provided"
"label": "Family planning counselling provided"
},
{
"concept": "dc9ae14d-30ab-102d-86b0-7a5022ba4115",
"label": "DISCLOSURE COUNSELING"
"label": "Disclosure Counseling"
},
{
"concept": "dc98d576-2623-4677-8a08-2061e195864f",
"label": "Management of Stigma and Discrimination"
},
{
"concept": "dc7620b3-30ab-102d-86b0-7a5022ba4115",
"label": "METHOD OF FAMILY PLANNING"
"label": "Family planning method provided"
},
{
"concept": "7cb048f9-550b-4be2-9eb9-cc8e19c87041",
"label": "NUTRITION COUNSELLING ONLY >2YRS"
"label": "Nutrition Counseling ONLY >2YRS"
},
{
"concept": "dcd7e8e5-30ab-102d-86b0-7a5022ba4115",
Expand All @@ -363,7 +369,7 @@
},
{
"concept": "dcd68a88-30ab-102d-86b0-7a5022ba4115",
"label": "OTHER SPECIFY"
"label": "Others Specify"
}
]
},
Expand Down Expand Up @@ -421,9 +427,9 @@
}
},
{
"label": "Intervation Approaches",
"label": "Intervention Approaches",
"type": "obs",
"id": "intervationApproaches",
"id": "interventionApproaches",
"questionOptions": {
"rendering": "select",
"concept": "eb7c1c34-59e5-46d5-beba-626694badd54",
Expand All @@ -435,7 +441,7 @@
},
{
"concept": "a806304b-bef4-483f-b4d0-9514bfc80621",
"label": "Health Education Linkages and Refferals"
"label": "Linkages and Referrals"
},
{
"concept": "f1229461-aa7e-4a4f-a916-e1188c1ce622",
Expand Down
8 changes: 4 additions & 4 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 @@ -93,7 +93,7 @@
}
},
{
"label": "Gestation Age in Weeka",
"label": "Gestation Age in Weeks",
"type": "obs",
"id": "ageInWeeks",
"questionOptions": {
Expand Down Expand Up @@ -482,7 +482,7 @@
{
"label": "Signs and Symptoms",
"type": "obs",
"id": "signs_And_Symptoms",
"id": "signsAndSymptoms",
"questionOptions": {
"rendering": "checkbox",
"concept": "dce0e02a-30ab-102d-86b0-7a5022ba4115",
Expand Down Expand Up @@ -586,7 +586,7 @@
},
"validators": [],
"hide": {
"hideWhenExpression": "isEmpty(signs_And_Symptoms) || signs_And_Symptoms !== 'dcd68a88-30ab-102d-86b0-7a5022ba4115'"
"hideWhenExpression": "isEmpty(signsAndSymptoms) || signsAndSymptoms != 'dcd68a88-30ab-102d-86b0-7a5022ba4115'"
}
},
{
Expand Down Expand Up @@ -809,7 +809,7 @@
]
},
"hide": {
"hideWhenExpression": "hep_b_status !== '159971AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "hepBStatus != '159971AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
}
},
{
Expand Down

0 comments on commit 7260435

Please sign in to comment.