Merge pull request #30 from imranq2/ar-hdeus-900

HDEUS-900 Fix datatype and order of STU3 extension properties
icanbwell · Jul 23, 2021 · 6703063 · 6703063
2 parents 1b198d1 + 1cf35af
commit 6703063
Show file tree

Hide file tree

Showing 493 changed files with 1,121 additions and 873 deletions.
diff --git a/spark_fhir_schemas/stu3/complex_types/account.py b/spark_fhir_schemas/stu3/complex_types/account.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/account_coverage.py b/spark_fhir_schemas/stu3/complex_types/account_coverage.py
@@ -39,7 +39,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/account_guarantor.py b/spark_fhir_schemas/stu3/complex_types/account_guarantor.py
@@ -39,7 +39,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/activitydefinition.py b/spark_fhir_schemas/stu3/complex_types/activitydefinition.py
@@ -5,8 +5,10 @@
     StructField,
     StringType,
     ArrayType,
+    DateType,
     BooleanType,
     DataType,
+    TimestampType,
 )
 
 
@@ -40,7 +42,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,
@@ -414,10 +416,10 @@ def get_schema(
                 StructField("usage", StringType(), True),
                 # The date on which the resource content was approved by the publisher. Approval
                 # happens once when the content is officially approved for usage.
-                StructField("approvalDate", StringType(), True),
+                StructField("approvalDate", DateType(), True),
                 # The date on which the resource content was last reviewed. Review happens
                 # periodically after approval, but doesn't change the original approval date.
-                StructField("lastReviewDate", StringType(), True),
+                StructField("lastReviewDate", DateType(), True),
                 # The period during which the activity definition content was or is planned to
                 # be in active use.
                 StructField(
@@ -602,7 +604,7 @@ def get_schema(
                     True,
                 ),
                 # The period, timing or frequency upon which the described activity is to occur.
-                StructField("timingDateTime", StringType(), True),
+                StructField("timingDateTime", TimestampType(), True),
                 # The period, timing or frequency upon which the described activity is to occur.
                 StructField(
                     "timingPeriod",

diff --git a/spark_fhir_schemas/stu3/complex_types/activitydefinition_dynamicvalue.py b/spark_fhir_schemas/stu3/complex_types/activitydefinition_dynamicvalue.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/activitydefinition_participant.py b/spark_fhir_schemas/stu3/complex_types/activitydefinition_participant.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/address.py b/spark_fhir_schemas/stu3/complex_types/address.py
@@ -35,7 +35,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/adverseevent.py b/spark_fhir_schemas/stu3/complex_types/adverseevent.py
@@ -34,7 +34,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/adverseevent_suspectentity.py b/spark_fhir_schemas/stu3/complex_types/adverseevent_suspectentity.py
@@ -34,7 +34,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/age.py b/spark_fhir_schemas/stu3/complex_types/age.py
@@ -5,8 +5,8 @@
     StructField,
     StringType,
     ArrayType,
-    IntegerType,
     DataType,
+    FloatType,
 )
 
 
@@ -38,7 +38,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,
@@ -108,7 +108,7 @@ def get_schema(
                 ),
                 # The value of the measured amount. The value includes an implicit precision in
                 # the presentation of the value.
-                StructField("value", IntegerType(), True),
+                StructField("value", FloatType(), True),
                 # How the value should be understood and represented - whether the actual value
                 # is greater or less than the stated value due to measurement issues; e.g. if
                 # the comparator is "<" , then the real value is < stated value.

diff --git a/spark_fhir_schemas/stu3/complex_types/allergyintolerance.py b/spark_fhir_schemas/stu3/complex_types/allergyintolerance.py
@@ -1,6 +1,14 @@
 from typing import Union, List, Optional
 
-from pyspark.sql.types import StructType, StructField, StringType, ArrayType, DataType
+from pyspark.sql.types import (
+    StructType,
+    StructField,
+    StringType,
+    ArrayType,
+    DateType,
+    DataType,
+    TimestampType,
+)
 
 
 # This file is auto-generated by generate_schema so do not edit manually
@@ -32,7 +40,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,
@@ -318,7 +326,7 @@ def get_schema(
                 ),
                 # Estimated or actual date,  date-time, or age when allergy or intolerance was
                 # identified.
-                StructField("onsetDateTime", StringType(), True),
+                StructField("onsetDateTime", TimestampType(), True),
                 # Estimated or actual date,  date-time, or age when allergy or intolerance was
                 # identified.
                 StructField(
@@ -372,7 +380,7 @@ def get_schema(
                 StructField("onsetString", StringType(), True),
                 # The date on which the existance of the AllergyIntolerance was first asserted
                 # or acknowledged.
-                StructField("assertedDate", StringType(), True),
+                StructField("assertedDate", DateType(), True),
                 # Individual who recorded the record and takes responsibility for its content.
                 StructField(
                     "recorder",

diff --git a/spark_fhir_schemas/stu3/complex_types/allergyintolerance_reaction.py b/spark_fhir_schemas/stu3/complex_types/allergyintolerance_reaction.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/annotation.py b/spark_fhir_schemas/stu3/complex_types/annotation.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/appointment.py b/spark_fhir_schemas/stu3/complex_types/appointment.py
@@ -40,7 +40,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/appointment_participant.py b/spark_fhir_schemas/stu3/complex_types/appointment_participant.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/appointmentresponse.py b/spark_fhir_schemas/stu3/complex_types/appointmentresponse.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/attachment.py b/spark_fhir_schemas/stu3/complex_types/attachment.py
@@ -38,7 +38,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent.py b/spark_fhir_schemas/stu3/complex_types/auditevent.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent_agent.py b/spark_fhir_schemas/stu3/complex_types/auditevent_agent.py
@@ -40,7 +40,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent_detail.py b/spark_fhir_schemas/stu3/complex_types/auditevent_detail.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent_entity.py b/spark_fhir_schemas/stu3/complex_types/auditevent_entity.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent_network.py b/spark_fhir_schemas/stu3/complex_types/auditevent_network.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/auditevent_source.py b/spark_fhir_schemas/stu3/complex_types/auditevent_source.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/backboneelement.py b/spark_fhir_schemas/stu3/complex_types/backboneelement.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/basic.py b/spark_fhir_schemas/stu3/complex_types/basic.py
@@ -33,7 +33,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/binary.py b/spark_fhir_schemas/stu3/complex_types/binary.py
@@ -32,7 +32,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bodysite.py b/spark_fhir_schemas/stu3/complex_types/bodysite.py
@@ -40,7 +40,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bundle.py b/spark_fhir_schemas/stu3/complex_types/bundle.py
@@ -38,7 +38,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bundle_entry.py b/spark_fhir_schemas/stu3/complex_types/bundle_entry.py
@@ -31,7 +31,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bundle_link.py b/spark_fhir_schemas/stu3/complex_types/bundle_link.py
@@ -31,7 +31,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bundle_request.py b/spark_fhir_schemas/stu3/complex_types/bundle_request.py
@@ -31,7 +31,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,

diff --git a/spark_fhir_schemas/stu3/complex_types/bundle_response.py b/spark_fhir_schemas/stu3/complex_types/bundle_response.py
@@ -31,7 +31,7 @@ def get_schema(
             "valueTime",
             "valueUnsignedInt",
             "valueUri",
-            "valueUrl",
+            "valueQuantity",
         ],
         extension_depth: int = 0,
         max_extension_depth: Optional[int] = 2,