From fe95ff20d0d58fd5dbf83dfc83dcc13c57a242c6 Mon Sep 17 00:00:00 2001
From: Kote Cosmas <110154947+ckote@users.noreply.github.com>
Date: Mon, 3 Jul 2023 15:28:05 +0300
Subject: [PATCH] Changes on the concepts from id to uuid (#108)

---
 .../HTS_Eligibility_Screening.json            | 219 ++++++++++++------
 1 file changed, 151 insertions(+), 68 deletions(-)

diff --git a/configuration/ampathforms/HTS_Eligibility_Screening.json b/configuration/ampathforms/HTS_Eligibility_Screening.json
index 0afc631e..89dc97fb 100644
--- a/configuration/ampathforms/HTS_Eligibility_Screening.json
+++ b/configuration/ampathforms/HTS_Eligibility_Screening.json
@@ -199,6 +199,71 @@
               "hide": {
                 "hideWhenExpression": "populationType !== '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age <15"
               }
+            },
+            {
+              "label": "Does client have any disability?",
+              "type": "obs",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "162558AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Yes"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "No"
+                  }
+                ]
+              },
+              "id": "DisabilityClienT"
+            },
+            {
+              "label": "Please indicated the type of disability :",
+              "type": "obs",
+              "questionOptions": {
+                "rendering": "checkbox",
+                "concept": "162558AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "answers": [
+                  {
+                    "concept": "120291AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Hearing impairment"
+                  },
+                  {
+                    "concept": "147215AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Visual impairment"
+                  },
+                  {
+                    "concept": "151342AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Mentally Challenged"
+                  },
+                  {
+                    "concept": "164538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Physically Challenged"
+                  },
+                  {
+                    "concept": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Others"
+                  }
+                ]
+              },
+              "id": "disaBilityTypes",
+              "hide": {
+                "hideWhenExpression": "isEmpty(DisabilityClienT) || DisabilityClienT != '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              }
+            },
+            {
+              "label": "Specify",
+              "type": "obs",
+              "questionOptions": {
+                "rendering": "text",
+                "concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+              },
+              "id": "specifyOtherDisability",
+              "hide": {
+                "hideWhenExpression": "isEmpty(disaBilityTypes) || disaBilityTypes != '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              }
             }
           ]
         },
@@ -207,69 +272,68 @@
           "isExpanded": "true",
           "questions": [
             {
-              "label": "Client has any relationship with an index client?",
+              "label": "Department",
               "type": "obs",
+              "id": "patDepart",
               "questionOptions": {
-                "rendering": "checkbox",
-                "concept": "166570AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "rendering": "select",
+                "concept": "159936AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "answers": [
                   {
-                    "concept": "163565AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Sexual Contact"
+                    "concept": "160542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "OPD:Out-patient department"
                   },
                   {
-                    "concept": "166606AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Social Contact"
+                    "concept": "5485AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "IPD:In-patient department"
                   },
                   {
-                    "concept": "166517AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Needle Sharing"
+                    "concept": "160473AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Emergency"
                   },
                   {
-                    "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "None"
+                    "concept": "160538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "PMTCT"
+                  },
+                  {
+                    "concept": "159940AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "VCT"
+                  },
+                  {
+                    "concept": "163488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Community outreach"
                   }
                 ]
               },
-              "id": "cricAdulT",
-              "required": "true",
-              "hide": {
-                "hideWhenExpression": "age <9"
-              }
+              "required": "true"
             },
             {
-              "label": "Client has any relationship with an index client?",
+              "label": "Patient Type",
               "type": "obs",
+              "id": "patienTyPe",
               "questionOptions": {
-                "rendering": "checkbox",
-                "concept": "166570AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "rendering": "radio",
+                "concept": "423c034e-14ac-4243-ae75-80d1daddce55",
                 "answers": [
                   {
-                    "concept": "166606AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Social Contact"
-                  },
-                  {
-                    "concept": "166517AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Needle Sharing"
+                    "concept": "164163AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "HP:Hospital Patient"
                   },
                   {
-                    "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "None"
+                    "concept": "06f16792-9611-40d4-82ec-9615930cc486",
+                    "label": "NP:Non-Hospital Patient"
                   }
                 ]
               },
-              "id": "cricChild",
-              "required": "true",
-              "hide": {
-                "hideWhenExpression": "age >9"
-              }
+              "required": "true"
             },
             {
-              "label": "Does client have any disability?",
+              "label": "Client a health care worker?",
               "type": "obs",
+              "id": "hcwCare",
               "questionOptions": {
                 "rendering": "radio",
-                "concept": "162558AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "concept": "5619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "answers": [
                   {
                     "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -281,56 +345,75 @@
                   }
                 ]
               },
-              "id": "DisabilityClienT",
-              "required": "true"
+              "required": "true",
+              "hide": {
+                "hideWhenExpression": "age < 17"
+              }
             },
             {
-              "label": "Please indicated the type of disability :",
+              "label": "Client has any relationship with an index client?",
               "type": "obs",
               "questionOptions": {
                 "rendering": "checkbox",
-                "concept": "162558AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "concept": "166570AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "answers": [
                   {
-                    "concept": "120291AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Hearing impairment"
-                  },
-                  {
-                    "concept": "147215AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Visual impairment"
-                  },
-                  {
-                    "concept": "151342AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Mentally Challenged"
+                    "concept": "166606AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Social Contact"
                   },
                   {
-                    "concept": "164538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Physically Challenged"
+                    "concept": "166517AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Needle Sharing"
                   },
                   {
-                    "concept": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Others"
+                    "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "None"
                   }
                 ]
               },
-              "id": "disaBilityTypes",
+              "id": "cricChild",
               "required": "true",
               "hide": {
-                "hideWhenExpression": "isEmpty(DisabilityClienT) || DisabilityClienT != '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age > 9"
               }
             },
             {
-              "label": "Specify",
+              "label": "Client has any relationship with an index client?",
               "type": "obs",
               "questionOptions": {
-                "rendering": "text",
-                "concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                "rendering": "checkbox",
+                "concept": "166570AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "answers": [
+                  {
+                    "concept": "163565AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Sexual Contact"
+                  },
+                  {
+                    "concept": "166606AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Social Contact"
+                  },
+                  {
+                    "concept": "166517AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "Needle Sharing"
+                  },
+                  {
+                    "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "None"
+                  }
+                ]
               },
-              "id": "specifyOtherDisability",
+              "id": "cricAdulT",
+              "required": "true",
               "hide": {
-                "hideWhenExpression": "isEmpty(disaBilityTypes) || disaBilityTypes != '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age < 9"
               }
-            },
+            }
+          ]
+        },
+        {
+          "label": "HTS Strategy",
+          "isExpanded": "true",
+          "questions": [
             {
               "label": "Indicate HTS strategy used:",
               "type": "obs",
@@ -380,7 +463,7 @@
               },
               "id": "otherFacilityhtsStrategy",
               "hide": {
-                "hideWhenExpression": "isEmpty(facilityHTStrategy) || facilityHTStrategy != '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(facilityHTStrategy) || facilityHTStrategy !== '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -462,7 +545,7 @@
               },
               "id": "otherEntryPoint",
               "hide": {
-                "hideWhenExpression": "isEmpty(htsFacilityEntryPoint) || htsFacilityEntryPoint != '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(htsFacilityEntryPoint) || htsFacilityEntryPoint !== '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -476,10 +559,10 @@
               "type": "obs",
               "questionOptions": {
                 "rendering": "radio",
-                "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "concept": "1396AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "answers": [
                   {
-                    "concept": "138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Positive"
                   },
                   {
@@ -496,7 +579,7 @@
               "required": "true",
               "validators": [],
               "hide": {
-                "hideWhenExpression": "age <10"
+                "hideWhenExpression": "age > 10"
               }
             },
             {
@@ -517,7 +600,7 @@
                 ]
               },
               "id": "testHistory",
-              "required": "Yes"
+              "required": "true"
             },
             {
               "label": "Who performed the test?:",
@@ -708,7 +791,7 @@
               },
               "validators": [],
               "hide": {
-                "hideWhenExpression": "age < 15 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age > 15 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1071,7 +1154,7 @@
               },
               "validators": [],
               "hide": {
-                "hideWhenExpression": "isEmpty(sexuallyActive) || sexuallyActive == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+                "hideWhenExpression": "isEmpty(hcwCare) || hcwCare !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {