From 953ed38852140d21cb1f8076c5cdeb3aeadb50e4 Mon Sep 17 00:00:00 2001
From: melkam-mekonnen <mmm2477@cumc.columbia.edu>
Date: Thu, 1 Aug 2024 17:53:11 +0300
Subject: [PATCH] UAN concept updates on forms

---
 src/forms/hei-enrollment.json         | 57 +++++++++++----------------
 src/forms/pre-exposure-screening.json | 21 ++++------
 2 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/src/forms/hei-enrollment.json b/src/forms/hei-enrollment.json
index eb53b6b..75edd05 100644
--- a/src/forms/hei-enrollment.json
+++ b/src/forms/hei-enrollment.json
@@ -940,29 +940,23 @@
               ]
             },
             {
-              "label": "Unique ART number",
-              "type": "obs",
-              "required": false,
-              "id": "artNumber",
-              "questionOptions": {
-                "rendering": "text",
-                "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "CIEL",
-                    "value": "164402"
-                  }
-                ],
+							"label": "Unique ART number",
+							"type": "obs",
+							"questionOptions": {
+								"rendering": "text",
+								"calculate": {
+                                    "calculateExpression": "getIdentifier(patient, 'UAN')"
+                                },
+								"concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "hide": {
                   "hideWhenExpression": "mothersPmtct !== '1a259ed4-15b5-4e23-8382-972f89be84c8'"
                 }
-              },
+							},
               "hide": {
                 "hideWhenExpression": "mothersStatus != '6691e136-0289-4d2f-80bf-50ec816e121a'"
               },
-              "validators": []
-            }
+							"id": "artNumber"
+						}
           ]
         },
         {
@@ -1067,27 +1061,20 @@
               "validators": []
             },
             {
-              "label": "If on ART, Unique ART number",
-              "type": "obs",
-              "required": false,
-              "id": "ifOnArt",
+							"label": "If on ART, Unique ART number",
+							"type": "obs",
+							"questionOptions": {
+								"rendering": "text",
+								"calculate": {
+                                    "calculateExpression": "getIdentifier(patient, 'UAN')"
+                                },
+								"concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+							},
               "hide": {
                 "hideWhenExpression": "ifPositive != '95daa4f8-b45d-4dee-b5d0-5f9446d22c19' || fathersStatus == '160432AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               },
-              "questionOptions": {
-                "rendering": "text",
-                "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "CIEL",
-                    "value": "164402"
-                  }
-                ],
-                "answers": []
-              },
-              "validators": []
-            }
+							"id": "ifOnArt"
+						}
           ]
         },
         {
diff --git a/src/forms/pre-exposure-screening.json b/src/forms/pre-exposure-screening.json
index ab6b961..51cdd85 100644
--- a/src/forms/pre-exposure-screening.json
+++ b/src/forms/pre-exposure-screening.json
@@ -1825,22 +1825,15 @@
 			  {
 				"label": "Unique identification code (UIC)",
 				"type": "obs",
-				"required": false,
-				"id": "uniqueIdentificaitonCode",
 				"questionOptions": {
-				  "rendering": "number",
-				  "concept": "164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "conceptMappings": [
-					{
-					  "relationship": "SAME-AS",
-					  "type": "CIEL",
-					  "value": "164402"
-					}
-				  ],
-				  "answers": []
+					"rendering": "text",
+					"calculate": {
+						"calculateExpression": "getIdentifier(patient, 'UAN')"
+					},
+					"concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 				},
-				"validators": []
-			  }
+				"id": "uniqueIdentificaitonCode"
+			}
 			]
 		  }
 		]