Merge pull request #33 from UCSF-IGHS/dev

Dev
UCSF-IGHS · Jul 12, 2023 · e5c9f20 · e5c9f20
2 parents 7f0d955 + 6e07b68
commit e5c9f20
Show file tree

Hide file tree

Showing 22 changed files with 2,396 additions and 1,880 deletions.
diff --git a/distro/configuration/ampathforms/covid_assessment_summary_v1.0.json b/distro/configuration/ampathforms/covid_assessment_summary_v1.0.json
@@ -502,7 +502,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "bbb35235-7c31-4606-9a70-5bbfdc8132fc",
   "referencedForms": [],
   "allowUnspecifiedAll": true
 }
diff --git a/distro/configuration/ampathforms/covid_case_assessment_v1.0.json b/distro/configuration/ampathforms/covid_case_assessment_v1.0.json
@@ -1978,7 +1978,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_order",
+        "name": "COVID Lab Order Form",
         "package": "covid",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/covid_case_v1.0.json b/distro/configuration/ampathforms/covid_case_v1.0.json
@@ -9,7 +9,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_assessment",
+        "name": "COVID Assessment Form",
         "package": "covid",
         "behaviours": [
           {
@@ -25,7 +25,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_outcome",
+        "name": "COVID Outcome Form",
         "package": "covid",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/covid_lab_order_cancellation_v1.0.json b/distro/configuration/ampathforms/covid_lab_order_cancellation_v1.0.json
@@ -9,7 +9,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_order",
+        "name": "COVID Lab Order Form",
         "package": "covid",
         "behaviours": [
           {
@@ -212,7 +212,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "d38bc949-c95b-39eb-a2c5-08b82a36409c",
   "referencedForms": [],
   "encounterType": "a77d3e7f-5c8f-4074-a207-77a70e197b0c",
   "encounter": "COVID Lab Encounter",

diff --git a/distro/configuration/ampathforms/covid_lab_result_v1.0.json b/distro/configuration/ampathforms/covid_lab_result_v1.0.json
@@ -9,7 +9,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_order",
+        "name": "COVID Lab Order Form",
         "package": "covid",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/covid_lab_test_v1.0.json b/distro/configuration/ampathforms/covid_lab_test_v1.0.json
@@ -44,7 +44,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_order",
+        "name": "COVID Lab Order Form",
         "package": "covid",
         "behaviours": [
           {
@@ -60,7 +60,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_sample_collection",
+        "name": "Sample Collection",
         "package": "covid",
         "behaviours": [
           {
@@ -76,7 +76,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_order_cancellation",
+        "name": "Lab Order Cancellation",
         "package": "covid",
         "behaviours": [
           {
@@ -92,7 +92,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_lab_result",
+        "name": "COVID Lab Result Form",
         "package": "covid",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/covid_outcome_tracking_v1.0.json b/distro/configuration/ampathforms/covid_outcome_tracking_v1.0.json
@@ -195,7 +195,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "d9bbee02-4f76-3e88-89b8-fb5b70d2cb2d",
   "referencedForms": [],
   "encounterType": "253a43d3-c99e-415c-8b78-ee7d4d3c1d54",
   "encounter": "COVID Case Assessment",

diff --git a/distro/configuration/ampathforms/covid_outcome_v1.0.json b/distro/configuration/ampathforms/covid_outcome_v1.0.json
@@ -9,7 +9,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "covid_assessment",
+        "name": "COVID Assessment Form",
         "package": "covid",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json b/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json
@@ -242,7 +242,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "a66197de-419a-3223-8691-f70d36b1524b",
   "referencedForms": [],
   "encounterType": "96adb28e-e417-43a3-8f7d-682f8af5e912",
   "encounter": "CD4 Lab results",

diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v1.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v1.0.json
@@ -8882,7 +8882,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "cd4_lab_results",
+        "name": "CD4 Lab Result",
         "package": "hiv",
         "behaviours": [
           {
@@ -8898,7 +8898,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "viral_load_results",
+        "name": "Viral Load Lab Result",
         "package": "hiv",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
@@ -9075,7 +9075,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "cd4_lab_results",
+        "name": "CD4 Lab Result",
         "package": "hiv",
         "behaviours": [
           {
@@ -9091,7 +9091,7 @@
       "sections": [],
       "isSubform": "true",
       "subform": {
-        "name": "viral_load_results",
+        "name": "Viral Load Lab Result",
         "package": "hiv",
         "behaviours": [
           {

diff --git a/distro/configuration/ampathforms/ct_lab_results_v1.0.json b/distro/configuration/ampathforms/ct_lab_results_v1.0.json
@@ -886,7 +886,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "98621650-1e6c-3632-99e7-04afd1258d1e",
   "referencedForms": [],
   "encounterType": "15272be5-ae9c-4278-a303-4b8907eae73b",
   "encounter": "HIV Lab Order and Results",

diff --git a/distro/configuration/ampathforms/ct_viral_load_request_v1.0.json b/distro/configuration/ampathforms/ct_viral_load_request_v1.0.json
@@ -598,7 +598,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "717eed11-55bb-3adb-9be4-3e92efcea2c8",
   "encounterType": "41af1931-184e-45f8-86ca-d42e0db0b8a1",
   "encounter": "Viral Load results",
   "referencedForms": []

diff --git a/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json b/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json
@@ -445,7 +445,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "xxxx",
+  "uuid": "c9eb639e-b5d0-3ed3-a3c7-0dc48fc6acb6",
   "referencedForms": [],
   "encounterType": "41af1931-184e-45f8-86ca-d42e0db0b8a1",
   "encounter": "Viral Load results",