diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml index 77b42f2d3f..c5bb7b18b9 100644 --- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml +++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml @@ -8,6 +8,13 @@ lib/net8.0/Hl7.Fhir.Base.dll true + + CP0001 + T:Hl7.Fhir.Introspection.BackboneTypeAttribute + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + CP0001 T:System.Runtime.CompilerServices.CollectionBuilderAttribute @@ -21,6 +28,13 @@ lib/netstandard2.0/Hl7.Fhir.Base.dll true + + CP0001 + T:Hl7.Fhir.Introspection.BackboneTypeAttribute + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + CP0002 M:Hl7.Fhir.ElementModel.TypedElementExtensions.IsExactlyEqualTo``1(``0,``0,System.Boolean) @@ -98,6 +112,41 @@ lib/net8.0/Hl7.Fhir.Base.dll true + + CP0002 + M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean) + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean) + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + CP0002 M:Hl7.Fhir.Model.Parameters.get_Item(System.String) @@ -231,6 +280,41 @@ lib/netstandard2.0/Hl7.Fhir.Base.dll true + + CP0002 + M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean) + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean) + lib/netstandard2.0/Hl7.Fhir.Base.dll + lib/netstandard2.0/Hl7.Fhir.Base.dll + true + CP0002 M:Hl7.Fhir.Model.Parameters.get_Item(System.String) diff --git a/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs b/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs deleted file mode 100644 index 6785c7af3b..0000000000 --- a/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2023, Firely (info@fire.ly) and contributors - * See the file CONTRIBUTORS for details. - * - * This file is licensed under the BSD 3-Clause license - * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE - */ - -using System; - -#nullable enable - -namespace Hl7.Fhir.Introspection -{ - /// - /// This attribute is applied to classes that represent Backbone types. - /// - [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)] - public sealed class BackboneTypeAttribute : Attribute - { - public BackboneTypeAttribute(string definitionPath) - { - DefinitionPath = definitionPath ?? throw new ArgumentNullException(nameof(definitionPath)); - } - - /// - /// The path in the StructureDefinition where the backbone was defined. - /// - /// When the backbone is reused in the resource, and thus appears on multiple paths, - /// this is the initial path where the backbone was defined. - public string DefinitionPath { get; private set; } - } -} - -#nullable restore \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs index ef314bd070..98f2324cf8 100644 --- a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs +++ b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs @@ -88,16 +88,13 @@ public static bool TryCreate(Type type, [NotNullWhen(true)]out ClassMapping? res // Now continue with the normal algorithm, types adorned with the [FhirTypeAttribute] if (GetAttribute(type.GetTypeInfo(), release) is not { } typeAttribute) return false; - var backboneAttribute = GetAttribute(type, release); - result = new ClassMapping(collectTypeName(typeAttribute, type), type, release) { - IsResource = typeAttribute.IsResource || type.CanBeTreatedAsType(typeof(Resource)), + IsResource = type.CanBeTreatedAsType(typeof(Resource)), IsCodeOfT = ReflectionHelper.IsClosedGenericType(type) && ReflectionHelper.IsConstructedFromGenericTypeDefinition(type, typeof(Code<>)), IsFhirPrimitive = typeof(PrimitiveType).IsAssignableFrom(type), - IsBackboneType = typeAttribute.IsNestedType || backboneAttribute is not null, - DefinitionPath = backboneAttribute?.DefinitionPath, + IsBackboneType = typeAttribute.IsBackboneType, IsBindable = GetAttribute(type.GetTypeInfo(), release)?.IsBindable ?? false, Canonical = typeAttribute.Canonical, ValidationAttributes = GetAttributes(type.GetTypeInfo(), release).ToArray(), @@ -173,13 +170,6 @@ private ClassMapping(string name, Type nativeType, FhirRelease release) /// public bool IsBackboneType { get; private set; } = false; - - /// - /// If this is a backbone type (), then this contains the path - /// in the StructureDefinition where the backbone was defined first. - /// - public string? DefinitionPath { get; private set; } - /// /// Indicates whether this class can be used for binding. /// diff --git a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs index 24be913e18..4570483ceb 100644 --- a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs +++ b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs @@ -37,7 +37,7 @@ namespace Hl7.Fhir.Introspection /// /// This attribute is applied to classes that represent FHIR datatypes and resources. /// - [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)] + [AttributeUsage(AttributeTargets.Class, Inherited = false)] public sealed class FhirTypeAttribute : VersionedAttribute { public FhirTypeAttribute(string name) @@ -57,20 +57,13 @@ public FhirTypeAttribute(string name, string canonical) public string Name { get; private set; } /// - /// Indicates whether this class represents the nested complex type for a (backbone) element. - /// - public bool IsNestedType { get; set; } - - /// - /// Indicates whether this class represents a Resource + /// The canonical of the StructureDefinition defining this type. /// - public bool IsResource { get; set; } + public string? Canonical { get; set; } /// - /// The canonical of the StructureDefinition defining this type. + /// Indicates whether this class represents the nested complex type for a (backbone) element. /// - public string? Canonical { get; set; } + public bool IsBackboneType { get; set; } } -} - -#nullable restore \ No newline at end of file +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs index 6a1859a1a6..911bd9d092 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs @@ -55,7 +55,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Binary","http://hl7.org/fhir/StructureDefinition/Binary", IsResource=true)] + [FhirType("Binary","http://hl7.org/fhir/StructureDefinition/Binary")] public partial class Binary : Hl7.Fhir.Model.Resource { /// diff --git a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs index 3eecfed903..793a725615 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Bundle","http://hl7.org/fhir/StructureDefinition/Bundle", IsResource=true)] + [FhirType("Bundle","http://hl7.org/fhir/StructureDefinition/Bundle")] public partial class Bundle : Hl7.Fhir.Model.Resource, IIdentifiable { /// @@ -945,14 +945,13 @@ public enum HTTPVerb /// [Serializable] [DataContract] - [FhirType("Bundle#Link", IsNestedType=true)] - [BackboneType("Bundle.link")] + [FhirType("Bundle.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Bundle#Link"; } } + public override string TypeName { get { return "Bundle.link"; } } /// /// See http://www.iana.org/assignments/link-relations/link-relations.xhtml#link-relations-1 @@ -1135,14 +1134,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Bundle#Entry", IsNestedType=true)] - [BackboneType("Bundle.entry")] + [FhirType("Bundle.entry", IsBackboneType=true)] public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Bundle#Entry"; } } + public override string TypeName { get { return "Bundle.entry"; } } /// /// Links related to this entry @@ -1407,14 +1405,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Bundle#Search", IsNestedType=true)] - [BackboneType("Bundle.entry.search")] + [FhirType("Bundle.entry.search", IsBackboneType=true)] public partial class SearchComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Bundle#Search"; } } + public override string TypeName { get { return "Bundle.entry.search"; } } /// /// match | include - why this is in the result set @@ -1596,14 +1593,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Bundle#Request", IsNestedType=true)] - [BackboneType("Bundle.entry.request")] + [FhirType("Bundle.entry.request", IsBackboneType=true)] public partial class RequestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Bundle#Request"; } } + public override string TypeName { get { return "Bundle.entry.request"; } } /// /// GET | HEAD | POST | PUT | DELETE | PATCH @@ -1959,14 +1955,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Bundle#Response", IsNestedType=true)] - [BackboneType("Bundle.entry.response")] + [FhirType("Bundle.entry.response", IsBackboneType=true)] public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Bundle#Response"; } } + public override string TypeName { get { return "Bundle.entry.response"; } } /// /// Status response code (text optional) diff --git a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs index cab8ebf3d5..576631b9eb 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DomainResource","http://hl7.org/fhir/StructureDefinition/DomainResource", IsResource=true)] + [FhirType("DomainResource","http://hl7.org/fhir/StructureDefinition/DomainResource")] public abstract partial class DomainResource : Hl7.Fhir.Model.Resource, Hl7.Fhir.Model.IModifierExtendable { /// diff --git a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs index 0f773dcbad..a50383dd61 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OperationOutcome","http://hl7.org/fhir/StructureDefinition/OperationOutcome", IsResource=true)] + [FhirType("OperationOutcome","http://hl7.org/fhir/StructureDefinition/OperationOutcome")] public partial class OperationOutcome : Hl7.Fhir.Model.DomainResource { /// @@ -316,14 +316,13 @@ public enum IssueType /// [Serializable] [DataContract] - [FhirType("OperationOutcome#Issue", IsNestedType=true)] - [BackboneType("OperationOutcome.issue")] + [FhirType("OperationOutcome.issue", IsBackboneType=true)] public partial class IssueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationOutcome#Issue"; } } + public override string TypeName { get { return "OperationOutcome.issue"; } } /// /// fatal | error | warning | information | success diff --git a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs index bc9f010e53..03e70f9f40 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Parameters","http://hl7.org/fhir/StructureDefinition/Parameters", IsResource=true)] + [FhirType("Parameters","http://hl7.org/fhir/StructureDefinition/Parameters")] public partial class Parameters : Hl7.Fhir.Model.Resource { /// @@ -68,14 +68,13 @@ public partial class Parameters : Hl7.Fhir.Model.Resource /// [Serializable] [DataContract] - [FhirType("Parameters#Parameter", IsNestedType=true)] - [BackboneType("Parameters.parameter")] + [FhirType("Parameters.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Parameters#Parameter"; } } + public override string TypeName { get { return "Parameters.parameter"; } } /// /// Name from the definition diff --git a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs index 72769aab16..216336e366 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Resource","http://hl7.org/fhir/StructureDefinition/Resource", IsResource=true)] + [FhirType("Resource","http://hl7.org/fhir/StructureDefinition/Resource")] public abstract partial class Resource : Hl7.Fhir.Model.Base { /// diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs index 8f172e4b8f..edc3979a16 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement", IsResource=true)] + [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement")] public partial class CapabilityStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -362,14 +362,13 @@ public enum DocumentMode /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Software", IsNestedType=true)] - [BackboneType("CapabilityStatement.software")] + [FhirType("CapabilityStatement.software", IsBackboneType=true)] public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Software"; } } + public override string TypeName { get { return "CapabilityStatement.software"; } } /// /// A name the software is known by @@ -593,14 +592,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Implementation", IsNestedType=true)] - [BackboneType("CapabilityStatement.implementation")] + [FhirType("CapabilityStatement.implementation", IsBackboneType=true)] public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Implementation"; } } + public override string TypeName { get { return "CapabilityStatement.implementation"; } } /// /// Describes this specific instance @@ -811,14 +809,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Rest", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest")] + [FhirType("CapabilityStatement.rest", IsBackboneType=true)] public partial class RestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Rest"; } } + public override string TypeName { get { return "CapabilityStatement.rest"; } } /// /// client | server @@ -1174,14 +1171,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Security", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.security")] + [FhirType("CapabilityStatement.rest.security", IsBackboneType=true)] public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Security"; } } + public override string TypeName { get { return "CapabilityStatement.rest.security"; } } /// /// Adds CORS Headers (http://enable-cors.org/) @@ -1389,14 +1385,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Resource", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource")] + [FhirType("CapabilityStatement.rest.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Resource"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource"; } } /// /// A resource type that is supported @@ -2228,14 +2223,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#ResourceInteraction", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource.interaction")] + [FhirType("CapabilityStatement.rest.resource.interaction", IsBackboneType=true)] public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#ResourceInteraction"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource.interaction"; } } /// /// read | vread | update | patch | delete | history-instance | history-type | create | search-type @@ -2419,14 +2413,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SearchParam", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource.searchParam")] + [FhirType("CapabilityStatement.rest.resource.searchParam", IsBackboneType=true)] public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SearchParam"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource.searchParam"; } } /// /// Name for parameter in search url @@ -2698,14 +2691,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Operation", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource.operation")] + [FhirType("CapabilityStatement.rest.resource.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Operation"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource.operation"; } } /// /// Name by which the operation/query is invoked @@ -2930,14 +2922,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SystemInteraction", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.interaction")] + [FhirType("CapabilityStatement.rest.interaction", IsBackboneType=true)] public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SystemInteraction"; } } + public override string TypeName { get { return "CapabilityStatement.rest.interaction"; } } /// /// transaction | batch | search-system | history-system @@ -3121,14 +3112,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Messaging", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging")] + [FhirType("CapabilityStatement.messaging", IsBackboneType=true)] public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Messaging"; } } + public override string TypeName { get { return "CapabilityStatement.messaging"; } } /// /// Where messages should be sent @@ -3360,14 +3350,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Endpoint", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging.endpoint")] + [FhirType("CapabilityStatement.messaging.endpoint", IsBackboneType=true)] public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Endpoint"; } } + public override string TypeName { get { return "CapabilityStatement.messaging.endpoint"; } } /// /// http | ftp | mllp + @@ -3533,14 +3522,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SupportedMessage", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging.supportedMessage")] + [FhirType("CapabilityStatement.messaging.supportedMessage", IsBackboneType=true)] public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SupportedMessage"; } } + public override string TypeName { get { return "CapabilityStatement.messaging.supportedMessage"; } } /// /// sender | receiver @@ -3724,14 +3712,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Document", IsNestedType=true)] - [BackboneType("CapabilityStatement.document")] + [FhirType("CapabilityStatement.document", IsBackboneType=true)] public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Document"; } } + public override string TypeName { get { return "CapabilityStatement.document"; } } /// /// producer | consumer diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs index c2a8bc8c84..6c4761bdf8 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem", IsResource=true)] + [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem")] public partial class CodeSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -154,14 +154,13 @@ public enum PropertyType /// [Serializable] [DataContract] - [FhirType("CodeSystem#Filter", IsNestedType=true)] - [BackboneType("CodeSystem.filter")] + [FhirType("CodeSystem.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Filter"; } } + public override string TypeName { get { return "CodeSystem.filter"; } } /// /// Code that identifies the filter @@ -433,14 +432,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#Property", IsNestedType=true)] - [BackboneType("CodeSystem.property")] + [FhirType("CodeSystem.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Property"; } } + public override string TypeName { get { return "CodeSystem.property"; } } /// /// Identifies the property on the concepts, and when referred to in operations @@ -711,14 +709,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#ConceptDefinition", IsNestedType=true)] - [BackboneType("CodeSystem.concept")] + [FhirType("CodeSystem.concept", IsBackboneType=true)] public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#ConceptDefinition"; } } + public override string TypeName { get { return "CodeSystem.concept"; } } /// /// Code that identifies concept @@ -1021,14 +1018,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#Designation", IsNestedType=true)] - [BackboneType("CodeSystem.concept.designation")] + [FhirType("CodeSystem.concept.designation", IsBackboneType=true)] public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Designation"; } } + public override string TypeName { get { return "CodeSystem.concept.designation"; } } /// /// Human language of the designation @@ -1263,14 +1259,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#ConceptProperty", IsNestedType=true)] - [BackboneType("CodeSystem.concept.property")] + [FhirType("CodeSystem.concept.property", IsBackboneType=true)] public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#ConceptProperty"; } } + public override string TypeName { get { return "CodeSystem.concept.property"; } } /// /// Reference to CodeSystem.property.code diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs index 95a4575d1b..07c4c86a1a 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs @@ -309,14 +309,13 @@ public enum AdditionalBindingPurposeVS /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Slicing", IsNestedType=true)] - [BackboneType("ElementDefinition.slicing")] + [FhirType("ElementDefinition.slicing", IsBackboneType=true)] public partial class SlicingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Slicing"; } } + public override string TypeName { get { return "ElementDefinition.slicing"; } } /// /// Element values that are used to distinguish the slices @@ -569,14 +568,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Discriminator", IsNestedType=true)] - [BackboneType("ElementDefinition.slicing.discriminator")] + [FhirType("ElementDefinition.slicing.discriminator", IsBackboneType=true)] public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Discriminator"; } } + public override string TypeName { get { return "ElementDefinition.slicing.discriminator"; } } /// /// value | exists | type | profile | position @@ -761,14 +759,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Base", IsNestedType=true)] - [BackboneType("ElementDefinition.base")] + [FhirType("ElementDefinition.base", IsBackboneType=true)] public partial class BaseComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Base"; } } + public override string TypeName { get { return "ElementDefinition.base"; } } /// /// Path that identifies the base element @@ -995,14 +992,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#TypeRef", IsNestedType=true)] - [BackboneType("ElementDefinition.type")] + [FhirType("ElementDefinition.type", IsBackboneType=true)] public partial class TypeRefComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#TypeRef"; } } + public override string TypeName { get { return "ElementDefinition.type"; } } /// /// Data type or Resource (reference to definition) @@ -1321,14 +1317,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Example", IsNestedType=true)] - [BackboneType("ElementDefinition.example")] + [FhirType("ElementDefinition.example", IsBackboneType=true)] public partial class ExampleComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Example"; } } + public override string TypeName { get { return "ElementDefinition.example"; } } /// /// Describes the purpose of this example @@ -1493,14 +1488,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Constraint", IsNestedType=true)] - [BackboneType("ElementDefinition.constraint")] + [FhirType("ElementDefinition.constraint", IsBackboneType=true)] public partial class ConstraintComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Constraint"; } } + public override string TypeName { get { return "ElementDefinition.constraint"; } } /// /// Target of 'condition' reference above @@ -1947,14 +1941,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#ElementDefinitionBinding", IsNestedType=true)] - [BackboneType("ElementDefinition.binding")] + [FhirType("ElementDefinition.binding", IsBackboneType=true)] public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#ElementDefinitionBinding"; } } + public override string TypeName { get { return "ElementDefinition.binding"; } } /// /// required | extensible | preferred | example @@ -2208,14 +2201,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Additional", IsNestedType=true)] - [BackboneType("ElementDefinition.binding.additional")] + [FhirType("ElementDefinition.binding.additional", IsBackboneType=true)] public partial class AdditionalComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Additional"; } } + public override string TypeName { get { return "ElementDefinition.binding.additional"; } } /// /// maximum | minimum | required | extensible | candidate | current | preferred | ui | starter | component. Note: Element was introduced in R5, do not use when working with older releases. @@ -2555,14 +2547,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Mapping", IsNestedType=true)] - [BackboneType("ElementDefinition.mapping")] + [FhirType("ElementDefinition.mapping", IsBackboneType=true)] public partial class MappingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Mapping"; } } + public override string TypeName { get { return "ElementDefinition.mapping"; } } /// /// Reference to mapping declaration diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs index 6ea94c7722..2f82e963ee 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition", IsResource=true)] + [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition")] public partial class StructureDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -151,14 +151,13 @@ public enum ExtensionContextType /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Mapping", IsNestedType=true)] - [BackboneType("StructureDefinition.mapping")] + [FhirType("StructureDefinition.mapping", IsBackboneType=true)] public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Mapping"; } } + public override string TypeName { get { return "StructureDefinition.mapping"; } } /// /// Internal id when this mapping is used @@ -425,14 +424,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Context", IsNestedType=true)] - [BackboneType("StructureDefinition.context")] + [FhirType("StructureDefinition.context", IsBackboneType=true)] public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Context"; } } + public override string TypeName { get { return "StructureDefinition.context"; } } /// /// fhirpath | element | extension @@ -616,14 +614,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Snapshot", IsNestedType=true)] - [BackboneType("StructureDefinition.snapshot")] + [FhirType("StructureDefinition.snapshot", IsBackboneType=true)] public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Snapshot"; } } + public override string TypeName { get { return "StructureDefinition.snapshot"; } } /// /// Definition of elements in the resource (if no StructureDefinition) @@ -743,14 +740,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Differential", IsNestedType=true)] - [BackboneType("StructureDefinition.differential")] + [FhirType("StructureDefinition.differential", IsBackboneType=true)] public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Differential"; } } + public override string TypeName { get { return "StructureDefinition.differential"; } } /// /// Definition of elements in the resource (if no StructureDefinition) diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs index feafaf4758..ffb38af3f8 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet", IsResource=true)] + [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet")] public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("ValueSet#Compose", IsNestedType=true)] - [BackboneType("ValueSet.compose")] + [FhirType("ValueSet.compose", IsBackboneType=true)] public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Compose"; } } + public override string TypeName { get { return "ValueSet.compose"; } } /// /// Fixed date for references with no specified version (transitive) @@ -350,14 +349,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptSet", IsNestedType=true)] - [BackboneType("ValueSet.compose.include")] + [FhirType("ValueSet.compose.include", IsBackboneType=true)] public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptSet"; } } + public override string TypeName { get { return "ValueSet.compose.include"; } } /// /// The system the codes come from @@ -677,14 +675,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptReference", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.concept")] + [FhirType("ValueSet.compose.include.concept", IsBackboneType=true)] public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptReference"; } } + public override string TypeName { get { return "ValueSet.compose.include.concept"; } } /// /// Code or expression from system @@ -892,14 +889,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Designation", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.concept.designation")] + [FhirType("ValueSet.compose.include.concept.designation", IsBackboneType=true)] public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Designation"; } } + public override string TypeName { get { return "ValueSet.compose.include.concept.designation"; } } /// /// Human language of the designation @@ -1135,14 +1131,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Filter", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.filter")] + [FhirType("ValueSet.compose.include.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Filter"; } } + public override string TypeName { get { return "ValueSet.compose.include.filter"; } } /// /// A property/filter defined by the code system @@ -1372,14 +1367,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Expansion", IsNestedType=true)] - [BackboneType("ValueSet.expansion")] + [FhirType("ValueSet.expansion", IsBackboneType=true)] public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Expansion"; } } + public override string TypeName { get { return "ValueSet.expansion"; } } /// /// Identifies the value set expansion (business identifier) @@ -1768,14 +1762,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Parameter", IsNestedType=true)] - [BackboneType("ValueSet.expansion.parameter")] + [FhirType("ValueSet.expansion.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Parameter"; } } + public override string TypeName { get { return "ValueSet.expansion.parameter"; } } /// /// Name as assigned by the client or server @@ -1940,14 +1933,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Property", IsNestedType=true)] - [BackboneType("ValueSet.expansion.property")] + [FhirType("ValueSet.expansion.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Property"; } } + public override string TypeName { get { return "ValueSet.expansion.property"; } } /// /// Identifies the property on the concepts, and when referred to in operations @@ -2128,14 +2120,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Contains", IsNestedType=true)] - [BackboneType("ValueSet.expansion.contains")] + [FhirType("ValueSet.expansion.contains", IsBackboneType=true)] public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Contains"; } } + public override string TypeName { get { return "ValueSet.expansion.contains"; } } /// /// System value for the code @@ -2565,14 +2556,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptProperty", IsNestedType=true)] - [BackboneType("ValueSet.expansion.contains.property")] + [FhirType("ValueSet.expansion.contains.property", IsBackboneType=true)] public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptProperty"; } } + public override string TypeName { get { return "ValueSet.expansion.contains.property"; } } /// /// Reference to ValueSet.expansion.property.code @@ -2764,14 +2754,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptSubProperty", IsNestedType=true)] - [BackboneType("ValueSet.expansion.contains.property.subProperty")] + [FhirType("ValueSet.expansion.contains.property.subProperty", IsBackboneType=true)] public partial class ConceptSubPropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptSubProperty"; } } + public override string TypeName { get { return "ValueSet.expansion.contains.property.subProperty"; } } /// /// Reference to ValueSet.expansion.property.code. Note: Element was introduced in R5, do not use when working with older releases. @@ -2934,14 +2923,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Scope", IsNestedType=true)] - [BackboneType("ValueSet.scope")] + [FhirType("ValueSet.scope", IsBackboneType=true)] public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Scope"; } } + public override string TypeName { get { return "ValueSet.scope"; } } /// /// Criteria describing which concepts or codes should be included and why diff --git a/src/Hl7.Fhir.R4/Model/Generated/Account.cs b/src/Hl7.Fhir.R4/Model/Generated/Account.cs index c9e263f1a3..030c5e3bb2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Account.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)] + [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")] public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -109,14 +109,13 @@ public enum AccountStatus /// [Serializable] [DataContract] - [FhirType("Account#Coverage", IsNestedType=true)] - [BackboneType("Account.coverage")] + [FhirType("Account.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Coverage"; } } + public override string TypeName { get { return "Account.coverage"; } } /// /// The party(s), such as insurances, that may contribute to the payment of this account @@ -281,14 +280,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Guarantor", IsNestedType=true)] - [BackboneType("Account.guarantor")] + [FhirType("Account.guarantor", IsBackboneType=true)] public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Guarantor"; } } + public override string TypeName { get { return "Account.guarantor"; } } /// /// Responsible entity diff --git a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs index 3b54c5954c..4b30543734 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)] + [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")] public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -167,14 +167,13 @@ public enum RequestResourceType /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#Participant", IsNestedType=true)] - [BackboneType("ActivityDefinition.participant")] + [FhirType("ActivityDefinition.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#Participant"; } } + public override string TypeName { get { return "ActivityDefinition.participant"; } } /// /// patient | practitioner | related-person | device @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("ActivityDefinition.dynamicValue")] + [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } } + public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } } /// /// The path to the element to be set dynamically diff --git a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs index 6ad04087fb..99cd32e82d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)] + [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")] public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable, ICoded { /// @@ -163,14 +163,13 @@ public enum AdverseEventOutcome /// [Serializable] [DataContract] - [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity")] + [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)] public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity"; } } /// /// Refers to the specific entity that caused the adverse event @@ -315,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#Causality", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity.causality")] + [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)] public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#Causality"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } } /// /// Assessment of if the entity caused the event diff --git a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs index 3a4f6756bc..8e4a9a4760 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)] + [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")] public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)] - [BackboneType("AllergyIntolerance.reaction")] + [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AllergyIntolerance#Reaction"; } } + public override string TypeName { get { return "AllergyIntolerance.reaction"; } } /// /// Specific substance or pharmaceutical product considered to be responsible for event diff --git a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs index 8a5fd0a958..cdac934dd7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)] + [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")] public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -162,14 +162,13 @@ public enum ParticipantRequired /// [Serializable] [DataContract] - [FhirType("Appointment#Participant", IsNestedType=true)] - [BackboneType("Appointment.participant")] + [FhirType("Appointment.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#Participant"; } } + public override string TypeName { get { return "Appointment.participant"; } } /// /// Role of participant in the appointment diff --git a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs index 2ffd4f55d1..8fd4699c83 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)] + [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")] public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs index 2cfd658945..a2d01919bf 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)] + [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")] public partial class AuditEvent : Hl7.Fhir.Model.DomainResource { /// @@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType /// [Serializable] [DataContract] - [FhirType("AuditEvent#Agent", IsNestedType=true)] - [BackboneType("AuditEvent.agent")] + [FhirType("AuditEvent.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Agent"; } } + public override string TypeName { get { return "AuditEvent.agent"; } } /// /// How agent participated @@ -644,14 +643,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Network", IsNestedType=true)] - [BackboneType("AuditEvent.agent.network")] + [FhirType("AuditEvent.agent.network", IsBackboneType=true)] public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Network"; } } + public override string TypeName { get { return "AuditEvent.agent.network"; } } /// /// Identifier for the network access point of the user device @@ -834,14 +832,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Source", IsNestedType=true)] - [BackboneType("AuditEvent.source")] + [FhirType("AuditEvent.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Source"; } } + public override string TypeName { get { return "AuditEvent.source"; } } /// /// Logical source location within the enterprise @@ -1034,14 +1031,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Entity", IsNestedType=true)] - [BackboneType("AuditEvent.entity")] + [FhirType("AuditEvent.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Entity"; } } + public override string TypeName { get { return "AuditEvent.entity"; } } /// /// Specific instance of resource @@ -1422,14 +1418,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Detail", IsNestedType=true)] - [BackboneType("AuditEvent.entity.detail")] + [FhirType("AuditEvent.entity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Detail"; } } + public override string TypeName { get { return "AuditEvent.entity.detail"; } } /// /// Name of the property diff --git a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs index fb660b36b0..ee64f48ba4 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)] + [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")] public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs index ca96fee32f..41ec2d9cc9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs @@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)] + [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")] public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -156,14 +156,13 @@ public enum BiologicallyDerivedProductStorageScale /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.collection")] + [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } } /// /// Individual performing collection @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Processing", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.processing")] + [FhirType("BiologicallyDerivedProduct.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Processing"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.processing"; } } /// /// Description of of processing @@ -562,14 +560,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Manipulation", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.manipulation")] + [FhirType("BiologicallyDerivedProduct.manipulation", IsBackboneType=true)] public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Manipulation"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.manipulation"; } } /// /// Description of manipulation @@ -730,14 +727,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Storage", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.storage")] + [FhirType("BiologicallyDerivedProduct.storage", IsBackboneType=true)] public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Storage"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.storage"; } } /// /// Description of storage diff --git a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs index 98f3e1bd78..4f5e3efc1c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)] + [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")] public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs index 44a9722b16..adb4d5e6d9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)] + [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")] public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -223,14 +223,13 @@ public enum CarePlanActivityStatus /// [Serializable] [DataContract] - [FhirType("CarePlan#Activity", IsNestedType=true)] - [BackboneType("CarePlan.activity")] + [FhirType("CarePlan.activity", IsBackboneType=true)] public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Activity"; } } + public override string TypeName { get { return "CarePlan.activity"; } } /// /// Results of the activity @@ -457,14 +456,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CarePlan#Detail", IsNestedType=true)] - [BackboneType("CarePlan.activity.detail")] + [FhirType("CarePlan.activity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Detail"; } } + public override string TypeName { get { return "CarePlan.activity.detail"; } } /// /// Appointment | CommunicationRequest | DeviceRequest | MedicationRequest | NutritionOrder | Task | ServiceRequest | VisionPrescription diff --git a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs index d8a2b3fb1c..d4b7e9a029 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)] + [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")] public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -107,14 +107,13 @@ public enum CareTeamStatus /// [Serializable] [DataContract] - [FhirType("CareTeam#Participant", IsNestedType=true)] - [BackboneType("CareTeam.participant")] + [FhirType("CareTeam.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CareTeam#Participant"; } } + public override string TypeName { get { return "CareTeam.participant"; } } /// /// Type of involvement diff --git a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs index 0cca9bf004..54b82e1551 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry", IsResource=true)] + [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry")] public partial class CatalogEntry : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -89,14 +89,13 @@ public enum CatalogEntryRelationType /// [Serializable] [DataContract] - [FhirType("CatalogEntry#RelatedEntry", IsNestedType=true)] - [BackboneType("CatalogEntry.relatedEntry")] + [FhirType("CatalogEntry.relatedEntry", IsBackboneType=true)] public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CatalogEntry#RelatedEntry"; } } + public override string TypeName { get { return "CatalogEntry.relatedEntry"; } } /// /// triggers | is-replaced-by diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs index 2227630db3..3f22ad1d99 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)] + [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")] public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -119,14 +119,13 @@ public enum ChargeItemStatus /// [Serializable] [DataContract] - [FhirType("ChargeItem#Performer", IsNestedType=true)] - [BackboneType("ChargeItem.performer")] + [FhirType("ChargeItem.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItem#Performer"; } } + public override string TypeName { get { return "ChargeItem.performer"; } } /// /// What type of performance was done diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs index 71bdf6e028..7f3b7771f9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)] + [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")] public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.applicability")] + [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)] public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } } + public override string TypeName { get { return "ChargeItemDefinition.applicability"; } } /// /// Natural language description of the condition @@ -298,14 +297,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.propertyGroup")] + [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)] public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } } + public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } } /// /// Conditions under which the priceComponent is applicable @@ -451,14 +449,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#PriceComponent", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")] + [FhirType("ChargeItemDefinition.propertyGroup.priceComponent", IsBackboneType=true)] public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#PriceComponent"; } } + public override string TypeName { get { return "ChargeItemDefinition.propertyGroup.priceComponent"; } } /// /// base | surcharge | deduction | discount | tax | informational diff --git a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs index 48375bb89b..032ac84108 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)] + [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")] public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Claim#RelatedClaim", IsNestedType=true)] - [BackboneType("Claim.related")] + [FhirType("Claim.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#RelatedClaim"; } } + public override string TypeName { get { return "Claim.related"; } } /// /// Reference to the related claim @@ -249,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Payee", IsNestedType=true)] - [BackboneType("Claim.payee")] + [FhirType("Claim.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Payee"; } } + public override string TypeName { get { return "Claim.payee"; } } /// /// Category of recipient @@ -404,14 +402,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#CareTeam", IsNestedType=true)] - [BackboneType("Claim.careTeam")] + [FhirType("Claim.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#CareTeam"; } } + public override string TypeName { get { return "Claim.careTeam"; } } /// /// Order of care team @@ -673,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SupportingInformation", IsNestedType=true)] - [BackboneType("Claim.supportingInfo")] + [FhirType("Claim.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SupportingInformation"; } } + public override string TypeName { get { return "Claim.supportingInfo"; } } /// /// Information instance identifier @@ -952,14 +948,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Diagnosis", IsNestedType=true)] - [BackboneType("Claim.diagnosis")] + [FhirType("Claim.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Diagnosis"; } } + public override string TypeName { get { return "Claim.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1206,14 +1201,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Procedure", IsNestedType=true)] - [BackboneType("Claim.procedure")] + [FhirType("Claim.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Procedure"; } } + public override string TypeName { get { return "Claim.procedure"; } } /// /// Procedure instance identifier @@ -1480,14 +1474,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Insurance", IsNestedType=true)] - [BackboneType("Claim.insurance")] + [FhirType("Claim.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Insurance"; } } + public override string TypeName { get { return "Claim.insurance"; } } /// /// Insurance instance identifier @@ -1836,14 +1829,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Accident", IsNestedType=true)] - [BackboneType("Claim.accident")] + [FhirType("Claim.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Accident"; } } + public override string TypeName { get { return "Claim.accident"; } } /// /// When the incident occurred @@ -2035,14 +2027,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Item", IsNestedType=true)] - [BackboneType("Claim.item")] + [FhirType("Claim.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Item"; } } + public override string TypeName { get { return "Claim.item"; } } /// /// Item instance identifier @@ -2798,14 +2789,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Detail", IsNestedType=true)] - [BackboneType("Claim.item.detail")] + [FhirType("Claim.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Detail"; } } + public override string TypeName { get { return "Claim.item.detail"; } } /// /// Item instance identifier @@ -3248,14 +3238,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SubDetail", IsNestedType=true)] - [BackboneType("Claim.item.detail.subDetail")] + [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SubDetail"; } } + public override string TypeName { get { return "Claim.item.detail.subDetail"; } } /// /// Item instance identifier diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs index 2c2fc30b1a..b8949d427b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)] + [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")] public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Item", IsNestedType=true)] - [BackboneType("ClaimResponse.item")] + [FhirType("ClaimResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Item"; } } + public override string TypeName { get { return "ClaimResponse.item"; } } /// /// Claim item instance identifier @@ -308,14 +307,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Adjudication", IsNestedType=true)] - [BackboneType("ClaimResponse.item.adjudication")] + [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Adjudication"; } } + public override string TypeName { get { return "ClaimResponse.item.adjudication"; } } /// /// Type of adjudication information @@ -530,14 +528,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail")] + [FhirType("ClaimResponse.item.detail", IsBackboneType=true)] public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#ItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail"; } } /// /// Claim detail instance identifier @@ -771,14 +768,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#SubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail.subDetail")] + [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#SubDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } } /// /// Claim sub-detail instance identifier @@ -986,14 +982,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItem", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem")] + [FhirType("ClaimResponse.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItem"; } } + public override string TypeName { get { return "ClaimResponse.addItem"; } } /// /// Item sequence number @@ -1651,14 +1646,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail")] + [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail"; } } /// /// Billing, service, product, or drug code @@ -2020,14 +2014,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail.subDetail")] + [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } } /// /// Billing, service, product, or drug code @@ -2364,14 +2357,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Total", IsNestedType=true)] - [BackboneType("ClaimResponse.total")] + [FhirType("ClaimResponse.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Total"; } } + public override string TypeName { get { return "ClaimResponse.total"; } } /// /// Type of adjudication information @@ -2518,14 +2510,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Payment", IsNestedType=true)] - [BackboneType("ClaimResponse.payment")] + [FhirType("ClaimResponse.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Payment"; } } + public override string TypeName { get { return "ClaimResponse.payment"; } } /// /// Partial or complete payment @@ -2791,14 +2782,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Note", IsNestedType=true)] - [BackboneType("ClaimResponse.processNote")] + [FhirType("ClaimResponse.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Note"; } } + public override string TypeName { get { return "ClaimResponse.processNote"; } } /// /// Note instance identifier @@ -3051,14 +3041,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Insurance", IsNestedType=true)] - [BackboneType("ClaimResponse.insurance")] + [FhirType("ClaimResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Insurance"; } } + public override string TypeName { get { return "ClaimResponse.insurance"; } } /// /// Insurance instance identifier @@ -3339,14 +3328,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Error", IsNestedType=true)] - [BackboneType("ClaimResponse.error")] + [FhirType("ClaimResponse.error", IsBackboneType=true)] public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Error"; } } + public override string TypeName { get { return "ClaimResponse.error"; } } /// /// Item sequence number diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs index 2417136cc0..149567b762 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)] + [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")] public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Investigation", IsNestedType=true)] - [BackboneType("ClinicalImpression.investigation")] + [FhirType("ClinicalImpression.investigation", IsBackboneType=true)] public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Investigation"; } } + public override string TypeName { get { return "ClinicalImpression.investigation"; } } /// /// A name/code for the set @@ -251,14 +250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Finding", IsNestedType=true)] - [BackboneType("ClinicalImpression.finding")] + [FhirType("ClinicalImpression.finding", IsBackboneType=true)] public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Finding"; } } + public override string TypeName { get { return "ClinicalImpression.finding"; } } /// /// What was found diff --git a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs index 211464f456..162987fd35 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)] + [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")] public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("Communication#Payload", IsNestedType=true)] - [BackboneType("Communication.payload")] + [FhirType("Communication.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Communication#Payload"; } } + public override string TypeName { get { return "Communication.payload"; } } /// /// Message part content diff --git a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs index 9638087d7a..9f7484eedd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)] + [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")] public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("CommunicationRequest#Payload", IsNestedType=true)] - [BackboneType("CommunicationRequest.payload")] + [FhirType("CommunicationRequest.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CommunicationRequest#Payload"; } } + public override string TypeName { get { return "CommunicationRequest.payload"; } } /// /// Message part content diff --git a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs index 5d395ea3f3..a784aa575f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)] + [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")] public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition#Resource", IsNestedType=true)] - [BackboneType("CompartmentDefinition.resource")] + [FhirType("CompartmentDefinition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CompartmentDefinition#Resource"; } } + public override string TypeName { get { return "CompartmentDefinition.resource"; } } /// /// Name of resource type diff --git a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs index 5d661c22e4..e0b6677acb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)] + [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")] public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable, ICoded { /// @@ -166,14 +166,13 @@ public enum CompositionAttestationMode /// [Serializable] [DataContract] - [FhirType("Composition#Attester", IsNestedType=true)] - [BackboneType("Composition.attester")] + [FhirType("Composition.attester", IsBackboneType=true)] public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Attester"; } } + public override string TypeName { get { return "Composition.attester"; } } /// /// personal | professional | legal | official @@ -384,14 +383,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#RelatesTo", IsNestedType=true)] - [BackboneType("Composition.relatesTo")] + [FhirType("Composition.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#RelatesTo"; } } + public override string TypeName { get { return "Composition.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -561,14 +559,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Event", IsNestedType=true)] - [BackboneType("Composition.event")] + [FhirType("Composition.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Event"; } } + public override string TypeName { get { return "Composition.event"; } } /// /// Code(s) that apply to the event being documented @@ -742,14 +739,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Section", IsNestedType=true)] - [BackboneType("Composition.section")] + [FhirType("Composition.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Section"; } } + public override string TypeName { get { return "Composition.section"; } } /// /// Label for section (e.g. for ToC) diff --git a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs index 7e888d92e4..63521c4022 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)] + [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")] public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -95,14 +95,13 @@ public enum ConceptMapGroupUnmappedMode /// [Serializable] [DataContract] - [FhirType("ConceptMap#Group", IsNestedType=true)] - [BackboneType("ConceptMap.group")] + [FhirType("ConceptMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Group"; } } + public override string TypeName { get { return "ConceptMap.group"; } } /// /// Source system where concepts to be mapped are defined @@ -420,14 +419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#SourceElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element")] + [FhirType("ConceptMap.group.element", IsBackboneType=true)] public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#SourceElement"; } } + public override string TypeName { get { return "ConceptMap.group.element"; } } /// /// Identifies element being mapped @@ -634,14 +632,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#TargetElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target")] + [FhirType("ConceptMap.group.element.target", IsBackboneType=true)] public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#TargetElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target"; } } /// /// Code that identifies the target element @@ -962,14 +959,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#OtherElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target.dependsOn")] + [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)] public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#OtherElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } } /// /// Reference to property mapping depends on @@ -1238,14 +1234,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#Unmapped", IsNestedType=true)] - [BackboneType("ConceptMap.group.unmapped")] + [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)] public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Unmapped"; } } + public override string TypeName { get { return "ConceptMap.group.unmapped"; } } /// /// provided | fixed | other-map diff --git a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs index 0de4d87b4c..f4cceb9eaf 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)] + [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")] public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -159,14 +159,13 @@ public enum ConditionVerificationStatus /// [Serializable] [DataContract] - [FhirType("Condition#Stage", IsNestedType=true)] - [BackboneType("Condition.stage")] + [FhirType("Condition.stage", IsBackboneType=true)] public partial class StageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Stage"; } } + public override string TypeName { get { return "Condition.stage"; } } /// /// Simple summary (disease specific) @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Condition#Evidence", IsNestedType=true)] - [BackboneType("Condition.evidence")] + [FhirType("Condition.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Evidence"; } } + public override string TypeName { get { return "Condition.evidence"; } } /// /// Manifestation/symptom diff --git a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs index 2228366d7f..c59c727a4c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)] + [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")] public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -170,14 +170,13 @@ public enum ConsentDataMeaning /// [Serializable] [DataContract] - [FhirType("Consent#Policy", IsNestedType=true)] - [BackboneType("Consent.policy")] + [FhirType("Consent.policy", IsBackboneType=true)] public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Policy"; } } + public override string TypeName { get { return "Consent.policy"; } } /// /// Enforcement source for policy @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Verification", IsNestedType=true)] - [BackboneType("Consent.verification")] + [FhirType("Consent.verification", IsBackboneType=true)] public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Verification"; } } + public override string TypeName { get { return "Consent.verification"; } } /// /// Has been verified @@ -572,14 +570,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provision", IsNestedType=true)] - [BackboneType("Consent.provision")] + [FhirType("Consent.provision", IsBackboneType=true)] public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provision"; } } + public override string TypeName { get { return "Consent.provision"; } } /// /// deny | permit @@ -981,14 +978,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionActor", IsNestedType=true)] - [BackboneType("Consent.provision.actor")] + [FhirType("Consent.provision.actor", IsBackboneType=true)] public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionActor"; } } + public override string TypeName { get { return "Consent.provision.actor"; } } /// /// How the actor is involved @@ -1137,14 +1133,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionData", IsNestedType=true)] - [BackboneType("Consent.provision.data")] + [FhirType("Consent.provision.data", IsBackboneType=true)] public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionData"; } } + public override string TypeName { get { return "Consent.provision.data"; } } /// /// instance | related | dependents | authoredby diff --git a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs index e72d82178d..9655948aff 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)] + [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")] public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Contract#ContentDefinition", IsNestedType=true)] - [BackboneType("Contract.contentDefinition")] + [FhirType("Contract.contentDefinition", IsBackboneType=true)] public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContentDefinition"; } } + public override string TypeName { get { return "Contract.contentDefinition"; } } /// /// Content structure and use @@ -580,14 +579,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Term", IsNestedType=true)] - [BackboneType("Contract.term")] + [FhirType("Contract.term", IsBackboneType=true)] public partial class TermComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Term"; } } + public override string TypeName { get { return "Contract.term"; } } /// /// Contract Term Number @@ -1027,14 +1025,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#SecurityLabel", IsNestedType=true)] - [BackboneType("Contract.term.securityLabel")] + [FhirType("Contract.term.securityLabel", IsBackboneType=true)] public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#SecurityLabel"; } } + public override string TypeName { get { return "Contract.term.securityLabel"; } } /// /// Link to Security Labels @@ -1253,14 +1250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractOffer", IsNestedType=true)] - [BackboneType("Contract.term.offer")] + [FhirType("Contract.term.offer", IsBackboneType=true)] public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractOffer"; } } + public override string TypeName { get { return "Contract.term.offer"; } } /// /// Offer business ID @@ -1666,14 +1662,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractParty", IsNestedType=true)] - [BackboneType("Contract.term.offer.party")] + [FhirType("Contract.term.offer.party", IsBackboneType=true)] public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractParty"; } } + public override string TypeName { get { return "Contract.term.offer.party"; } } /// /// Referenced entity @@ -1819,14 +1814,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Answer", IsNestedType=true)] - [BackboneType("Contract.term.offer.answer")] + [FhirType("Contract.term.offer.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Answer"; } } + public override string TypeName { get { return "Contract.term.offer.answer"; } } /// /// The actual answer response @@ -1946,14 +1940,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractAsset", IsNestedType=true)] - [BackboneType("Contract.term.asset")] + [FhirType("Contract.term.asset", IsBackboneType=true)] public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractAsset"; } } + public override string TypeName { get { return "Contract.term.asset"; } } /// /// Range of asset @@ -2509,14 +2502,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#AssetContext", IsNestedType=true)] - [BackboneType("Contract.term.asset.context")] + [FhirType("Contract.term.asset.context", IsBackboneType=true)] public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#AssetContext"; } } + public override string TypeName { get { return "Contract.term.asset.context"; } } /// /// Creator,custodian or owner @@ -2704,14 +2696,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ValuedItem", IsNestedType=true)] - [BackboneType("Contract.term.asset.valuedItem")] + [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)] public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ValuedItem"; } } + public override string TypeName { get { return "Contract.term.asset.valuedItem"; } } /// /// Contract Valued Item Type @@ -3292,14 +3283,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Action", IsNestedType=true)] - [BackboneType("Contract.term.action")] + [FhirType("Contract.term.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Action"; } } + public override string TypeName { get { return "Contract.term.action"; } } /// /// True if the term prohibits the action @@ -4091,14 +4081,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ActionSubject", IsNestedType=true)] - [BackboneType("Contract.term.action.subject")] + [FhirType("Contract.term.action.subject", IsBackboneType=true)] public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ActionSubject"; } } + public override string TypeName { get { return "Contract.term.action.subject"; } } /// /// Entity of the action @@ -4248,14 +4237,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Signatory", IsNestedType=true)] - [BackboneType("Contract.signer")] + [FhirType("Contract.signer", IsBackboneType=true)] public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Signatory"; } } + public override string TypeName { get { return "Contract.signer"; } } /// /// Contract Signatory Role @@ -4430,14 +4418,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#FriendlyLanguage", IsNestedType=true)] - [BackboneType("Contract.friendly")] + [FhirType("Contract.friendly", IsBackboneType=true)] public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#FriendlyLanguage"; } } + public override string TypeName { get { return "Contract.friendly"; } } /// /// Easily comprehended representation of this Contract @@ -4560,14 +4547,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#LegalLanguage", IsNestedType=true)] - [BackboneType("Contract.legal")] + [FhirType("Contract.legal", IsBackboneType=true)] public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#LegalLanguage"; } } + public override string TypeName { get { return "Contract.legal"; } } /// /// Contract Legal Text @@ -4690,14 +4676,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ComputableLanguage", IsNestedType=true)] - [BackboneType("Contract.rule")] + [FhirType("Contract.rule", IsBackboneType=true)] public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ComputableLanguage"; } } + public override string TypeName { get { return "Contract.rule"; } } /// /// Computable Contract Rules diff --git a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs index c8575684bd..35a5028c7c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)] + [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")] public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -69,14 +69,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Coverage#Class", IsNestedType=true)] - [BackboneType("Coverage.class")] + [FhirType("Coverage.class", IsBackboneType=true)] public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Class"; } } + public override string TypeName { get { return "Coverage.class"; } } /// /// Type of class such as 'group' or 'plan' @@ -285,14 +284,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary")] + [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)] public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#CostToBeneficiary"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary"; } } /// /// Cost category @@ -466,14 +464,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#Exemption", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary.exception")] + [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)] public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Exemption"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } } /// /// Exception category diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs index c837077edc..97280be900 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)] + [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")] public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum EligibilityRequestPurpose /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.supportingInfo")] + [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } } /// /// Information instance identifier @@ -319,14 +318,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.insurance")] + [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } } /// /// Applicable coverage @@ -534,14 +532,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item")] + [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item"; } } /// /// Applicable exception or supporting information @@ -916,14 +913,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item.diagnosis")] + [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } } /// /// Nature of illness or problem diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs index 4103d993a2..c0e40913ae 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)] + [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")] public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum EligibilityResponsePurpose /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance")] + [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } } /// /// Insurance information @@ -325,14 +324,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item")] + [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)] public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } } /// /// Benefit classification @@ -878,14 +876,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")] + [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } } /// /// Benefit classification @@ -1060,14 +1057,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.error")] + [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)] public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.error"; } } /// /// Error code detailing processing issues diff --git a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs index 1faa7c7437..488766bc2e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs @@ -89,14 +89,13 @@ public enum SortDirection /// [Serializable] [DataContract] - [FhirType("DataRequirement#CodeFilter", IsNestedType=true)] - [BackboneType("DataRequirement.codeFilter")] + [FhirType("DataRequirement.codeFilter", IsBackboneType=true)] public partial class CodeFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#CodeFilter"; } } + public override string TypeName { get { return "DataRequirement.codeFilter"; } } /// /// A code-valued attribute to filter on @@ -345,14 +344,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#DateFilter", IsNestedType=true)] - [BackboneType("DataRequirement.dateFilter")] + [FhirType("DataRequirement.dateFilter", IsBackboneType=true)] public partial class DateFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#DateFilter"; } } + public override string TypeName { get { return "DataRequirement.dateFilter"; } } /// /// A date-valued attribute to filter on @@ -560,14 +558,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#Sort", IsNestedType=true)] - [BackboneType("DataRequirement.sort")] + [FhirType("DataRequirement.sort", IsBackboneType=true)] public partial class SortComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#Sort"; } } + public override string TypeName { get { return "DataRequirement.sort"; } } /// /// The name of the attribute to perform the sort diff --git a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs index 8ac2879c43..195bff0dc6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)] + [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")] public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -95,14 +95,13 @@ public enum DetectedIssueSeverity /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Evidence", IsNestedType=true)] - [BackboneType("DetectedIssue.evidence")] + [FhirType("DetectedIssue.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Evidence"; } } + public override string TypeName { get { return "DetectedIssue.evidence"; } } /// /// Manifestation @@ -251,14 +250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Mitigation", IsNestedType=true)] - [BackboneType("DetectedIssue.mitigation")] + [FhirType("DetectedIssue.mitigation", IsBackboneType=true)] public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Mitigation"; } } + public override string TypeName { get { return "DetectedIssue.mitigation"; } } /// /// What mitigation? diff --git a/src/Hl7.Fhir.R4/Model/Generated/Device.cs b/src/Hl7.Fhir.R4/Model/Generated/Device.cs index a782d5f06c..7d779f69e1 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Device.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)] + [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")] public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -148,14 +148,13 @@ public enum UDIEntryType /// [Serializable] [DataContract] - [FhirType("Device#UdiCarrier", IsNestedType=true)] - [BackboneType("Device.udiCarrier")] + [FhirType("Device.udiCarrier", IsBackboneType=true)] public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#UdiCarrier"; } } + public override string TypeName { get { return "Device.udiCarrier"; } } /// /// Mandatory fixed portion of UDI @@ -509,14 +508,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#DeviceName", IsNestedType=true)] - [BackboneType("Device.deviceName")] + [FhirType("Device.deviceName", IsBackboneType=true)] public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#DeviceName"; } } + public override string TypeName { get { return "Device.deviceName"; } } /// /// The name of the device @@ -697,14 +695,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Specialization", IsNestedType=true)] - [BackboneType("Device.specialization")] + [FhirType("Device.specialization", IsBackboneType=true)] public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Specialization"; } } + public override string TypeName { get { return "Device.specialization"; } } /// /// The standard that is used to operate and communicate @@ -864,14 +861,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Version", IsNestedType=true)] - [BackboneType("Device.version")] + [FhirType("Device.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Version"; } } + public override string TypeName { get { return "Device.version"; } } /// /// The type of the device version @@ -1056,14 +1052,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Property", IsNestedType=true)] - [BackboneType("Device.property")] + [FhirType("Device.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Property"; } } + public override string TypeName { get { return "Device.property"; } } /// /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible) diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs index f52ec98878..0c488f75b8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)] + [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")] public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)] - [BackboneType("DeviceDefinition.udiDeviceIdentifier")] + [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)] public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } } + public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } } /// /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdication porvided in the DeviceDefinition.udiDeviceIdentifier @@ -298,14 +297,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)] - [BackboneType("DeviceDefinition.deviceName")] + [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)] public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#DeviceName"; } } + public override string TypeName { get { return "DeviceDefinition.deviceName"; } } /// /// The name of the device @@ -486,14 +484,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Specialization", IsNestedType=true)] - [BackboneType("DeviceDefinition.specialization")] + [FhirType("DeviceDefinition.specialization", IsBackboneType=true)] public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Specialization"; } } + public override string TypeName { get { return "DeviceDefinition.specialization"; } } /// /// The standard that is used to operate and communicate @@ -671,14 +668,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Capability", IsNestedType=true)] - [BackboneType("DeviceDefinition.capability")] + [FhirType("DeviceDefinition.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Capability"; } } + public override string TypeName { get { return "DeviceDefinition.capability"; } } /// /// Type of capability @@ -821,14 +817,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Property", IsNestedType=true)] - [BackboneType("DeviceDefinition.property")] + [FhirType("DeviceDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Property"; } } + public override string TypeName { get { return "DeviceDefinition.property"; } } /// /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible) @@ -997,14 +992,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Material", IsNestedType=true)] - [BackboneType("DeviceDefinition.material")] + [FhirType("DeviceDefinition.material", IsBackboneType=true)] public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Material"; } } + public override string TypeName { get { return "DeviceDefinition.material"; } } /// /// The substance diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs index 20d9ce4d2e..add986262e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)] + [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")] public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState /// [Serializable] [DataContract] - [FhirType("DeviceMetric#Calibration", IsNestedType=true)] - [BackboneType("DeviceMetric.calibration")] + [FhirType("DeviceMetric.calibration", IsBackboneType=true)] public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceMetric#Calibration"; } } + public override string TypeName { get { return "DeviceMetric.calibration"; } } /// /// unspecified | offset | gain | two-point diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs index bcc3f377fc..5a0564e469 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)] + [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")] public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("DeviceRequest#Parameter", IsNestedType=true)] - [BackboneType("DeviceRequest.parameter")] + [FhirType("DeviceRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceRequest#Parameter"; } } + public override string TypeName { get { return "DeviceRequest.parameter"; } } /// /// Device detail diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs index eaf7e44cf9..d933546488 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)] + [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")] public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs index 53197d1ff0..24d9b305a5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)] + [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")] public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -138,14 +138,13 @@ public enum DiagnosticReportStatus /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#Media", IsNestedType=true)] - [BackboneType("DiagnosticReport.media")] + [FhirType("DiagnosticReport.media", IsBackboneType=true)] public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#Media"; } } + public override string TypeName { get { return "DiagnosticReport.media"; } } /// /// Comment about the image (e.g. explanation) diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs index fdd04208ff..716dd2142f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)] + [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")] public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("DocumentManifest#Related", IsNestedType=true)] - [BackboneType("DocumentManifest.related")] + [FhirType("DocumentManifest.related", IsBackboneType=true)] public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentManifest#Related"; } } + public override string TypeName { get { return "DocumentManifest.related"; } } /// /// Identifiers of things that are related diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs index 13714b34b6..5295dbe8c3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)] + [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")] public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("DocumentReference#RelatesTo", IsNestedType=true)] - [BackboneType("DocumentReference.relatesTo")] + [FhirType("DocumentReference.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#RelatesTo"; } } + public override string TypeName { get { return "DocumentReference.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -244,14 +243,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Content", IsNestedType=true)] - [BackboneType("DocumentReference.content")] + [FhirType("DocumentReference.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Content"; } } + public override string TypeName { get { return "DocumentReference.content"; } } /// /// Where to access the document @@ -398,14 +396,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Context", IsNestedType=true)] - [BackboneType("DocumentReference.context")] + [FhirType("DocumentReference.context", IsBackboneType=true)] public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Context"; } } + public override string TypeName { get { return "DocumentReference.context"; } } /// /// Context of the document content diff --git a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs index 8768962e84..1fa2a2a362 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs @@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType /// [Serializable] [DataContract] - [FhirType("Dosage#DoseAndRate", IsNestedType=true)] - [BackboneType("Dosage.doseAndRate")] + [FhirType("Dosage.doseAndRate", IsBackboneType=true)] public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Dosage#DoseAndRate"; } } + public override string TypeName { get { return "Dosage.doseAndRate"; } } /// /// The kind of dose or rate specified diff --git a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs index de32351dce..1ca8ff4820 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis", IsResource=true)] + [FhirType("EffectEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis")] public partial class EffectEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -89,14 +89,13 @@ public enum ExposureStateCode /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#SampleSize", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.sampleSize")] + [FhirType("EffectEvidenceSynthesis.sampleSize", IsBackboneType=true)] public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#SampleSize"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.sampleSize"; } } /// /// Description of sample size @@ -319,14 +318,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#ResultsByExposure", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.resultsByExposure")] + [FhirType("EffectEvidenceSynthesis.resultsByExposure", IsBackboneType=true)] public partial class ResultsByExposureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#ResultsByExposure"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.resultsByExposure"; } } /// /// Description of results by exposure @@ -562,14 +560,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#EffectEstimate", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.effectEstimate")] + [FhirType("EffectEvidenceSynthesis.effectEstimate", IsBackboneType=true)] public partial class EffectEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#EffectEstimate"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.effectEstimate"; } } /// /// Description of effect estimate @@ -853,14 +850,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#PrecisionEstimate", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.effectEstimate.precisionEstimate")] + [FhirType("EffectEvidenceSynthesis.effectEstimate.precisionEstimate", IsBackboneType=true)] public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#PrecisionEstimate"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.effectEstimate.precisionEstimate"; } } /// /// Type of precision estimate @@ -1109,14 +1105,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#Certainty", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.certainty")] + [FhirType("EffectEvidenceSynthesis.certainty", IsBackboneType=true)] public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#Certainty"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.certainty"; } } /// /// Certainty rating @@ -1289,14 +1284,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EffectEvidenceSynthesis#CertaintySubcomponent", IsNestedType=true)] - [BackboneType("EffectEvidenceSynthesis.certainty.certaintySubcomponent")] + [FhirType("EffectEvidenceSynthesis.certainty.certaintySubcomponent", IsBackboneType=true)] public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EffectEvidenceSynthesis#CertaintySubcomponent"; } } + public override string TypeName { get { return "EffectEvidenceSynthesis.certainty.certaintySubcomponent"; } } /// /// Type of subcomponent of certainty rating diff --git a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs index 6fdc9dbbbc..07d61b0613 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)] + [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")] public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -168,14 +168,13 @@ public enum EncounterLocationStatus /// [Serializable] [DataContract] - [FhirType("Encounter#StatusHistory", IsNestedType=true)] - [BackboneType("Encounter.statusHistory")] + [FhirType("Encounter.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#StatusHistory"; } } + public override string TypeName { get { return "Encounter.statusHistory"; } } /// /// planned | arrived | triaged | in-progress | onleave | finished | cancelled + @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#ClassHistory", IsNestedType=true)] - [BackboneType("Encounter.classHistory")] + [FhirType("Encounter.classHistory", IsBackboneType=true)] public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#ClassHistory"; } } + public override string TypeName { get { return "Encounter.classHistory"; } } /// /// inpatient | outpatient | ambulatory | emergency + @@ -495,14 +493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Participant", IsNestedType=true)] - [BackboneType("Encounter.participant")] + [FhirType("Encounter.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Participant"; } } + public override string TypeName { get { return "Encounter.participant"; } } /// /// Role of participant in encounter @@ -672,14 +669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Diagnosis", IsNestedType=true)] - [BackboneType("Encounter.diagnosis")] + [FhirType("Encounter.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Diagnosis"; } } + public override string TypeName { get { return "Encounter.diagnosis"; } } /// /// The diagnosis or procedure relevant to the encounter @@ -871,14 +867,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Hospitalization", IsNestedType=true)] - [BackboneType("Encounter.hospitalization")] + [FhirType("Encounter.hospitalization", IsBackboneType=true)] public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Hospitalization"; } } + public override string TypeName { get { return "Encounter.hospitalization"; } } /// /// Pre-admission identifier @@ -1211,14 +1206,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Location", IsNestedType=true)] - [BackboneType("Encounter.location")] + [FhirType("Encounter.location", IsBackboneType=true)] public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Location"; } } + public override string TypeName { get { return "Encounter.location"; } } /// /// Location the encounter takes place diff --git a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs index caa5813a83..d005f9fcba 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)] + [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")] public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs index bd95b76a73..8f0ed7c2c7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)] + [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")] public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs index 2e19ba6220..6f3b5e969d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)] + [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")] public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs index ae0e326d4c..fb6146368e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)] + [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")] public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)] - [BackboneType("EpisodeOfCare.statusHistory")] + [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } } + public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } } /// /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error @@ -289,14 +288,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)] - [BackboneType("EpisodeOfCare.diagnosis")] + [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } } + public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } } /// /// Conditions/problems/diagnoses this episode of care is for diff --git a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs index aafe53f88e..8186e3e05a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)] + [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")] public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs index 999cd0bb5c..0c95952a13 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)] + [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")] public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs index 6aa759db18..40e9c9800a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)] + [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")] public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic")] + [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#Characteristic"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic"; } } /// /// Natural language description of the characteristic diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs index 1e30b81548..5d6938b8be 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)] + [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")] public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -83,14 +83,13 @@ public enum ExampleScenarioActorType /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Actor", IsNestedType=true)] - [BackboneType("ExampleScenario.actor")] + [FhirType("ExampleScenario.actor", IsBackboneType=true)] public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Actor"; } } + public override string TypeName { get { return "ExampleScenario.actor"; } } /// /// ID or acronym of the actor @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Instance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance")] + [FhirType("ExampleScenario.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Instance"; } } + public override string TypeName { get { return "ExampleScenario.instance"; } } /// /// The id of the resource for referencing @@ -683,14 +681,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Version", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.version")] + [FhirType("ExampleScenario.instance.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Version"; } } + public override string TypeName { get { return "ExampleScenario.instance.version"; } } /// /// The identifier of a specific version of a resource @@ -872,14 +869,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.containedInstance")] + [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)] public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } } + public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } } /// /// Each resource contained in the instance @@ -1057,14 +1053,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Process", IsNestedType=true)] - [BackboneType("ExampleScenario.process")] + [FhirType("ExampleScenario.process", IsBackboneType=true)] public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Process"; } } + public override string TypeName { get { return "ExampleScenario.process"; } } /// /// The diagram title of the group of operations @@ -1354,14 +1349,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Step", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step")] + [FhirType("ExampleScenario.process.step", IsBackboneType=true)] public partial class StepComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Step"; } } + public override string TypeName { get { return "ExampleScenario.process.step"; } } /// /// Nested process @@ -1572,14 +1566,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Operation", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.operation")] + [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Operation"; } } + public override string TypeName { get { return "ExampleScenario.process.step.operation"; } } /// /// The sequential number of the interaction @@ -2068,14 +2061,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Alternative", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.alternative")] + [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)] public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Alternative"; } } + public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } } /// /// Label for alternative diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs index f92c41fdd7..bb99511a78 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)] + [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")] public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.related")] + [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } } + public override string TypeName { get { return "ExplanationOfBenefit.related"; } } /// /// Reference to the related claim @@ -282,14 +281,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payee")] + [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payee"; } } /// /// Category of recipient @@ -436,14 +434,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.careTeam")] + [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } } + public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } } /// /// Order of care team @@ -705,14 +702,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.supportingInfo")] + [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } } + public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } } /// /// Information instance identifier @@ -984,14 +980,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.diagnosis")] + [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } } + public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1238,14 +1233,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.procedure")] + [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } } + public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } } /// /// Procedure instance identifier @@ -1512,14 +1506,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.insurance")] + [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } } /// /// Coverage to be used for adjudication @@ -1729,14 +1722,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.accident")] + [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } } + public override string TypeName { get { return "ExplanationOfBenefit.accident"; } } /// /// When the incident occurred @@ -1927,14 +1919,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item")] + [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Item"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item"; } } /// /// Item instance identifier @@ -2760,14 +2751,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.adjudication")] + [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } } /// /// Type of adjudication information @@ -2982,14 +2972,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail")] + [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } } /// /// Product or service provided @@ -3502,14 +3491,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail.subDetail")] + [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } } /// /// Product or service provided @@ -3996,14 +3984,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem")] + [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } } /// /// Item sequence number @@ -4661,14 +4648,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail")] + [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } } /// /// Billing, service, product, or drug code @@ -5030,14 +5016,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")] + [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } } /// /// Billing, service, product, or drug code @@ -5374,14 +5359,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.total")] + [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Total"; } } + public override string TypeName { get { return "ExplanationOfBenefit.total"; } } /// /// Type of adjudication information @@ -5528,14 +5512,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payment")] + [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payment"; } } /// /// Partial or complete payment @@ -5799,14 +5782,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.processNote")] + [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Note"; } } + public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } } /// /// Note instance identifier @@ -6054,14 +6036,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance")] + [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)] public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } } /// /// Benefit classification @@ -6415,14 +6396,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance.financial")] + [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } } /// /// Benefit classification diff --git a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs index 6dbd7eab60..1465722277 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)] + [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")] public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum FamilyHistoryStatus /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.condition")] + [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Condition"; } } + public override string TypeName { get { return "FamilyMemberHistory.condition"; } } /// /// Condition suffered by relation diff --git a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs index 874d05b7e6..7d7fa6b7c3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)] + [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")] public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs index 68d2c0ff87..dd52e810b2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)] + [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")] public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -133,14 +133,13 @@ public enum GoalLifecycleStatus /// [Serializable] [DataContract] - [FhirType("Goal#Target", IsNestedType=true)] - [BackboneType("Goal.target")] + [FhirType("Goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Goal#Target"; } } + public override string TypeName { get { return "Goal.target"; } } /// /// The parameter whose value is being tracked diff --git a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs index 7aab062b3a..32b9e513e7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)] + [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")] public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -120,14 +120,13 @@ public enum GraphCompartmentRule /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Link", IsNestedType=true)] - [BackboneType("GraphDefinition.link")] + [FhirType("GraphDefinition.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Link"; } } + public override string TypeName { get { return "GraphDefinition.link"; } } /// /// Path in the resource that contains the link @@ -459,14 +458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Target", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target")] + [FhirType("GraphDefinition.link.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Target"; } } + public override string TypeName { get { return "GraphDefinition.link.target"; } } /// /// Type of resource this link refers to @@ -741,14 +739,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Compartment", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target.compartment")] + [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)] public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Compartment"; } } + public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } } /// /// condition | requirement diff --git a/src/Hl7.Fhir.R4/Model/Generated/Group.cs b/src/Hl7.Fhir.R4/Model/Generated/Group.cs index cda11a4647..ce0ae6507b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Group.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)] + [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")] public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -115,14 +115,13 @@ public enum GroupType /// [Serializable] [DataContract] - [FhirType("Group#Characteristic", IsNestedType=true)] - [BackboneType("Group.characteristic")] + [FhirType("Group.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Characteristic"; } } + public override string TypeName { get { return "Group.characteristic"; } } /// /// Kind of characteristic @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Group#Member", IsNestedType=true)] - [BackboneType("Group.member")] + [FhirType("Group.member", IsBackboneType=true)] public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Member"; } } + public override string TypeName { get { return "Group.member"; } } /// /// Reference to the group member diff --git a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs index c255909672..0809e16cfa 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)] + [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")] public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs index 1c6715f9ec..acf9174e67 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)] + [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")] public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("HealthcareService#Eligibility", IsNestedType=true)] - [BackboneType("HealthcareService.eligibility")] + [FhirType("HealthcareService.eligibility", IsBackboneType=true)] public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#Eligibility"; } } + public override string TypeName { get { return "HealthcareService.eligibility"; } } /// /// Coded value for the eligibility @@ -235,14 +234,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("HealthcareService#AvailableTime", IsNestedType=true)] - [BackboneType("HealthcareService.availableTime")] + [FhirType("HealthcareService.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#AvailableTime"; } } + public override string TypeName { get { return "HealthcareService.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -511,14 +509,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("HealthcareService#NotAvailable", IsNestedType=true)] - [BackboneType("HealthcareService.notAvailable")] + [FhirType("HealthcareService.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#NotAvailable"; } } + public override string TypeName { get { return "HealthcareService.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs index 64223e9f7b..2c8a128605 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)] + [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")] public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum ImagingStudyStatus /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Series", IsNestedType=true)] - [BackboneType("ImagingStudy.series")] + [FhirType("ImagingStudy.series", IsBackboneType=true)] public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Series"; } } + public override string TypeName { get { return "ImagingStudy.series"; } } /// /// DICOM Series Instance UID for the series @@ -612,14 +611,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Performer", IsNestedType=true)] - [BackboneType("ImagingStudy.series.performer")] + [FhirType("ImagingStudy.series.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Performer"; } } + public override string TypeName { get { return "ImagingStudy.series.performer"; } } /// /// Type of performance @@ -767,14 +765,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Instance", IsNestedType=true)] - [BackboneType("ImagingStudy.series.instance")] + [FhirType("ImagingStudy.series.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Instance"; } } + public override string TypeName { get { return "ImagingStudy.series.instance"; } } /// /// DICOM SOP Instance UID diff --git a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs index a196c20834..64a5a50bcd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)] + [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")] public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes /// [Serializable] [DataContract] - [FhirType("Immunization#Performer", IsNestedType=true)] - [BackboneType("Immunization.performer")] + [FhirType("Immunization.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Performer"; } } + public override string TypeName { get { return "Immunization.performer"; } } /// /// What type of performance was done @@ -250,14 +249,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Education", IsNestedType=true)] - [BackboneType("Immunization.education")] + [FhirType("Immunization.education", IsBackboneType=true)] public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Education"; } } + public override string TypeName { get { return "Immunization.education"; } } /// /// Educational material document identifier @@ -524,14 +522,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Reaction", IsNestedType=true)] - [BackboneType("Immunization.reaction")] + [FhirType("Immunization.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Reaction"; } } + public override string TypeName { get { return "Immunization.reaction"; } } /// /// When reaction started @@ -738,14 +735,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#ProtocolApplied", IsNestedType=true)] - [BackboneType("Immunization.protocolApplied")] + [FhirType("Immunization.protocolApplied", IsBackboneType=true)] public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#ProtocolApplied"; } } + public override string TypeName { get { return "Immunization.protocolApplied"; } } /// /// Name of vaccine series diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs index 7d787ee7ee..0348804f6a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)] + [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")] public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs index fcb4ad7acc..cdd30c27d8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)] + [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")] public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation")] + [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)] public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } } /// /// Vaccine or vaccine group recommendation applies to @@ -521,14 +520,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")] + [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)] public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } } /// /// Type of date diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs index 1e86c06d53..076d9c3fbc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)] + [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")] public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource { /// @@ -2257,14 +2257,13 @@ public enum GuideParameterCode /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)] - [BackboneType("ImplementationGuide.dependsOn")] + [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)] public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#DependsOn"; } } + public override string TypeName { get { return "ImplementationGuide.dependsOn"; } } /// /// Identity of the IG that this depends on @@ -2489,14 +2488,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Global", IsNestedType=true)] - [BackboneType("ImplementationGuide.global")] + [FhirType("ImplementationGuide.global", IsBackboneType=true)] public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Global"; } } + public override string TypeName { get { return "ImplementationGuide.global"; } } /// /// Type this profile applies to @@ -2681,14 +2679,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Definition", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition")] + [FhirType("ImplementationGuide.definition", IsBackboneType=true)] public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Definition"; } } + public override string TypeName { get { return "ImplementationGuide.definition"; } } /// /// Grouping used to present related resources in the IG @@ -2912,14 +2909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Grouping", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.grouping")] + [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)] public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Grouping"; } } + public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } } /// /// Descriptive name for the package @@ -3100,14 +3096,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Resource", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.resource")] + [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Resource"; } } + public override string TypeName { get { return "ImplementationGuide.definition.resource"; } } /// /// Location of the resource @@ -3432,14 +3427,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Page", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.page")] + [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)] public partial class PageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Page"; } } + public override string TypeName { get { return "ImplementationGuide.definition.page"; } } /// /// Where to find that page @@ -3675,14 +3669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Parameter", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.parameter")] + [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Parameter"; } } + public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } } /// /// apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template @@ -3863,14 +3856,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Template", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.template")] + [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)] public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Template"; } } + public override string TypeName { get { return "ImplementationGuide.definition.template"; } } /// /// Type of template specified @@ -4095,14 +4087,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Manifest", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest")] + [FhirType("ImplementationGuide.manifest", IsBackboneType=true)] public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Manifest"; } } + public override string TypeName { get { return "ImplementationGuide.manifest"; } } /// /// Location of rendered implementation guide @@ -4379,14 +4370,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.resource")] + [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)] public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } } /// /// Location of the resource @@ -4578,14 +4568,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.page")] + [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)] public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.page"; } } /// /// HTML page name diff --git a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs index fdf99df9ed..41d944d24a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)] + [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")] public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -93,14 +93,13 @@ public enum BenefitCostApplicability /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Contact", IsNestedType=true)] - [BackboneType("InsurancePlan.contact")] + [FhirType("InsurancePlan.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Contact"; } } + public override string TypeName { get { return "InsurancePlan.contact"; } } /// /// The type of contact @@ -296,14 +295,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Coverage", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage")] + [FhirType("InsurancePlan.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Coverage"; } } + public override string TypeName { get { return "InsurancePlan.coverage"; } } /// /// Type of coverage @@ -477,14 +475,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit")] + [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)] public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } } /// /// Type of benefit @@ -673,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Limit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit.limit")] + [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)] public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Limit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } } /// /// Maximum value allowed @@ -824,14 +820,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Plan", IsNestedType=true)] - [BackboneType("InsurancePlan.plan")] + [FhirType("InsurancePlan.plan", IsBackboneType=true)] public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Plan"; } } + public override string TypeName { get { return "InsurancePlan.plan"; } } /// /// Business Identifier for Product @@ -1084,14 +1079,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.generalCost")] + [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)] public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#GeneralCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } } /// /// Type of cost @@ -1321,14 +1315,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost")] + [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)] public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#SpecificCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } } /// /// General category of benefit @@ -1474,14 +1467,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit")] + [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)] public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } } /// /// Type of specific benefit @@ -1627,14 +1619,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Cost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")] + [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Cost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } } /// /// Type of cost diff --git a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs index 5d2910457d..c1de7c0093 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)] + [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")] public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum InvoiceStatus /// [Serializable] [DataContract] - [FhirType("Invoice#Participant", IsNestedType=true)] - [BackboneType("Invoice.participant")] + [FhirType("Invoice.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#Participant"; } } + public override string TypeName { get { return "Invoice.participant"; } } /// /// Type of involvement in creation of this Invoice @@ -261,14 +260,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Invoice#LineItem", IsNestedType=true)] - [BackboneType("Invoice.lineItem")] + [FhirType("Invoice.lineItem", IsBackboneType=true)] public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#LineItem"; } } + public override string TypeName { get { return "Invoice.lineItem"; } } /// /// Sequence number of line item @@ -460,14 +458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Invoice#PriceComponent", IsNestedType=true)] - [BackboneType("Invoice.lineItem.priceComponent")] + [FhirType("Invoice.lineItem.priceComponent", IsBackboneType=true)] public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#PriceComponent"; } } + public override string TypeName { get { return "Invoice.lineItem.priceComponent"; } } /// /// base | surcharge | deduction | discount | tax | informational diff --git a/src/Hl7.Fhir.R4/Model/Generated/Library.cs b/src/Hl7.Fhir.R4/Model/Generated/Library.cs index a1274b933a..fcbed94a73 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Library.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)] + [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")] public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs index 72b40f4919..91fd395b19 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)] + [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")] public partial class Linkage : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum LinkageType /// [Serializable] [DataContract] - [FhirType("Linkage#Item", IsNestedType=true)] - [BackboneType("Linkage.item")] + [FhirType("Linkage.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Linkage#Item"; } } + public override string TypeName { get { return "Linkage.item"; } } /// /// source | alternate | historical diff --git a/src/Hl7.Fhir.R4/Model/Generated/List.cs b/src/Hl7.Fhir.R4/Model/Generated/List.cs index 7e8e59148a..e94fde4525 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/List.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)] + [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")] public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -93,14 +93,13 @@ public enum ListStatus /// [Serializable] [DataContract] - [FhirType("List#Entry", IsNestedType=true)] - [BackboneType("List.entry")] + [FhirType("List.entry", IsBackboneType=true)] public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "List#Entry"; } } + public override string TypeName { get { return "List.entry"; } } /// /// Status/Workflow information about this item diff --git a/src/Hl7.Fhir.R4/Model/Generated/Location.cs b/src/Hl7.Fhir.R4/Model/Generated/Location.cs index 40d7d98893..c5453f90aa 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Location.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)] + [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")] public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -117,14 +117,13 @@ public enum LocationMode /// [Serializable] [DataContract] - [FhirType("Location#Position", IsNestedType=true)] - [BackboneType("Location.position")] + [FhirType("Location.position", IsBackboneType=true)] public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#Position"; } } + public override string TypeName { get { return "Location.position"; } } /// /// Longitude with WGS84 datum @@ -350,14 +349,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Location#HoursOfOperation", IsNestedType=true)] - [BackboneType("Location.hoursOfOperation")] + [FhirType("Location.hoursOfOperation", IsBackboneType=true)] public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#HoursOfOperation"; } } + public override string TypeName { get { return "Location.hoursOfOperation"; } } /// /// mon | tue | wed | thu | fri | sat | sun diff --git a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs index ba76cef10a..3dfc3e8897 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)] + [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")] public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Measure#Group", IsNestedType=true)] - [BackboneType("Measure.group")] + [FhirType("Measure.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Group"; } } + public override string TypeName { get { return "Measure.group"; } } /// /// Meaning of the group @@ -288,14 +287,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Population", IsNestedType=true)] - [BackboneType("Measure.group.population")] + [FhirType("Measure.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Population"; } } + public override string TypeName { get { return "Measure.group.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation @@ -484,14 +482,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Stratifier", IsNestedType=true)] - [BackboneType("Measure.group.stratifier")] + [FhirType("Measure.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Stratifier"; } } + public override string TypeName { get { return "Measure.group.stratifier"; } } /// /// Meaning of the stratifier @@ -705,14 +702,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Component", IsNestedType=true)] - [BackboneType("Measure.group.stratifier.component")] + [FhirType("Measure.group.stratifier.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Component"; } } + public override string TypeName { get { return "Measure.group.stratifier.component"; } } /// /// Meaning of the stratifier component @@ -901,14 +897,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#SupplementalData", IsNestedType=true)] - [BackboneType("Measure.supplementalData")] + [FhirType("Measure.supplementalData", IsBackboneType=true)] public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#SupplementalData"; } } + public override string TypeName { get { return "Measure.supplementalData"; } } /// /// Meaning of the supplemental data diff --git a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs index 7a148c3813..425dac26f3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)] + [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")] public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -129,14 +129,13 @@ public enum MeasureReportType /// [Serializable] [DataContract] - [FhirType("MeasureReport#Group", IsNestedType=true)] - [BackboneType("MeasureReport.group")] + [FhirType("MeasureReport.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Group"; } } + public override string TypeName { get { return "MeasureReport.group"; } } /// /// Meaning of the group @@ -332,14 +331,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Population", IsNestedType=true)] - [BackboneType("MeasureReport.group.population")] + [FhirType("MeasureReport.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Population"; } } + public override string TypeName { get { return "MeasureReport.group.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation @@ -529,14 +527,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Stratifier", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier")] + [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Stratifier"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier"; } } /// /// What stratifier of the group @@ -682,14 +679,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum")] + [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)] public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroup"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } } /// /// The stratum value, e.g. male @@ -885,14 +881,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Component", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.component")] + [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Component"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } } /// /// What stratifier component of the group @@ -1038,14 +1033,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.population")] + [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)] public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation diff --git a/src/Hl7.Fhir.R4/Model/Generated/Media.cs b/src/Hl7.Fhir.R4/Model/Generated/Media.cs index 0d7577619f..a7eb0aff32 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Media.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)] + [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")] public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs index 97e07ada14..38d6b8fc0c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)] + [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")] public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -96,14 +96,13 @@ public enum MedicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Medication#Ingredient", IsNestedType=true)] - [BackboneType("Medication.ingredient")] + [FhirType("Medication.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Ingredient"; } } + public override string TypeName { get { return "Medication.ingredient"; } } /// /// The actual ingredient or content @@ -294,14 +293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Batch", IsNestedType=true)] - [BackboneType("Medication.batch")] + [FhirType("Medication.batch", IsBackboneType=true)] public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Batch"; } } + public override string TypeName { get { return "Medication.batch"; } } /// /// Identifier assigned to batch diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs index cb6f284659..eb304c6d72 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)] + [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")] public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Performer", IsNestedType=true)] - [BackboneType("MedicationAdministration.performer")] + [FhirType("MedicationAdministration.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Performer"; } } + public override string TypeName { get { return "MedicationAdministration.performer"; } } /// /// Type of performance @@ -274,14 +273,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Dosage", IsNestedType=true)] - [BackboneType("MedicationAdministration.dosage")] + [FhirType("MedicationAdministration.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Dosage"; } } + public override string TypeName { get { return "MedicationAdministration.dosage"; } } /// /// Free text dosage instructions e.g. SIG diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs index 93d1ad4a1e..f674642ba5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)] + [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")] public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Performer", IsNestedType=true)] - [BackboneType("MedicationDispense.performer")] + [FhirType("MedicationDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Performer"; } } + public override string TypeName { get { return "MedicationDispense.performer"; } } /// /// Who performed the dispense and what they did @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Substitution", IsNestedType=true)] - [BackboneType("MedicationDispense.substitution")] + [FhirType("MedicationDispense.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Substitution"; } } + public override string TypeName { get { return "MedicationDispense.substitution"; } } /// /// Whether a substitution was or was not performed on the dispense diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs index ed12b38b07..62d7f1cbf8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)] + [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")] public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource, ICoded { /// @@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)] - [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")] + [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)] public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } } + public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } } /// /// Category of medicationKnowledge @@ -247,14 +246,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monograph")] + [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)] public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Monograph"; } } + public override string TypeName { get { return "MedicationKnowledge.monograph"; } } /// /// The category of medication document @@ -400,14 +398,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)] - [BackboneType("MedicationKnowledge.ingredient")] + [FhirType("MedicationKnowledge.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } } + public override string TypeName { get { return "MedicationKnowledge.ingredient"; } } /// /// Medication(s) or substance(s) contained in the medication @@ -598,14 +595,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Cost", IsNestedType=true)] - [BackboneType("MedicationKnowledge.cost")] + [FhirType("MedicationKnowledge.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Cost"; } } + public override string TypeName { get { return "MedicationKnowledge.cost"; } } /// /// The category of the cost information @@ -794,14 +790,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monitoringProgram")] + [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)] public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } } + public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } } /// /// Type of program under which the medication is monitored @@ -963,14 +958,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#AdministrationGuidelines", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines")] + [FhirType("MedicationKnowledge.administrationGuidelines", IsBackboneType=true)] public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#AdministrationGuidelines"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines"; } } /// /// Dosage for the medication for the specific guidelines @@ -1141,14 +1135,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")] + [FhirType("MedicationKnowledge.administrationGuidelines.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Dosage"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.dosage"; } } /// /// Type of dosage @@ -1294,14 +1287,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#PatientCharacteristics", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")] + [FhirType("MedicationKnowledge.administrationGuidelines.patientCharacteristics", IsBackboneType=true)] public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristics"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.patientCharacteristics"; } } /// /// Specific characteristic that is relevant to the administration guideline @@ -1464,14 +1456,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)] - [BackboneType("MedicationKnowledge.medicineClassification")] + [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)] public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } } + public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } } /// /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification) @@ -1617,14 +1608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)] - [BackboneType("MedicationKnowledge.packaging")] + [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)] public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Packaging"; } } + public override string TypeName { get { return "MedicationKnowledge.packaging"; } } /// /// A code that defines the specific type of packaging that the medication can be found in @@ -1769,14 +1759,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)] - [BackboneType("MedicationKnowledge.drugCharacteristic")] + [FhirType("MedicationKnowledge.drugCharacteristic", IsBackboneType=true)] public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } } + public override string TypeName { get { return "MedicationKnowledge.drugCharacteristic"; } } /// /// Code specifying the type of characteristic of medication @@ -1920,14 +1909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory")] + [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)] public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory"; } } /// /// Specifies the authority of the regulation @@ -2123,14 +2111,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.substitution")] + [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Substitution"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } } /// /// Specifies the type of substitution allowed @@ -2291,14 +2278,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Schedule", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.schedule")] + [FhirType("MedicationKnowledge.regulatory.schedule", IsBackboneType=true)] public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Schedule"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.schedule"; } } /// /// Specifies the specific drug schedule @@ -2415,14 +2401,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.maxDispense")] + [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)] public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } } /// /// The maximum number of units of the medication that can be dispensed @@ -2564,14 +2549,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Kinetics", IsNestedType=true)] - [BackboneType("MedicationKnowledge.kinetics")] + [FhirType("MedicationKnowledge.kinetics", IsBackboneType=true)] public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Kinetics"; } } + public override string TypeName { get { return "MedicationKnowledge.kinetics"; } } /// /// The drug concentration measured at certain discrete points in time diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs index 9cf3952102..d86c52ec56 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)] + [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")] public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -183,14 +183,13 @@ public enum MedicationRequestIntent /// [Serializable] [DataContract] - [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest")] + [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)] public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } } /// /// First fill details @@ -480,14 +479,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#InitialFill", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest.initialFill")] + [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)] public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#InitialFill"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } } /// /// First fill quantity @@ -631,14 +629,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#Substitution", IsNestedType=true)] - [BackboneType("MedicationRequest.substitution")] + [FhirType("MedicationRequest.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#Substitution"; } } + public override string TypeName { get { return "MedicationRequest.substitution"; } } /// /// Whether substitution is allowed or not diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs index 1bf70b8ac5..db362d1fa2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs @@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)] + [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")] public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs index 108b8ada60..fdbd9e569a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProduct","http://hl7.org/fhir/StructureDefinition/MedicinalProduct", IsResource=true)] + [FhirType("MedicinalProduct","http://hl7.org/fhir/StructureDefinition/MedicinalProduct")] public partial class MedicinalProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class MedicinalProduct : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("MedicinalProduct#Name", IsNestedType=true)] - [BackboneType("MedicinalProduct.name")] + [FhirType("MedicinalProduct.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProduct#Name"; } } + public override string TypeName { get { return "MedicinalProduct.name"; } } /// /// The full product name @@ -255,14 +254,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProduct#NamePart", IsNestedType=true)] - [BackboneType("MedicinalProduct.name.namePart")] + [FhirType("MedicinalProduct.name.namePart", IsBackboneType=true)] public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProduct#NamePart"; } } + public override string TypeName { get { return "MedicinalProduct.name.namePart"; } } /// /// A fragment of a product name @@ -423,14 +421,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProduct#CountryLanguage", IsNestedType=true)] - [BackboneType("MedicinalProduct.name.countryLanguage")] + [FhirType("MedicinalProduct.name.countryLanguage", IsBackboneType=true)] public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProduct#CountryLanguage"; } } + public override string TypeName { get { return "MedicinalProduct.name.countryLanguage"; } } /// /// Country code for where this name applies @@ -598,14 +595,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProduct#ManufacturingBusinessOperation", IsNestedType=true)] - [BackboneType("MedicinalProduct.manufacturingBusinessOperation")] + [FhirType("MedicinalProduct.manufacturingBusinessOperation", IsBackboneType=true)] public partial class ManufacturingBusinessOperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProduct#ManufacturingBusinessOperation"; } } + public override string TypeName { get { return "MedicinalProduct.manufacturingBusinessOperation"; } } /// /// The type of manufacturing operation @@ -869,14 +865,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProduct#SpecialDesignation", IsNestedType=true)] - [BackboneType("MedicinalProduct.specialDesignation")] + [FhirType("MedicinalProduct.specialDesignation", IsBackboneType=true)] public partial class SpecialDesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProduct#SpecialDesignation"; } } + public override string TypeName { get { return "MedicinalProduct.specialDesignation"; } } /// /// Identifier for the designation, or procedure number diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs index 90548009b5..e1eae3fd09 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductAuthorization","http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization", IsResource=true)] + [FhirType("MedicinalProductAuthorization","http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization")] public partial class MedicinalProductAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class MedicinalProductAuthorization : Hl7.Fhir.Model.DomainResour /// [Serializable] [DataContract] - [FhirType("MedicinalProductAuthorization#JurisdictionalAuthorization", IsNestedType=true)] - [BackboneType("MedicinalProductAuthorization.jurisdictionalAuthorization")] + [FhirType("MedicinalProductAuthorization.jurisdictionalAuthorization", IsBackboneType=true)] public partial class JurisdictionalAuthorizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductAuthorization#JurisdictionalAuthorization"; } } + public override string TypeName { get { return "MedicinalProductAuthorization.jurisdictionalAuthorization"; } } /// /// The assigned number for the marketing authorization @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductAuthorization#Procedure", IsNestedType=true)] - [BackboneType("MedicinalProductAuthorization.procedure")] + [FhirType("MedicinalProductAuthorization.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductAuthorization#Procedure"; } } + public override string TypeName { get { return "MedicinalProductAuthorization.procedure"; } } /// /// Identifier for this procedure diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs index c5de22ac6b..a88e03ec7a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductContraindication","http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication", IsResource=true)] + [FhirType("MedicinalProductContraindication","http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication")] public partial class MedicinalProductContraindication : Hl7.Fhir.Model.DomainResource { /// @@ -64,14 +64,13 @@ public partial class MedicinalProductContraindication : Hl7.Fhir.Model.DomainRes /// [Serializable] [DataContract] - [FhirType("MedicinalProductContraindication#OtherTherapy", IsNestedType=true)] - [BackboneType("MedicinalProductContraindication.otherTherapy")] + [FhirType("MedicinalProductContraindication.otherTherapy", IsBackboneType=true)] public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductContraindication#OtherTherapy"; } } + public override string TypeName { get { return "MedicinalProductContraindication.otherTherapy"; } } /// /// The type of relationship between the medicinal product indication or contraindication and another therapy diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs index 632db1a377..7e58250f70 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductIndication","http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication", IsResource=true)] + [FhirType("MedicinalProductIndication","http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication")] public partial class MedicinalProductIndication : Hl7.Fhir.Model.DomainResource { /// @@ -64,14 +64,13 @@ public partial class MedicinalProductIndication : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("MedicinalProductIndication#OtherTherapy", IsNestedType=true)] - [BackboneType("MedicinalProductIndication.otherTherapy")] + [FhirType("MedicinalProductIndication.otherTherapy", IsBackboneType=true)] public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductIndication#OtherTherapy"; } } + public override string TypeName { get { return "MedicinalProductIndication.otherTherapy"; } } /// /// The type of relationship between the medicinal product indication or contraindication and another therapy diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs index 946333aaa4..7dd2f43bce 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductIngredient","http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient", IsResource=true)] + [FhirType("MedicinalProductIngredient","http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient")] public partial class MedicinalProductIngredient : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -61,14 +61,13 @@ public partial class MedicinalProductIngredient : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("MedicinalProductIngredient#SpecifiedSubstance", IsNestedType=true)] - [BackboneType("MedicinalProductIngredient.specifiedSubstance")] + [FhirType("MedicinalProductIngredient.specifiedSubstance", IsBackboneType=true)] public partial class SpecifiedSubstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductIngredient#SpecifiedSubstance"; } } + public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance"; } } /// /// The specified substance @@ -262,14 +261,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductIngredient#Strength", IsNestedType=true)] - [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength")] + [FhirType("MedicinalProductIngredient.specifiedSubstance.strength", IsBackboneType=true)] public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductIngredient#Strength"; } } + public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance.strength"; } } /// /// The quantity of substance in the unit of presentation, or in the volume (or mass) of the single pharmaceutical product or manufactured item @@ -556,14 +554,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductIngredient#ReferenceStrength", IsNestedType=true)] - [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength")] + [FhirType("MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength", IsBackboneType=true)] public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductIngredient#ReferenceStrength"; } } + public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength"; } } /// /// Relevant reference substance @@ -799,14 +796,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductIngredient#Substance", IsNestedType=true)] - [BackboneType("MedicinalProductIngredient.substance")] + [FhirType("MedicinalProductIngredient.substance", IsBackboneType=true)] public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductIngredient#Substance"; } } + public override string TypeName { get { return "MedicinalProductIngredient.substance"; } } /// /// The ingredient substance diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs index e647a220e0..2274a26d20 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductInteraction","http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction", IsResource=true)] + [FhirType("MedicinalProductInteraction","http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction")] public partial class MedicinalProductInteraction : Hl7.Fhir.Model.DomainResource { /// @@ -64,14 +64,13 @@ public partial class MedicinalProductInteraction : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("MedicinalProductInteraction#Interactant", IsNestedType=true)] - [BackboneType("MedicinalProductInteraction.interactant")] + [FhirType("MedicinalProductInteraction.interactant", IsBackboneType=true)] public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductInteraction#Interactant"; } } + public override string TypeName { get { return "MedicinalProductInteraction.interactant"; } } /// /// The specific medication, food or laboratory test that interacts diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs index 00b4a61208..e10313c783 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductManufactured","http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured", IsResource=true)] + [FhirType("MedicinalProductManufactured","http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured")] public partial class MedicinalProductManufactured : Hl7.Fhir.Model.DomainResource { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs index d71f80a36b..c3d4326e12 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductPackaged","http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged", IsResource=true)] + [FhirType("MedicinalProductPackaged","http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged")] public partial class MedicinalProductPackaged : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class MedicinalProductPackaged : Hl7.Fhir.Model.DomainResource, I /// [Serializable] [DataContract] - [FhirType("MedicinalProductPackaged#BatchIdentifier", IsNestedType=true)] - [BackboneType("MedicinalProductPackaged.batchIdentifier")] + [FhirType("MedicinalProductPackaged.batchIdentifier", IsBackboneType=true)] public partial class BatchIdentifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPackaged#BatchIdentifier"; } } + public override string TypeName { get { return "MedicinalProductPackaged.batchIdentifier"; } } /// /// A number appearing on the outer packaging of a specific batch @@ -210,14 +209,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductPackaged#PackageItem", IsNestedType=true)] - [BackboneType("MedicinalProductPackaged.packageItem")] + [FhirType("MedicinalProductPackaged.packageItem", IsBackboneType=true)] public partial class PackageItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPackaged#PackageItem"; } } + public override string TypeName { get { return "MedicinalProductPackaged.packageItem"; } } /// /// Including possibly Data Carrier Identifier diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs index eacb99d654..8f78ce4a03 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductPharmaceutical","http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical", IsResource=true)] + [FhirType("MedicinalProductPharmaceutical","http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical")] public partial class MedicinalProductPharmaceutical : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class MedicinalProductPharmaceutical : Hl7.Fhir.Model.DomainResou /// [Serializable] [DataContract] - [FhirType("MedicinalProductPharmaceutical#Characteristics", IsNestedType=true)] - [BackboneType("MedicinalProductPharmaceutical.characteristics")] + [FhirType("MedicinalProductPharmaceutical.characteristics", IsBackboneType=true)] public partial class CharacteristicsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPharmaceutical#Characteristics"; } } + public override string TypeName { get { return "MedicinalProductPharmaceutical.characteristics"; } } /// /// A coded characteristic @@ -210,14 +209,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductPharmaceutical#RouteOfAdministration", IsNestedType=true)] - [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration")] + [FhirType("MedicinalProductPharmaceutical.routeOfAdministration", IsBackboneType=true)] public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPharmaceutical#RouteOfAdministration"; } } + public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration"; } } /// /// Coded expression for the route @@ -485,14 +483,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductPharmaceutical#TargetSpecies", IsNestedType=true)] - [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies")] + [FhirType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies", IsBackboneType=true)] public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPharmaceutical#TargetSpecies"; } } + public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies"; } } /// /// Coded expression for the species @@ -635,14 +632,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductPharmaceutical#WithdrawalPeriod", IsNestedType=true)] - [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod")] + [FhirType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)] public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductPharmaceutical#WithdrawalPeriod"; } } + public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod"; } } /// /// Coded expression for the type of tissue for which the withdrawal period applues, e.g. meat, milk diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs index c7a7eaf317..a66824fda2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductUndesirableEffect","http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect", IsResource=true)] + [FhirType("MedicinalProductUndesirableEffect","http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect")] public partial class MedicinalProductUndesirableEffect : Hl7.Fhir.Model.DomainResource { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs index f544fe255e..19db4dcd29 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)] + [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")] public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -96,14 +96,13 @@ public enum MessageSignificanceCategory /// [Serializable] [DataContract] - [FhirType("MessageDefinition#Focus", IsNestedType=true)] - [BackboneType("MessageDefinition.focus")] + [FhirType("MessageDefinition.focus", IsBackboneType=true)] public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#Focus"; } } + public override string TypeName { get { return "MessageDefinition.focus"; } } /// /// Type of resource @@ -374,14 +373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)] - [BackboneType("MessageDefinition.allowedResponse")] + [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)] public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } } + public override string TypeName { get { return "MessageDefinition.allowedResponse"; } } /// /// Reference to allowed message definition response diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs index d732f42084..7451ba1f97 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)] + [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")] public partial class MessageHeader : Hl7.Fhir.Model.DomainResource { /// @@ -96,14 +96,13 @@ public enum ResponseType /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageDestination", IsNestedType=true)] - [BackboneType("MessageHeader.destination")] + [FhirType("MessageHeader.destination", IsBackboneType=true)] public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageDestination"; } } + public override string TypeName { get { return "MessageHeader.destination"; } } /// /// Name of system @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageSource", IsNestedType=true)] - [BackboneType("MessageHeader.source")] + [FhirType("MessageHeader.source", IsBackboneType=true)] public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageSource"; } } + public override string TypeName { get { return "MessageHeader.source"; } } /// /// Name of system @@ -637,14 +635,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#Response", IsNestedType=true)] - [BackboneType("MessageHeader.response")] + [FhirType("MessageHeader.response", IsBackboneType=true)] public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#Response"; } } + public override string TypeName { get { return "MessageHeader.response"; } } /// /// Id of original message diff --git a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs index 03de0742c6..cdc3d3bb1d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)] + [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")] public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -207,14 +207,13 @@ public enum RepositoryType /// [Serializable] [DataContract] - [FhirType("MolecularSequence#ReferenceSeq", IsNestedType=true)] - [BackboneType("MolecularSequence.referenceSeq")] + [FhirType("MolecularSequence.referenceSeq", IsBackboneType=true)] public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#ReferenceSeq"; } } + public override string TypeName { get { return "MolecularSequence.referenceSeq"; } } /// /// Chromosome containing genetic finding @@ -649,14 +648,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Variant", IsNestedType=true)] - [BackboneType("MolecularSequence.variant")] + [FhirType("MolecularSequence.variant", IsBackboneType=true)] public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Variant"; } } + public override string TypeName { get { return "MolecularSequence.variant"; } } /// /// Start position of the variant on the reference sequence @@ -992,14 +990,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Quality", IsNestedType=true)] - [BackboneType("MolecularSequence.quality")] + [FhirType("MolecularSequence.quality", IsBackboneType=true)] public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Quality"; } } + public override string TypeName { get { return "MolecularSequence.quality"; } } /// /// indel | snp | unknown @@ -1671,14 +1668,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Roc", IsNestedType=true)] - [BackboneType("MolecularSequence.quality.roc")] + [FhirType("MolecularSequence.quality.roc", IsBackboneType=true)] public partial class RocComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Roc"; } } + public override string TypeName { get { return "MolecularSequence.quality.roc"; } } /// /// Genotype quality score @@ -2080,14 +2076,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Repository", IsNestedType=true)] - [BackboneType("MolecularSequence.repository")] + [FhirType("MolecularSequence.repository", IsBackboneType=true)] public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Repository"; } } + public override string TypeName { get { return "MolecularSequence.repository"; } } /// /// directlink | openapi | login | oauth | other @@ -2442,14 +2437,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#StructureVariant", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant")] + [FhirType("MolecularSequence.structureVariant", IsBackboneType=true)] public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#StructureVariant"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant"; } } /// /// Structural variant change type @@ -2702,14 +2696,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Outer", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant.outer")] + [FhirType("MolecularSequence.structureVariant.outer", IsBackboneType=true)] public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Outer"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant.outer"; } } /// /// Structural variant outer start @@ -2886,14 +2879,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Inner", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant.inner")] + [FhirType("MolecularSequence.structureVariant.inner", IsBackboneType=true)] public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Inner"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant.inner"; } } /// /// Structural variant inner start diff --git a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs index d516a6c65e..a150932f34 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)] + [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")] public partial class NamingSystem : Hl7.Fhir.Model.DomainResource { /// @@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType /// [Serializable] [DataContract] - [FhirType("NamingSystem#UniqueId", IsNestedType=true)] - [BackboneType("NamingSystem.uniqueId")] + [FhirType("NamingSystem.uniqueId", IsBackboneType=true)] public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NamingSystem#UniqueId"; } } + public override string TypeName { get { return "NamingSystem.uniqueId"; } } /// /// oid | uuid | uri | other diff --git a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs index 6bd91b00f5..76479e521c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)] + [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")] public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("NutritionOrder#OralDiet", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet")] + [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)] public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#OralDiet"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet"; } } /// /// Type of oral diet or diet restrictions that describe what can be consumed orally @@ -344,14 +343,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Nutrient", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.nutrient")] + [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Nutrient"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } } /// /// Type of nutrient that is being modified @@ -496,14 +494,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Texture", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.texture")] + [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)] public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Texture"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } } /// /// Code to indicate how to alter the texture of the foods, e.g. pureed @@ -649,14 +646,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Supplement", IsNestedType=true)] - [BackboneType("NutritionOrder.supplement")] + [FhirType("NutritionOrder.supplement", IsBackboneType=true)] public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Supplement"; } } + public override string TypeName { get { return "NutritionOrder.supplement"; } } /// /// Type of supplement product requested @@ -913,14 +909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula")] + [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)] public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula"; } } /// /// Type of enteral or infant formula @@ -1298,14 +1293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Administration", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.administration")] + [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)] public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Administration"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } } /// /// Scheduled frequency of enteral feeding diff --git a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs index 2aaad91230..05ece6b0f5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)] + [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")] public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -69,14 +69,13 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable< /// [Serializable] [DataContract] - [FhirType("Observation#ReferenceRange", IsNestedType=true)] - [BackboneType("Observation.referenceRange")] + [FhirType("Observation.referenceRange", IsBackboneType=true)] public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#ReferenceRange"; } } + public override string TypeName { get { return "Observation.referenceRange"; } } /// /// Low Range, if relevant @@ -342,14 +341,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#Component", IsNestedType=true)] - [BackboneType("Observation.component")] + [FhirType("Observation.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#Component"; } } + public override string TypeName { get { return "Observation.component"; } } /// /// Type of component observation (code / type) diff --git a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs index 1f91ee2090..d75cc7fee3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)] + [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")] public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -172,14 +172,13 @@ public enum ObservationRangeCategory /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#QuantitativeDetails", IsNestedType=true)] - [BackboneType("ObservationDefinition.quantitativeDetails")] + [FhirType("ObservationDefinition.quantitativeDetails", IsBackboneType=true)] public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#QuantitativeDetails"; } } + public override string TypeName { get { return "ObservationDefinition.quantitativeDetails"; } } /// /// Customary unit for quantitative results @@ -411,14 +410,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#QualifiedInterval", IsNestedType=true)] - [BackboneType("ObservationDefinition.qualifiedInterval")] + [FhirType("ObservationDefinition.qualifiedInterval", IsBackboneType=true)] public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#QualifiedInterval"; } } + public override string TypeName { get { return "ObservationDefinition.qualifiedInterval"; } } /// /// reference | critical | absolute diff --git a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs index a8696a5c13..ea0e94b3ef 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)] + [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")] public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource, ICoded { /// @@ -90,14 +90,13 @@ public enum OperationKind /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Parameter", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter")] + [FhirType("OperationDefinition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Parameter"; } } + public override string TypeName { get { return "OperationDefinition.parameter"; } } /// /// Name in Parameters.parameter.name or in URL @@ -623,14 +622,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Binding", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.binding")] + [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)] public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Binding"; } } + public override string TypeName { get { return "OperationDefinition.parameter.binding"; } } /// /// required | extensible | preferred | example @@ -815,14 +813,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.referencedFrom")] + [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)] public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } } + public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } } /// /// Referencing parameter @@ -1004,14 +1001,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Overload", IsNestedType=true)] - [BackboneType("OperationDefinition.overload")] + [FhirType("OperationDefinition.overload", IsBackboneType=true)] public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Overload"; } } + public override string TypeName { get { return "OperationDefinition.overload"; } } /// /// Name of parameter to include in overload diff --git a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs index 99dc258d21..c586a1263e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)] + [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")] public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Organization#Contact", IsNestedType=true)] - [BackboneType("Organization.contact")] + [FhirType("Organization.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Organization#Contact"; } } + public override string TypeName { get { return "Organization.contact"; } } /// /// The type of contact diff --git a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs index 7eec29f305..09a1326ab2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)] + [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")] public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs index 0f9339d2a6..0782340222 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)] + [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")] public partial class Patient : Hl7.Fhir.Model.DomainResource, Hl7.Fhir.Model.IPatient, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum LinkType /// [Serializable] [DataContract] - [FhirType("Patient#Contact", IsNestedType=true)] - [BackboneType("Patient.contact")] + [FhirType("Patient.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Contact"; } } + public override string TypeName { get { return "Patient.contact"; } } /// /// The kind of relationship @@ -402,14 +401,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Communication", IsNestedType=true)] - [BackboneType("Patient.communication")] + [FhirType("Patient.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Communication"; } } + public override string TypeName { get { return "Patient.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health @@ -574,14 +572,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Link", IsNestedType=true)] - [BackboneType("Patient.link")] + [FhirType("Patient.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Link"; } } + public override string TypeName { get { return "Patient.link"; } } /// /// The other patient or related person resource that the link refers to diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs index f5d4349f62..783b970eff 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)] + [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")] public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs index 8bc50e9a9e..e90062ee63 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)] + [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")] public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Details", IsNestedType=true)] - [BackboneType("PaymentReconciliation.detail")] + [FhirType("PaymentReconciliation.detail", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Details"; } } + public override string TypeName { get { return "PaymentReconciliation.detail"; } } /// /// Business identifier of the payment detail @@ -448,14 +447,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Notes", IsNestedType=true)] - [BackboneType("PaymentReconciliation.processNote")] + [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)] public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Notes"; } } + public override string TypeName { get { return "PaymentReconciliation.processNote"; } } /// /// display | print | printoper diff --git a/src/Hl7.Fhir.R4/Model/Generated/Person.cs b/src/Hl7.Fhir.R4/Model/Generated/Person.cs index 2408a2b1a7..5a0c081272 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Person.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)] + [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")] public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel /// [Serializable] [DataContract] - [FhirType("Person#Link", IsNestedType=true)] - [BackboneType("Person.link")] + [FhirType("Person.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Person#Link"; } } + public override string TypeName { get { return "Person.link"; } } /// /// The resource to which this actual person is associated diff --git a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs index 78e3888189..b5cb65a618 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)] + [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")] public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Goal", IsNestedType=true)] - [BackboneType("PlanDefinition.goal")] + [FhirType("PlanDefinition.goal", IsBackboneType=true)] public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Goal"; } } + public override string TypeName { get { return "PlanDefinition.goal"; } } /// /// E.g. Treatment, dietary, behavioral @@ -352,14 +351,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Target", IsNestedType=true)] - [BackboneType("PlanDefinition.goal.target")] + [FhirType("PlanDefinition.goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Target"; } } + public override string TypeName { get { return "PlanDefinition.goal.target"; } } /// /// The parameter whose value is to be tracked @@ -532,14 +530,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Action", IsNestedType=true)] - [BackboneType("PlanDefinition.action")] + [FhirType("PlanDefinition.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Action"; } } + public override string TypeName { get { return "PlanDefinition.action"; } } /// /// User-visible prefix for the action (e.g. 1. or A.) @@ -1558,14 +1555,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Condition", IsNestedType=true)] - [BackboneType("PlanDefinition.action.condition")] + [FhirType("PlanDefinition.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Condition"; } } + public override string TypeName { get { return "PlanDefinition.action.condition"; } } /// /// applicability | start | stop @@ -1731,14 +1727,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)] - [BackboneType("PlanDefinition.action.relatedAction")] + [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#RelatedAction"; } } + public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } } /// /// What action is this related to @@ -1949,14 +1944,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Participant", IsNestedType=true)] - [BackboneType("PlanDefinition.action.participant")] + [FhirType("PlanDefinition.action.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Participant"; } } + public override string TypeName { get { return "PlanDefinition.action.participant"; } } /// /// patient | practitioner | related-person | device @@ -2123,14 +2117,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("PlanDefinition.action.dynamicValue")] + [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#DynamicValue"; } } + public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } } /// /// The path to the element to be set dynamically diff --git a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs index 14af0bb071..81bc21c532 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)] + [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")] public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Practitioner#Qualification", IsNestedType=true)] - [BackboneType("Practitioner.qualification")] + [FhirType("Practitioner.qualification", IsBackboneType=true)] public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Practitioner#Qualification"; } } + public override string TypeName { get { return "Practitioner.qualification"; } } /// /// An identifier for this qualification for the practitioner diff --git a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs index e9ebf9cb70..c57f9b551f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)] + [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")] public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)] - [BackboneType("PractitionerRole.availableTime")] + [FhirType("PractitionerRole.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#AvailableTime"; } } + public override string TypeName { get { return "PractitionerRole.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -344,14 +343,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)] - [BackboneType("PractitionerRole.notAvailable")] + [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#NotAvailable"; } } + public override string TypeName { get { return "PractitionerRole.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs index 52b6473cb3..5ea229a399 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)] + [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")] public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable
  • [Serializable] [DataContract] - [FhirType("Procedure#Performer", IsNestedType=true)] - [BackboneType("Procedure.performer")] + [FhirType("Procedure.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#Performer"; } } + public override string TypeName { get { return "Procedure.performer"; } } /// /// Type of performance @@ -249,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Procedure#FocalDevice", IsNestedType=true)] - [BackboneType("Procedure.focalDevice")] + [FhirType("Procedure.focalDevice", IsBackboneType=true)] public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#FocalDevice"; } } + public override string TypeName { get { return "Procedure.focalDevice"; } } /// /// Kind of change to device diff --git a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs index 789456bd2e..bf066ff044 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)] + [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")] public partial class Provenance : Hl7.Fhir.Model.DomainResource { /// @@ -109,14 +109,13 @@ public enum ProvenanceEntityRole /// [Serializable] [DataContract] - [FhirType("Provenance#Agent", IsNestedType=true)] - [BackboneType("Provenance.agent")] + [FhirType("Provenance.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Agent"; } } + public override string TypeName { get { return "Provenance.agent"; } } /// /// How the agent participated @@ -315,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Provenance#Entity", IsNestedType=true)] - [BackboneType("Provenance.entity")] + [FhirType("Provenance.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Entity"; } } + public override string TypeName { get { return "Provenance.entity"; } } /// /// derivation | revision | quotation | source | removal diff --git a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs index 446793d6fb..2d05b408bb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)] + [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")] public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -248,14 +248,13 @@ public enum QuestionnaireItemOperator /// [Serializable] [DataContract] - [FhirType("Questionnaire#Item", IsNestedType=true)] - [BackboneType("Questionnaire.item")] + [FhirType("Questionnaire.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Item"; } } + public override string TypeName { get { return "Questionnaire.item"; } } /// /// Unique id for item in questionnaire @@ -960,14 +959,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#EnableWhen", IsNestedType=true)] - [BackboneType("Questionnaire.item.enableWhen")] + [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)] public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#EnableWhen"; } } + public override string TypeName { get { return "Questionnaire.item.enableWhen"; } } /// /// Question that determines whether item is enabled @@ -1182,14 +1180,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#AnswerOption", IsNestedType=true)] - [BackboneType("Questionnaire.item.answerOption")] + [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)] public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#AnswerOption"; } } + public override string TypeName { get { return "Questionnaire.item.answerOption"; } } /// /// Answer value @@ -1357,14 +1354,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#Initial", IsNestedType=true)] - [BackboneType("Questionnaire.item.initial")] + [FhirType("Questionnaire.item.initial", IsBackboneType=true)] public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Initial"; } } + public override string TypeName { get { return "Questionnaire.item.initial"; } } /// /// Actual value for initializing the question diff --git a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs index 4bd212fc42..824284d9bd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)] + [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")] public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Item", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item")] + [FhirType("QuestionnaireResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Item"; } } + public override string TypeName { get { return "QuestionnaireResponse.item"; } } /// /// Pointer to specific item from Questionnaire @@ -393,14 +392,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item.answer")] + [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Answer"; } } + public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } } /// /// Single-valued answer to the question diff --git a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs index 67b147a64c..71b6fec83f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)] + [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")] public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded> { /// @@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("RelatedPerson#Communication", IsNestedType=true)] - [BackboneType("RelatedPerson.communication")] + [FhirType("RelatedPerson.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RelatedPerson#Communication"; } } + public override string TypeName { get { return "RelatedPerson.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health diff --git a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs index be87baacc1..1029fc0365 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)] + [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")] public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("RequestGroup#Action", IsNestedType=true)] - [BackboneType("RequestGroup.action")] + [FhirType("RequestGroup.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Action"; } } + public override string TypeName { get { return "RequestGroup.action"; } } /// /// User-visible prefix for the action (e.g. 1. or A.) @@ -849,14 +848,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#Condition", IsNestedType=true)] - [BackboneType("RequestGroup.action.condition")] + [FhirType("RequestGroup.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Condition"; } } + public override string TypeName { get { return "RequestGroup.action.condition"; } } /// /// applicability | start | stop @@ -1021,14 +1019,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#RelatedAction", IsNestedType=true)] - [BackboneType("RequestGroup.action.relatedAction")] + [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#RelatedAction"; } } + public override string TypeName { get { return "RequestGroup.action.relatedAction"; } } /// /// What action this is related to diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs index 2236c169c6..56cef94cf9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition", IsResource=true)] + [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition")] public partial class ResearchDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs index 27afc5bc22..a1c52585b5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition", IsResource=true)] + [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition")] public partial class ResearchElementDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -97,14 +97,13 @@ public enum ResearchElementType /// [Serializable] [DataContract] - [FhirType("ResearchElementDefinition#Characteristic", IsNestedType=true)] - [BackboneType("ResearchElementDefinition.characteristic")] + [FhirType("ResearchElementDefinition.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchElementDefinition#Characteristic"; } } + public override string TypeName { get { return "ResearchElementDefinition.characteristic"; } } /// /// What code or expression defines members? diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs index be69ad3e78..6585f1292b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)] + [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")] public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -144,14 +144,13 @@ public enum ResearchStudyStatus /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Arm", IsNestedType=true)] - [BackboneType("ResearchStudy.arm")] + [FhirType("ResearchStudy.arm", IsBackboneType=true)] public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Arm"; } } + public override string TypeName { get { return "ResearchStudy.arm"; } } /// /// Label for study arm @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Objective", IsNestedType=true)] - [BackboneType("ResearchStudy.objective")] + [FhirType("ResearchStudy.objective", IsBackboneType=true)] public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Objective"; } } + public override string TypeName { get { return "ResearchStudy.objective"; } } /// /// Label for the objective diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs index 3f84b16123..564746c9c3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)] + [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")] public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs index 328a00b924..e8c81c16c5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)] + [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")] public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("RiskAssessment#Prediction", IsNestedType=true)] - [BackboneType("RiskAssessment.prediction")] + [FhirType("RiskAssessment.prediction", IsBackboneType=true)] public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskAssessment#Prediction"; } } + public override string TypeName { get { return "RiskAssessment.prediction"; } } /// /// Possible outcome for the subject diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs index dc69b07e68..6cd2876fe6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis", IsResource=true)] + [FhirType("RiskEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis")] public partial class RiskEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RiskEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIde /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis#SampleSize", IsNestedType=true)] - [BackboneType("RiskEvidenceSynthesis.sampleSize")] + [FhirType("RiskEvidenceSynthesis.sampleSize", IsBackboneType=true)] public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskEvidenceSynthesis#SampleSize"; } } + public override string TypeName { get { return "RiskEvidenceSynthesis.sampleSize"; } } /// /// Description of sample size @@ -297,14 +296,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis#RiskEstimate", IsNestedType=true)] - [BackboneType("RiskEvidenceSynthesis.riskEstimate")] + [FhirType("RiskEvidenceSynthesis.riskEstimate", IsBackboneType=true)] public partial class RiskEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskEvidenceSynthesis#RiskEstimate"; } } + public override string TypeName { get { return "RiskEvidenceSynthesis.riskEstimate"; } } /// /// Description of risk estimate @@ -648,14 +646,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis#PrecisionEstimate", IsNestedType=true)] - [BackboneType("RiskEvidenceSynthesis.riskEstimate.precisionEstimate")] + [FhirType("RiskEvidenceSynthesis.riskEstimate.precisionEstimate", IsBackboneType=true)] public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskEvidenceSynthesis#PrecisionEstimate"; } } + public override string TypeName { get { return "RiskEvidenceSynthesis.riskEstimate.precisionEstimate"; } } /// /// Type of precision estimate @@ -904,14 +901,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis#Certainty", IsNestedType=true)] - [BackboneType("RiskEvidenceSynthesis.certainty")] + [FhirType("RiskEvidenceSynthesis.certainty", IsBackboneType=true)] public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskEvidenceSynthesis#Certainty"; } } + public override string TypeName { get { return "RiskEvidenceSynthesis.certainty"; } } /// /// Certainty rating @@ -1084,14 +1080,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RiskEvidenceSynthesis#CertaintySubcomponent", IsNestedType=true)] - [BackboneType("RiskEvidenceSynthesis.certainty.certaintySubcomponent")] + [FhirType("RiskEvidenceSynthesis.certainty.certaintySubcomponent", IsBackboneType=true)] public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskEvidenceSynthesis#CertaintySubcomponent"; } } + public override string TypeName { get { return "RiskEvidenceSynthesis.certainty.certaintySubcomponent"; } } /// /// Type of subcomponent of certainty rating diff --git a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs index c813a79132..e1a9e98efa 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)] + [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")] public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs index 0b35c901bd..9c9b63db38 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)] + [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")] public partial class SearchParameter : Hl7.Fhir.Model.DomainResource, ICoded>> { /// @@ -254,14 +254,13 @@ public enum SearchModifierCode /// [Serializable] [DataContract] - [FhirType("SearchParameter#Component", IsNestedType=true)] - [BackboneType("SearchParameter.component")] + [FhirType("SearchParameter.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SearchParameter#Component"; } } + public override string TypeName { get { return "SearchParameter.component"; } } /// /// Defines how the part works diff --git a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs index 8aaf552f2e..b25da3d4d3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)] + [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")] public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs index 92ecd95072..f65d2dab27 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)] + [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")] public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs index 581c261fe8..65a5df9e61 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)] + [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")] public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -101,14 +101,13 @@ public enum SpecimenStatus /// [Serializable] [DataContract] - [FhirType("Specimen#Collection", IsNestedType=true)] - [BackboneType("Specimen.collection")] + [FhirType("Specimen.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Collection"; } } + public override string TypeName { get { return "Specimen.collection"; } } /// /// Who collected the specimen @@ -386,14 +385,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Processing", IsNestedType=true)] - [BackboneType("Specimen.processing")] + [FhirType("Specimen.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Processing"; } } + public override string TypeName { get { return "Specimen.processing"; } } /// /// Textual description of procedure @@ -611,14 +609,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Container", IsNestedType=true)] - [BackboneType("Specimen.container")] + [FhirType("Specimen.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Container"; } } + public override string TypeName { get { return "Specimen.container"; } } /// /// Id for the container diff --git a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs index f17be3ea35..157b8ba93a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)] + [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")] public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -89,14 +89,13 @@ public enum SpecimenContainedPreference /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested")] + [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)] public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested"; } } /// /// Primary or secondary specimen @@ -448,14 +447,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Container", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container")] + [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Container"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } } /// /// Container material @@ -791,14 +789,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Additive", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container.additive")] + [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)] public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Additive"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } } /// /// Additive associated with container @@ -922,14 +919,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Handling", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.handling")] + [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)] public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Handling"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } } /// /// Temperature qualifier diff --git a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs index 41c775f9f0..c90eb80d97 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)] + [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")] public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -357,14 +357,13 @@ public enum StructureMapTransform /// [Serializable] [DataContract] - [FhirType("StructureMap#Structure", IsNestedType=true)] - [BackboneType("StructureMap.structure")] + [FhirType("StructureMap.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Structure"; } } + public override string TypeName { get { return "StructureMap.structure"; } } /// /// Canonical reference to structure definition @@ -634,14 +633,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Group", IsNestedType=true)] - [BackboneType("StructureMap.group")] + [FhirType("StructureMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Group"; } } + public override string TypeName { get { return "StructureMap.group"; } } /// /// Human-readable label @@ -964,14 +962,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Input", IsNestedType=true)] - [BackboneType("StructureMap.group.input")] + [FhirType("StructureMap.group.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Input"; } } + public override string TypeName { get { return "StructureMap.group.input"; } } /// /// Name for this instance of data @@ -1238,14 +1235,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Rule", IsNestedType=true)] - [BackboneType("StructureMap.group.rule")] + [FhirType("StructureMap.group.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Rule"; } } + public override string TypeName { get { return "StructureMap.group.rule"; } } /// /// Name of the rule for internal references @@ -1527,14 +1523,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Source", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.source")] + [FhirType("StructureMap.group.rule.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Source"; } } + public override string TypeName { get { return "StructureMap.group.rule.source"; } } /// /// Type or variable this rule applies to @@ -2085,14 +2080,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Target", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target")] + [FhirType("StructureMap.group.rule.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Target"; } } + public override string TypeName { get { return "StructureMap.group.rule.target"; } } /// /// Type or variable this rule applies to @@ -2517,14 +2511,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Parameter", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target.parameter")] + [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Parameter"; } } + public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } } /// /// Parameter value - variable or literal @@ -2643,14 +2636,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Dependent", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.dependent")] + [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)] public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Dependent"; } } + public override string TypeName { get { return "StructureMap.group.rule.dependent"; } } /// /// Name of a rule or group to apply diff --git a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs index 2922ca1a45..d2afd1b39e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)] + [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")] public partial class Subscription : Hl7.Fhir.Model.DomainResource { /// @@ -141,14 +141,13 @@ public enum SubscriptionChannelType /// [Serializable] [DataContract] - [FhirType("Subscription#Channel", IsNestedType=true)] - [BackboneType("Subscription.channel")] + [FhirType("Subscription.channel", IsBackboneType=true)] public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Subscription#Channel"; } } + public override string TypeName { get { return "Subscription.channel"; } } /// /// rest-hook | websocket | email | sms | message diff --git a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs index 622ab24197..d386e66e3e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)] + [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")] public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus /// [Serializable] [DataContract] - [FhirType("Substance#Instance", IsNestedType=true)] - [BackboneType("Substance.instance")] + [FhirType("Substance.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Instance"; } } + public override string TypeName { get { return "Substance.instance"; } } /// /// Identifier of the package/container @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Substance#Ingredient", IsNestedType=true)] - [BackboneType("Substance.ingredient")] + [FhirType("Substance.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Ingredient"; } } + public override string TypeName { get { return "Substance.ingredient"; } } /// /// Optional amount (concentration) diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs index f42543412b..2cccf107fa 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs @@ -61,14 +61,13 @@ public partial class SubstanceAmount : Hl7.Fhir.Model.BackboneType /// [Serializable] [DataContract] - [FhirType("SubstanceAmount#ReferenceRange", IsNestedType=true)] - [BackboneType("SubstanceAmount.referenceRange")] + [FhirType("SubstanceAmount.referenceRange", IsBackboneType=true)] public partial class ReferenceRangeComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceAmount#ReferenceRange"; } } + public override string TypeName { get { return "SubstanceAmount.referenceRange"; } } /// /// Lower limit possible or expected diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs index 991db06dd9..97fef2e004 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid", IsResource=true)] + [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid")] public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Subunit", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit")] + [FhirType("SubstanceNucleicAcid.subunit", IsBackboneType=true)] public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Subunit"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit"; } } /// /// Index of linear sequences of nucleic acids in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts @@ -415,14 +414,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Linkage", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit.linkage")] + [FhirType("SubstanceNucleicAcid.subunit.linkage", IsBackboneType=true)] public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Linkage"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit.linkage"; } } /// /// The entity that links the sugar residues together should also be captured for nearly all naturally occurring nucleic acid the linkage is a phosphate group. For many synthetic oligonucleotides phosphorothioate linkages are often seen. Linkage connectivity is assumed to be 3’-5’. If the linkage is either 3’-3’ or 5’-5’ this should be specified @@ -667,14 +665,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Sugar", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit.sugar")] + [FhirType("SubstanceNucleicAcid.subunit.sugar", IsBackboneType=true)] public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Sugar"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit.sugar"; } } /// /// The Substance ID of the sugar or sugar-like component that make up the nucleotide diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs index 19f186e695..b6366ac49d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer", IsResource=true)] + [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer")] public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#MonomerSet", IsNestedType=true)] - [BackboneType("SubstancePolymer.monomerSet")] + [FhirType("SubstancePolymer.monomerSet", IsBackboneType=true)] public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#MonomerSet"; } } + public override string TypeName { get { return "SubstancePolymer.monomerSet"; } } /// /// Todo @@ -210,14 +209,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#StartingMaterial", IsNestedType=true)] - [BackboneType("SubstancePolymer.monomerSet.startingMaterial")] + [FhirType("SubstancePolymer.monomerSet.startingMaterial", IsBackboneType=true)] public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#StartingMaterial"; } } + public override string TypeName { get { return "SubstancePolymer.monomerSet.startingMaterial"; } } /// /// Todo @@ -426,14 +424,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#Repeat", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat")] + [FhirType("SubstancePolymer.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#Repeat"; } } + public override string TypeName { get { return "SubstancePolymer.repeat"; } } /// /// Todo @@ -661,14 +658,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#RepeatUnit", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit")] + [FhirType("SubstancePolymer.repeat.repeatUnit", IsBackboneType=true)] public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#RepeatUnit"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit"; } } /// /// Todo @@ -904,14 +900,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#DegreeOfPolymerisation", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")] + [FhirType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation", IsBackboneType=true)] public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#DegreeOfPolymerisation"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation"; } } /// /// Todo @@ -1052,14 +1047,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#StructuralRepresentation", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")] + [FhirType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation", IsBackboneType=true)] public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#StructuralRepresentation"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.structuralRepresentation"; } } /// /// Todo diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs index 86a3766009..f093f7322f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein", IsResource=true)] + [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein")] public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceProtein#Subunit", IsNestedType=true)] - [BackboneType("SubstanceProtein.subunit")] + [FhirType("SubstanceProtein.subunit", IsBackboneType=true)] public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceProtein#Subunit"; } } + public override string TypeName { get { return "SubstanceProtein.subunit"; } } /// /// Index of primary sequences of amino acids linked through peptide bonds in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs index 0293b7f7a3..bfc69a78e2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation", IsResource=true)] + [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation")] public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#Gene", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.gene")] + [FhirType("SubstanceReferenceInformation.gene", IsBackboneType=true)] public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#Gene"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.gene"; } } /// /// Todo @@ -237,14 +236,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#GeneElement", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.geneElement")] + [FhirType("SubstanceReferenceInformation.geneElement", IsBackboneType=true)] public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#GeneElement"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.geneElement"; } } /// /// Todo @@ -413,14 +411,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#Classification", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.classification")] + [FhirType("SubstanceReferenceInformation.classification", IsBackboneType=true)] public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#Classification"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.classification"; } } /// /// Todo @@ -615,14 +612,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#Target", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.target")] + [FhirType("SubstanceReferenceInformation.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#Target"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.target"; } } /// /// Todo diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs index 6d6da390d1..b78fa85ac0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial", IsResource=true)] + [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial")] public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#FractionDescription", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.fractionDescription")] + [FhirType("SubstanceSourceMaterial.fractionDescription", IsBackboneType=true)] public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#FractionDescription"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.fractionDescription"; } } /// /// This element is capturing information about the fraction of a plant part, or human plasma for fractionation @@ -227,14 +226,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Organism", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism")] + [FhirType("SubstanceSourceMaterial.organism", IsBackboneType=true)] public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Organism"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism"; } } /// /// The family of an organism shall be specified @@ -544,14 +542,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Author", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.author")] + [FhirType("SubstanceSourceMaterial.organism.author", IsBackboneType=true)] public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Author"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.author"; } } /// /// The type of author of an organism species shall be specified. The parenthetical author of an organism species refers to the first author who published the plant/animal name (of any rank). The primary author of an organism species refers to the first author(s), who validly published the plant/animal name @@ -710,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Hybrid", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.hybrid")] + [FhirType("SubstanceSourceMaterial.organism.hybrid", IsBackboneType=true)] public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Hybrid"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.hybrid"; } } /// /// The identifier of the maternal species constituting the hybrid organism shall be specified based on a controlled vocabulary. For plants, the parents aren’t always known, and it is unlikely that it will be known which is maternal and which is paternal @@ -1005,14 +1001,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#OrganismGeneral", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")] + [FhirType("SubstanceSourceMaterial.organism.organismGeneral", IsBackboneType=true)] public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#OrganismGeneral"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.organismGeneral"; } } /// /// The kingdom of an organism shall be specified @@ -1203,14 +1198,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#PartDescription", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.partDescription")] + [FhirType("SubstanceSourceMaterial.partDescription", IsBackboneType=true)] public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#PartDescription"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.partDescription"; } } /// /// Entity of anatomical origin of source material within an organism diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs index 152fa1c0c5..e7ea4d3aeb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification","http://hl7.org/fhir/StructureDefinition/SubstanceSpecification", IsResource=true)] + [FhirType("SubstanceSpecification","http://hl7.org/fhir/StructureDefinition/SubstanceSpecification")] public partial class SubstanceSpecification : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -61,14 +61,13 @@ public partial class SubstanceSpecification : Hl7.Fhir.Model.DomainResource, IId /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Moiety", IsNestedType=true)] - [BackboneType("SubstanceSpecification.moiety")] + [FhirType("SubstanceSpecification.moiety", IsBackboneType=true)] public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Moiety"; } } + public override string TypeName { get { return "SubstanceSpecification.moiety"; } } /// /// Role that the moiety is playing @@ -372,14 +371,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Property", IsNestedType=true)] - [BackboneType("SubstanceSpecification.property")] + [FhirType("SubstanceSpecification.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Property"; } } + public override string TypeName { get { return "SubstanceSpecification.property"; } } /// /// A category for this property, e.g. Physical, Chemical, Enzymatic @@ -618,14 +616,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Structure", IsNestedType=true)] - [BackboneType("SubstanceSpecification.structure")] + [FhirType("SubstanceSpecification.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Structure"; } } + public override string TypeName { get { return "SubstanceSpecification.structure"; } } /// /// Stereochemistry type @@ -957,14 +954,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Isotope", IsNestedType=true)] - [BackboneType("SubstanceSpecification.structure.isotope")] + [FhirType("SubstanceSpecification.structure.isotope", IsBackboneType=true)] public partial class IsotopeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Isotope"; } } + public override string TypeName { get { return "SubstanceSpecification.structure.isotope"; } } /// /// Substance identifier for each non-natural or radioisotope @@ -1180,14 +1176,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#MolecularWeight", IsNestedType=true)] - [BackboneType("SubstanceSpecification.structure.isotope.molecularWeight")] + [FhirType("SubstanceSpecification.structure.isotope.molecularWeight", IsBackboneType=true)] public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#MolecularWeight"; } } + public override string TypeName { get { return "SubstanceSpecification.structure.isotope.molecularWeight"; } } /// /// The method by which the molecular weight was determined @@ -1353,14 +1348,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Representation", IsNestedType=true)] - [BackboneType("SubstanceSpecification.structure.representation")] + [FhirType("SubstanceSpecification.structure.representation", IsBackboneType=true)] public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Representation"; } } + public override string TypeName { get { return "SubstanceSpecification.structure.representation"; } } /// /// The type of structure (e.g. Full, Partial, Representative) @@ -1544,14 +1538,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Code", IsNestedType=true)] - [BackboneType("SubstanceSpecification.code")] + [FhirType("SubstanceSpecification.code", IsBackboneType=true)] public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Code"; } } + public override string TypeName { get { return "SubstanceSpecification.code"; } } /// /// The specific code @@ -1806,14 +1799,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Name", IsNestedType=true)] - [BackboneType("SubstanceSpecification.name")] + [FhirType("SubstanceSpecification.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Name"; } } + public override string TypeName { get { return "SubstanceSpecification.name"; } } /// /// The actual name @@ -2225,14 +2217,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Official", IsNestedType=true)] - [BackboneType("SubstanceSpecification.name.official")] + [FhirType("SubstanceSpecification.name.official", IsBackboneType=true)] public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Official"; } } + public override string TypeName { get { return "SubstanceSpecification.name.official"; } } /// /// Which authority uses this official name @@ -2416,14 +2407,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSpecification#Relationship", IsNestedType=true)] - [BackboneType("SubstanceSpecification.relationship")] + [FhirType("SubstanceSpecification.relationship", IsBackboneType=true)] public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSpecification#Relationship"; } } + public override string TypeName { get { return "SubstanceSpecification.relationship"; } } /// /// A pointer to another substance, as a resource or just a representational code diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs index 507718aae8..a9a18ea8c4 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)] + [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")] public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -123,14 +123,13 @@ public enum SupplyItemType /// [Serializable] [DataContract] - [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)] - [BackboneType("SupplyDelivery.suppliedItem")] + [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)] public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } } + public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } } /// /// Amount dispensed diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs index 99296f6508..3d17f8933b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)] + [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")] public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -119,14 +119,13 @@ public enum SupplyRequestStatus /// [Serializable] [DataContract] - [FhirType("SupplyRequest#Parameter", IsNestedType=true)] - [BackboneType("SupplyRequest.parameter")] + [FhirType("SupplyRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyRequest#Parameter"; } } + public override string TypeName { get { return "SupplyRequest.parameter"; } } /// /// Item detail diff --git a/src/Hl7.Fhir.R4/Model/Generated/Task.cs b/src/Hl7.Fhir.R4/Model/Generated/Task.cs index 0c676b1699..19545db700 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Task.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)] + [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")] public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable>, ICoded { /// @@ -210,14 +210,13 @@ public enum TaskIntent /// [Serializable] [DataContract] - [FhirType("Task#Restriction", IsNestedType=true)] - [BackboneType("Task.restriction")] + [FhirType("Task.restriction", IsBackboneType=true)] public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Restriction"; } } + public override string TypeName { get { return "Task.restriction"; } } /// /// How many times to repeat @@ -407,14 +406,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Parameter", IsNestedType=true)] - [BackboneType("Task.input")] + [FhirType("Task.input", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Parameter"; } } + public override string TypeName { get { return "Task.input"; } } /// /// Label for the input @@ -563,14 +561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Output", IsNestedType=true)] - [BackboneType("Task.output")] + [FhirType("Task.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Output"; } } + public override string TypeName { get { return "Task.output"; } } /// /// Label for output diff --git a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs index 6cda7dd039..e01dfe1684 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)] + [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")] public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource { /// @@ -89,14 +89,13 @@ public enum CodeSearchSupport /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Software", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.software")] + [FhirType("TerminologyCapabilities.software", IsBackboneType=true)] public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Software"; } } + public override string TypeName { get { return "TerminologyCapabilities.software"; } } /// /// A name the software is known by @@ -277,14 +276,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.implementation")] + [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)] public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } } + public override string TypeName { get { return "TerminologyCapabilities.implementation"; } } /// /// Describes this specific instance @@ -466,14 +464,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem")] + [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)] public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } } /// /// URI for the Code System @@ -680,14 +677,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Version", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version")] + [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Version"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } } /// /// Version identifier for this version @@ -1021,14 +1017,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version.filter")] + [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Filter"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } } /// /// Code of the property supported @@ -1207,14 +1202,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion")] + [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)] public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion"; } } /// /// Whether the server can return nested value sets @@ -1503,14 +1497,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion.parameter")] + [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } } /// /// Expansion Parameter name @@ -1688,14 +1681,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.validateCode")] + [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)] public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } } + public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } } /// /// Whether translations are validated @@ -1830,14 +1822,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.translation")] + [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)] public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Translation"; } } + public override string TypeName { get { return "TerminologyCapabilities.translation"; } } /// /// Whether the client must identify the map @@ -1975,14 +1966,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.closure")] + [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)] public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Closure"; } } + public override string TypeName { get { return "TerminologyCapabilities.closure"; } } /// /// If cross-system closure is supported diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs index 3ff0af3ed6..691e9e78ea 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)] + [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")] public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -200,14 +200,13 @@ public enum TestReportActionResult /// [Serializable] [DataContract] - [FhirType("TestReport#Participant", IsNestedType=true)] - [BackboneType("TestReport.participant")] + [FhirType("TestReport.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Participant"; } } + public override string TypeName { get { return "TestReport.participant"; } } /// /// test-engine | client | server @@ -431,14 +430,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Setup", IsNestedType=true)] - [BackboneType("TestReport.setup")] + [FhirType("TestReport.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Setup"; } } + public override string TypeName { get { return "TestReport.setup"; } } /// /// A setup operation or assert that was executed @@ -559,14 +557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#SetupAction", IsNestedType=true)] - [BackboneType("TestReport.setup.action")] + [FhirType("TestReport.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#SetupAction"; } } + public override string TypeName { get { return "TestReport.setup.action"; } } /// /// The operation to perform @@ -710,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Operation", IsNestedType=true)] - [BackboneType("TestReport.setup.action.operation")] + [FhirType("TestReport.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Operation"; } } + public override string TypeName { get { return "TestReport.setup.action.operation"; } } /// /// pass | skip | fail | warning | error @@ -943,14 +939,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Assert", IsNestedType=true)] - [BackboneType("TestReport.setup.action.assert")] + [FhirType("TestReport.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Assert"; } } + public override string TypeName { get { return "TestReport.setup.action.assert"; } } /// /// pass | skip | fail | warning | error @@ -1173,14 +1168,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Test", IsNestedType=true)] - [BackboneType("TestReport.test")] + [FhirType("TestReport.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Test"; } } + public override string TypeName { get { return "TestReport.test"; } } /// /// Tracking/logging name of this test @@ -1387,14 +1381,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TestAction", IsNestedType=true)] - [BackboneType("TestReport.test.action")] + [FhirType("TestReport.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TestAction"; } } + public override string TypeName { get { return "TestReport.test.action"; } } /// /// The operation performed @@ -1538,14 +1531,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Teardown", IsNestedType=true)] - [BackboneType("TestReport.teardown")] + [FhirType("TestReport.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Teardown"; } } + public override string TypeName { get { return "TestReport.teardown"; } } /// /// One or more teardown operations performed @@ -1666,14 +1658,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TeardownAction", IsNestedType=true)] - [BackboneType("TestReport.teardown.action")] + [FhirType("TestReport.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TeardownAction"; } } + public override string TypeName { get { return "TestReport.teardown.action"; } } /// /// The teardown operation performed diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs index 7145881272..5f2099ea3c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)] + [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")] public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -300,14 +300,13 @@ public enum AssertionResponseTypes /// [Serializable] [DataContract] - [FhirType("TestScript#Origin", IsNestedType=true)] - [BackboneType("TestScript.origin")] + [FhirType("TestScript.origin", IsBackboneType=true)] public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Origin"; } } + public override string TypeName { get { return "TestScript.origin"; } } /// /// The index of the abstract origin server starting at 1 @@ -473,14 +472,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Destination", IsNestedType=true)] - [BackboneType("TestScript.destination")] + [FhirType("TestScript.destination", IsBackboneType=true)] public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Destination"; } } + public override string TypeName { get { return "TestScript.destination"; } } /// /// The index of the abstract destination server starting at 1 @@ -645,14 +643,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Metadata", IsNestedType=true)] - [BackboneType("TestScript.metadata")] + [FhirType("TestScript.metadata", IsBackboneType=true)] public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Metadata"; } } + public override string TypeName { get { return "TestScript.metadata"; } } /// /// Links to the FHIR specification @@ -798,14 +795,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Link", IsNestedType=true)] - [BackboneType("TestScript.metadata.link")] + [FhirType("TestScript.metadata.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Link"; } } + public override string TypeName { get { return "TestScript.metadata.link"; } } /// /// URL to the specification @@ -987,14 +983,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Capability", IsNestedType=true)] - [BackboneType("TestScript.metadata.capability")] + [FhirType("TestScript.metadata.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Capability"; } } + public override string TypeName { get { return "TestScript.metadata.capability"; } } /// /// Are the capabilities required? @@ -1394,14 +1389,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Fixture", IsNestedType=true)] - [BackboneType("TestScript.fixture")] + [FhirType("TestScript.fixture", IsBackboneType=true)] public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Fixture"; } } + public override string TypeName { get { return "TestScript.fixture"; } } /// /// Whether or not to implicitly create the fixture during setup @@ -1611,14 +1605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Variable", IsNestedType=true)] - [BackboneType("TestScript.variable")] + [FhirType("TestScript.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Variable"; } } + public override string TypeName { get { return "TestScript.variable"; } } /// /// Descriptive name for this variable @@ -2054,14 +2047,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Setup", IsNestedType=true)] - [BackboneType("TestScript.setup")] + [FhirType("TestScript.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Setup"; } } + public override string TypeName { get { return "TestScript.setup"; } } /// /// A setup operation or assert to perform @@ -2182,14 +2174,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#SetupAction", IsNestedType=true)] - [BackboneType("TestScript.setup.action")] + [FhirType("TestScript.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#SetupAction"; } } + public override string TypeName { get { return "TestScript.setup.action"; } } /// /// The setup operation to perform @@ -2333,14 +2324,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Operation", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation")] + [FhirType("TestScript.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Operation"; } } + public override string TypeName { get { return "TestScript.setup.action.operation"; } } /// /// The operation code type that will be executed @@ -3139,14 +3129,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RequestHeader", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation.requestHeader")] + [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)] public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RequestHeader"; } } + public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } } /// /// HTTP header field name @@ -3329,14 +3318,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Assert", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert")] + [FhirType("TestScript.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Assert"; } } + public override string TypeName { get { return "TestScript.setup.action.assert"; } } /// /// Tracking/logging assertion label @@ -4385,14 +4373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Test", IsNestedType=true)] - [BackboneType("TestScript.test")] + [FhirType("TestScript.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Test"; } } + public override string TypeName { get { return "TestScript.test"; } } /// /// Tracking/logging name of this test @@ -4599,14 +4586,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TestAction", IsNestedType=true)] - [BackboneType("TestScript.test.action")] + [FhirType("TestScript.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TestAction"; } } + public override string TypeName { get { return "TestScript.test.action"; } } /// /// The setup operation to perform @@ -4750,14 +4736,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Teardown", IsNestedType=true)] - [BackboneType("TestScript.teardown")] + [FhirType("TestScript.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Teardown"; } } + public override string TypeName { get { return "TestScript.teardown"; } } /// /// One or more teardown operations to perform @@ -4878,14 +4863,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TeardownAction", IsNestedType=true)] - [BackboneType("TestScript.teardown.action")] + [FhirType("TestScript.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TeardownAction"; } } + public override string TypeName { get { return "TestScript.teardown.action"; } } /// /// The teardown operation to perform diff --git a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs index 81685daa82..ee955366b1 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs @@ -291,14 +291,13 @@ public enum EventTiming /// [Serializable] [DataContract] - [FhirType("Timing#Repeat", IsNestedType=true)] - [BackboneType("Timing.repeat")] + [FhirType("Timing.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Timing#Repeat"; } } + public override string TypeName { get { return "Timing.repeat"; } } /// /// Length/Range of lengths, or (Start and/or end) limits diff --git a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs index 3028c3a90f..3877b1b1bc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)] + [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")] public partial class VerificationResult : Hl7.Fhir.Model.DomainResource { /// @@ -107,14 +107,13 @@ public enum StatusCode /// [Serializable] [DataContract] - [FhirType("VerificationResult#PrimarySource", IsNestedType=true)] - [BackboneType("VerificationResult.primarySource")] + [FhirType("VerificationResult.primarySource", IsBackboneType=true)] public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#PrimarySource"; } } + public override string TypeName { get { return "VerificationResult.primarySource"; } } /// /// Reference to the primary source @@ -408,14 +407,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Attestation", IsNestedType=true)] - [BackboneType("VerificationResult.attestation")] + [FhirType("VerificationResult.attestation", IsBackboneType=true)] public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Attestation"; } } + public override string TypeName { get { return "VerificationResult.attestation"; } } /// /// The individual or organization attesting to information @@ -765,14 +763,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Validator", IsNestedType=true)] - [BackboneType("VerificationResult.validator")] + [FhirType("VerificationResult.validator", IsBackboneType=true)] public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Validator"; } } + public override string TypeName { get { return "VerificationResult.validator"; } } /// /// Reference to the organization validating information diff --git a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs index 1268c01658..cfe4a5cee9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)] + [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")] public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum VisionBase /// [Serializable] [DataContract] - [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification")] + [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)] public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#LensSpecification"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification"; } } /// /// Product to be supplied @@ -761,14 +760,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VisionPrescription#Prism", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification.prism")] + [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)] public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#Prism"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } } /// /// Amount of adjustment diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs index 1846f50618..2f910665a1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)] + [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")] public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -109,14 +109,13 @@ public enum AccountStatus /// [Serializable] [DataContract] - [FhirType("Account#Coverage", IsNestedType=true)] - [BackboneType("Account.coverage")] + [FhirType("Account.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Coverage"; } } + public override string TypeName { get { return "Account.coverage"; } } /// /// The party(s), such as insurances, that may contribute to the payment of this account @@ -281,14 +280,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Guarantor", IsNestedType=true)] - [BackboneType("Account.guarantor")] + [FhirType("Account.guarantor", IsBackboneType=true)] public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Guarantor"; } } + public override string TypeName { get { return "Account.guarantor"; } } /// /// Responsible entity diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs index 7adc2af71d..c0c177dca0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)] + [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")] public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -167,14 +167,13 @@ public enum RequestResourceType /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#Participant", IsNestedType=true)] - [BackboneType("ActivityDefinition.participant")] + [FhirType("ActivityDefinition.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#Participant"; } } + public override string TypeName { get { return "ActivityDefinition.participant"; } } /// /// patient | practitioner | related-person | device @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("ActivityDefinition.dynamicValue")] + [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } } + public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } } /// /// The path to the element to be set dynamically diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs index 41afb91c8f..c94b95fbdb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition", IsResource=true)] + [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition")] public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#Property", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.property")] + [FhirType("AdministrableProductDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#Property"; } } + public override string TypeName { get { return "AdministrableProductDefinition.property"; } } /// /// A code expressing the type of characteristic @@ -245,14 +244,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#RouteOfAdministration", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration")] + [FhirType("AdministrableProductDefinition.routeOfAdministration", IsBackboneType=true)] public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#RouteOfAdministration"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration"; } } /// /// Coded expression for the route @@ -521,14 +519,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#TargetSpecies", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")] + [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies", IsBackboneType=true)] public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#TargetSpecies"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies"; } } /// /// Coded expression for the species @@ -672,14 +669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#WithdrawalPeriod", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")] + [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)] public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#WithdrawalPeriod"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod"; } } /// /// The type of tissue for which the withdrawal period applies, e.g. meat, milk diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs index 34425784fb..0d92d79fe2 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)] + [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")] public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -163,14 +163,13 @@ public enum AdverseEventOutcome /// [Serializable] [DataContract] - [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity")] + [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)] public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity"; } } /// /// Refers to the specific entity that caused the adverse event @@ -315,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#Causality", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity.causality")] + [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)] public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#Causality"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } } /// /// Assessment of if the entity caused the event diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs index a8ba67ef83..9101184ee0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)] + [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")] public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)] - [BackboneType("AllergyIntolerance.reaction")] + [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AllergyIntolerance#Reaction"; } } + public override string TypeName { get { return "AllergyIntolerance.reaction"; } } /// /// Specific substance or pharmaceutical product considered to be responsible for event diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs index 73094e11f5..88a798c191 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)] + [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")] public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -162,14 +162,13 @@ public enum ParticipantRequired /// [Serializable] [DataContract] - [FhirType("Appointment#Participant", IsNestedType=true)] - [BackboneType("Appointment.participant")] + [FhirType("Appointment.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#Participant"; } } + public override string TypeName { get { return "Appointment.participant"; } } /// /// Role of participant in the appointment diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs index 87f25f913e..41fb0ea65a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)] + [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")] public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs index 2254afbd9d..9e447529ce 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)] + [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")] public partial class AuditEvent : Hl7.Fhir.Model.DomainResource { /// @@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType /// [Serializable] [DataContract] - [FhirType("AuditEvent#Agent", IsNestedType=true)] - [BackboneType("AuditEvent.agent")] + [FhirType("AuditEvent.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Agent"; } } + public override string TypeName { get { return "AuditEvent.agent"; } } /// /// How agent participated @@ -644,14 +643,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Network", IsNestedType=true)] - [BackboneType("AuditEvent.agent.network")] + [FhirType("AuditEvent.agent.network", IsBackboneType=true)] public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Network"; } } + public override string TypeName { get { return "AuditEvent.agent.network"; } } /// /// Identifier for the network access point of the user device @@ -834,14 +832,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Source", IsNestedType=true)] - [BackboneType("AuditEvent.source")] + [FhirType("AuditEvent.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Source"; } } + public override string TypeName { get { return "AuditEvent.source"; } } /// /// Logical source location within the enterprise @@ -1034,14 +1031,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Entity", IsNestedType=true)] - [BackboneType("AuditEvent.entity")] + [FhirType("AuditEvent.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Entity"; } } + public override string TypeName { get { return "AuditEvent.entity"; } } /// /// Specific instance of resource @@ -1422,14 +1418,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Detail", IsNestedType=true)] - [BackboneType("AuditEvent.entity.detail")] + [FhirType("AuditEvent.entity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Detail"; } } + public override string TypeName { get { return "AuditEvent.entity.detail"; } } /// /// Name of the property diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs index b1d548c966..9f20602b74 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)] + [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")] public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs index 064d8e8078..4f2c5e3b19 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs @@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)] + [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")] public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -156,14 +156,13 @@ public enum BiologicallyDerivedProductStorageScale /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.collection")] + [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } } /// /// Individual performing collection @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Processing", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.processing")] + [FhirType("BiologicallyDerivedProduct.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Processing"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.processing"; } } /// /// Description of of processing @@ -562,14 +560,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Manipulation", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.manipulation")] + [FhirType("BiologicallyDerivedProduct.manipulation", IsBackboneType=true)] public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Manipulation"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.manipulation"; } } /// /// Description of manipulation @@ -730,14 +727,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Storage", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.storage")] + [FhirType("BiologicallyDerivedProduct.storage", IsBackboneType=true)] public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Storage"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.storage"; } } /// /// Description of storage diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs index 3f46cc8b29..5ddf0fe79c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)] + [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")] public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs index 3a43f5d022..d87ca2efa9 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)] + [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")] public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -223,14 +223,13 @@ public enum CarePlanActivityStatus /// [Serializable] [DataContract] - [FhirType("CarePlan#Activity", IsNestedType=true)] - [BackboneType("CarePlan.activity")] + [FhirType("CarePlan.activity", IsBackboneType=true)] public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Activity"; } } + public override string TypeName { get { return "CarePlan.activity"; } } /// /// Results of the activity @@ -457,14 +456,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CarePlan#Detail", IsNestedType=true)] - [BackboneType("CarePlan.activity.detail")] + [FhirType("CarePlan.activity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Detail"; } } + public override string TypeName { get { return "CarePlan.activity.detail"; } } /// /// Appointment | CommunicationRequest | DeviceRequest | MedicationRequest | NutritionOrder | Task | ServiceRequest | VisionPrescription diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs index eb8f046c62..3e41dbd231 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)] + [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")] public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum CareTeamStatus /// [Serializable] [DataContract] - [FhirType("CareTeam#Participant", IsNestedType=true)] - [BackboneType("CareTeam.participant")] + [FhirType("CareTeam.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CareTeam#Participant"; } } + public override string TypeName { get { return "CareTeam.participant"; } } /// /// Type of involvement diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs index 652fa72fc0..5a1e9a73ba 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry", IsResource=true)] + [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry")] public partial class CatalogEntry : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -89,14 +89,13 @@ public enum CatalogEntryRelationType /// [Serializable] [DataContract] - [FhirType("CatalogEntry#RelatedEntry", IsNestedType=true)] - [BackboneType("CatalogEntry.relatedEntry")] + [FhirType("CatalogEntry.relatedEntry", IsBackboneType=true)] public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CatalogEntry#RelatedEntry"; } } + public override string TypeName { get { return "CatalogEntry.relatedEntry"; } } /// /// triggers | is-replaced-by diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs index e90020f4c2..d614aed190 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)] + [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")] public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum ChargeItemStatus /// [Serializable] [DataContract] - [FhirType("ChargeItem#Performer", IsNestedType=true)] - [BackboneType("ChargeItem.performer")] + [FhirType("ChargeItem.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItem#Performer"; } } + public override string TypeName { get { return "ChargeItem.performer"; } } /// /// What type of performance was done diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs index c8b40a2b19..998752fe74 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)] + [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")] public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.applicability")] + [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)] public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } } + public override string TypeName { get { return "ChargeItemDefinition.applicability"; } } /// /// Natural language description of the condition @@ -298,14 +297,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.propertyGroup")] + [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)] public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } } + public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } } /// /// Conditions under which the priceComponent is applicable @@ -451,14 +449,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#PriceComponent", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")] + [FhirType("ChargeItemDefinition.propertyGroup.priceComponent", IsBackboneType=true)] public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#PriceComponent"; } } + public override string TypeName { get { return "ChargeItemDefinition.propertyGroup.priceComponent"; } } /// /// base | surcharge | deduction | discount | tax | informational diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs index f19ce29cf6..ee6f2ab871 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation", IsResource=true)] + [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation")] public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Citation#Summary", IsNestedType=true)] - [BackboneType("Citation.summary")] + [FhirType("Citation.summary", IsBackboneType=true)] public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#Summary"; } } + public override string TypeName { get { return "Citation.summary"; } } /// /// Format for display of the citation @@ -232,14 +231,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#Classification", IsNestedType=true)] - [BackboneType("Citation.classification")] + [FhirType("Citation.classification", IsBackboneType=true)] public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#Classification"; } } + public override string TypeName { get { return "Citation.classification"; } } /// /// The kind of classifier (e.g. publication type, keyword) @@ -383,14 +381,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#StatusDate", IsNestedType=true)] - [BackboneType("Citation.statusDate")] + [FhirType("Citation.statusDate", IsBackboneType=true)] public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#StatusDate"; } } + public override string TypeName { get { return "Citation.statusDate"; } } /// /// Classification of the status @@ -577,14 +574,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#RelatesTo", IsNestedType=true)] - [BackboneType("Citation.relatesTo")] + [FhirType("Citation.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#RelatesTo"; } } + public override string TypeName { get { return "Citation.relatesTo"; } } /// /// How the Citation resource relates to the target artifact @@ -758,14 +754,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifact", IsNestedType=true)] - [BackboneType("Citation.citedArtifact")] + [FhirType("Citation.citedArtifact", IsBackboneType=true)] public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifact"; } } + public override string TypeName { get { return "Citation.citedArtifact"; } } /// /// May include DOI, PMID, PMCID, etc. @@ -1261,14 +1256,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactVersion", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.version")] + [FhirType("Citation.citedArtifact.version", IsBackboneType=true)] public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactVersion"; } } + public override string TypeName { get { return "Citation.citedArtifact.version"; } } /// /// The version number or other version identifier @@ -1430,14 +1424,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactStatusDate", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.statusDate")] + [FhirType("Citation.citedArtifact.statusDate", IsBackboneType=true)] public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactStatusDate"; } } + public override string TypeName { get { return "Citation.citedArtifact.statusDate"; } } /// /// Classification of the status @@ -1624,14 +1617,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactTitle", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.title")] + [FhirType("Citation.citedArtifact.title", IsBackboneType=true)] public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactTitle"; } } + public override string TypeName { get { return "Citation.citedArtifact.title"; } } /// /// The kind of title @@ -1819,14 +1811,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactAbstract", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.abstract")] + [FhirType("Citation.citedArtifact.abstract", IsBackboneType=true)] public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactAbstract"; } } + public override string TypeName { get { return "Citation.citedArtifact.abstract"; } } /// /// The kind of abstract @@ -2056,14 +2047,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPart", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.part")] + [FhirType("Citation.citedArtifact.part", IsBackboneType=true)] public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPart"; } } + public override string TypeName { get { return "Citation.citedArtifact.part"; } } /// /// The kind of component @@ -2250,14 +2240,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactRelatesTo", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.relatesTo")] + [FhirType("Citation.citedArtifact.relatesTo", IsBackboneType=true)] public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactRelatesTo"; } } + public override string TypeName { get { return "Citation.citedArtifact.relatesTo"; } } /// /// How the cited artifact relates to the target artifact @@ -2434,14 +2423,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationForm", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm")] + [FhirType("Citation.citedArtifact.publicationForm", IsBackboneType=true)] public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationForm"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm"; } } /// /// The collection the cited article or artifact is published in @@ -2953,14 +2941,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationFormPublishedIn", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")] + [FhirType("Citation.citedArtifact.publicationForm.publishedIn", IsBackboneType=true)] public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPublishedIn"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm.publishedIn"; } } /// /// Kind of container (e.g. Periodical, database, or book) @@ -3216,14 +3203,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationFormPeriodicRelease", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease")] + [FhirType("Citation.citedArtifact.publicationForm.periodicRelease", IsBackboneType=true)] public partial class CitedArtifactPublicationFormPeriodicReleaseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPeriodicRelease"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm.periodicRelease"; } } /// /// Internet or Print @@ -3451,14 +3437,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication")] + [FhirType("Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication", IsBackboneType=true)] public partial class CitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication"; } } /// /// Date on which the issue of the journal was published @@ -3807,14 +3792,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactWebLocation", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.webLocation")] + [FhirType("Citation.citedArtifact.webLocation", IsBackboneType=true)] public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactWebLocation"; } } + public override string TypeName { get { return "Citation.citedArtifact.webLocation"; } } /// /// Code the reason for different URLs, e.g. abstract and full-text @@ -3974,14 +3958,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactClassification", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.classification")] + [FhirType("Citation.citedArtifact.classification", IsBackboneType=true)] public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactClassification"; } } + public override string TypeName { get { return "Citation.citedArtifact.classification"; } } /// /// The kind of classifier (e.g. publication type, keyword) @@ -4150,14 +4133,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactClassificationWhoClassified", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.classification.whoClassified")] + [FhirType("Citation.citedArtifact.classification.whoClassified", IsBackboneType=true)] public partial class CitedArtifactClassificationWhoClassifiedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactClassificationWhoClassified"; } } + public override string TypeName { get { return "Citation.citedArtifact.classification.whoClassified"; } } /// /// Person who created the classification @@ -4418,14 +4400,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorship", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship")] + [FhirType("Citation.citedArtifact.contributorship", IsBackboneType=true)] public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorship"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship"; } } /// /// Indicates if the list includes all authors and/or contributors @@ -4615,14 +4596,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipEntry", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.entry")] + [FhirType("Citation.citedArtifact.contributorship.entry", IsBackboneType=true)] public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntry"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry"; } } /// /// A name associated with the person @@ -5096,14 +5076,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipEntryAffiliationInfo", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.entry.affiliationInfo")] + [FhirType("Citation.citedArtifact.contributorship.entry.affiliationInfo", IsBackboneType=true)] public partial class CitedArtifactContributorshipEntryAffiliationInfoComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryAffiliationInfo"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.affiliationInfo"; } } /// /// Display for the organization @@ -5306,14 +5285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")] + [FhirType("Citation.citedArtifact.contributorship.entry.contributionInstance", IsBackboneType=true)] public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryContributionInstance"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.contributionInstance"; } } /// /// The specific contribution @@ -5474,14 +5452,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipSummary", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.summary")] + [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)] public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipSummary"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.summary"; } } /// /// Either authorList or contributorshipStatement diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs index 1d6be4fcaf..fcd001b867 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)] + [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")] public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Claim#RelatedClaim", IsNestedType=true)] - [BackboneType("Claim.related")] + [FhirType("Claim.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#RelatedClaim"; } } + public override string TypeName { get { return "Claim.related"; } } /// /// Reference to the related claim @@ -249,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Payee", IsNestedType=true)] - [BackboneType("Claim.payee")] + [FhirType("Claim.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Payee"; } } + public override string TypeName { get { return "Claim.payee"; } } /// /// Category of recipient @@ -404,14 +402,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#CareTeam", IsNestedType=true)] - [BackboneType("Claim.careTeam")] + [FhirType("Claim.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#CareTeam"; } } + public override string TypeName { get { return "Claim.careTeam"; } } /// /// Order of care team @@ -673,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SupportingInformation", IsNestedType=true)] - [BackboneType("Claim.supportingInfo")] + [FhirType("Claim.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SupportingInformation"; } } + public override string TypeName { get { return "Claim.supportingInfo"; } } /// /// Information instance identifier @@ -952,14 +948,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Diagnosis", IsNestedType=true)] - [BackboneType("Claim.diagnosis")] + [FhirType("Claim.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Diagnosis"; } } + public override string TypeName { get { return "Claim.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1206,14 +1201,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Procedure", IsNestedType=true)] - [BackboneType("Claim.procedure")] + [FhirType("Claim.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Procedure"; } } + public override string TypeName { get { return "Claim.procedure"; } } /// /// Procedure instance identifier @@ -1480,14 +1474,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Insurance", IsNestedType=true)] - [BackboneType("Claim.insurance")] + [FhirType("Claim.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Insurance"; } } + public override string TypeName { get { return "Claim.insurance"; } } /// /// Insurance instance identifier @@ -1836,14 +1829,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Accident", IsNestedType=true)] - [BackboneType("Claim.accident")] + [FhirType("Claim.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Accident"; } } + public override string TypeName { get { return "Claim.accident"; } } /// /// When the incident occurred @@ -2035,14 +2027,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Item", IsNestedType=true)] - [BackboneType("Claim.item")] + [FhirType("Claim.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Item"; } } + public override string TypeName { get { return "Claim.item"; } } /// /// Item instance identifier @@ -2798,14 +2789,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Detail", IsNestedType=true)] - [BackboneType("Claim.item.detail")] + [FhirType("Claim.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Detail"; } } + public override string TypeName { get { return "Claim.item.detail"; } } /// /// Item instance identifier @@ -3248,14 +3238,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SubDetail", IsNestedType=true)] - [BackboneType("Claim.item.detail.subDetail")] + [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SubDetail"; } } + public override string TypeName { get { return "Claim.item.detail.subDetail"; } } /// /// Item instance identifier diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs index c4f7a54f51..87b7b2b4aa 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)] + [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")] public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Item", IsNestedType=true)] - [BackboneType("ClaimResponse.item")] + [FhirType("ClaimResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Item"; } } + public override string TypeName { get { return "ClaimResponse.item"; } } /// /// Claim item instance identifier @@ -308,14 +307,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Adjudication", IsNestedType=true)] - [BackboneType("ClaimResponse.item.adjudication")] + [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Adjudication"; } } + public override string TypeName { get { return "ClaimResponse.item.adjudication"; } } /// /// Type of adjudication information @@ -530,14 +528,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail")] + [FhirType("ClaimResponse.item.detail", IsBackboneType=true)] public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#ItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail"; } } /// /// Claim detail instance identifier @@ -771,14 +768,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#SubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail.subDetail")] + [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#SubDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } } /// /// Claim sub-detail instance identifier @@ -986,14 +982,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItem", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem")] + [FhirType("ClaimResponse.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItem"; } } + public override string TypeName { get { return "ClaimResponse.addItem"; } } /// /// Item sequence number @@ -1651,14 +1646,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail")] + [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail"; } } /// /// Billing, service, product, or drug code @@ -2020,14 +2014,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail.subDetail")] + [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } } /// /// Billing, service, product, or drug code @@ -2364,14 +2357,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Total", IsNestedType=true)] - [BackboneType("ClaimResponse.total")] + [FhirType("ClaimResponse.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Total"; } } + public override string TypeName { get { return "ClaimResponse.total"; } } /// /// Type of adjudication information @@ -2518,14 +2510,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Payment", IsNestedType=true)] - [BackboneType("ClaimResponse.payment")] + [FhirType("ClaimResponse.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Payment"; } } + public override string TypeName { get { return "ClaimResponse.payment"; } } /// /// Partial or complete payment @@ -2791,14 +2782,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Note", IsNestedType=true)] - [BackboneType("ClaimResponse.processNote")] + [FhirType("ClaimResponse.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Note"; } } + public override string TypeName { get { return "ClaimResponse.processNote"; } } /// /// Note instance identifier @@ -3051,14 +3041,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Insurance", IsNestedType=true)] - [BackboneType("ClaimResponse.insurance")] + [FhirType("ClaimResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Insurance"; } } + public override string TypeName { get { return "ClaimResponse.insurance"; } } /// /// Insurance instance identifier @@ -3339,14 +3328,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Error", IsNestedType=true)] - [BackboneType("ClaimResponse.error")] + [FhirType("ClaimResponse.error", IsBackboneType=true)] public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Error"; } } + public override string TypeName { get { return "ClaimResponse.error"; } } /// /// Item sequence number diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs index 834e23cbce..b48746d632 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)] + [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")] public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Investigation", IsNestedType=true)] - [BackboneType("ClinicalImpression.investigation")] + [FhirType("ClinicalImpression.investigation", IsBackboneType=true)] public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Investigation"; } } + public override string TypeName { get { return "ClinicalImpression.investigation"; } } /// /// A name/code for the set @@ -251,14 +250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Finding", IsNestedType=true)] - [BackboneType("ClinicalImpression.finding")] + [FhirType("ClinicalImpression.finding", IsBackboneType=true)] public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Finding"; } } + public override string TypeName { get { return "ClinicalImpression.finding"; } } /// /// What was found diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs index 6dde3b1d7e..809a3a0cd5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition", IsResource=true)] + [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition")] public partial class ClinicalUseDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum ClinicalUseDefinitionType /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Contraindication", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.contraindication")] + [FhirType("ClinicalUseDefinition.contraindication", IsBackboneType=true)] public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Contraindication"; } } + public override string TypeName { get { return "ClinicalUseDefinition.contraindication"; } } /// /// The situation that is being documented as contraindicating against this item @@ -335,14 +334,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#OtherTherapy", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")] + [FhirType("ClinicalUseDefinition.contraindication.otherTherapy", IsBackboneType=true)] public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#OtherTherapy"; } } + public override string TypeName { get { return "ClinicalUseDefinition.contraindication.otherTherapy"; } } /// /// The type of relationship between the product indication/contraindication and another therapy @@ -487,14 +485,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Indication", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.indication")] + [FhirType("ClinicalUseDefinition.indication", IsBackboneType=true)] public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Indication"; } } + public override string TypeName { get { return "ClinicalUseDefinition.indication"; } } /// /// The situation that is being documented as an indicaton for this item @@ -771,14 +768,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Interaction", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.interaction")] + [FhirType("ClinicalUseDefinition.interaction", IsBackboneType=true)] public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Interaction"; } } + public override string TypeName { get { return "ClinicalUseDefinition.interaction"; } } /// /// The specific medication, food, substance or laboratory test that interacts @@ -1000,14 +996,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Interactant", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.interaction.interactant")] + [FhirType("ClinicalUseDefinition.interaction.interactant", IsBackboneType=true)] public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Interactant"; } } + public override string TypeName { get { return "ClinicalUseDefinition.interaction.interactant"; } } /// /// The specific medication, food or laboratory test that interacts @@ -1131,14 +1126,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#UndesirableEffect", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.undesirableEffect")] + [FhirType("ClinicalUseDefinition.undesirableEffect", IsBackboneType=true)] public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#UndesirableEffect"; } } + public override string TypeName { get { return "ClinicalUseDefinition.undesirableEffect"; } } /// /// The situation in which the undesirable effect may manifest @@ -1310,14 +1304,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Warning", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.warning")] + [FhirType("ClinicalUseDefinition.warning", IsBackboneType=true)] public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Warning"; } } + public override string TypeName { get { return "ClinicalUseDefinition.warning"; } } /// /// A textual definition of this warning, with formatting diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs index 4ac5f46c54..2b8004a2fc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)] + [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")] public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("Communication#Payload", IsNestedType=true)] - [BackboneType("Communication.payload")] + [FhirType("Communication.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Communication#Payload"; } } + public override string TypeName { get { return "Communication.payload"; } } /// /// Message part content diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs index c9e9a7a591..bc3686b6e6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)] + [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")] public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("CommunicationRequest#Payload", IsNestedType=true)] - [BackboneType("CommunicationRequest.payload")] + [FhirType("CommunicationRequest.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CommunicationRequest#Payload"; } } + public override string TypeName { get { return "CommunicationRequest.payload"; } } /// /// Message part content diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs index d8da7fa037..081839e377 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)] + [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")] public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition#Resource", IsNestedType=true)] - [BackboneType("CompartmentDefinition.resource")] + [FhirType("CompartmentDefinition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CompartmentDefinition#Resource"; } } + public override string TypeName { get { return "CompartmentDefinition.resource"; } } /// /// Name of resource type diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs index 23ec521208..b0f1beaa53 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)] + [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")] public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -149,14 +149,13 @@ public enum CompositionAttestationMode /// [Serializable] [DataContract] - [FhirType("Composition#Attester", IsNestedType=true)] - [BackboneType("Composition.attester")] + [FhirType("Composition.attester", IsBackboneType=true)] public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Attester"; } } + public override string TypeName { get { return "Composition.attester"; } } /// /// personal | professional | legal | official @@ -367,14 +366,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#RelatesTo", IsNestedType=true)] - [BackboneType("Composition.relatesTo")] + [FhirType("Composition.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#RelatesTo"; } } + public override string TypeName { get { return "Composition.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -544,14 +542,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Event", IsNestedType=true)] - [BackboneType("Composition.event")] + [FhirType("Composition.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Event"; } } + public override string TypeName { get { return "Composition.event"; } } /// /// Code(s) that apply to the event being documented @@ -725,14 +722,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Section", IsNestedType=true)] - [BackboneType("Composition.section")] + [FhirType("Composition.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Section"; } } + public override string TypeName { get { return "Composition.section"; } } /// /// Label for section (e.g. for ToC) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs index 6b63a565ed..5d0ca3e620 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)] + [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")] public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -95,14 +95,13 @@ public enum ConceptMapGroupUnmappedMode /// [Serializable] [DataContract] - [FhirType("ConceptMap#Group", IsNestedType=true)] - [BackboneType("ConceptMap.group")] + [FhirType("ConceptMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Group"; } } + public override string TypeName { get { return "ConceptMap.group"; } } /// /// Source system where concepts to be mapped are defined @@ -420,14 +419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#SourceElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element")] + [FhirType("ConceptMap.group.element", IsBackboneType=true)] public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#SourceElement"; } } + public override string TypeName { get { return "ConceptMap.group.element"; } } /// /// Identifies element being mapped @@ -634,14 +632,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#TargetElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target")] + [FhirType("ConceptMap.group.element.target", IsBackboneType=true)] public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#TargetElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target"; } } /// /// Code that identifies the target element @@ -962,14 +959,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#OtherElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target.dependsOn")] + [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)] public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#OtherElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } } /// /// Reference to property mapping depends on @@ -1238,14 +1234,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#Unmapped", IsNestedType=true)] - [BackboneType("ConceptMap.group.unmapped")] + [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)] public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Unmapped"; } } + public override string TypeName { get { return "ConceptMap.group.unmapped"; } } /// /// provided | fixed | other-map diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs index 6bb7806674..0777f09001 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)] + [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")] public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -159,14 +159,13 @@ public enum ConditionVerificationStatus /// [Serializable] [DataContract] - [FhirType("Condition#Stage", IsNestedType=true)] - [BackboneType("Condition.stage")] + [FhirType("Condition.stage", IsBackboneType=true)] public partial class StageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Stage"; } } + public override string TypeName { get { return "Condition.stage"; } } /// /// Simple summary (disease specific) @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Condition#Evidence", IsNestedType=true)] - [BackboneType("Condition.evidence")] + [FhirType("Condition.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Evidence"; } } + public override string TypeName { get { return "Condition.evidence"; } } /// /// Manifestation/symptom diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs index 7365b6ea45..b85387c166 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)] + [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")] public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -170,14 +170,13 @@ public enum ConsentDataMeaning /// [Serializable] [DataContract] - [FhirType("Consent#Policy", IsNestedType=true)] - [BackboneType("Consent.policy")] + [FhirType("Consent.policy", IsBackboneType=true)] public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Policy"; } } + public override string TypeName { get { return "Consent.policy"; } } /// /// Enforcement source for policy @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Verification", IsNestedType=true)] - [BackboneType("Consent.verification")] + [FhirType("Consent.verification", IsBackboneType=true)] public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Verification"; } } + public override string TypeName { get { return "Consent.verification"; } } /// /// Has been verified @@ -572,14 +570,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provision", IsNestedType=true)] - [BackboneType("Consent.provision")] + [FhirType("Consent.provision", IsBackboneType=true)] public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provision"; } } + public override string TypeName { get { return "Consent.provision"; } } /// /// deny | permit @@ -981,14 +978,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionActor", IsNestedType=true)] - [BackboneType("Consent.provision.actor")] + [FhirType("Consent.provision.actor", IsBackboneType=true)] public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionActor"; } } + public override string TypeName { get { return "Consent.provision.actor"; } } /// /// How the actor is involved @@ -1137,14 +1133,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionData", IsNestedType=true)] - [BackboneType("Consent.provision.data")] + [FhirType("Consent.provision.data", IsBackboneType=true)] public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionData"; } } + public override string TypeName { get { return "Consent.provision.data"; } } /// /// instance | related | dependents | authoredby diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs index 6e2812e5e1..d2b4ffb391 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)] + [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")] public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Contract#ContentDefinition", IsNestedType=true)] - [BackboneType("Contract.contentDefinition")] + [FhirType("Contract.contentDefinition", IsBackboneType=true)] public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContentDefinition"; } } + public override string TypeName { get { return "Contract.contentDefinition"; } } /// /// Content structure and use @@ -580,14 +579,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Term", IsNestedType=true)] - [BackboneType("Contract.term")] + [FhirType("Contract.term", IsBackboneType=true)] public partial class TermComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Term"; } } + public override string TypeName { get { return "Contract.term"; } } /// /// Contract Term Number @@ -1027,14 +1025,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#SecurityLabel", IsNestedType=true)] - [BackboneType("Contract.term.securityLabel")] + [FhirType("Contract.term.securityLabel", IsBackboneType=true)] public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#SecurityLabel"; } } + public override string TypeName { get { return "Contract.term.securityLabel"; } } /// /// Link to Security Labels @@ -1253,14 +1250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractOffer", IsNestedType=true)] - [BackboneType("Contract.term.offer")] + [FhirType("Contract.term.offer", IsBackboneType=true)] public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractOffer"; } } + public override string TypeName { get { return "Contract.term.offer"; } } /// /// Offer business ID @@ -1666,14 +1662,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractParty", IsNestedType=true)] - [BackboneType("Contract.term.offer.party")] + [FhirType("Contract.term.offer.party", IsBackboneType=true)] public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractParty"; } } + public override string TypeName { get { return "Contract.term.offer.party"; } } /// /// Referenced entity @@ -1819,14 +1814,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Answer", IsNestedType=true)] - [BackboneType("Contract.term.offer.answer")] + [FhirType("Contract.term.offer.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Answer"; } } + public override string TypeName { get { return "Contract.term.offer.answer"; } } /// /// The actual answer response @@ -1946,14 +1940,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractAsset", IsNestedType=true)] - [BackboneType("Contract.term.asset")] + [FhirType("Contract.term.asset", IsBackboneType=true)] public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractAsset"; } } + public override string TypeName { get { return "Contract.term.asset"; } } /// /// Range of asset @@ -2509,14 +2502,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#AssetContext", IsNestedType=true)] - [BackboneType("Contract.term.asset.context")] + [FhirType("Contract.term.asset.context", IsBackboneType=true)] public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#AssetContext"; } } + public override string TypeName { get { return "Contract.term.asset.context"; } } /// /// Creator,custodian or owner @@ -2704,14 +2696,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ValuedItem", IsNestedType=true)] - [BackboneType("Contract.term.asset.valuedItem")] + [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)] public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ValuedItem"; } } + public override string TypeName { get { return "Contract.term.asset.valuedItem"; } } /// /// Contract Valued Item Type @@ -3292,14 +3283,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Action", IsNestedType=true)] - [BackboneType("Contract.term.action")] + [FhirType("Contract.term.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Action"; } } + public override string TypeName { get { return "Contract.term.action"; } } /// /// True if the term prohibits the action @@ -4091,14 +4081,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ActionSubject", IsNestedType=true)] - [BackboneType("Contract.term.action.subject")] + [FhirType("Contract.term.action.subject", IsBackboneType=true)] public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ActionSubject"; } } + public override string TypeName { get { return "Contract.term.action.subject"; } } /// /// Entity of the action @@ -4248,14 +4237,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Signatory", IsNestedType=true)] - [BackboneType("Contract.signer")] + [FhirType("Contract.signer", IsBackboneType=true)] public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Signatory"; } } + public override string TypeName { get { return "Contract.signer"; } } /// /// Contract Signatory Role @@ -4430,14 +4418,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#FriendlyLanguage", IsNestedType=true)] - [BackboneType("Contract.friendly")] + [FhirType("Contract.friendly", IsBackboneType=true)] public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#FriendlyLanguage"; } } + public override string TypeName { get { return "Contract.friendly"; } } /// /// Easily comprehended representation of this Contract @@ -4560,14 +4547,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#LegalLanguage", IsNestedType=true)] - [BackboneType("Contract.legal")] + [FhirType("Contract.legal", IsBackboneType=true)] public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#LegalLanguage"; } } + public override string TypeName { get { return "Contract.legal"; } } /// /// Contract Legal Text @@ -4690,14 +4676,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ComputableLanguage", IsNestedType=true)] - [BackboneType("Contract.rule")] + [FhirType("Contract.rule", IsBackboneType=true)] public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ComputableLanguage"; } } + public override string TypeName { get { return "Contract.rule"; } } /// /// Computable Contract Rules diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs index 9e2099f864..13e41ca46f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)] + [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")] public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Coverage#Class", IsNestedType=true)] - [BackboneType("Coverage.class")] + [FhirType("Coverage.class", IsBackboneType=true)] public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Class"; } } + public override string TypeName { get { return "Coverage.class"; } } /// /// Type of class such as 'group' or 'plan' @@ -285,14 +284,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary")] + [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)] public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#CostToBeneficiary"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary"; } } /// /// Cost category @@ -466,14 +464,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#Exemption", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary.exception")] + [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)] public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Exemption"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } } /// /// Exception category diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs index 804b746aae..d8ee875942 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)] + [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")] public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum EligibilityRequestPurpose /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.supportingInfo")] + [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } } /// /// Information instance identifier @@ -319,14 +318,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.insurance")] + [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } } /// /// Applicable coverage @@ -534,14 +532,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item")] + [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item"; } } /// /// Applicable exception or supporting information @@ -916,14 +913,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item.diagnosis")] + [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } } /// /// Nature of illness or problem diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs index 04647a5db3..21523ca2eb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)] + [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")] public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum EligibilityResponsePurpose /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance")] + [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } } /// /// Insurance information @@ -325,14 +324,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item")] + [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)] public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } } /// /// Benefit classification @@ -878,14 +876,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")] + [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } } /// /// Benefit classification @@ -1060,14 +1057,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.error")] + [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)] public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.error"; } } /// /// Error code detailing processing issues diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs index 99078bfe4d..278501a5fa 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs @@ -89,14 +89,13 @@ public enum SortDirection /// [Serializable] [DataContract] - [FhirType("DataRequirement#CodeFilter", IsNestedType=true)] - [BackboneType("DataRequirement.codeFilter")] + [FhirType("DataRequirement.codeFilter", IsBackboneType=true)] public partial class CodeFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#CodeFilter"; } } + public override string TypeName { get { return "DataRequirement.codeFilter"; } } /// /// A code-valued attribute to filter on @@ -345,14 +344,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#DateFilter", IsNestedType=true)] - [BackboneType("DataRequirement.dateFilter")] + [FhirType("DataRequirement.dateFilter", IsBackboneType=true)] public partial class DateFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#DateFilter"; } } + public override string TypeName { get { return "DataRequirement.dateFilter"; } } /// /// A date-valued attribute to filter on @@ -560,14 +558,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#Sort", IsNestedType=true)] - [BackboneType("DataRequirement.sort")] + [FhirType("DataRequirement.sort", IsBackboneType=true)] public partial class SortComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#Sort"; } } + public override string TypeName { get { return "DataRequirement.sort"; } } /// /// The name of the attribute to perform the sort diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs index a17a93d09e..821671cad6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)] + [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")] public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum DetectedIssueSeverity /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Evidence", IsNestedType=true)] - [BackboneType("DetectedIssue.evidence")] + [FhirType("DetectedIssue.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Evidence"; } } + public override string TypeName { get { return "DetectedIssue.evidence"; } } /// /// Manifestation @@ -251,14 +250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Mitigation", IsNestedType=true)] - [BackboneType("DetectedIssue.mitigation")] + [FhirType("DetectedIssue.mitigation", IsBackboneType=true)] public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Mitigation"; } } + public override string TypeName { get { return "DetectedIssue.mitigation"; } } /// /// What mitigation? diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs index b16fa9685e..6c41a9e54b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)] + [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")] public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -148,14 +148,13 @@ public enum UDIEntryType /// [Serializable] [DataContract] - [FhirType("Device#UdiCarrier", IsNestedType=true)] - [BackboneType("Device.udiCarrier")] + [FhirType("Device.udiCarrier", IsBackboneType=true)] public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#UdiCarrier"; } } + public override string TypeName { get { return "Device.udiCarrier"; } } /// /// Mandatory fixed portion of UDI @@ -509,14 +508,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#DeviceName", IsNestedType=true)] - [BackboneType("Device.deviceName")] + [FhirType("Device.deviceName", IsBackboneType=true)] public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#DeviceName"; } } + public override string TypeName { get { return "Device.deviceName"; } } /// /// The name that identifies the device @@ -697,14 +695,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Specialization", IsNestedType=true)] - [BackboneType("Device.specialization")] + [FhirType("Device.specialization", IsBackboneType=true)] public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Specialization"; } } + public override string TypeName { get { return "Device.specialization"; } } /// /// The standard that is used to operate and communicate @@ -864,14 +861,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Version", IsNestedType=true)] - [BackboneType("Device.version")] + [FhirType("Device.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Version"; } } + public override string TypeName { get { return "Device.version"; } } /// /// The type of the device version, e.g. manufacturer, approved, internal @@ -1056,14 +1052,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Property", IsNestedType=true)] - [BackboneType("Device.property")] + [FhirType("Device.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Property"; } } + public override string TypeName { get { return "Device.property"; } } /// /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs index b938124a6e..ea7676ce37 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)] + [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")] public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)] - [BackboneType("DeviceDefinition.udiDeviceIdentifier")] + [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)] public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } } + public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } } /// /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdication porvided in the DeviceDefinition.udiDeviceIdentifier @@ -298,14 +297,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)] - [BackboneType("DeviceDefinition.deviceName")] + [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)] public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#DeviceName"; } } + public override string TypeName { get { return "DeviceDefinition.deviceName"; } } /// /// The name of the device @@ -486,14 +484,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Specialization", IsNestedType=true)] - [BackboneType("DeviceDefinition.specialization")] + [FhirType("DeviceDefinition.specialization", IsBackboneType=true)] public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Specialization"; } } + public override string TypeName { get { return "DeviceDefinition.specialization"; } } /// /// The standard that is used to operate and communicate @@ -671,14 +668,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Capability", IsNestedType=true)] - [BackboneType("DeviceDefinition.capability")] + [FhirType("DeviceDefinition.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Capability"; } } + public override string TypeName { get { return "DeviceDefinition.capability"; } } /// /// Type of capability @@ -821,14 +817,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Property", IsNestedType=true)] - [BackboneType("DeviceDefinition.property")] + [FhirType("DeviceDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Property"; } } + public override string TypeName { get { return "DeviceDefinition.property"; } } /// /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible) @@ -997,14 +992,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Material", IsNestedType=true)] - [BackboneType("DeviceDefinition.material")] + [FhirType("DeviceDefinition.material", IsBackboneType=true)] public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Material"; } } + public override string TypeName { get { return "DeviceDefinition.material"; } } /// /// The substance diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs index 45f5ac0565..91ca6692c1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)] + [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")] public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState /// [Serializable] [DataContract] - [FhirType("DeviceMetric#Calibration", IsNestedType=true)] - [BackboneType("DeviceMetric.calibration")] + [FhirType("DeviceMetric.calibration", IsBackboneType=true)] public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceMetric#Calibration"; } } + public override string TypeName { get { return "DeviceMetric.calibration"; } } /// /// unspecified | offset | gain | two-point diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs index 22a10abf73..dca0d43f3e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)] + [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")] public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("DeviceRequest#Parameter", IsNestedType=true)] - [BackboneType("DeviceRequest.parameter")] + [FhirType("DeviceRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceRequest#Parameter"; } } + public override string TypeName { get { return "DeviceRequest.parameter"; } } /// /// Device detail diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs index cc81242106..00b3b84fbd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)] + [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")] public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs index 0a4e749db5..8ecc5756ac 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)] + [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")] public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -138,14 +138,13 @@ public enum DiagnosticReportStatus /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#Media", IsNestedType=true)] - [BackboneType("DiagnosticReport.media")] + [FhirType("DiagnosticReport.media", IsBackboneType=true)] public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#Media"; } } + public override string TypeName { get { return "DiagnosticReport.media"; } } /// /// Comment about the image (e.g. explanation) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs index 0054ec5d93..221cc60b49 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)] + [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")] public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("DocumentManifest#Related", IsNestedType=true)] - [BackboneType("DocumentManifest.related")] + [FhirType("DocumentManifest.related", IsBackboneType=true)] public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentManifest#Related"; } } + public override string TypeName { get { return "DocumentManifest.related"; } } /// /// Identifiers of things that are related diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs index 51541f2b56..6089f9f418 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)] + [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")] public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("DocumentReference#RelatesTo", IsNestedType=true)] - [BackboneType("DocumentReference.relatesTo")] + [FhirType("DocumentReference.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#RelatesTo"; } } + public override string TypeName { get { return "DocumentReference.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -244,14 +243,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Content", IsNestedType=true)] - [BackboneType("DocumentReference.content")] + [FhirType("DocumentReference.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Content"; } } + public override string TypeName { get { return "DocumentReference.content"; } } /// /// Where to access the document @@ -398,14 +396,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Context", IsNestedType=true)] - [BackboneType("DocumentReference.context")] + [FhirType("DocumentReference.context", IsBackboneType=true)] public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Context"; } } + public override string TypeName { get { return "DocumentReference.context"; } } /// /// Context of the document content diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs index cc52340ab2..284f4de6cc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs @@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType /// [Serializable] [DataContract] - [FhirType("Dosage#DoseAndRate", IsNestedType=true)] - [BackboneType("Dosage.doseAndRate")] + [FhirType("Dosage.doseAndRate", IsBackboneType=true)] public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Dosage#DoseAndRate"; } } + public override string TypeName { get { return "Dosage.doseAndRate"; } } /// /// The kind of dose or rate specified diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs index ae3b085814..1d35ae3a75 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)] + [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")] public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -168,14 +168,13 @@ public enum EncounterLocationStatus /// [Serializable] [DataContract] - [FhirType("Encounter#StatusHistory", IsNestedType=true)] - [BackboneType("Encounter.statusHistory")] + [FhirType("Encounter.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#StatusHistory"; } } + public override string TypeName { get { return "Encounter.statusHistory"; } } /// /// planned | arrived | triaged | in-progress | onleave | finished | cancelled + @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#ClassHistory", IsNestedType=true)] - [BackboneType("Encounter.classHistory")] + [FhirType("Encounter.classHistory", IsBackboneType=true)] public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#ClassHistory"; } } + public override string TypeName { get { return "Encounter.classHistory"; } } /// /// inpatient | outpatient | ambulatory | emergency + @@ -495,14 +493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Participant", IsNestedType=true)] - [BackboneType("Encounter.participant")] + [FhirType("Encounter.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Participant"; } } + public override string TypeName { get { return "Encounter.participant"; } } /// /// Role of participant in encounter @@ -672,14 +669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Diagnosis", IsNestedType=true)] - [BackboneType("Encounter.diagnosis")] + [FhirType("Encounter.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Diagnosis"; } } + public override string TypeName { get { return "Encounter.diagnosis"; } } /// /// The diagnosis or procedure relevant to the encounter @@ -871,14 +867,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Hospitalization", IsNestedType=true)] - [BackboneType("Encounter.hospitalization")] + [FhirType("Encounter.hospitalization", IsBackboneType=true)] public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Hospitalization"; } } + public override string TypeName { get { return "Encounter.hospitalization"; } } /// /// Pre-admission identifier @@ -1211,14 +1206,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Location", IsNestedType=true)] - [BackboneType("Encounter.location")] + [FhirType("Encounter.location", IsBackboneType=true)] public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Location"; } } + public override string TypeName { get { return "Encounter.location"; } } /// /// Location the encounter takes place diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs index 4faf7d0f25..e51d75d459 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)] + [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")] public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs index f79c48050f..1d45182c25 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)] + [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")] public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs index 4e185428f4..e9d39ab3df 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)] + [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")] public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs index bc800335ba..531d182042 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)] + [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")] public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)] - [BackboneType("EpisodeOfCare.statusHistory")] + [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } } + public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } } /// /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error @@ -289,14 +288,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)] - [BackboneType("EpisodeOfCare.diagnosis")] + [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } } + public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } } /// /// Conditions/problems/diagnoses this episode of care is for diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs index 900ca2be63..283281dc65 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)] + [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")] public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs index 1620b7803c..3bb6057f80 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)] + [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")] public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Evidence#VariableDefinition", IsNestedType=true)] - [BackboneType("Evidence.variableDefinition")] + [FhirType("Evidence.variableDefinition", IsBackboneType=true)] public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#VariableDefinition"; } } + public override string TypeName { get { return "Evidence.variableDefinition"; } } /// /// A text description or summary of the variable @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Statistic", IsNestedType=true)] - [BackboneType("Evidence.statistic")] + [FhirType("Evidence.statistic", IsBackboneType=true)] public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Statistic"; } } + public override string TypeName { get { return "Evidence.statistic"; } } /// /// Description of content @@ -744,14 +742,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#SampleSize", IsNestedType=true)] - [BackboneType("Evidence.statistic.sampleSize")] + [FhirType("Evidence.statistic.sampleSize", IsBackboneType=true)] public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#SampleSize"; } } + public override string TypeName { get { return "Evidence.statistic.sampleSize"; } } /// /// Textual description of sample size for statistic @@ -1043,14 +1040,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#AttributeEstimate", IsNestedType=true)] - [BackboneType("Evidence.statistic.attributeEstimate")] + [FhirType("Evidence.statistic.attributeEstimate", IsBackboneType=true)] public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#AttributeEstimate"; } } + public override string TypeName { get { return "Evidence.statistic.attributeEstimate"; } } /// /// Textual description of the attribute estimate @@ -1358,14 +1354,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#ModelCharacteristic", IsNestedType=true)] - [BackboneType("Evidence.statistic.modelCharacteristic")] + [FhirType("Evidence.statistic.modelCharacteristic", IsBackboneType=true)] public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#ModelCharacteristic"; } } + public override string TypeName { get { return "Evidence.statistic.modelCharacteristic"; } } /// /// Model specification @@ -1560,14 +1555,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Variable", IsNestedType=true)] - [BackboneType("Evidence.statistic.modelCharacteristic.variable")] + [FhirType("Evidence.statistic.modelCharacteristic.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Variable"; } } + public override string TypeName { get { return "Evidence.statistic.modelCharacteristic.variable"; } } /// /// Description of the variable @@ -1812,14 +1806,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Certainty", IsNestedType=true)] - [BackboneType("Evidence.certainty")] + [FhirType("Evidence.certainty", IsBackboneType=true)] public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Certainty"; } } + public override string TypeName { get { return "Evidence.certainty"; } } /// /// Textual description of certainty diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs index e003511c2d..95078ee47f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport", IsResource=true)] + [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport")] public partial class EvidenceReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -126,14 +126,13 @@ public enum ReportRelationshipType /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Subject", IsNestedType=true)] - [BackboneType("EvidenceReport.subject")] + [FhirType("EvidenceReport.subject", IsBackboneType=true)] public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Subject"; } } + public override string TypeName { get { return "EvidenceReport.subject"; } } /// /// Characteristic @@ -276,14 +275,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Characteristic", IsNestedType=true)] - [BackboneType("EvidenceReport.subject.characteristic")] + [FhirType("EvidenceReport.subject.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Characteristic"; } } + public override string TypeName { get { return "EvidenceReport.subject.characteristic"; } } /// /// Characteristic code @@ -502,14 +500,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#RelatesTo", IsNestedType=true)] - [BackboneType("EvidenceReport.relatesTo")] + [FhirType("EvidenceReport.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#RelatesTo"; } } + public override string TypeName { get { return "EvidenceReport.relatesTo"; } } /// /// replaces | amends | appends | transforms | replacedWith | amendedWith | appendedWith | transformedWith @@ -678,14 +675,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Section", IsNestedType=true)] - [BackboneType("EvidenceReport.section")] + [FhirType("EvidenceReport.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Section"; } } + public override string TypeName { get { return "EvidenceReport.section"; } } /// /// Label for section (e.g. for ToC) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs index 0c44327aaf..ebb71805c5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)] + [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")] public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -91,14 +91,13 @@ public enum CharacteristicCombinationCode /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic")] + [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#Characteristic"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic"; } } /// /// Natural language description of the characteristic @@ -430,14 +429,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#TimeFromStart", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic.timeFromStart")] + [FhirType("EvidenceVariable.characteristic.timeFromStart", IsBackboneType=true)] public partial class TimeFromStartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#TimeFromStart"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic.timeFromStart"; } } /// /// Human readable description @@ -650,14 +648,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#Category", IsNestedType=true)] - [BackboneType("EvidenceVariable.category")] + [FhirType("EvidenceVariable.category", IsBackboneType=true)] public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#Category"; } } + public override string TypeName { get { return "EvidenceVariable.category"; } } /// /// Description of the grouping diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs index c598e03f21..0a1726554a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)] + [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")] public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -83,14 +83,13 @@ public enum ExampleScenarioActorType /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Actor", IsNestedType=true)] - [BackboneType("ExampleScenario.actor")] + [FhirType("ExampleScenario.actor", IsBackboneType=true)] public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Actor"; } } + public override string TypeName { get { return "ExampleScenario.actor"; } } /// /// ID or acronym of the actor @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Instance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance")] + [FhirType("ExampleScenario.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Instance"; } } + public override string TypeName { get { return "ExampleScenario.instance"; } } /// /// The id of the resource for referencing @@ -683,14 +681,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Version", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.version")] + [FhirType("ExampleScenario.instance.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Version"; } } + public override string TypeName { get { return "ExampleScenario.instance.version"; } } /// /// The identifier of a specific version of a resource @@ -872,14 +869,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.containedInstance")] + [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)] public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } } + public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } } /// /// Each resource contained in the instance @@ -1057,14 +1053,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Process", IsNestedType=true)] - [BackboneType("ExampleScenario.process")] + [FhirType("ExampleScenario.process", IsBackboneType=true)] public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Process"; } } + public override string TypeName { get { return "ExampleScenario.process"; } } /// /// The diagram title of the group of operations @@ -1354,14 +1349,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Step", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step")] + [FhirType("ExampleScenario.process.step", IsBackboneType=true)] public partial class StepComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Step"; } } + public override string TypeName { get { return "ExampleScenario.process.step"; } } /// /// Nested process @@ -1572,14 +1566,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Operation", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.operation")] + [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Operation"; } } + public override string TypeName { get { return "ExampleScenario.process.step.operation"; } } /// /// The sequential number of the interaction @@ -2068,14 +2061,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Alternative", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.alternative")] + [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)] public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Alternative"; } } + public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } } /// /// Label for alternative diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs index afc33908d4..7cc5ec41fd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)] + [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")] public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.related")] + [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } } + public override string TypeName { get { return "ExplanationOfBenefit.related"; } } /// /// Reference to the related claim @@ -282,14 +281,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payee")] + [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payee"; } } /// /// Category of recipient @@ -436,14 +434,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.careTeam")] + [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } } + public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } } /// /// Order of care team @@ -705,14 +702,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.supportingInfo")] + [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } } + public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } } /// /// Information instance identifier @@ -984,14 +980,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.diagnosis")] + [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } } + public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1238,14 +1233,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.procedure")] + [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } } + public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } } /// /// Procedure instance identifier @@ -1512,14 +1506,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.insurance")] + [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } } /// /// Coverage to be used for adjudication @@ -1729,14 +1722,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.accident")] + [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } } + public override string TypeName { get { return "ExplanationOfBenefit.accident"; } } /// /// When the incident occurred @@ -1927,14 +1919,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item")] + [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Item"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item"; } } /// /// Item instance identifier @@ -2760,14 +2751,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.adjudication")] + [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } } /// /// Type of adjudication information @@ -2982,14 +2972,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail")] + [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } } /// /// Product or service provided @@ -3502,14 +3491,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail.subDetail")] + [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } } /// /// Product or service provided @@ -3996,14 +3984,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem")] + [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } } /// /// Item sequence number @@ -4661,14 +4648,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail")] + [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } } /// /// Billing, service, product, or drug code @@ -5030,14 +5016,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")] + [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } } /// /// Billing, service, product, or drug code @@ -5374,14 +5359,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.total")] + [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Total"; } } + public override string TypeName { get { return "ExplanationOfBenefit.total"; } } /// /// Type of adjudication information @@ -5528,14 +5512,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payment")] + [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payment"; } } /// /// Partial or complete payment @@ -5799,14 +5782,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.processNote")] + [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Note"; } } + public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } } /// /// Note instance identifier @@ -6054,14 +6036,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance")] + [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)] public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } } /// /// Benefit classification @@ -6415,14 +6396,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance.financial")] + [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } } /// /// Benefit classification diff --git a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs index 571fd66183..57e2f81468 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)] + [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")] public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum FamilyHistoryStatus /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.condition")] + [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Condition"; } } + public override string TypeName { get { return "FamilyMemberHistory.condition"; } } /// /// Condition suffered by relation diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs index dbd7c9e42a..84bb347b2f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)] + [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")] public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs index 0163423be0..b6cc33bdd1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)] + [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")] public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -133,14 +133,13 @@ public enum GoalLifecycleStatus /// [Serializable] [DataContract] - [FhirType("Goal#Target", IsNestedType=true)] - [BackboneType("Goal.target")] + [FhirType("Goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Goal#Target"; } } + public override string TypeName { get { return "Goal.target"; } } /// /// The parameter whose value is being tracked diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs index fac6f406b0..9441cc76e4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)] + [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")] public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -120,14 +120,13 @@ public enum GraphCompartmentRule /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Link", IsNestedType=true)] - [BackboneType("GraphDefinition.link")] + [FhirType("GraphDefinition.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Link"; } } + public override string TypeName { get { return "GraphDefinition.link"; } } /// /// Path in the resource that contains the link @@ -459,14 +458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Target", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target")] + [FhirType("GraphDefinition.link.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Target"; } } + public override string TypeName { get { return "GraphDefinition.link.target"; } } /// /// Type of resource this link refers to @@ -741,14 +739,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Compartment", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target.compartment")] + [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)] public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Compartment"; } } + public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } } /// /// condition | requirement diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs index 4600f4b1f1..0531cd0217 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)] + [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")] public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -115,14 +115,13 @@ public enum GroupType /// [Serializable] [DataContract] - [FhirType("Group#Characteristic", IsNestedType=true)] - [BackboneType("Group.characteristic")] + [FhirType("Group.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Characteristic"; } } + public override string TypeName { get { return "Group.characteristic"; } } /// /// Kind of characteristic @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Group#Member", IsNestedType=true)] - [BackboneType("Group.member")] + [FhirType("Group.member", IsBackboneType=true)] public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Member"; } } + public override string TypeName { get { return "Group.member"; } } /// /// Reference to the group member diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs index fdb47cd016..f79ea07761 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)] + [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")] public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs index c49dcc35ca..c0ed0b9eba 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)] + [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")] public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("HealthcareService#Eligibility", IsNestedType=true)] - [BackboneType("HealthcareService.eligibility")] + [FhirType("HealthcareService.eligibility", IsBackboneType=true)] public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#Eligibility"; } } + public override string TypeName { get { return "HealthcareService.eligibility"; } } /// /// Coded value for the eligibility @@ -235,14 +234,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("HealthcareService#AvailableTime", IsNestedType=true)] - [BackboneType("HealthcareService.availableTime")] + [FhirType("HealthcareService.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#AvailableTime"; } } + public override string TypeName { get { return "HealthcareService.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -511,14 +509,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("HealthcareService#NotAvailable", IsNestedType=true)] - [BackboneType("HealthcareService.notAvailable")] + [FhirType("HealthcareService.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#NotAvailable"; } } + public override string TypeName { get { return "HealthcareService.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs index cca6524870..5f0a92dc1f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)] + [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")] public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum ImagingStudyStatus /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Series", IsNestedType=true)] - [BackboneType("ImagingStudy.series")] + [FhirType("ImagingStudy.series", IsBackboneType=true)] public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Series"; } } + public override string TypeName { get { return "ImagingStudy.series"; } } /// /// DICOM Series Instance UID for the series @@ -612,14 +611,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Performer", IsNestedType=true)] - [BackboneType("ImagingStudy.series.performer")] + [FhirType("ImagingStudy.series.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Performer"; } } + public override string TypeName { get { return "ImagingStudy.series.performer"; } } /// /// Type of performance @@ -767,14 +765,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Instance", IsNestedType=true)] - [BackboneType("ImagingStudy.series.instance")] + [FhirType("ImagingStudy.series.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Instance"; } } + public override string TypeName { get { return "ImagingStudy.series.instance"; } } /// /// DICOM SOP Instance UID diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs index 08fca3e75c..8ec27e8e36 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)] + [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")] public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes /// [Serializable] [DataContract] - [FhirType("Immunization#Performer", IsNestedType=true)] - [BackboneType("Immunization.performer")] + [FhirType("Immunization.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Performer"; } } + public override string TypeName { get { return "Immunization.performer"; } } /// /// What type of performance was done @@ -250,14 +249,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Education", IsNestedType=true)] - [BackboneType("Immunization.education")] + [FhirType("Immunization.education", IsBackboneType=true)] public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Education"; } } + public override string TypeName { get { return "Immunization.education"; } } /// /// Educational material document identifier @@ -524,14 +522,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Reaction", IsNestedType=true)] - [BackboneType("Immunization.reaction")] + [FhirType("Immunization.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Reaction"; } } + public override string TypeName { get { return "Immunization.reaction"; } } /// /// When reaction started @@ -738,14 +735,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#ProtocolApplied", IsNestedType=true)] - [BackboneType("Immunization.protocolApplied")] + [FhirType("Immunization.protocolApplied", IsBackboneType=true)] public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#ProtocolApplied"; } } + public override string TypeName { get { return "Immunization.protocolApplied"; } } /// /// Name of vaccine series diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs index 064428acb9..0809b03c87 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)] + [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")] public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs index 3392b979b7..44002f099f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)] + [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")] public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation")] + [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)] public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } } /// /// Vaccine or vaccine group recommendation applies to @@ -521,14 +520,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")] + [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)] public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } } /// /// Type of date diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs index 8cb307c6aa..c2ea48e24c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)] + [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")] public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource { /// @@ -2257,14 +2257,13 @@ public enum GuideParameterCode /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)] - [BackboneType("ImplementationGuide.dependsOn")] + [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)] public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#DependsOn"; } } + public override string TypeName { get { return "ImplementationGuide.dependsOn"; } } /// /// Identity of the IG that this depends on @@ -2489,14 +2488,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Global", IsNestedType=true)] - [BackboneType("ImplementationGuide.global")] + [FhirType("ImplementationGuide.global", IsBackboneType=true)] public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Global"; } } + public override string TypeName { get { return "ImplementationGuide.global"; } } /// /// Type this profile applies to @@ -2681,14 +2679,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Definition", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition")] + [FhirType("ImplementationGuide.definition", IsBackboneType=true)] public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Definition"; } } + public override string TypeName { get { return "ImplementationGuide.definition"; } } /// /// Grouping used to present related resources in the IG @@ -2912,14 +2909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Grouping", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.grouping")] + [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)] public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Grouping"; } } + public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } } /// /// Descriptive name for the package @@ -3100,14 +3096,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Resource", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.resource")] + [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Resource"; } } + public override string TypeName { get { return "ImplementationGuide.definition.resource"; } } /// /// Location of the resource @@ -3432,14 +3427,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Page", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.page")] + [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)] public partial class PageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Page"; } } + public override string TypeName { get { return "ImplementationGuide.definition.page"; } } /// /// Where to find that page @@ -3675,14 +3669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Parameter", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.parameter")] + [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Parameter"; } } + public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } } /// /// apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template @@ -3863,14 +3856,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Template", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.template")] + [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)] public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Template"; } } + public override string TypeName { get { return "ImplementationGuide.definition.template"; } } /// /// Type of template specified @@ -4095,14 +4087,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Manifest", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest")] + [FhirType("ImplementationGuide.manifest", IsBackboneType=true)] public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Manifest"; } } + public override string TypeName { get { return "ImplementationGuide.manifest"; } } /// /// Location of rendered implementation guide @@ -4379,14 +4370,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.resource")] + [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)] public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } } /// /// Location of the resource @@ -4578,14 +4568,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.page")] + [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)] public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.page"; } } /// /// HTML page name diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs index d17cd21f3c..5ed90be07c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient", IsResource=true)] + [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient")] public partial class Ingredient : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -92,14 +92,13 @@ public enum IngredientManufacturerRole /// [Serializable] [DataContract] - [FhirType("Ingredient#Manufacturer", IsNestedType=true)] - [BackboneType("Ingredient.manufacturer")] + [FhirType("Ingredient.manufacturer", IsBackboneType=true)] public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Manufacturer"; } } + public override string TypeName { get { return "Ingredient.manufacturer"; } } /// /// allowed | possible | actual @@ -263,14 +262,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#Substance", IsNestedType=true)] - [BackboneType("Ingredient.substance")] + [FhirType("Ingredient.substance", IsBackboneType=true)] public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Substance"; } } + public override string TypeName { get { return "Ingredient.substance"; } } /// /// A code or full resource that represents the ingredient substance @@ -417,14 +415,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#Strength", IsNestedType=true)] - [BackboneType("Ingredient.substance.strength")] + [FhirType("Ingredient.substance.strength", IsBackboneType=true)] public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Strength"; } } + public override string TypeName { get { return "Ingredient.substance.strength"; } } /// /// The quantity of substance in the unit of presentation @@ -754,14 +751,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#ReferenceStrength", IsNestedType=true)] - [BackboneType("Ingredient.substance.strength.referenceStrength")] + [FhirType("Ingredient.substance.strength.referenceStrength", IsBackboneType=true)] public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#ReferenceStrength"; } } + public override string TypeName { get { return "Ingredient.substance.strength.referenceStrength"; } } /// /// Relevant reference substance diff --git a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs index d0507e9de4..181a7aabc3 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)] + [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")] public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -93,14 +93,13 @@ public enum BenefitCostApplicability /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Contact", IsNestedType=true)] - [BackboneType("InsurancePlan.contact")] + [FhirType("InsurancePlan.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Contact"; } } + public override string TypeName { get { return "InsurancePlan.contact"; } } /// /// The type of contact @@ -296,14 +295,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Coverage", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage")] + [FhirType("InsurancePlan.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Coverage"; } } + public override string TypeName { get { return "InsurancePlan.coverage"; } } /// /// Type of coverage @@ -477,14 +475,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit")] + [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)] public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } } /// /// Type of benefit @@ -673,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Limit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit.limit")] + [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)] public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Limit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } } /// /// Maximum value allowed @@ -824,14 +820,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Plan", IsNestedType=true)] - [BackboneType("InsurancePlan.plan")] + [FhirType("InsurancePlan.plan", IsBackboneType=true)] public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Plan"; } } + public override string TypeName { get { return "InsurancePlan.plan"; } } /// /// Business Identifier for Product @@ -1084,14 +1079,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.generalCost")] + [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)] public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#GeneralCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } } /// /// Type of cost @@ -1321,14 +1315,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost")] + [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)] public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#SpecificCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } } /// /// General category of benefit @@ -1474,14 +1467,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit")] + [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)] public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } } /// /// Type of specific benefit @@ -1627,14 +1619,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Cost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")] + [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Cost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } } /// /// Type of cost diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs index 7c41ae7b39..a7b308e03c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)] + [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")] public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum InvoiceStatus /// [Serializable] [DataContract] - [FhirType("Invoice#Participant", IsNestedType=true)] - [BackboneType("Invoice.participant")] + [FhirType("Invoice.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#Participant"; } } + public override string TypeName { get { return "Invoice.participant"; } } /// /// Type of involvement in creation of this Invoice @@ -261,14 +260,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Invoice#LineItem", IsNestedType=true)] - [BackboneType("Invoice.lineItem")] + [FhirType("Invoice.lineItem", IsBackboneType=true)] public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#LineItem"; } } + public override string TypeName { get { return "Invoice.lineItem"; } } /// /// Sequence number of line item @@ -460,14 +458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Invoice#PriceComponent", IsNestedType=true)] - [BackboneType("Invoice.lineItem.priceComponent")] + [FhirType("Invoice.lineItem.priceComponent", IsBackboneType=true)] public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#PriceComponent"; } } + public override string TypeName { get { return "Invoice.lineItem.priceComponent"; } } /// /// base | surcharge | deduction | discount | tax | informational diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs index 39e6da393a..c25a491377 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)] + [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")] public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs index 6a73c70cad..583b2a2828 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)] + [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")] public partial class Linkage : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum LinkageType /// [Serializable] [DataContract] - [FhirType("Linkage#Item", IsNestedType=true)] - [BackboneType("Linkage.item")] + [FhirType("Linkage.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Linkage#Item"; } } + public override string TypeName { get { return "Linkage.item"; } } /// /// source | alternate | historical diff --git a/src/Hl7.Fhir.R4B/Model/Generated/List.cs b/src/Hl7.Fhir.R4B/Model/Generated/List.cs index 1dfedfe997..7c9776ad35 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/List.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)] + [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")] public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -93,14 +93,13 @@ public enum ListStatus /// [Serializable] [DataContract] - [FhirType("List#Entry", IsNestedType=true)] - [BackboneType("List.entry")] + [FhirType("List.entry", IsBackboneType=true)] public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "List#Entry"; } } + public override string TypeName { get { return "List.entry"; } } /// /// Status/Workflow information about this item diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs index 8dd95ab273..f53fa42184 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)] + [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")] public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -117,14 +117,13 @@ public enum LocationMode /// [Serializable] [DataContract] - [FhirType("Location#Position", IsNestedType=true)] - [BackboneType("Location.position")] + [FhirType("Location.position", IsBackboneType=true)] public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#Position"; } } + public override string TypeName { get { return "Location.position"; } } /// /// Longitude with WGS84 datum @@ -350,14 +349,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Location#HoursOfOperation", IsNestedType=true)] - [BackboneType("Location.hoursOfOperation")] + [FhirType("Location.hoursOfOperation", IsBackboneType=true)] public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#HoursOfOperation"; } } + public override string TypeName { get { return "Location.hoursOfOperation"; } } /// /// mon | tue | wed | thu | fri | sat | sun diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs index 9f09404555..050952c0e2 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition", IsResource=true)] + [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition")] public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition#Property", IsNestedType=true)] - [BackboneType("ManufacturedItemDefinition.property")] + [FhirType("ManufacturedItemDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ManufacturedItemDefinition#Property"; } } + public override string TypeName { get { return "ManufacturedItemDefinition.property"; } } /// /// A code expressing the type of characteristic diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs index 8ae6bec83f..118018889f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)] + [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")] public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Measure#Group", IsNestedType=true)] - [BackboneType("Measure.group")] + [FhirType("Measure.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Group"; } } + public override string TypeName { get { return "Measure.group"; } } /// /// Meaning of the group @@ -289,14 +288,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Population", IsNestedType=true)] - [BackboneType("Measure.group.population")] + [FhirType("Measure.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Population"; } } + public override string TypeName { get { return "Measure.group.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation @@ -485,14 +483,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Stratifier", IsNestedType=true)] - [BackboneType("Measure.group.stratifier")] + [FhirType("Measure.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Stratifier"; } } + public override string TypeName { get { return "Measure.group.stratifier"; } } /// /// Meaning of the stratifier @@ -707,14 +704,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Component", IsNestedType=true)] - [BackboneType("Measure.group.stratifier.component")] + [FhirType("Measure.group.stratifier.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Component"; } } + public override string TypeName { get { return "Measure.group.stratifier.component"; } } /// /// Meaning of the stratifier component @@ -904,14 +900,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#SupplementalData", IsNestedType=true)] - [BackboneType("Measure.supplementalData")] + [FhirType("Measure.supplementalData", IsBackboneType=true)] public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#SupplementalData"; } } + public override string TypeName { get { return "Measure.supplementalData"; } } /// /// Meaning of the supplemental data diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs index 51bfa88c08..6b6ffc00d4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)] + [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")] public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -129,14 +129,13 @@ public enum MeasureReportType /// [Serializable] [DataContract] - [FhirType("MeasureReport#Group", IsNestedType=true)] - [BackboneType("MeasureReport.group")] + [FhirType("MeasureReport.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Group"; } } + public override string TypeName { get { return "MeasureReport.group"; } } /// /// Meaning of the group @@ -333,14 +332,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Population", IsNestedType=true)] - [BackboneType("MeasureReport.group.population")] + [FhirType("MeasureReport.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Population"; } } + public override string TypeName { get { return "MeasureReport.group.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation @@ -530,14 +528,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Stratifier", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier")] + [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Stratifier"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier"; } } /// /// What stratifier of the group @@ -684,14 +681,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum")] + [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)] public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroup"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } } /// /// The stratum value, e.g. male @@ -888,14 +884,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Component", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.component")] + [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Component"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } } /// /// What stratifier component of the group @@ -1043,14 +1038,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.population")] + [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)] public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } } /// /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs index 48695c3b81..a02bb88dca 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)] + [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")] public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs index 2926e4d2e9..e393717904 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)] + [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")] public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum MedicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Medication#Ingredient", IsNestedType=true)] - [BackboneType("Medication.ingredient")] + [FhirType("Medication.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Ingredient"; } } + public override string TypeName { get { return "Medication.ingredient"; } } /// /// The actual ingredient or content @@ -294,14 +293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Batch", IsNestedType=true)] - [BackboneType("Medication.batch")] + [FhirType("Medication.batch", IsBackboneType=true)] public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Batch"; } } + public override string TypeName { get { return "Medication.batch"; } } /// /// Identifier assigned to batch diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs index 5f2f34f134..4a4f747a6e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)] + [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")] public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Performer", IsNestedType=true)] - [BackboneType("MedicationAdministration.performer")] + [FhirType("MedicationAdministration.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Performer"; } } + public override string TypeName { get { return "MedicationAdministration.performer"; } } /// /// Type of performance @@ -274,14 +273,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Dosage", IsNestedType=true)] - [BackboneType("MedicationAdministration.dosage")] + [FhirType("MedicationAdministration.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Dosage"; } } + public override string TypeName { get { return "MedicationAdministration.dosage"; } } /// /// Free text dosage instructions e.g. SIG diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs index 9394e76c2e..b11a9738b7 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)] + [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")] public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Performer", IsNestedType=true)] - [BackboneType("MedicationDispense.performer")] + [FhirType("MedicationDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Performer"; } } + public override string TypeName { get { return "MedicationDispense.performer"; } } /// /// Who performed the dispense and what they did @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Substitution", IsNestedType=true)] - [BackboneType("MedicationDispense.substitution")] + [FhirType("MedicationDispense.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Substitution"; } } + public override string TypeName { get { return "MedicationDispense.substitution"; } } /// /// Whether a substitution was or was not performed on the dispense diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs index 35dc05046f..bccc859bcd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)] + [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")] public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)] - [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")] + [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)] public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } } + public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } } /// /// Category of medicationKnowledge @@ -247,14 +246,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monograph")] + [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)] public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Monograph"; } } + public override string TypeName { get { return "MedicationKnowledge.monograph"; } } /// /// The category of medication document @@ -400,14 +398,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)] - [BackboneType("MedicationKnowledge.ingredient")] + [FhirType("MedicationKnowledge.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } } + public override string TypeName { get { return "MedicationKnowledge.ingredient"; } } /// /// Medication(s) or substance(s) contained in the medication @@ -598,14 +595,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Cost", IsNestedType=true)] - [BackboneType("MedicationKnowledge.cost")] + [FhirType("MedicationKnowledge.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Cost"; } } + public override string TypeName { get { return "MedicationKnowledge.cost"; } } /// /// The category of the cost information @@ -794,14 +790,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monitoringProgram")] + [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)] public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } } + public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } } /// /// Type of program under which the medication is monitored @@ -963,14 +958,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#AdministrationGuidelines", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines")] + [FhirType("MedicationKnowledge.administrationGuidelines", IsBackboneType=true)] public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#AdministrationGuidelines"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines"; } } /// /// Dosage for the medication for the specific guidelines @@ -1141,14 +1135,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")] + [FhirType("MedicationKnowledge.administrationGuidelines.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Dosage"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.dosage"; } } /// /// Type of dosage @@ -1294,14 +1287,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#PatientCharacteristics", IsNestedType=true)] - [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")] + [FhirType("MedicationKnowledge.administrationGuidelines.patientCharacteristics", IsBackboneType=true)] public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristics"; } } + public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.patientCharacteristics"; } } /// /// Specific characteristic that is relevant to the administration guideline @@ -1464,14 +1456,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)] - [BackboneType("MedicationKnowledge.medicineClassification")] + [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)] public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } } + public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } } /// /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification) @@ -1617,14 +1608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)] - [BackboneType("MedicationKnowledge.packaging")] + [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)] public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Packaging"; } } + public override string TypeName { get { return "MedicationKnowledge.packaging"; } } /// /// A code that defines the specific type of packaging that the medication can be found in @@ -1769,14 +1759,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)] - [BackboneType("MedicationKnowledge.drugCharacteristic")] + [FhirType("MedicationKnowledge.drugCharacteristic", IsBackboneType=true)] public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } } + public override string TypeName { get { return "MedicationKnowledge.drugCharacteristic"; } } /// /// Code specifying the type of characteristic of medication @@ -1920,14 +1909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory")] + [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)] public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory"; } } /// /// Specifies the authority of the regulation @@ -2123,14 +2111,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.substitution")] + [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Substitution"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } } /// /// Specifies the type of substitution allowed @@ -2291,14 +2278,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Schedule", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.schedule")] + [FhirType("MedicationKnowledge.regulatory.schedule", IsBackboneType=true)] public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Schedule"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.schedule"; } } /// /// Specifies the specific drug schedule @@ -2415,14 +2401,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.maxDispense")] + [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)] public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } } /// /// The maximum number of units of the medication that can be dispensed @@ -2564,14 +2549,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Kinetics", IsNestedType=true)] - [BackboneType("MedicationKnowledge.kinetics")] + [FhirType("MedicationKnowledge.kinetics", IsBackboneType=true)] public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Kinetics"; } } + public override string TypeName { get { return "MedicationKnowledge.kinetics"; } } /// /// The drug concentration measured at certain discrete points in time diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs index e1db458a25..3ff6cfeaab 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)] + [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")] public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -183,14 +183,13 @@ public enum MedicationRequestIntent /// [Serializable] [DataContract] - [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest")] + [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)] public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } } /// /// First fill details @@ -480,14 +479,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#InitialFill", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest.initialFill")] + [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)] public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#InitialFill"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } } /// /// First fill quantity @@ -631,14 +629,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#Substitution", IsNestedType=true)] - [BackboneType("MedicationRequest.substitution")] + [FhirType("MedicationRequest.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#Substitution"; } } + public override string TypeName { get { return "MedicationRequest.substitution"; } } /// /// Whether substitution is allowed or not diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs index 6c095be1ab..d61e52c32c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs @@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)] + [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")] public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs index d4ba0a2bdc..e8d21e36fb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition", IsResource=true)] + [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition")] public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Contact", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.contact")] + [FhirType("MedicinalProductDefinition.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Contact"; } } + public override string TypeName { get { return "MedicinalProductDefinition.contact"; } } /// /// Allows the contact to be classified, for example QPPV, Pharmacovigilance Enquiry Information @@ -216,14 +215,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Name", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name")] + [FhirType("MedicinalProductDefinition.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Name"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name"; } } /// /// The full product name @@ -436,14 +434,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#NamePart", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name.namePart")] + [FhirType("MedicinalProductDefinition.name.namePart", IsBackboneType=true)] public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#NamePart"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name.namePart"; } } /// /// A fragment of a product name @@ -608,14 +605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#CountryLanguage", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name.countryLanguage")] + [FhirType("MedicinalProductDefinition.name.countryLanguage", IsBackboneType=true)] public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#CountryLanguage"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name.countryLanguage"; } } /// /// Country code for where this name applies @@ -789,14 +785,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#CrossReference", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.crossReference")] + [FhirType("MedicinalProductDefinition.crossReference", IsBackboneType=true)] public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#CrossReference"; } } + public override string TypeName { get { return "MedicinalProductDefinition.crossReference"; } } /// /// Reference to another product, e.g. for linking authorised to investigational product @@ -942,14 +937,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Operation", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.operation")] + [FhirType("MedicinalProductDefinition.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Operation"; } } + public override string TypeName { get { return "MedicinalProductDefinition.operation"; } } /// /// The type of manufacturing operation e.g. manufacturing itself, re-packaging @@ -1147,14 +1141,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Characteristic", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.characteristic")] + [FhirType("MedicinalProductDefinition.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Characteristic"; } } + public override string TypeName { get { return "MedicinalProductDefinition.characteristic"; } } /// /// A code expressing the type of characteristic diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs index b0842490f4..054c710d98 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)] + [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")] public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum MessageSignificanceCategory /// [Serializable] [DataContract] - [FhirType("MessageDefinition#Focus", IsNestedType=true)] - [BackboneType("MessageDefinition.focus")] + [FhirType("MessageDefinition.focus", IsBackboneType=true)] public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#Focus"; } } + public override string TypeName { get { return "MessageDefinition.focus"; } } /// /// Type of resource @@ -374,14 +373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)] - [BackboneType("MessageDefinition.allowedResponse")] + [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)] public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } } + public override string TypeName { get { return "MessageDefinition.allowedResponse"; } } /// /// Reference to allowed message definition response diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs index 48ef36634b..5642b8f392 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)] + [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")] public partial class MessageHeader : Hl7.Fhir.Model.DomainResource { /// @@ -96,14 +96,13 @@ public enum ResponseType /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageDestination", IsNestedType=true)] - [BackboneType("MessageHeader.destination")] + [FhirType("MessageHeader.destination", IsBackboneType=true)] public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageDestination"; } } + public override string TypeName { get { return "MessageHeader.destination"; } } /// /// Name of system @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageSource", IsNestedType=true)] - [BackboneType("MessageHeader.source")] + [FhirType("MessageHeader.source", IsBackboneType=true)] public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageSource"; } } + public override string TypeName { get { return "MessageHeader.source"; } } /// /// Name of system @@ -637,14 +635,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#Response", IsNestedType=true)] - [BackboneType("MessageHeader.response")] + [FhirType("MessageHeader.response", IsBackboneType=true)] public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#Response"; } } + public override string TypeName { get { return "MessageHeader.response"; } } /// /// Id of original message diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs index 19908293a1..0836036c54 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)] + [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")] public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -207,14 +207,13 @@ public enum RepositoryType /// [Serializable] [DataContract] - [FhirType("MolecularSequence#ReferenceSeq", IsNestedType=true)] - [BackboneType("MolecularSequence.referenceSeq")] + [FhirType("MolecularSequence.referenceSeq", IsBackboneType=true)] public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#ReferenceSeq"; } } + public override string TypeName { get { return "MolecularSequence.referenceSeq"; } } /// /// Chromosome containing genetic finding @@ -649,14 +648,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Variant", IsNestedType=true)] - [BackboneType("MolecularSequence.variant")] + [FhirType("MolecularSequence.variant", IsBackboneType=true)] public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Variant"; } } + public override string TypeName { get { return "MolecularSequence.variant"; } } /// /// Start position of the variant on the reference sequence @@ -992,14 +990,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Quality", IsNestedType=true)] - [BackboneType("MolecularSequence.quality")] + [FhirType("MolecularSequence.quality", IsBackboneType=true)] public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Quality"; } } + public override string TypeName { get { return "MolecularSequence.quality"; } } /// /// indel | snp | unknown @@ -1671,14 +1668,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Roc", IsNestedType=true)] - [BackboneType("MolecularSequence.quality.roc")] + [FhirType("MolecularSequence.quality.roc", IsBackboneType=true)] public partial class RocComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Roc"; } } + public override string TypeName { get { return "MolecularSequence.quality.roc"; } } /// /// Genotype quality score @@ -2080,14 +2076,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Repository", IsNestedType=true)] - [BackboneType("MolecularSequence.repository")] + [FhirType("MolecularSequence.repository", IsBackboneType=true)] public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Repository"; } } + public override string TypeName { get { return "MolecularSequence.repository"; } } /// /// directlink | openapi | login | oauth | other @@ -2442,14 +2437,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#StructureVariant", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant")] + [FhirType("MolecularSequence.structureVariant", IsBackboneType=true)] public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#StructureVariant"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant"; } } /// /// Structural variant change type @@ -2702,14 +2696,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Outer", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant.outer")] + [FhirType("MolecularSequence.structureVariant.outer", IsBackboneType=true)] public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Outer"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant.outer"; } } /// /// Structural variant outer start @@ -2886,14 +2879,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Inner", IsNestedType=true)] - [BackboneType("MolecularSequence.structureVariant.inner")] + [FhirType("MolecularSequence.structureVariant.inner", IsBackboneType=true)] public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Inner"; } } + public override string TypeName { get { return "MolecularSequence.structureVariant.inner"; } } /// /// Structural variant inner start diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs index 67f7cb02ee..99266308ab 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)] + [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")] public partial class NamingSystem : Hl7.Fhir.Model.DomainResource { /// @@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType /// [Serializable] [DataContract] - [FhirType("NamingSystem#UniqueId", IsNestedType=true)] - [BackboneType("NamingSystem.uniqueId")] + [FhirType("NamingSystem.uniqueId", IsBackboneType=true)] public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NamingSystem#UniqueId"; } } + public override string TypeName { get { return "NamingSystem.uniqueId"; } } /// /// oid | uuid | uri | other diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs index 75480cf8b8..f4c1d1d153 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)] + [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")] public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("NutritionOrder#OralDiet", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet")] + [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)] public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#OralDiet"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet"; } } /// /// Type of oral diet or diet restrictions that describe what can be consumed orally @@ -344,14 +343,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Nutrient", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.nutrient")] + [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Nutrient"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } } /// /// Type of nutrient that is being modified @@ -496,14 +494,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Texture", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.texture")] + [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)] public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Texture"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } } /// /// Code to indicate how to alter the texture of the foods, e.g. pureed @@ -649,14 +646,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Supplement", IsNestedType=true)] - [BackboneType("NutritionOrder.supplement")] + [FhirType("NutritionOrder.supplement", IsBackboneType=true)] public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Supplement"; } } + public override string TypeName { get { return "NutritionOrder.supplement"; } } /// /// Type of supplement product requested @@ -913,14 +909,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula")] + [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)] public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula"; } } /// /// Type of enteral or infant formula @@ -1298,14 +1293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Administration", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.administration")] + [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)] public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Administration"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } } /// /// Scheduled frequency of enteral feeding diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs index a2272a9f36..2595ce65d6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct", IsResource=true)] + [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct")] public partial class NutritionProduct : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum NutritionProductStatus /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Nutrient", IsNestedType=true)] - [BackboneType("NutritionProduct.nutrient")] + [FhirType("NutritionProduct.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Nutrient"; } } + public override string TypeName { get { return "NutritionProduct.nutrient"; } } /// /// The (relevant) nutrients in the product @@ -245,14 +244,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Ingredient", IsNestedType=true)] - [BackboneType("NutritionProduct.ingredient")] + [FhirType("NutritionProduct.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Ingredient"; } } + public override string TypeName { get { return "NutritionProduct.ingredient"; } } /// /// The ingredient contained in the product @@ -395,14 +393,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#ProductCharacteristic", IsNestedType=true)] - [BackboneType("NutritionProduct.productCharacteristic")] + [FhirType("NutritionProduct.productCharacteristic", IsBackboneType=true)] public partial class ProductCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#ProductCharacteristic"; } } + public override string TypeName { get { return "NutritionProduct.productCharacteristic"; } } /// /// Code specifying the type of characteristic @@ -551,14 +548,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Instance", IsNestedType=true)] - [BackboneType("NutritionProduct.instance")] + [FhirType("NutritionProduct.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Instance"; } } + public override string TypeName { get { return "NutritionProduct.instance"; } } /// /// The amount of items or instances diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs index b404275fff..3f46e3cc19 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)] + [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")] public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable< /// [Serializable] [DataContract] - [FhirType("Observation#ReferenceRange", IsNestedType=true)] - [BackboneType("Observation.referenceRange")] + [FhirType("Observation.referenceRange", IsBackboneType=true)] public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#ReferenceRange"; } } + public override string TypeName { get { return "Observation.referenceRange"; } } /// /// Low Range, if relevant @@ -342,14 +341,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#Component", IsNestedType=true)] - [BackboneType("Observation.component")] + [FhirType("Observation.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#Component"; } } + public override string TypeName { get { return "Observation.component"; } } /// /// Type of component observation (code / type) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs index 22f5b773ec..ac17f77572 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)] + [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")] public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -172,14 +172,13 @@ public enum ObservationRangeCategory /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#QuantitativeDetails", IsNestedType=true)] - [BackboneType("ObservationDefinition.quantitativeDetails")] + [FhirType("ObservationDefinition.quantitativeDetails", IsBackboneType=true)] public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#QuantitativeDetails"; } } + public override string TypeName { get { return "ObservationDefinition.quantitativeDetails"; } } /// /// Customary unit for quantitative results @@ -411,14 +410,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#QualifiedInterval", IsNestedType=true)] - [BackboneType("ObservationDefinition.qualifiedInterval")] + [FhirType("ObservationDefinition.qualifiedInterval", IsBackboneType=true)] public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#QualifiedInterval"; } } + public override string TypeName { get { return "ObservationDefinition.qualifiedInterval"; } } /// /// reference | critical | absolute diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs index 63a636406b..5e74d61afc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)] + [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")] public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -90,14 +90,13 @@ public enum OperationKind /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Parameter", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter")] + [FhirType("OperationDefinition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Parameter"; } } + public override string TypeName { get { return "OperationDefinition.parameter"; } } /// /// Name in Parameters.parameter.name or in URL @@ -623,14 +622,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Binding", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.binding")] + [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)] public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Binding"; } } + public override string TypeName { get { return "OperationDefinition.parameter.binding"; } } /// /// required | extensible | preferred | example @@ -815,14 +813,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.referencedFrom")] + [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)] public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } } + public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } } /// /// Referencing parameter @@ -1004,14 +1001,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Overload", IsNestedType=true)] - [BackboneType("OperationDefinition.overload")] + [FhirType("OperationDefinition.overload", IsBackboneType=true)] public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Overload"; } } + public override string TypeName { get { return "OperationDefinition.overload"; } } /// /// Name of parameter to include in overload diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs index 743dcf4d08..0a704533b6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)] + [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")] public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Organization#Contact", IsNestedType=true)] - [BackboneType("Organization.contact")] + [FhirType("Organization.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Organization#Contact"; } } + public override string TypeName { get { return "Organization.contact"; } } /// /// The type of contact diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs index 4e34fa0b4e..1b86f6ce02 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)] + [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")] public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs index f9dc515281..f061d4ac38 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition", IsResource=true)] + [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition")] public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#LegalStatusOfSupply", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.legalStatusOfSupply")] + [FhirType("PackagedProductDefinition.legalStatusOfSupply", IsBackboneType=true)] public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#LegalStatusOfSupply"; } } + public override string TypeName { get { return "PackagedProductDefinition.legalStatusOfSupply"; } } /// /// The actual status of supply. In what situation this package type may be supplied for use @@ -214,14 +213,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#Package", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.package")] + [FhirType("PackagedProductDefinition.package", IsBackboneType=true)] public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#Package"; } } + public override string TypeName { get { return "PackagedProductDefinition.package"; } } /// /// An identifier that is specific to this particular part of the packaging. Including possibly a Data Carrier Identifier @@ -593,14 +591,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#ShelfLifeStorage", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.package.shelfLifeStorage")] + [FhirType("PackagedProductDefinition.package.shelfLifeStorage", IsBackboneType=true)] public partial class ShelfLifeStorageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#ShelfLifeStorage"; } } + public override string TypeName { get { return "PackagedProductDefinition.package.shelfLifeStorage"; } } /// /// This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified @@ -769,14 +766,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#Property", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.package.property")] + [FhirType("PackagedProductDefinition.package.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#Property"; } } + public override string TypeName { get { return "PackagedProductDefinition.package.property"; } } /// /// A code expressing the type of characteristic @@ -921,14 +917,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#ContainedItem", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.package.containedItem")] + [FhirType("PackagedProductDefinition.package.containedItem", IsBackboneType=true)] public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#ContainedItem"; } } + public override string TypeName { get { return "PackagedProductDefinition.package.containedItem"; } } /// /// The actual item(s) of medication, as manufactured, or a device, or other medically related item (food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs index 9e1808ff29..6b7eddee86 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)] + [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")] public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum LinkType /// [Serializable] [DataContract] - [FhirType("Patient#Contact", IsNestedType=true)] - [BackboneType("Patient.contact")] + [FhirType("Patient.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Contact"; } } + public override string TypeName { get { return "Patient.contact"; } } /// /// The kind of relationship @@ -402,14 +401,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Communication", IsNestedType=true)] - [BackboneType("Patient.communication")] + [FhirType("Patient.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Communication"; } } + public override string TypeName { get { return "Patient.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health @@ -574,14 +572,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Link", IsNestedType=true)] - [BackboneType("Patient.link")] + [FhirType("Patient.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Link"; } } + public override string TypeName { get { return "Patient.link"; } } /// /// The other patient or related person resource that the link refers to diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs index 2e4d8829b4..6fbd3ba0c6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)] + [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")] public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs index c211a82df6..83b76c8c21 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)] + [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")] public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Details", IsNestedType=true)] - [BackboneType("PaymentReconciliation.detail")] + [FhirType("PaymentReconciliation.detail", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Details"; } } + public override string TypeName { get { return "PaymentReconciliation.detail"; } } /// /// Business identifier of the payment detail @@ -448,14 +447,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Notes", IsNestedType=true)] - [BackboneType("PaymentReconciliation.processNote")] + [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)] public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Notes"; } } + public override string TypeName { get { return "PaymentReconciliation.processNote"; } } /// /// display | print | printoper diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs index 4a1376b455..4f179340c0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)] + [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")] public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel /// [Serializable] [DataContract] - [FhirType("Person#Link", IsNestedType=true)] - [BackboneType("Person.link")] + [FhirType("Person.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Person#Link"; } } + public override string TypeName { get { return "Person.link"; } } /// /// The resource to which this actual person is associated diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs index 4731bad4aa..4f2a14f3f5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)] + [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")] public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Goal", IsNestedType=true)] - [BackboneType("PlanDefinition.goal")] + [FhirType("PlanDefinition.goal", IsBackboneType=true)] public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Goal"; } } + public override string TypeName { get { return "PlanDefinition.goal"; } } /// /// E.g. Treatment, dietary, behavioral @@ -352,14 +351,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Target", IsNestedType=true)] - [BackboneType("PlanDefinition.goal.target")] + [FhirType("PlanDefinition.goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Target"; } } + public override string TypeName { get { return "PlanDefinition.goal.target"; } } /// /// The parameter whose value is to be tracked @@ -532,14 +530,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Action", IsNestedType=true)] - [BackboneType("PlanDefinition.action")] + [FhirType("PlanDefinition.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Action"; } } + public override string TypeName { get { return "PlanDefinition.action"; } } /// /// User-visible prefix for the action (e.g. 1. or A.) @@ -1560,14 +1557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Condition", IsNestedType=true)] - [BackboneType("PlanDefinition.action.condition")] + [FhirType("PlanDefinition.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Condition"; } } + public override string TypeName { get { return "PlanDefinition.action.condition"; } } /// /// applicability | start | stop @@ -1733,14 +1729,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)] - [BackboneType("PlanDefinition.action.relatedAction")] + [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#RelatedAction"; } } + public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } } /// /// What action is this related to @@ -1951,14 +1946,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Participant", IsNestedType=true)] - [BackboneType("PlanDefinition.action.participant")] + [FhirType("PlanDefinition.action.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Participant"; } } + public override string TypeName { get { return "PlanDefinition.action.participant"; } } /// /// patient | practitioner | related-person | device @@ -2125,14 +2119,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("PlanDefinition.action.dynamicValue")] + [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#DynamicValue"; } } + public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } } /// /// The path to the element to be set dynamically diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs index c3076baa23..2be5bd6c64 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)] + [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")] public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Practitioner#Qualification", IsNestedType=true)] - [BackboneType("Practitioner.qualification")] + [FhirType("Practitioner.qualification", IsBackboneType=true)] public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Practitioner#Qualification"; } } + public override string TypeName { get { return "Practitioner.qualification"; } } /// /// An identifier for this qualification for the practitioner diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs index aeccb3643b..17c2828363 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)] + [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")] public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)] - [BackboneType("PractitionerRole.availableTime")] + [FhirType("PractitionerRole.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#AvailableTime"; } } + public override string TypeName { get { return "PractitionerRole.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -344,14 +343,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)] - [BackboneType("PractitionerRole.notAvailable")] + [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#NotAvailable"; } } + public override string TypeName { get { return "PractitionerRole.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs index 7a6741434e..9e12c5afe4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)] + [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")] public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable
  • [Serializable] [DataContract] - [FhirType("Procedure#Performer", IsNestedType=true)] - [BackboneType("Procedure.performer")] + [FhirType("Procedure.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#Performer"; } } + public override string TypeName { get { return "Procedure.performer"; } } /// /// Type of performance @@ -249,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Procedure#FocalDevice", IsNestedType=true)] - [BackboneType("Procedure.focalDevice")] + [FhirType("Procedure.focalDevice", IsBackboneType=true)] public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#FocalDevice"; } } + public override string TypeName { get { return "Procedure.focalDevice"; } } /// /// Kind of change to device diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs index 76a6508317..86657031f2 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)] + [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")] public partial class Provenance : Hl7.Fhir.Model.DomainResource { /// @@ -109,14 +109,13 @@ public enum ProvenanceEntityRole /// [Serializable] [DataContract] - [FhirType("Provenance#Agent", IsNestedType=true)] - [BackboneType("Provenance.agent")] + [FhirType("Provenance.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Agent"; } } + public override string TypeName { get { return "Provenance.agent"; } } /// /// How the agent participated @@ -315,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Provenance#Entity", IsNestedType=true)] - [BackboneType("Provenance.entity")] + [FhirType("Provenance.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Entity"; } } + public override string TypeName { get { return "Provenance.entity"; } } /// /// derivation | revision | quotation | source | removal diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs index 01ec18ede6..3062cad6ac 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)] + [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")] public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -254,14 +254,13 @@ public enum QuestionnaireItemOperator /// [Serializable] [DataContract] - [FhirType("Questionnaire#Item", IsNestedType=true)] - [BackboneType("Questionnaire.item")] + [FhirType("Questionnaire.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Item"; } } + public override string TypeName { get { return "Questionnaire.item"; } } /// /// Unique id for item in questionnaire @@ -966,14 +965,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#EnableWhen", IsNestedType=true)] - [BackboneType("Questionnaire.item.enableWhen")] + [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)] public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#EnableWhen"; } } + public override string TypeName { get { return "Questionnaire.item.enableWhen"; } } /// /// Question that determines whether item is enabled @@ -1188,14 +1186,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#AnswerOption", IsNestedType=true)] - [BackboneType("Questionnaire.item.answerOption")] + [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)] public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#AnswerOption"; } } + public override string TypeName { get { return "Questionnaire.item.answerOption"; } } /// /// Answer value @@ -1363,14 +1360,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#Initial", IsNestedType=true)] - [BackboneType("Questionnaire.item.initial")] + [FhirType("Questionnaire.item.initial", IsBackboneType=true)] public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Initial"; } } + public override string TypeName { get { return "Questionnaire.item.initial"; } } /// /// Actual value for initializing the question diff --git a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs index 58205e09fc..1986f63017 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)] + [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")] public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Item", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item")] + [FhirType("QuestionnaireResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Item"; } } + public override string TypeName { get { return "QuestionnaireResponse.item"; } } /// /// Pointer to specific item from Questionnaire @@ -393,14 +392,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item.answer")] + [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Answer"; } } + public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } } /// /// Single-valued answer to the question diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs index 6a7cad8f8e..14f6883962 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization", IsResource=true)] + [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization")] public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId /// [Serializable] [DataContract] - [FhirType("RegulatedAuthorization#Case", IsNestedType=true)] - [BackboneType("RegulatedAuthorization.case")] + [FhirType("RegulatedAuthorization.case", IsBackboneType=true)] public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RegulatedAuthorization#Case"; } } + public override string TypeName { get { return "RegulatedAuthorization.case"; } } /// /// Identifier by which this case can be referenced diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs index 87cc970ce3..349b390aa6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)] + [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")] public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("RelatedPerson#Communication", IsNestedType=true)] - [BackboneType("RelatedPerson.communication")] + [FhirType("RelatedPerson.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RelatedPerson#Communication"; } } + public override string TypeName { get { return "RelatedPerson.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs index 31a1c95eb8..854e9e1c18 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)] + [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")] public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("RequestGroup#Action", IsNestedType=true)] - [BackboneType("RequestGroup.action")] + [FhirType("RequestGroup.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Action"; } } + public override string TypeName { get { return "RequestGroup.action"; } } /// /// User-visible prefix for the action (e.g. 1. or A.) @@ -849,14 +848,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#Condition", IsNestedType=true)] - [BackboneType("RequestGroup.action.condition")] + [FhirType("RequestGroup.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Condition"; } } + public override string TypeName { get { return "RequestGroup.action.condition"; } } /// /// applicability | start | stop @@ -1021,14 +1019,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#RelatedAction", IsNestedType=true)] - [BackboneType("RequestGroup.action.relatedAction")] + [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#RelatedAction"; } } + public override string TypeName { get { return "RequestGroup.action.relatedAction"; } } /// /// What action this is related to diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs index b27c881622..f05c9ac6fb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition", IsResource=true)] + [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition")] public partial class ResearchDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs index 0eb9a34bc2..a9f2d40616 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition", IsResource=true)] + [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition")] public partial class ResearchElementDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -125,14 +125,13 @@ public enum VariableTypeCode /// [Serializable] [DataContract] - [FhirType("ResearchElementDefinition#Characteristic", IsNestedType=true)] - [BackboneType("ResearchElementDefinition.characteristic")] + [FhirType("ResearchElementDefinition.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchElementDefinition#Characteristic"; } } + public override string TypeName { get { return "ResearchElementDefinition.characteristic"; } } /// /// What code or expression defines members? diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs index 2d0dc8d029..1679d456ab 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)] + [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")] public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -144,14 +144,13 @@ public enum ResearchStudyStatus /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Arm", IsNestedType=true)] - [BackboneType("ResearchStudy.arm")] + [FhirType("ResearchStudy.arm", IsBackboneType=true)] public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Arm"; } } + public override string TypeName { get { return "ResearchStudy.arm"; } } /// /// Label for study arm @@ -357,14 +356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Objective", IsNestedType=true)] - [BackboneType("ResearchStudy.objective")] + [FhirType("ResearchStudy.objective", IsBackboneType=true)] public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Objective"; } } + public override string TypeName { get { return "ResearchStudy.objective"; } } /// /// Label for the objective diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs index b41f3495a1..16d10b5dc5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)] + [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")] public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs index 31ac230bae..bd2b8f02cb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)] + [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")] public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("RiskAssessment#Prediction", IsNestedType=true)] - [BackboneType("RiskAssessment.prediction")] + [FhirType("RiskAssessment.prediction", IsBackboneType=true)] public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskAssessment#Prediction"; } } + public override string TypeName { get { return "RiskAssessment.prediction"; } } /// /// Possible outcome for the subject diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs index fa1b7ac8ea..20d03c7ab1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)] + [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")] public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs index b061f65f9a..de803db64b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)] + [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")] public partial class SearchParameter : Hl7.Fhir.Model.DomainResource { /// @@ -254,14 +254,13 @@ public enum SearchModifierCode /// [Serializable] [DataContract] - [FhirType("SearchParameter#Component", IsNestedType=true)] - [BackboneType("SearchParameter.component")] + [FhirType("SearchParameter.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SearchParameter#Component"; } } + public override string TypeName { get { return "SearchParameter.component"; } } /// /// Defines how the part works diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs index 4618527e66..a7e1d4f61d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)] + [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")] public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs index 87311a61d4..c271d1fb42 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)] + [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")] public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs index 5609b3baa7..dcd433cc4a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)] + [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")] public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum SpecimenStatus /// [Serializable] [DataContract] - [FhirType("Specimen#Collection", IsNestedType=true)] - [BackboneType("Specimen.collection")] + [FhirType("Specimen.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Collection"; } } + public override string TypeName { get { return "Specimen.collection"; } } /// /// Who collected the specimen @@ -386,14 +385,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Processing", IsNestedType=true)] - [BackboneType("Specimen.processing")] + [FhirType("Specimen.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Processing"; } } + public override string TypeName { get { return "Specimen.processing"; } } /// /// Textual description of procedure @@ -611,14 +609,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Container", IsNestedType=true)] - [BackboneType("Specimen.container")] + [FhirType("Specimen.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Container"; } } + public override string TypeName { get { return "Specimen.container"; } } /// /// Id for the container diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs index 50a260aff8..3d3d03604c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)] + [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")] public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -89,14 +89,13 @@ public enum SpecimenContainedPreference /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested")] + [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)] public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested"; } } /// /// Primary or secondary specimen @@ -448,14 +447,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Container", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container")] + [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Container"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } } /// /// Container material @@ -791,14 +789,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Additive", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container.additive")] + [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)] public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Additive"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } } /// /// Additive associated with container @@ -922,14 +919,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Handling", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.handling")] + [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)] public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Handling"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } } /// /// Temperature qualifier diff --git a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs index 743796fd16..0ce4d29051 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)] + [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")] public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -357,14 +357,13 @@ public enum StructureMapTransform /// [Serializable] [DataContract] - [FhirType("StructureMap#Structure", IsNestedType=true)] - [BackboneType("StructureMap.structure")] + [FhirType("StructureMap.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Structure"; } } + public override string TypeName { get { return "StructureMap.structure"; } } /// /// Canonical reference to structure definition @@ -634,14 +633,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Group", IsNestedType=true)] - [BackboneType("StructureMap.group")] + [FhirType("StructureMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Group"; } } + public override string TypeName { get { return "StructureMap.group"; } } /// /// Human-readable label @@ -964,14 +962,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Input", IsNestedType=true)] - [BackboneType("StructureMap.group.input")] + [FhirType("StructureMap.group.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Input"; } } + public override string TypeName { get { return "StructureMap.group.input"; } } /// /// Name for this instance of data @@ -1238,14 +1235,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Rule", IsNestedType=true)] - [BackboneType("StructureMap.group.rule")] + [FhirType("StructureMap.group.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Rule"; } } + public override string TypeName { get { return "StructureMap.group.rule"; } } /// /// Name of the rule for internal references @@ -1527,14 +1523,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Source", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.source")] + [FhirType("StructureMap.group.rule.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Source"; } } + public override string TypeName { get { return "StructureMap.group.rule.source"; } } /// /// Type or variable this rule applies to @@ -2085,14 +2080,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Target", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target")] + [FhirType("StructureMap.group.rule.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Target"; } } + public override string TypeName { get { return "StructureMap.group.rule.target"; } } /// /// Type or variable this rule applies to @@ -2517,14 +2511,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Parameter", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target.parameter")] + [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Parameter"; } } + public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } } /// /// Parameter value - variable or literal @@ -2643,14 +2636,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Dependent", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.dependent")] + [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)] public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Dependent"; } } + public override string TypeName { get { return "StructureMap.group.rule.dependent"; } } /// /// Name of a rule or group to apply diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs index 60dedb0d4e..b5aa388622 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)] + [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")] public partial class Subscription : Hl7.Fhir.Model.DomainResource { /// @@ -107,14 +107,13 @@ public enum SubscriptionChannelType /// [Serializable] [DataContract] - [FhirType("Subscription#Channel", IsNestedType=true)] - [BackboneType("Subscription.channel")] + [FhirType("Subscription.channel", IsBackboneType=true)] public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Subscription#Channel"; } } + public override string TypeName { get { return "Subscription.channel"; } } /// /// rest-hook | websocket | email | sms | message diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs index e68e588d21..1d09c73b61 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus", IsResource=true)] + [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus")] public partial class SubscriptionStatus : Hl7.Fhir.Model.DomainResource { /// @@ -107,14 +107,13 @@ public enum SubscriptionNotificationType /// [Serializable] [DataContract] - [FhirType("SubscriptionStatus#NotificationEvent", IsNestedType=true)] - [BackboneType("SubscriptionStatus.notificationEvent")] + [FhirType("SubscriptionStatus.notificationEvent", IsBackboneType=true)] public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionStatus#NotificationEvent"; } } + public override string TypeName { get { return "SubscriptionStatus.notificationEvent"; } } /// /// Event number diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs index 84d1e057f9..850db7d20f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic", IsResource=true)] + [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic")] public partial class SubscriptionTopic : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -217,14 +217,13 @@ public enum SubscriptionSearchModifier /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#ResourceTrigger", IsNestedType=true)] - [BackboneType("SubscriptionTopic.resourceTrigger")] + [FhirType("SubscriptionTopic.resourceTrigger", IsBackboneType=true)] public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#ResourceTrigger"; } } + public override string TypeName { get { return "SubscriptionTopic.resourceTrigger"; } } /// /// Text representation of the resource trigger @@ -520,14 +519,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#QueryCriteria", IsNestedType=true)] - [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")] + [FhirType("SubscriptionTopic.resourceTrigger.queryCriteria", IsBackboneType=true)] public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#QueryCriteria"; } } + public override string TypeName { get { return "SubscriptionTopic.resourceTrigger.queryCriteria"; } } /// /// Rule applied to previous resource state @@ -840,14 +838,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#EventTrigger", IsNestedType=true)] - [BackboneType("SubscriptionTopic.eventTrigger")] + [FhirType("SubscriptionTopic.eventTrigger", IsBackboneType=true)] public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#EventTrigger"; } } + public override string TypeName { get { return "SubscriptionTopic.eventTrigger"; } } /// /// Text representation of the event trigger @@ -1056,14 +1053,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#CanFilterBy", IsNestedType=true)] - [BackboneType("SubscriptionTopic.canFilterBy")] + [FhirType("SubscriptionTopic.canFilterBy", IsBackboneType=true)] public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#CanFilterBy"; } } + public override string TypeName { get { return "SubscriptionTopic.canFilterBy"; } } /// /// Description of this filter parameter @@ -1377,14 +1373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#NotificationShape", IsNestedType=true)] - [BackboneType("SubscriptionTopic.notificationShape")] + [FhirType("SubscriptionTopic.notificationShape", IsBackboneType=true)] public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#NotificationShape"; } } + public override string TypeName { get { return "SubscriptionTopic.notificationShape"; } } /// /// URL of the Resource that is the focus (main) resource in a notification shape diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs index f7c5e28c21..b1144ba843 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)] + [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")] public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus /// [Serializable] [DataContract] - [FhirType("Substance#Instance", IsNestedType=true)] - [BackboneType("Substance.instance")] + [FhirType("Substance.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Instance"; } } + public override string TypeName { get { return "Substance.instance"; } } /// /// Identifier of the package/container @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Substance#Ingredient", IsNestedType=true)] - [BackboneType("Substance.ingredient")] + [FhirType("Substance.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Ingredient"; } } + public override string TypeName { get { return "Substance.ingredient"; } } /// /// Optional amount (concentration) diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs index e4a396cee3..82cf699c0d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition", IsResource=true)] + [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition")] public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Moiety", IsNestedType=true)] - [BackboneType("SubstanceDefinition.moiety")] + [FhirType("SubstanceDefinition.moiety", IsBackboneType=true)] public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Moiety"; } } + public override string TypeName { get { return "SubstanceDefinition.moiety"; } } /// /// Role that the moiety is playing @@ -400,14 +399,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Property", IsNestedType=true)] - [BackboneType("SubstanceDefinition.property")] + [FhirType("SubstanceDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Property"; } } + public override string TypeName { get { return "SubstanceDefinition.property"; } } /// /// A code expressing the type of property @@ -555,14 +553,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#MolecularWeight", IsNestedType=true)] - [BackboneType("SubstanceDefinition.molecularWeight")] + [FhirType("SubstanceDefinition.molecularWeight", IsBackboneType=true)] public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#MolecularWeight"; } } + public override string TypeName { get { return "SubstanceDefinition.molecularWeight"; } } /// /// The method by which the weight was determined @@ -731,14 +728,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Structure", IsNestedType=true)] - [BackboneType("SubstanceDefinition.structure")] + [FhirType("SubstanceDefinition.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Structure"; } } + public override string TypeName { get { return "SubstanceDefinition.structure"; } } /// /// Stereochemistry type @@ -1073,14 +1069,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Representation", IsNestedType=true)] - [BackboneType("SubstanceDefinition.structure.representation")] + [FhirType("SubstanceDefinition.structure.representation", IsBackboneType=true)] public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Representation"; } } + public override string TypeName { get { return "SubstanceDefinition.structure.representation"; } } /// /// The kind of structural representation (e.g. full, partial) @@ -1293,14 +1288,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Code", IsNestedType=true)] - [BackboneType("SubstanceDefinition.code")] + [FhirType("SubstanceDefinition.code", IsBackboneType=true)] public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Code"; } } + public override string TypeName { get { return "SubstanceDefinition.code"; } } /// /// The specific code @@ -1539,14 +1533,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Name", IsNestedType=true)] - [BackboneType("SubstanceDefinition.name")] + [FhirType("SubstanceDefinition.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Name"; } } + public override string TypeName { get { return "SubstanceDefinition.name"; } } /// /// The actual name @@ -1963,14 +1956,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Official", IsNestedType=true)] - [BackboneType("SubstanceDefinition.name.official")] + [FhirType("SubstanceDefinition.name.official", IsBackboneType=true)] public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Official"; } } + public override string TypeName { get { return "SubstanceDefinition.name.official"; } } /// /// Which authority uses this official name @@ -2159,14 +2151,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Relationship", IsNestedType=true)] - [BackboneType("SubstanceDefinition.relationship")] + [FhirType("SubstanceDefinition.relationship", IsBackboneType=true)] public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Relationship"; } } + public override string TypeName { get { return "SubstanceDefinition.relationship"; } } /// /// A pointer to another substance, as a resource or a representational code @@ -2464,14 +2455,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#SourceMaterial", IsNestedType=true)] - [BackboneType("SubstanceDefinition.sourceMaterial")] + [FhirType("SubstanceDefinition.sourceMaterial", IsBackboneType=true)] public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#SourceMaterial"; } } + public override string TypeName { get { return "SubstanceDefinition.sourceMaterial"; } } /// /// Classification of the origin of the raw material. e.g. cat hair is an Animal source type diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs index 834bbf411d..14caa83802 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)] + [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")] public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum SupplyItemType /// [Serializable] [DataContract] - [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)] - [BackboneType("SupplyDelivery.suppliedItem")] + [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)] public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } } + public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } } /// /// Amount dispensed diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs index 82f00fd2af..f498b0db21 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)] + [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")] public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum SupplyRequestStatus /// [Serializable] [DataContract] - [FhirType("SupplyRequest#Parameter", IsNestedType=true)] - [BackboneType("SupplyRequest.parameter")] + [FhirType("SupplyRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyRequest#Parameter"; } } + public override string TypeName { get { return "SupplyRequest.parameter"; } } /// /// Item detail diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs index e60f380173..cdec518284 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)] + [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")] public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -210,14 +210,13 @@ public enum TaskIntent /// [Serializable] [DataContract] - [FhirType("Task#Restriction", IsNestedType=true)] - [BackboneType("Task.restriction")] + [FhirType("Task.restriction", IsBackboneType=true)] public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Restriction"; } } + public override string TypeName { get { return "Task.restriction"; } } /// /// How many times to repeat @@ -407,14 +406,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Parameter", IsNestedType=true)] - [BackboneType("Task.input")] + [FhirType("Task.input", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Parameter"; } } + public override string TypeName { get { return "Task.input"; } } /// /// Label for the input @@ -563,14 +561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Output", IsNestedType=true)] - [BackboneType("Task.output")] + [FhirType("Task.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Output"; } } + public override string TypeName { get { return "Task.output"; } } /// /// Label for output diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs index 35de459836..e79c8172a3 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)] + [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")] public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource { /// @@ -89,14 +89,13 @@ public enum CodeSearchSupport /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Software", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.software")] + [FhirType("TerminologyCapabilities.software", IsBackboneType=true)] public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Software"; } } + public override string TypeName { get { return "TerminologyCapabilities.software"; } } /// /// A name the software is known by @@ -277,14 +276,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.implementation")] + [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)] public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } } + public override string TypeName { get { return "TerminologyCapabilities.implementation"; } } /// /// Describes this specific instance @@ -466,14 +464,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem")] + [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)] public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } } /// /// URI for the Code System @@ -680,14 +677,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Version", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version")] + [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Version"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } } /// /// Version identifier for this version @@ -1021,14 +1017,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version.filter")] + [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Filter"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } } /// /// Code of the property supported @@ -1207,14 +1202,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion")] + [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)] public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion"; } } /// /// Whether the server can return nested value sets @@ -1503,14 +1497,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion.parameter")] + [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } } /// /// Expansion Parameter name @@ -1688,14 +1681,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.validateCode")] + [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)] public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } } + public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } } /// /// Whether translations are validated @@ -1830,14 +1822,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.translation")] + [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)] public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Translation"; } } + public override string TypeName { get { return "TerminologyCapabilities.translation"; } } /// /// Whether the client must identify the map @@ -1975,14 +1966,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.closure")] + [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)] public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Closure"; } } + public override string TypeName { get { return "TerminologyCapabilities.closure"; } } /// /// If cross-system closure is supported diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs index 874dd68bc9..03210719cb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)] + [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")] public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -200,14 +200,13 @@ public enum TestReportActionResult /// [Serializable] [DataContract] - [FhirType("TestReport#Participant", IsNestedType=true)] - [BackboneType("TestReport.participant")] + [FhirType("TestReport.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Participant"; } } + public override string TypeName { get { return "TestReport.participant"; } } /// /// test-engine | client | server @@ -431,14 +430,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Setup", IsNestedType=true)] - [BackboneType("TestReport.setup")] + [FhirType("TestReport.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Setup"; } } + public override string TypeName { get { return "TestReport.setup"; } } /// /// A setup operation or assert that was executed @@ -559,14 +557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#SetupAction", IsNestedType=true)] - [BackboneType("TestReport.setup.action")] + [FhirType("TestReport.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#SetupAction"; } } + public override string TypeName { get { return "TestReport.setup.action"; } } /// /// The operation to perform @@ -710,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Operation", IsNestedType=true)] - [BackboneType("TestReport.setup.action.operation")] + [FhirType("TestReport.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Operation"; } } + public override string TypeName { get { return "TestReport.setup.action.operation"; } } /// /// pass | skip | fail | warning | error @@ -943,14 +939,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Assert", IsNestedType=true)] - [BackboneType("TestReport.setup.action.assert")] + [FhirType("TestReport.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Assert"; } } + public override string TypeName { get { return "TestReport.setup.action.assert"; } } /// /// pass | skip | fail | warning | error @@ -1173,14 +1168,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Test", IsNestedType=true)] - [BackboneType("TestReport.test")] + [FhirType("TestReport.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Test"; } } + public override string TypeName { get { return "TestReport.test"; } } /// /// Tracking/logging name of this test @@ -1387,14 +1381,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TestAction", IsNestedType=true)] - [BackboneType("TestReport.test.action")] + [FhirType("TestReport.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TestAction"; } } + public override string TypeName { get { return "TestReport.test.action"; } } /// /// The operation performed @@ -1538,14 +1531,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Teardown", IsNestedType=true)] - [BackboneType("TestReport.teardown")] + [FhirType("TestReport.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Teardown"; } } + public override string TypeName { get { return "TestReport.teardown"; } } /// /// One or more teardown operations performed @@ -1666,14 +1658,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TeardownAction", IsNestedType=true)] - [BackboneType("TestReport.teardown.action")] + [FhirType("TestReport.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TeardownAction"; } } + public override string TypeName { get { return "TestReport.teardown.action"; } } /// /// The teardown operation performed diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs index db61973e15..23645e3568 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)] + [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")] public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -300,14 +300,13 @@ public enum AssertionResponseTypes /// [Serializable] [DataContract] - [FhirType("TestScript#Origin", IsNestedType=true)] - [BackboneType("TestScript.origin")] + [FhirType("TestScript.origin", IsBackboneType=true)] public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Origin"; } } + public override string TypeName { get { return "TestScript.origin"; } } /// /// The index of the abstract origin server starting at 1 @@ -473,14 +472,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Destination", IsNestedType=true)] - [BackboneType("TestScript.destination")] + [FhirType("TestScript.destination", IsBackboneType=true)] public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Destination"; } } + public override string TypeName { get { return "TestScript.destination"; } } /// /// The index of the abstract destination server starting at 1 @@ -645,14 +643,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Metadata", IsNestedType=true)] - [BackboneType("TestScript.metadata")] + [FhirType("TestScript.metadata", IsBackboneType=true)] public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Metadata"; } } + public override string TypeName { get { return "TestScript.metadata"; } } /// /// Links to the FHIR specification @@ -798,14 +795,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Link", IsNestedType=true)] - [BackboneType("TestScript.metadata.link")] + [FhirType("TestScript.metadata.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Link"; } } + public override string TypeName { get { return "TestScript.metadata.link"; } } /// /// URL to the specification @@ -987,14 +983,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Capability", IsNestedType=true)] - [BackboneType("TestScript.metadata.capability")] + [FhirType("TestScript.metadata.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Capability"; } } + public override string TypeName { get { return "TestScript.metadata.capability"; } } /// /// Are the capabilities required? @@ -1394,14 +1389,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Fixture", IsNestedType=true)] - [BackboneType("TestScript.fixture")] + [FhirType("TestScript.fixture", IsBackboneType=true)] public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Fixture"; } } + public override string TypeName { get { return "TestScript.fixture"; } } /// /// Whether or not to implicitly create the fixture during setup @@ -1611,14 +1605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Variable", IsNestedType=true)] - [BackboneType("TestScript.variable")] + [FhirType("TestScript.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Variable"; } } + public override string TypeName { get { return "TestScript.variable"; } } /// /// Descriptive name for this variable @@ -2054,14 +2047,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Setup", IsNestedType=true)] - [BackboneType("TestScript.setup")] + [FhirType("TestScript.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Setup"; } } + public override string TypeName { get { return "TestScript.setup"; } } /// /// A setup operation or assert to perform @@ -2182,14 +2174,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#SetupAction", IsNestedType=true)] - [BackboneType("TestScript.setup.action")] + [FhirType("TestScript.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#SetupAction"; } } + public override string TypeName { get { return "TestScript.setup.action"; } } /// /// The setup operation to perform @@ -2333,14 +2324,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Operation", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation")] + [FhirType("TestScript.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Operation"; } } + public override string TypeName { get { return "TestScript.setup.action.operation"; } } /// /// The operation code type that will be executed @@ -3139,14 +3129,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RequestHeader", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation.requestHeader")] + [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)] public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RequestHeader"; } } + public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } } /// /// HTTP header field name @@ -3329,14 +3318,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Assert", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert")] + [FhirType("TestScript.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Assert"; } } + public override string TypeName { get { return "TestScript.setup.action.assert"; } } /// /// Tracking/logging assertion label @@ -4385,14 +4373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Test", IsNestedType=true)] - [BackboneType("TestScript.test")] + [FhirType("TestScript.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Test"; } } + public override string TypeName { get { return "TestScript.test"; } } /// /// Tracking/logging name of this test @@ -4599,14 +4586,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TestAction", IsNestedType=true)] - [BackboneType("TestScript.test.action")] + [FhirType("TestScript.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TestAction"; } } + public override string TypeName { get { return "TestScript.test.action"; } } /// /// The setup operation to perform @@ -4750,14 +4736,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Teardown", IsNestedType=true)] - [BackboneType("TestScript.teardown")] + [FhirType("TestScript.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Teardown"; } } + public override string TypeName { get { return "TestScript.teardown"; } } /// /// One or more teardown operations to perform @@ -4878,14 +4863,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TeardownAction", IsNestedType=true)] - [BackboneType("TestScript.teardown.action")] + [FhirType("TestScript.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TeardownAction"; } } + public override string TypeName { get { return "TestScript.teardown.action"; } } /// /// The teardown operation to perform diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs index 67a143ad88..019d7fcef4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs @@ -287,14 +287,13 @@ public enum EventTiming /// [Serializable] [DataContract] - [FhirType("Timing#Repeat", IsNestedType=true)] - [BackboneType("Timing.repeat")] + [FhirType("Timing.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Timing#Repeat"; } } + public override string TypeName { get { return "Timing.repeat"; } } /// /// Length/Range of lengths, or (Start and/or end) limits diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs index 8d4116263c..84bb7be7d1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)] + [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")] public partial class VerificationResult : Hl7.Fhir.Model.DomainResource { /// @@ -107,14 +107,13 @@ public enum StatusCode /// [Serializable] [DataContract] - [FhirType("VerificationResult#PrimarySource", IsNestedType=true)] - [BackboneType("VerificationResult.primarySource")] + [FhirType("VerificationResult.primarySource", IsBackboneType=true)] public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#PrimarySource"; } } + public override string TypeName { get { return "VerificationResult.primarySource"; } } /// /// Reference to the primary source @@ -408,14 +407,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Attestation", IsNestedType=true)] - [BackboneType("VerificationResult.attestation")] + [FhirType("VerificationResult.attestation", IsBackboneType=true)] public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Attestation"; } } + public override string TypeName { get { return "VerificationResult.attestation"; } } /// /// The individual or organization attesting to information @@ -765,14 +763,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Validator", IsNestedType=true)] - [BackboneType("VerificationResult.validator")] + [FhirType("VerificationResult.validator", IsBackboneType=true)] public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Validator"; } } + public override string TypeName { get { return "VerificationResult.validator"; } } /// /// Reference to the organization validating information diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs index 567d27a4fc..9ff8590b27 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)] + [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")] public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum VisionBase /// [Serializable] [DataContract] - [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification")] + [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)] public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#LensSpecification"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification"; } } /// /// Product to be supplied @@ -761,14 +760,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VisionPrescription#Prism", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification.prism")] + [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)] public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#Prism"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } } /// /// Amount of adjustment diff --git a/src/Hl7.Fhir.R5/Model/Generated/Account.cs b/src/Hl7.Fhir.R5/Model/Generated/Account.cs index 6d958f1877..3230d42e63 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Account.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)] + [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")] public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -109,14 +109,13 @@ public enum AccountStatus /// [Serializable] [DataContract] - [FhirType("Account#Coverage", IsNestedType=true)] - [BackboneType("Account.coverage")] + [FhirType("Account.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Coverage"; } } + public override string TypeName { get { return "Account.coverage"; } } /// /// The party(s), such as insurances, that may contribute to the payment of this account @@ -248,6 +247,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "priority": + PriorityElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -265,14 +280,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Guarantor", IsNestedType=true)] - [BackboneType("Account.guarantor")] + [FhirType("Account.guarantor", IsBackboneType=true)] public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Guarantor"; } } + public override string TypeName { get { return "Account.guarantor"; } } /// /// Responsible entity @@ -425,6 +439,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onHold": + OnHoldElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -443,14 +476,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Diagnosis", IsNestedType=true)] - [BackboneType("Account.diagnosis")] + [FhirType("Account.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Diagnosis"; } } + public override string TypeName { get { return "Account.diagnosis"; } } /// /// Ranking of the diagnosis (for each type) @@ -705,6 +737,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "condition": + Condition = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "dateOfDiagnosis": + DateOfDiagnosisElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "type": + Type = (List)value; + return this; + case "onAdmission": + OnAdmissionElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "packageCode": + PackageCode = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -726,14 +786,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Procedure", IsNestedType=true)] - [BackboneType("Account.procedure")] + [FhirType("Account.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Procedure"; } } + public override string TypeName { get { return "Account.procedure"; } } /// /// Ranking of the procedure (for each type) @@ -972,6 +1031,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "dateOfService": + DateOfServiceElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "type": + Type = (List)value; + return this; + case "packageCode": + PackageCode = (List)value; + return this; + case "device": + Device = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -990,14 +1077,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#RelatedAccount", IsNestedType=true)] - [BackboneType("Account.relatedAccount")] + [FhirType("Account.relatedAccount", IsBackboneType=true)] public partial class RelatedAccountComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#RelatedAccount"; } } + public override string TypeName { get { return "Account.relatedAccount"; } } /// /// Relationship of the associated Account @@ -1112,6 +1198,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "relationship": + Relationship = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "account": + Account = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1130,14 +1232,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Balance", IsNestedType=true)] - [BackboneType("Account.balance")] + [FhirType("Account.balance", IsBackboneType=true)] public partial class BalanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Balance"; } } + public override string TypeName { get { return "Account.balance"; } } /// /// Who is expected to pay this part of the balance @@ -1311,6 +1412,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "aggregate": + Aggregate = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "term": + Term = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "estimate": + EstimateElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1838,6 +1961,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "billingStatus": + BillingStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "servicePeriod": + ServicePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "coverage": + Coverage = (List)value; + return this; + case "owner": + Owner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "guarantor": + Guarantor = (List)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "procedure": + Procedure = (List)value; + return this; + case "relatedAccount": + RelatedAccount = (List)value; + return this; + case "currency": + Currency = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "balance": + Balance = (List)value; + return this; + case "calculatedAt": + CalculatedAtElement = (Hl7.Fhir.Model.Instant)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs index 8c2fed7eb3..c7793d167f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)] + [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")] public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -179,14 +179,13 @@ public enum RequestResourceTypes /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#Participant", IsNestedType=true)] - [BackboneType("ActivityDefinition.participant")] + [FhirType("ActivityDefinition.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#Participant"; } } + public override string TypeName { get { return "ActivityDefinition.participant"; } } /// /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson @@ -402,6 +401,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "typeCanonical": + TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "typeReference": + TypeReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -423,14 +447,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("ActivityDefinition.dynamicValue")] + [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } } + public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } } /// /// The path to the element to be set dynamically @@ -561,6 +584,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2182,6 +2221,163 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "library": + LibraryElement = (List)value; + return this; + case "kind": + KindElement = (Code)value; + return this; + case "profile": + ProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "asNeeded": + AsNeeded = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "product": + Product = (Hl7.Fhir.Model.DataType)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "dosage": + Dosage = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "specimenRequirement": + SpecimenRequirementElement = (List)value; + return this; + case "observationRequirement": + ObservationRequirementElement = (List)value; + return this; + case "observationResultRequirement": + ObservationResultRequirementElement = (List)value; + return this; + case "transform": + TransformElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "dynamicValue": + DynamicValue = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs index 88cce8331a..3294b10b90 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ActorDefinition","http://hl7.org/fhir/StructureDefinition/ActorDefinition", IsResource=true)] + [FhirType("ActorDefinition","http://hl7.org/fhir/StructureDefinition/ActorDefinition")] public partial class ActorDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -912,6 +912,82 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "reference": + ReferenceElement = (List)value; + return this; + case "capabilities": + CapabilitiesElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "derivedFrom": + DerivedFromElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Address.cs b/src/Hl7.Fhir.R5/Model/Generated/Address.cs index 31fc5f8d47..6ecb133d27 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Address.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Address.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -573,6 +573,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "use": + UseElement = (Code)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "line": + LineElement = (List)value; + return this; + case "city": + CityElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "district": + DistrictElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "state": + StateElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "postalCode": + PostalCodeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "country": + CountryElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs index f78802a152..e57806f883 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition", IsResource=true)] + [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition")] public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#Property", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.property")] + [FhirType("AdministrableProductDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#Property"; } } + public override string TypeName { get { return "AdministrableProductDefinition.property"; } } /// /// A code expressing the type of characteristic @@ -209,6 +208,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -227,14 +245,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#RouteOfAdministration", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration")] + [FhirType("AdministrableProductDefinition.routeOfAdministration", IsBackboneType=true)] public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#RouteOfAdministration"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration"; } } /// /// Coded expression for the route @@ -453,6 +470,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "firstDose": + FirstDose = (Hl7.Fhir.Model.Quantity)value; + return this; + case "maxSingleDose": + MaxSingleDose = (Hl7.Fhir.Model.Quantity)value; + return this; + case "maxDosePerDay": + MaxDosePerDay = (Hl7.Fhir.Model.Quantity)value; + return this; + case "maxDosePerTreatmentPeriod": + MaxDosePerTreatmentPeriod = (Hl7.Fhir.Model.Ratio)value; + return this; + case "maxTreatmentPeriod": + MaxTreatmentPeriod = (Hl7.Fhir.Model.Duration)value; + return this; + case "targetSpecies": + TargetSpecies = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -472,14 +520,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#TargetSpecies", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")] + [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies", IsBackboneType=true)] public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#TargetSpecies"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies"; } } /// /// Coded expression for the species @@ -593,6 +640,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "withdrawalPeriod": + WithdrawalPeriod = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -607,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdministrableProductDefinition#WithdrawalPeriod", IsNestedType=true)] - [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")] + [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)] public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdministrableProductDefinition#WithdrawalPeriod"; } } + public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod"; } } /// /// The type of tissue for which the withdrawal period applies, e.g. meat, milk @@ -767,6 +829,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "tissue": + Tissue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.Quantity)value; + return this; + case "supportingInformation": + SupportingInformationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1131,6 +1212,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "formOf": + FormOf = (List)value; + return this; + case "administrableDoseForm": + AdministrableDoseForm = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unitOfPresentation": + UnitOfPresentation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "producedFrom": + ProducedFrom = (List)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "property": + Property = (List)value; + return this; + case "routeOfAdministration": + RouteOfAdministration = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs index 8cd4f3dc71..2b88cf4f6b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)] + [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")] public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum AdverseEventActuality /// [Serializable] [DataContract] - [FhirType("AdverseEvent#Participant", IsNestedType=true)] - [BackboneType("AdverseEvent.participant")] + [FhirType("AdverseEvent.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#Participant"; } } + public override string TypeName { get { return "AdverseEvent.participant"; } } /// /// Type of involvement @@ -245,6 +244,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -262,14 +277,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity")] + [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)] public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity"; } } /// /// Refers to the specific entity that caused the adverse event @@ -384,6 +398,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "instance": + Instance = (Hl7.Fhir.Model.DataType)value; + return this; + case "causality": + Causality = (Hl7.Fhir.Model.AdverseEvent.CausalityComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -398,14 +428,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#Causality", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity.causality")] + [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)] public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#Causality"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } } /// /// Method of evaluating the relatedness of the suspected entity to the event @@ -541,6 +570,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "assessmentMethod": + AssessmentMethod = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "entityRelatedness": + EntityRelatedness = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -559,14 +607,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#ContributingFactor", IsNestedType=true)] - [BackboneType("AdverseEvent.contributingFactor")] + [FhirType("AdverseEvent.contributingFactor", IsBackboneType=true)] public partial class ContributingFactorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#ContributingFactor"; } } + public override string TypeName { get { return "AdverseEvent.contributingFactor"; } } /// /// Item suspected to have increased the probability or severity of the adverse event @@ -661,6 +708,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -674,14 +734,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#PreventiveAction", IsNestedType=true)] - [BackboneType("AdverseEvent.preventiveAction")] + [FhirType("AdverseEvent.preventiveAction", IsBackboneType=true)] public partial class PreventiveActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#PreventiveAction"; } } + public override string TypeName { get { return "AdverseEvent.preventiveAction"; } } /// /// Action that contributed to avoiding the adverse event @@ -776,6 +835,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -792,14 +864,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#MitigatingAction", IsNestedType=true)] - [BackboneType("AdverseEvent.mitigatingAction")] + [FhirType("AdverseEvent.mitigatingAction", IsBackboneType=true)] public partial class MitigatingActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#MitigatingAction"; } } + public override string TypeName { get { return "AdverseEvent.mitigatingAction"; } } /// /// Ameliorating action taken after the adverse event occured in order to reduce the extent of harm @@ -894,6 +965,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -907,14 +991,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AdverseEvent#SupportingInfo", IsNestedType=true)] - [BackboneType("AdverseEvent.supportingInfo")] + [FhirType("AdverseEvent.supportingInfo", IsBackboneType=true)] public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#SupportingInfo"; } } + public override string TypeName { get { return "AdverseEvent.supportingInfo"; } } /// /// Subject medical history or document relevant to this adverse event @@ -1009,6 +1092,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1717,6 +1813,88 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "actuality": + ActualityElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "detected": + DetectedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "recordedDate": + RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "resultingEffect": + ResultingEffect = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "seriousness": + Seriousness = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "outcome": + Outcome = (List)value; + return this; + case "recorder": + Recorder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "study": + Study = (List)value; + return this; + case "expectedInResearchStudy": + ExpectedInResearchStudyElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "suspectEntity": + SuspectEntity = (List)value; + return this; + case "contributingFactor": + ContributingFactor = (List)value; + return this; + case "preventiveAction": + PreventiveAction = (List)value; + return this; + case "mitigatingAction": + MitigatingAction = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Age.cs b/src/Hl7.Fhir.R5/Model/Generated/Age.cs index f2fe37d86c..f735c61e61 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Age.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Age.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs index a045e45f04..a533d020de 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)] + [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")] public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -226,14 +226,13 @@ public enum AllergyIntoleranceSeverity /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance#Participant", IsNestedType=true)] - [BackboneType("AllergyIntolerance.participant")] + [FhirType("AllergyIntolerance.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AllergyIntolerance#Participant"; } } + public override string TypeName { get { return "AllergyIntolerance.participant"; } } /// /// Type of involvement @@ -348,6 +347,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -365,14 +380,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)] - [BackboneType("AllergyIntolerance.reaction")] + [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AllergyIntolerance#Reaction"; } } + public override string TypeName { get { return "AllergyIntolerance.reaction"; } } /// /// Specific substance or pharmaceutical product considered to be responsible for event @@ -649,6 +663,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "substance": + Substance = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "manifestation": + Manifestation = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "onset": + OnsetElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "severity": + SeverityElement = (Code)value; + return this; + case "exposureRoute": + ExposureRoute = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1139,6 +1184,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "clinicalStatus": + ClinicalStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "verificationStatus": + VerificationStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + CategoryElement = (List>)value; + return this; + case "criticality": + CriticalityElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onset": + Onset = (Hl7.Fhir.Model.DataType)value; + return this; + case "recordedDate": + RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "lastOccurrence": + LastOccurrenceElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "note": + Note = (List)value; + return this; + case "reaction": + Reaction = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs index c2d031a688..0a456a730d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -230,6 +230,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "author": + Author = (Hl7.Fhir.Model.DataType)value; + return this; + case "time": + TimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs index f293b160d6..8e2b95cde2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)] + [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")] public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -3032,14 +3032,13 @@ public enum WeekOfMonth /// [Serializable] [DataContract] - [FhirType("Appointment#Participant", IsNestedType=true)] - [BackboneType("Appointment.participant")] + [FhirType("Appointment.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#Participant"; } } + public override string TypeName { get { return "Appointment.participant"; } } /// /// Role of participant in the appointment @@ -3256,6 +3255,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "required": + RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3276,14 +3300,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Appointment#RecurrenceTemplate", IsNestedType=true)] - [BackboneType("Appointment.recurrenceTemplate")] + [FhirType("Appointment.recurrenceTemplate", IsBackboneType=true)] public partial class RecurrenceTemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#RecurrenceTemplate"; } } + public override string TypeName { get { return "Appointment.recurrenceTemplate"; } } /// /// The timezone of the occurrences @@ -3658,6 +3681,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "timezone": + Timezone = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "recurrenceType": + RecurrenceType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "lastOccurrenceDate": + LastOccurrenceDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "occurrenceCount": + OccurrenceCountElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "occurrenceDate": + OccurrenceDateElement = (List)value; + return this; + case "weeklyTemplate": + WeeklyTemplate = (Hl7.Fhir.Model.Appointment.WeeklyTemplateComponent)value; + return this; + case "monthlyTemplate": + MonthlyTemplate = (Hl7.Fhir.Model.Appointment.MonthlyTemplateComponent)value; + return this; + case "yearlyTemplate": + YearlyTemplate = (Hl7.Fhir.Model.Appointment.YearlyTemplateComponent)value; + return this; + case "excludingDate": + ExcludingDateElement = (List)value; + return this; + case "excludingRecurrenceId": + ExcludingRecurrenceIdElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3680,14 +3743,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Appointment#WeeklyTemplate", IsNestedType=true)] - [BackboneType("Appointment.recurrenceTemplate.weeklyTemplate")] + [FhirType("Appointment.recurrenceTemplate.weeklyTemplate", IsBackboneType=true)] public partial class WeeklyTemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#WeeklyTemplate"; } } + public override string TypeName { get { return "Appointment.recurrenceTemplate.weeklyTemplate"; } } /// /// Recurs on Mondays @@ -4068,6 +4130,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "monday": + MondayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "tuesday": + TuesdayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "wednesday": + WednesdayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "thursday": + ThursdayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "friday": + FridayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "saturday": + SaturdayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "sunday": + SundayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "weekInterval": + WeekIntervalElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4088,14 +4184,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Appointment#MonthlyTemplate", IsNestedType=true)] - [BackboneType("Appointment.recurrenceTemplate.monthlyTemplate")] + [FhirType("Appointment.recurrenceTemplate.monthlyTemplate", IsBackboneType=true)] public partial class MonthlyTemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#MonthlyTemplate"; } } + public override string TypeName { get { return "Appointment.recurrenceTemplate.monthlyTemplate"; } } /// /// Recurs on a specific day of the month @@ -4287,6 +4382,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "dayOfMonth": + DayOfMonthElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "nthWeekOfMonth": + NthWeekOfMonth = (Hl7.Fhir.Model.Coding)value; + return this; + case "dayOfWeek": + DayOfWeek = (Hl7.Fhir.Model.Coding)value; + return this; + case "monthInterval": + MonthIntervalElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4303,14 +4420,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Appointment#YearlyTemplate", IsNestedType=true)] - [BackboneType("Appointment.recurrenceTemplate.yearlyTemplate")] + [FhirType("Appointment.recurrenceTemplate.yearlyTemplate", IsBackboneType=true)] public partial class YearlyTemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#YearlyTemplate"; } } + public override string TypeName { get { return "Appointment.recurrenceTemplate.yearlyTemplate"; } } /// /// Recurs every nth year @@ -4419,6 +4535,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "yearInterval": + YearIntervalElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5374,6 +5503,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "cancellationReason": + CancellationReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "class": + Class = (List)value; + return this; + case "serviceCategory": + ServiceCategory = (List)value; + return this; + case "serviceType": + ServiceType = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "appointmentType": + AppointmentType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "virtualService": + VirtualService = (List)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "previousAppointment": + PreviousAppointment = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "originatingAppointment": + OriginatingAppointment = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "start": + StartElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "end": + EndElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "minutesDuration": + MinutesDurationElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "requestedPeriod": + RequestedPeriod = (List)value; + return this; + case "slot": + Slot = (List)value; + return this; + case "account": + Account = (List)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "cancellationDate": + CancellationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "note": + Note = (List)value; + return this; + case "patientInstruction": + PatientInstruction = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "recurrenceId": + RecurrenceIdElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "occurrenceChanged": + OccurrenceChangedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "recurrenceTemplate": + RecurrenceTemplate = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs index 97685f7781..cea5320920 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)] + [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")] public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -572,6 +572,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "appointment": + Appointment = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "proposedNewTime": + ProposedNewTimeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "start": + StartElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "end": + EndElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "participantType": + ParticipantType = (List)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "participantStatus": + ParticipantStatusElement = (Code)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "recurring": + RecurringElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "occurrenceDate": + OccurrenceDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "recurrenceId": + RecurrenceIdElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs index 46cb33d1bb..42f032a91a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ArtifactAssessment","http://hl7.org/fhir/StructureDefinition/ArtifactAssessment", IsResource=true)] + [FhirType("ArtifactAssessment","http://hl7.org/fhir/StructureDefinition/ArtifactAssessment")] public partial class ArtifactAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -223,14 +223,13 @@ public enum ArtifactAssessmentInformationType /// [Serializable] [DataContract] - [FhirType("ArtifactAssessment#Content", IsNestedType=true)] - [BackboneType("ArtifactAssessment.content")] + [FhirType("ArtifactAssessment.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ArtifactAssessment#Content"; } } + public override string TypeName { get { return "ArtifactAssessment.content"; } } /// /// comment | classifier | rating | container | response | change-request @@ -591,6 +590,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "informationType": + InformationTypeElement = (Code)value; + return this; + case "summary": + SummaryElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "path": + PathElement = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "freeToShare": + FreeToShareElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1047,6 +1086,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "citeAs": + CiteAs = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "artifact": + Artifact = (Hl7.Fhir.Model.DataType)value; + return this; + case "content": + Content = (List)value; + return this; + case "workflowStatus": + WorkflowStatusElement = (Code)value; + return this; + case "disposition": + DispositionElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs index 2f05ff59ad..1db229fa24 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)] + [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")] public partial class AuditEvent : Hl7.Fhir.Model.DomainResource { /// @@ -167,14 +167,13 @@ public enum AuditEventSeverity /// [Serializable] [DataContract] - [FhirType("AuditEvent#Outcome", IsNestedType=true)] - [BackboneType("AuditEvent.outcome")] + [FhirType("AuditEvent.outcome", IsBackboneType=true)] public partial class OutcomeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Outcome"; } } + public override string TypeName { get { return "AuditEvent.outcome"; } } /// /// Whether the event succeeded or failed @@ -289,6 +288,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.Coding)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -309,14 +324,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Agent", IsNestedType=true)] - [BackboneType("AuditEvent.agent")] + [FhirType("AuditEvent.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Agent"; } } + public override string TypeName { get { return "AuditEvent.agent"; } } /// /// How agent participated @@ -603,6 +617,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "role": + Role = (List)value; + return this; + case "who": + Who = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestor": + RequestorElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "policy": + PolicyElement = (List)value; + return this; + case "network": + Network = (Hl7.Fhir.Model.DataType)value; + return this; + case "authorization": + Authorization = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -627,14 +675,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Source", IsNestedType=true)] - [BackboneType("AuditEvent.source")] + [FhirType("AuditEvent.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Source"; } } + public override string TypeName { get { return "AuditEvent.source"; } } /// /// Logical source location within the enterprise @@ -773,6 +820,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "site": + Site = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "observer": + Observer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -792,14 +858,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Entity", IsNestedType=true)] - [BackboneType("AuditEvent.entity")] + [FhirType("AuditEvent.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Entity"; } } + public override string TypeName { get { return "AuditEvent.entity"; } } /// /// Specific instance of resource @@ -1019,6 +1084,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "what": + What = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "securityLabel": + SecurityLabel = (List)value; + return this; + case "query": + QueryElement = (Hl7.Fhir.Model.Base64Binary)value; + return this; + case "detail": + Detail = (List)value; + return this; + case "agent": + Agent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1040,14 +1133,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Detail", IsNestedType=true)] - [BackboneType("AuditEvent.entity.detail")] + [FhirType("AuditEvent.entity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Detail"; } } + public override string TypeName { get { return "AuditEvent.entity.detail"; } } /// /// Name of the property @@ -1163,6 +1255,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1610,6 +1718,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "action": + ActionElement = (Code)value; + return this; + case "severity": + SeverityElement = (Code)value; + return this; + case "occurred": + Occurred = (Hl7.Fhir.Model.DataType)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "outcome": + Outcome = (Hl7.Fhir.Model.AuditEvent.OutcomeComponent)value; + return this; + case "authorization": + Authorization = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "agent": + Agent = (List)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.AuditEvent.SourceComponent)value; + return this; + case "entity": + Entity = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs index 197e9039f2..1a63e805e9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -61,14 +61,13 @@ public partial class Availability : Hl7.Fhir.Model.DataType /// [Serializable] [DataContract] - [FhirType("Availability#AvailableTime", IsNestedType=true)] - [BackboneType("Availability.availableTime")] + [FhirType("Availability.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Availability#AvailableTime"; } } + public override string TypeName { get { return "Availability.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -296,6 +295,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "daysOfWeek": + DaysOfWeekElement = (List>)value; + return this; + case "allDay": + AllDayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "availableStartTime": + AvailableStartTimeElement = (Hl7.Fhir.Model.Time)value; + return this; + case "availableEndTime": + AvailableEndTimeElement = (Hl7.Fhir.Model.Time)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -312,14 +333,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Availability#NotAvailableTime", IsNestedType=true)] - [BackboneType("Availability.notAvailableTime")] + [FhirType("Availability.notAvailableTime", IsBackboneType=true)] public partial class NotAvailableTimeComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Availability#NotAvailableTime"; } } + public override string TypeName { get { return "Availability.notAvailableTime"; } } /// /// Reason presented to the user explaining why time not available @@ -448,6 +468,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "during": + During = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -568,6 +604,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "availableTime": + AvailableTime = (List)value; + return this; + case "notAvailableTime": + NotAvailableTime = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs index bddb5a7a03..d35a0b9af2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)] + [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")] public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -258,6 +258,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs index d9873216ce..f2f73cfd3d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)] + [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")] public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -66,14 +66,13 @@ public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.collection")] + [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } } /// /// Individual performing collection @@ -211,6 +210,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "collector": + Collector = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "collected": + Collected = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -229,14 +247,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProduct#Property", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProduct.property")] + [FhirType("BiologicallyDerivedProduct.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProduct#Property"; } } + public override string TypeName { get { return "BiologicallyDerivedProduct.property"; } } /// /// Code that specifies the property @@ -352,6 +369,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -753,6 +786,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "productCategory": + ProductCategory = (Hl7.Fhir.Model.Coding)value; + return this; + case "productCode": + ProductCode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "parent": + Parent = (List)value; + return this; + case "request": + Request = (List)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "biologicalSourceEvent": + BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value; + return this; + case "processingFacility": + ProcessingFacility = (List)value; + return this; + case "division": + DivisionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "productStatus": + ProductStatus = (Hl7.Fhir.Model.Coding)value; + return this; + case "expirationDate": + ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "collection": + Collection = (Hl7.Fhir.Model.BiologicallyDerivedProduct.CollectionComponent)value; + return this; + case "storageTempRequirements": + StorageTempRequirements = (Hl7.Fhir.Model.Range)value; + return this; + case "property": + Property = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs index 7344796cba..26070cc7df 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProductDispense","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProductDispense", IsResource=true)] + [FhirType("BiologicallyDerivedProductDispense","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProductDispense")] public partial class BiologicallyDerivedProductDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -122,14 +122,13 @@ public enum BiologicallyDerivedProductDispenseCodes /// [Serializable] [DataContract] - [FhirType("BiologicallyDerivedProductDispense#Performer", IsNestedType=true)] - [BackboneType("BiologicallyDerivedProductDispense.performer")] + [FhirType("BiologicallyDerivedProductDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BiologicallyDerivedProductDispense#Performer"; } } + public override string TypeName { get { return "BiologicallyDerivedProductDispense.performer"; } } /// /// Identifies the function of the performer during the dispense @@ -244,6 +243,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -754,6 +769,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "originRelationshipType": + OriginRelationshipType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "product": + Product = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "matchStatus": + MatchStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "preparedDate": + PreparedDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "whenHandedOver": + WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "destination": + Destination = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "note": + Note = (List)value; + return this; + case "usageInstruction": + UsageInstructionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs index 6009d56488..abfcaa4b76 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)] + [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")] public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("BodyStructure#IncludedStructure", IsNestedType=true)] - [BackboneType("BodyStructure.includedStructure")] + [FhirType("BodyStructure.includedStructure", IsBackboneType=true)] public partial class IncludedStructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BodyStructure#IncludedStructure"; } } + public override string TypeName { get { return "BodyStructure.includedStructure"; } } /// /// Code that represents the included structure @@ -257,6 +256,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "structure": + Structure = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "laterality": + Laterality = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "bodyLandmarkOrientation": + BodyLandmarkOrientation = (List)value; + return this; + case "spatialReference": + SpatialReference = (List)value; + return this; + case "qualifier": + Qualifier = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -277,14 +301,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BodyStructure#BodyLandmarkOrientation", IsNestedType=true)] - [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation")] + [FhirType("BodyStructure.includedStructure.bodyLandmarkOrientation", IsBackboneType=true)] public partial class BodyLandmarkOrientationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BodyStructure#BodyLandmarkOrientation"; } } + public override string TypeName { get { return "BodyStructure.includedStructure.bodyLandmarkOrientation"; } } /// /// Body ]andmark description @@ -444,6 +467,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "landmarkDescription": + LandmarkDescription = (List)value; + return this; + case "clockFacePosition": + ClockFacePosition = (List)value; + return this; + case "distanceFromLandmark": + DistanceFromLandmark = (List)value; + return this; + case "surfaceOrientation": + SurfaceOrientation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -463,14 +508,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("BodyStructure#DistanceFromLandmark", IsNestedType=true)] - [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark")] + [FhirType("BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark", IsBackboneType=true)] public partial class DistanceFromLandmarkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "BodyStructure#DistanceFromLandmark"; } } + public override string TypeName { get { return "BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark"; } } /// /// Measurement device @@ -584,6 +628,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "device": + Device = (List)value; + return this; + case "value": + Value = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -874,6 +934,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "morphology": + Morphology = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "includedStructure": + IncludedStructure = (List)value; + return this; + case "excludedStructure": + ExcludedStructure = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "image": + Image = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs index adef858f24..85aedb510d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)] + [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")] public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum CarePlanIntent /// [Serializable] [DataContract] - [FhirType("CarePlan#Activity", IsNestedType=true)] - [BackboneType("CarePlan.activity")] + [FhirType("CarePlan.activity", IsBackboneType=true)] public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Activity"; } } + public override string TypeName { get { return "CarePlan.activity"; } } /// /// Results of the activity (concept, or Appointment, Encounter, Procedure, etc.) @@ -251,6 +250,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "performedActivity": + PerformedActivity = (List)value; + return this; + case "progress": + Progress = (List)value; + return this; + case "plannedActivityReference": + PlannedActivityReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -982,6 +1000,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "custodian": + Custodian = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "contributor": + Contributor = (List)value; + return this; + case "careTeam": + CareTeam = (List)value; + return this; + case "addresses": + Addresses = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "goal": + Goal = (List)value; + return this; + case "activity": + Activity = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs index 12f420d4a0..500b9a6100 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)] + [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")] public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum CareTeamStatus /// [Serializable] [DataContract] - [FhirType("CareTeam#Participant", IsNestedType=true)] - [BackboneType("CareTeam.participant")] + [FhirType("CareTeam.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CareTeam#Participant"; } } + public override string TypeName { get { return "CareTeam.participant"; } } /// /// Type of involvement @@ -274,6 +273,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "member": + Member = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onBehalfOf": + OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -636,6 +657,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "managingOrganization": + ManagingOrganization = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs index ca73d8b708..f2ccc88301 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)] + [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")] public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum ChargeItemStatus /// [Serializable] [DataContract] - [FhirType("ChargeItem#Performer", IsNestedType=true)] - [BackboneType("ChargeItem.performer")] + [FhirType("ChargeItem.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItem#Performer"; } } + public override string TypeName { get { return "ChargeItem.performer"; } } /// /// What type of performance was done @@ -241,6 +240,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -979,6 +994,94 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "definitionUri": + DefinitionUriElement = (List)value; + return this; + case "definitionCanonical": + DefinitionCanonicalElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "performingOrganization": + PerformingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestingOrganization": + RequestingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "costCenter": + CostCenter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "bodysite": + Bodysite = (List)value; + return this; + case "unitPriceComponent": + UnitPriceComponent = (Hl7.Fhir.Model.MonetaryComponent)value; + return this; + case "totalPriceComponent": + TotalPriceComponent = (Hl7.Fhir.Model.MonetaryComponent)value; + return this; + case "overrideReason": + OverrideReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "enterer": + Enterer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "enteredDate": + EnteredDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "service": + Service = (List)value; + return this; + case "product": + Product = (List)value; + return this; + case "account": + Account = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs index 4a1ccfbdc3..bb1a905071 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)] + [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")] public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.applicability")] + [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)] public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } } + public override string TypeName { get { return "ChargeItemDefinition.applicability"; } } /// /// Boolean-valued expression @@ -207,6 +206,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "condition": + Condition = (Hl7.Fhir.Model.Expression)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "relatedArtifact": + RelatedArtifact = (Hl7.Fhir.Model.RelatedArtifact)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -225,14 +243,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)] - [BackboneType("ChargeItemDefinition.propertyGroup")] + [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)] public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } } + public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } } /// /// Conditions under which the priceComponent is applicable @@ -345,6 +362,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "applicability": + Applicability = (List)value; + return this; + case "priceComponent": + PriceComponent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1294,6 +1327,94 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFromUri": + DerivedFromUriElement = (List)value; + return this; + case "partOf": + PartOfElement = (List)value; + return this; + case "replaces": + ReplacesElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "instance": + Instance = (List)value; + return this; + case "applicability": + Applicability = (List)value; + return this; + case "propertyGroup": + PropertyGroup = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs index 28619ab2e6..62fa855045 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation", IsResource=true)] + [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation")] public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -302,14 +302,13 @@ public enum RelatedArtifactTypeExpanded /// [Serializable] [DataContract] - [FhirType("Citation#Summary", IsNestedType=true)] - [BackboneType("Citation.summary")] + [FhirType("Citation.summary", IsBackboneType=true)] public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#Summary"; } } + public override string TypeName { get { return "Citation.summary"; } } /// /// Format for display of the citation summary @@ -440,6 +439,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "style": + Style = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -457,14 +472,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#Classification", IsNestedType=true)] - [BackboneType("Citation.classification")] + [FhirType("Citation.classification", IsBackboneType=true)] public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#Classification"; } } + public override string TypeName { get { return "Citation.classification"; } } /// /// The kind of classifier (e.g. publication type, keyword) @@ -578,6 +592,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -596,14 +626,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#StatusDate", IsNestedType=true)] - [BackboneType("Citation.statusDate")] + [FhirType("Citation.statusDate", IsBackboneType=true)] public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#StatusDate"; } } + public override string TypeName { get { return "Citation.statusDate"; } } /// /// Classification of the status @@ -756,6 +785,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "activity": + Activity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actual": + ActualElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -771,14 +819,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifact", IsNestedType=true)] - [BackboneType("Citation.citedArtifact")] + [FhirType("Citation.citedArtifact", IsBackboneType=true)] public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifact"; } } + public override string TypeName { get { return "Citation.citedArtifact"; } } /// /// Unique identifier. May include DOI, PMID, PMCID, etc @@ -1192,6 +1239,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "relatedIdentifier": + RelatedIdentifier = (List)value; + return this; + case "dateAccessed": + DateAccessedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "version": + Version = (Hl7.Fhir.Model.Citation.CitedArtifactVersionComponent)value; + return this; + case "currentState": + CurrentState = (List)value; + return this; + case "statusDate": + StatusDate = (List)value; + return this; + case "title": + Title = (List)value; + return this; + case "abstract": + Abstract = (List)value; + return this; + case "part": + Part = (Hl7.Fhir.Model.Citation.CitedArtifactPartComponent)value; + return this; + case "relatesTo": + RelatesTo = (List)value; + return this; + case "publicationForm": + PublicationForm = (List)value; + return this; + case "webLocation": + WebLocation = (List)value; + return this; + case "classification": + Classification = (List)value; + return this; + case "contributorship": + Contributorship = (Hl7.Fhir.Model.Citation.CitedArtifactContributorshipComponent)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1219,14 +1321,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactVersion", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.version")] + [FhirType("Citation.citedArtifact.version", IsBackboneType=true)] public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactVersion"; } } + public override string TypeName { get { return "Citation.citedArtifact.version"; } } /// /// The version number or other version identifier @@ -1358,6 +1459,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "baseCitation": + BaseCitation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1375,14 +1492,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactStatusDate", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.statusDate")] + [FhirType("Citation.citedArtifact.statusDate", IsBackboneType=true)] public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactStatusDate"; } } + public override string TypeName { get { return "Citation.citedArtifact.statusDate"; } } /// /// Classification of the status @@ -1535,6 +1651,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "activity": + Activity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actual": + ActualElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1550,14 +1685,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactTitle", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.title")] + [FhirType("Citation.citedArtifact.title", IsBackboneType=true)] public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactTitle"; } } + public override string TypeName { get { return "Citation.citedArtifact.title"; } } /// /// The kind of title @@ -1711,6 +1845,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1729,14 +1882,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactAbstract", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.abstract")] + [FhirType("Citation.citedArtifact.abstract", IsBackboneType=true)] public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactAbstract"; } } + public override string TypeName { get { return "Citation.citedArtifact.abstract"; } } /// /// The kind of abstract @@ -1928,6 +2080,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1944,14 +2118,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPart", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.part")] + [FhirType("Citation.citedArtifact.part", IsBackboneType=true)] public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPart"; } } + public override string TypeName { get { return "Citation.citedArtifact.part"; } } /// /// The kind of component @@ -2104,6 +2277,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "baseCitation": + BaseCitation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2122,14 +2314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactRelatesTo", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.relatesTo")] + [FhirType("Citation.citedArtifact.relatesTo", IsBackboneType=true)] public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactRelatesTo"; } } + public override string TypeName { get { return "Citation.citedArtifact.relatesTo"; } } /// /// documentation | justification | citation | predecessor | successor | derived-from | depends-on | composed-of | part-of | amends | amended-with | appends | appended-with | cites | cited-by | comments-on | comment-in | contains | contained-in | corrects | correction-in | replaces | replaced-with | retracts | retracted-by | signs | similar-to | supports | supported-with | transforms | transformed-into | transformed-with | documents | specification-of | created-with | cite-as | reprint | reprint-of @@ -2461,6 +2652,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + case "label": + LabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "citation": + CitationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "document": + Document = (Hl7.Fhir.Model.Attachment)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "resourceReference": + ResourceReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2484,14 +2709,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationForm", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm")] + [FhirType("Citation.citedArtifact.publicationForm", IsBackboneType=true)] public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationForm"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm"; } } /// /// The collection the cited article or artifact is published in @@ -3094,6 +3318,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "publishedIn": + PublishedIn = (Hl7.Fhir.Model.Citation.CitedArtifactPublicationFormPublishedInComponent)value; + return this; + case "citedMedium": + CitedMedium = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "volume": + VolumeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "issue": + IssueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "articleDate": + ArticleDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publicationDateText": + PublicationDateTextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "publicationDateSeason": + PublicationDateSeasonElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "lastRevisionDate": + LastRevisionDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "language": + Language = (List)value; + return this; + case "accessionNumber": + AccessionNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "pageString": + PageStringElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "firstPage": + FirstPageElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "lastPage": + LastPageElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "pageCount": + PageCountElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3121,14 +3400,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactPublicationFormPublishedIn", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")] + [FhirType("Citation.citedArtifact.publicationForm.publishedIn", IsBackboneType=true)] public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPublishedIn"; } } + public override string TypeName { get { return "Citation.citedArtifact.publicationForm.publishedIn"; } } /// /// Kind of container (e.g. Periodical, database, or book) @@ -3342,6 +3620,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "publisher": + Publisher = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "publisherLocation": + PublisherLocationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3359,14 +3662,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactWebLocation", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.webLocation")] + [FhirType("Citation.citedArtifact.webLocation", IsBackboneType=true)] public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactWebLocation"; } } + public override string TypeName { get { return "Citation.citedArtifact.webLocation"; } } /// /// Code the reason for different URLs, e.g. abstract and full-text @@ -3497,6 +3799,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "classifier": + Classifier = (List)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3511,14 +3829,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactClassification", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.classification")] + [FhirType("Citation.citedArtifact.classification", IsBackboneType=true)] public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactClassification"; } } + public override string TypeName { get { return "Citation.citedArtifact.classification"; } } /// /// The kind of classifier (e.g. publication type, keyword) @@ -3656,6 +3973,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + case "artifactAssessment": + ArtifactAssessment = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3674,14 +4010,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorship", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship")] + [FhirType("Citation.citedArtifact.contributorship", IsBackboneType=true)] public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorship"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship"; } } /// /// Indicates if the list includes all authors and/or contributors @@ -3833,6 +4168,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "complete": + CompleteElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "entry": + Entry = (List)value; + return this; + case "summary": + Summary = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3852,14 +4206,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipEntry", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.entry")] + [FhirType("Citation.citedArtifact.contributorship.entry", IsBackboneType=true)] public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntry"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry"; } } /// /// The identity of the individual contributor @@ -4160,6 +4513,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "contributor": + Contributor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "forenameInitials": + ForenameInitialsElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "affiliation": + Affiliation = (List)value; + return this; + case "contributionType": + ContributionType = (List)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "contributionInstance": + ContributionInstance = (List)value; + return this; + case "correspondingContact": + CorrespondingContactElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "rankingOrder": + RankingOrderElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4180,14 +4567,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")] + [FhirType("Citation.citedArtifact.contributorship.entry.contributionInstance", IsBackboneType=true)] public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryContributionInstance"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.contributionInstance"; } } /// /// The specific contribution @@ -4318,6 +4704,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "time": + TimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4332,14 +4734,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Citation#CitedArtifactContributorshipSummary", IsNestedType=true)] - [BackboneType("Citation.citedArtifact.contributorship.summary")] + [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)] public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Citation#CitedArtifactContributorshipSummary"; } } + public override string TypeName { get { return "Citation.citedArtifact.contributorship.summary"; } } /// /// Such as author list, contributorship statement, funding statement, acknowledgements statement, or conflicts of interest statement @@ -4514,6 +4915,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "style": + Style = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5518,6 +5941,109 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "summary": + Summary = (List)value; + return this; + case "classification": + Classification = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "currentState": + CurrentState = (List)value; + return this; + case "statusDate": + StatusDate = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "citedArtifact": + CitedArtifact = (Hl7.Fhir.Model.Citation.CitedArtifactComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs index d75e9bf42f..bdcd0162b2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)] + [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")] public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Claim#RelatedClaim", IsNestedType=true)] - [BackboneType("Claim.related")] + [FhirType("Claim.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#RelatedClaim"; } } + public override string TypeName { get { return "Claim.related"; } } /// /// Reference to the related claim @@ -211,6 +210,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "claim": + Claim = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "relationship": + Relationship = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.Identifier)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -230,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Payee", IsNestedType=true)] - [BackboneType("Claim.payee")] + [FhirType("Claim.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Payee"; } } + public override string TypeName { get { return "Claim.payee"; } } /// /// Category of recipient @@ -352,6 +369,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -369,14 +402,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Event", IsNestedType=true)] - [BackboneType("Claim.event")] + [FhirType("Claim.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Event"; } } + public override string TypeName { get { return "Claim.event"; } } /// /// Specific event @@ -492,6 +524,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -509,14 +557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#CareTeam", IsNestedType=true)] - [BackboneType("Claim.careTeam")] + [FhirType("Claim.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#CareTeam"; } } + public override string TypeName { get { return "Claim.careTeam"; } } /// /// Order of care team @@ -732,6 +779,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "responsible": + ResponsibleElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specialty": + Specialty = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -753,14 +825,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SupportingInformation", IsNestedType=true)] - [BackboneType("Claim.supportingInfo")] + [FhirType("Claim.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SupportingInformation"; } } + public override string TypeName { get { return "Claim.supportingInfo"; } } /// /// Information instance identifier @@ -983,6 +1054,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1004,14 +1103,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Diagnosis", IsNestedType=true)] - [BackboneType("Claim.diagnosis")] + [FhirType("Claim.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Diagnosis"; } } + public override string TypeName { get { return "Claim.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1191,6 +1289,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "diagnosis": + Diagnosis = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (List)value; + return this; + case "onAdmission": + OnAdmission = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1210,14 +1330,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Procedure", IsNestedType=true)] - [BackboneType("Claim.procedure")] + [FhirType("Claim.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Procedure"; } } + public override string TypeName { get { return "Claim.procedure"; } } /// /// Procedure instance identifier @@ -1438,6 +1557,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "type": + Type = (List)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "procedure": + Procedure = (Hl7.Fhir.Model.DataType)value; + return this; + case "udi": + Udi = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1459,14 +1603,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Insurance", IsNestedType=true)] - [BackboneType("Claim.insurance")] + [FhirType("Claim.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Insurance"; } } + public override string TypeName { get { return "Claim.insurance"; } } /// /// Insurance instance identifier @@ -1762,6 +1905,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "focal": + FocalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "businessArrangement": + BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthRef": + PreAuthRefElement = (List)value; + return this; + case "claimResponse": + ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1784,14 +1958,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Accident", IsNestedType=true)] - [BackboneType("Claim.accident")] + [FhirType("Claim.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Accident"; } } + public override string TypeName { get { return "Claim.accident"; } } /// /// When the incident occurred @@ -1946,6 +2119,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1964,14 +2156,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Item", IsNestedType=true)] - [BackboneType("Claim.item")] + [FhirType("Claim.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Item"; } } + public override string TypeName { get { return "Claim.item"; } } /// /// Item instance identifier @@ -2704,6 +2895,91 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "careTeamSequence": + CareTeamSequenceElement = (List)value; + return this; + case "diagnosisSequence": + DiagnosisSequenceElement = (List)value; + return this; + case "procedureSequence": + ProcedureSequenceElement = (List)value; + return this; + case "informationSequence": + InformationSequenceElement = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "request": + Request = (List)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "encounter": + Encounter = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2744,14 +3020,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#BodySite", IsNestedType=true)] - [BackboneType("Claim.item.bodySite")] + [FhirType("Claim.item.bodySite", IsBackboneType=true)] public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#BodySite"; } } + public override string TypeName { get { return "Claim.item.bodySite"; } } /// /// Location @@ -2866,6 +3141,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "site": + Site = (List)value; + return this; + case "subSite": + SubSite = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2883,14 +3174,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Detail", IsNestedType=true)] - [BackboneType("Claim.item.detail")] + [FhirType("Claim.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Detail"; } } + public override string TypeName { get { return "Claim.item.detail"; } } /// /// Item instance identifier @@ -3345,6 +3635,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + case "subDetail": + SubDetail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3376,14 +3724,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SubDetail", IsNestedType=true)] - [BackboneType("Claim.item.detail.subDetail")] + [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SubDetail"; } } + public override string TypeName { get { return "Claim.item.detail.subDetail"; } } /// /// Item instance identifier @@ -3816,6 +4163,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4676,6 +5078,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "use": + UseElement = (Code)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "billablePeriod": + BillablePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "enterer": + Enterer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "fundsReserve": + FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "related": + Related = (List)value; + return this; + case "prescription": + Prescription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "originalPrescription": + OriginalPrescription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "payee": + Payee = (Hl7.Fhir.Model.Claim.PayeeComponent)value; + return this; + case "referral": + Referral = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (List)value; + return this; + case "facility": + Facility = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "diagnosisRelatedGroup": + DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "event": + Event = (List)value; + return this; + case "careTeam": + CareTeam = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "procedure": + Procedure = (List)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "accident": + Accident = (Hl7.Fhir.Model.Claim.AccidentComponent)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "item": + Item = (List)value; + return this; + case "total": + Total = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs index 0ebaa941b4..c9f0693ff0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)] + [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")] public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Event", IsNestedType=true)] - [BackboneType("ClaimResponse.event")] + [FhirType("ClaimResponse.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Event"; } } + public override string TypeName { get { return "ClaimResponse.event"; } } /// /// Specific event @@ -190,6 +189,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -207,14 +222,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Item", IsNestedType=true)] - [BackboneType("ClaimResponse.item")] + [FhirType("ClaimResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Item"; } } + public override string TypeName { get { return "ClaimResponse.item"; } } /// /// Claim item instance identifier @@ -450,6 +464,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "itemSequence": + ItemSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -471,14 +513,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#ReviewOutcome", IsNestedType=true)] - [BackboneType("ClaimResponse.item.reviewOutcome")] + [FhirType("ClaimResponse.item.reviewOutcome", IsBackboneType=true)] public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#ReviewOutcome"; } } + public override string TypeName { get { return "ClaimResponse.item.reviewOutcome"; } } /// /// Result of the adjudication @@ -652,6 +693,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "decision": + Decision = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "preAuthRef": + PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthPeriod": + PreAuthPeriod = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -671,14 +734,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Adjudication", IsNestedType=true)] - [BackboneType("ClaimResponse.item.adjudication")] + [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Adjudication"; } } + public override string TypeName { get { return "ClaimResponse.item.adjudication"; } } /// /// Type of adjudication information @@ -834,6 +896,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -853,14 +937,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail")] + [FhirType("ClaimResponse.item.detail", IsBackboneType=true)] public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#ItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail"; } } /// /// Claim detail instance identifier @@ -1096,6 +1179,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "detailSequence": + DetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "subDetail": + SubDetail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1117,14 +1228,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#SubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail.subDetail")] + [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#SubDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } } /// /// Claim sub-detail instance identifier @@ -1338,6 +1448,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "subDetailSequence": + SubDetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1358,14 +1493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItem", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem")] + [FhirType("ClaimResponse.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItem"; } } + public override string TypeName { get { return "ClaimResponse.addItem"; } } /// /// Item sequence number @@ -2034,6 +2168,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "itemSequence": + ItemSequenceElement = (List)value; + return this; + case "detailSequence": + DetailSequenceElement = (List)value; + return this; + case "subdetailSequence": + SubdetailSequenceElement = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "provider": + Provider = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "request": + Request = (List)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2072,14 +2285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#BodySite", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.bodySite")] + [FhirType("ClaimResponse.addItem.bodySite", IsBackboneType=true)] public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#BodySite"; } } + public override string TypeName { get { return "ClaimResponse.addItem.bodySite"; } } /// /// Location @@ -2194,6 +2406,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "site": + Site = (List)value; + return this; + case "subSite": + SubSite = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2211,14 +2439,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail")] + [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail"; } } /// /// Number for tracking @@ -2626,6 +2853,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "subDetail": + SubDetail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2655,14 +2934,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail.subDetail")] + [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } } /// /// Number for tracking @@ -3048,6 +3326,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3077,14 +3404,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Total", IsNestedType=true)] - [BackboneType("ClaimResponse.total")] + [FhirType("ClaimResponse.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Total"; } } + public override string TypeName { get { return "ClaimResponse.total"; } } /// /// Type of adjudication information @@ -3198,6 +3524,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3215,14 +3557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Payment", IsNestedType=true)] - [BackboneType("ClaimResponse.payment")] + [FhirType("ClaimResponse.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Payment"; } } + public override string TypeName { get { return "ClaimResponse.payment"; } } /// /// Partial or complete payment @@ -3439,6 +3780,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "adjustment": + Adjustment = (Hl7.Fhir.Model.Money)value; + return this; + case "adjustmentReason": + AdjustmentReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3460,14 +3829,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Note", IsNestedType=true)] - [BackboneType("ClaimResponse.processNote")] + [FhirType("ClaimResponse.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Note"; } } + public override string TypeName { get { return "ClaimResponse.processNote"; } } /// /// Note instance identifier @@ -3659,6 +4027,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "number": + NumberElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3679,14 +4069,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Insurance", IsNestedType=true)] - [BackboneType("ClaimResponse.insurance")] + [FhirType("ClaimResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Insurance"; } } + public override string TypeName { get { return "ClaimResponse.insurance"; } } /// /// Insurance instance identifier @@ -3921,6 +4310,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "focal": + FocalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "businessArrangement": + BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "claimResponse": + ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3942,14 +4356,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Error", IsNestedType=true)] - [BackboneType("ClaimResponse.error")] + [FhirType("ClaimResponse.error", IsBackboneType=true)] public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Error"; } } + public override string TypeName { get { return "ClaimResponse.error"; } } /// /// Item sequence number @@ -4198,6 +4611,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "itemSequence": + ItemSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "detailSequence": + DetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "subDetailSequence": + SubDetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "expression": + ExpressionElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5102,6 +5540,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "use": + UseElement = (Code)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestor": + Requestor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outcome": + OutcomeElement = (Code)value; + return this; + case "decision": + Decision = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "disposition": + DispositionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthRef": + PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthPeriod": + PreAuthPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "event": + Event = (List)value; + return this; + case "payeeType": + PayeeType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "encounter": + Encounter = (List)value; + return this; + case "diagnosisRelatedGroup": + DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "item": + Item = (List)value; + return this; + case "addItem": + AddItem = (List)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "total": + Total = (List)value; + return this; + case "payment": + Payment = (Hl7.Fhir.Model.ClaimResponse.PaymentComponent)value; + return this; + case "fundsReserve": + FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "formCode": + FormCode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.Attachment)value; + return this; + case "processNote": + ProcessNote = (List)value; + return this; + case "communicationRequest": + CommunicationRequest = (List)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "error": + Error = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs index 3afc280dfd..73815fdf04 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)] + [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")] public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdenti /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Finding", IsNestedType=true)] - [BackboneType("ClinicalImpression.finding")] + [FhirType("ClinicalImpression.finding", IsBackboneType=true)] public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Finding"; } } + public override string TypeName { get { return "ClinicalImpression.finding"; } } /// /// What was found @@ -204,6 +203,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "basis": + BasisElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -802,6 +817,73 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "effective": + Effective = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "previous": + Previous = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "problem": + Problem = (List)value; + return this; + case "changePattern": + ChangePattern = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "protocol": + ProtocolElement = (List)value; + return this; + case "summary": + SummaryElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "finding": + Finding = (List)value; + return this; + case "prognosisCodeableConcept": + PrognosisCodeableConcept = (List)value; + return this; + case "prognosisReference": + PrognosisReference = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs index 473481770c..28201c8681 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition", IsResource=true)] + [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition")] public partial class ClinicalUseDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum ClinicalUseDefinitionType /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Contraindication", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.contraindication")] + [FhirType("ClinicalUseDefinition.contraindication", IsBackboneType=true)] public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Contraindication"; } } + public override string TypeName { get { return "ClinicalUseDefinition.contraindication"; } } /// /// The situation that is being documented as contraindicating against this item @@ -311,6 +310,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "diseaseSymptomProcedure": + DiseaseSymptomProcedure = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "diseaseStatus": + DiseaseStatus = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "comorbidity": + Comorbidity = (List)value; + return this; + case "indication": + Indication = (List)value; + return this; + case "applicability": + Applicability = (Hl7.Fhir.Model.Expression)value; + return this; + case "otherTherapy": + OtherTherapy = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -332,14 +359,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#OtherTherapy", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")] + [FhirType("ClinicalUseDefinition.contraindication.otherTherapy", IsBackboneType=true)] public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#OtherTherapy"; } } + public override string TypeName { get { return "ClinicalUseDefinition.contraindication.otherTherapy"; } } /// /// The type of relationship between the product indication/contraindication and another therapy @@ -454,6 +480,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "relationshipType": + RelationshipType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "treatment": + Treatment = (Hl7.Fhir.Model.CodeableReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -468,14 +510,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Indication", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.indication")] + [FhirType("ClinicalUseDefinition.indication", IsBackboneType=true)] public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Indication"; } } + public override string TypeName { get { return "ClinicalUseDefinition.indication"; } } /// /// The situation that is being documented as an indicaton for this item @@ -723,6 +764,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "diseaseSymptomProcedure": + DiseaseSymptomProcedure = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "diseaseStatus": + DiseaseStatus = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "comorbidity": + Comorbidity = (List)value; + return this; + case "intendedEffect": + IntendedEffect = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.DataType)value; + return this; + case "undesirableEffect": + UndesirableEffect = (List)value; + return this; + case "applicability": + Applicability = (Hl7.Fhir.Model.Expression)value; + return this; + case "otherTherapy": + OtherTherapy = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -743,14 +818,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Interaction", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.interaction")] + [FhirType("ClinicalUseDefinition.interaction", IsBackboneType=true)] public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Interaction"; } } + public override string TypeName { get { return "ClinicalUseDefinition.interaction"; } } /// /// The specific medication, product, food etc. or laboratory test that interacts @@ -930,6 +1004,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "interactant": + Interactant = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "effect": + Effect = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "incidence": + Incidence = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "management": + Management = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -950,14 +1049,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Interactant", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.interaction.interactant")] + [FhirType("ClinicalUseDefinition.interaction.interactant", IsBackboneType=true)] public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Interactant"; } } + public override string TypeName { get { return "ClinicalUseDefinition.interaction.interactant"; } } /// /// The specific medication, product, food etc. or laboratory test that interacts @@ -1052,6 +1150,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1068,14 +1179,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#UndesirableEffect", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.undesirableEffect")] + [FhirType("ClinicalUseDefinition.undesirableEffect", IsBackboneType=true)] public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#UndesirableEffect"; } } + public override string TypeName { get { return "ClinicalUseDefinition.undesirableEffect"; } } /// /// The situation in which the undesirable effect may manifest @@ -1210,6 +1320,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "symptomConditionEffect": + SymptomConditionEffect = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "classification": + Classification = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "frequencyOfOccurrence": + FrequencyOfOccurrence = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1228,14 +1357,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalUseDefinition#Warning", IsNestedType=true)] - [BackboneType("ClinicalUseDefinition.warning")] + [FhirType("ClinicalUseDefinition.warning", IsBackboneType=true)] public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalUseDefinition#Warning"; } } + public override string TypeName { get { return "ClinicalUseDefinition.warning"; } } /// /// A textual definition of this warning, with formatting @@ -1365,6 +1493,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1745,6 +1889,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "contraindication": + Contraindication = (Hl7.Fhir.Model.ClinicalUseDefinition.ContraindicationComponent)value; + return this; + case "indication": + Indication = (Hl7.Fhir.Model.ClinicalUseDefinition.IndicationComponent)value; + return this; + case "interaction": + Interaction = (Hl7.Fhir.Model.ClinicalUseDefinition.InteractionComponent)value; + return this; + case "population": + Population = (List)value; + return this; + case "library": + LibraryElement = (List)value; + return this; + case "undesirableEffect": + UndesirableEffect = (Hl7.Fhir.Model.ClinicalUseDefinition.UndesirableEffectComponent)value; + return this; + case "warning": + Warning = (Hl7.Fhir.Model.ClinicalUseDefinition.WarningComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs index 7c88530cd0..91fa2c3d1b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)] + [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")] public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("Communication#Payload", IsNestedType=true)] - [BackboneType("Communication.payload")] + [FhirType("Communication.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Communication#Payload"; } } + public override string TypeName { get { return "Communication.payload"; } } /// /// Message part content @@ -168,6 +167,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "content": + Content = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -854,6 +866,82 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "inResponseTo": + InResponseTo = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "medium": + Medium = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "topic": + Topic = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "about": + About = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "sent": + SentElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "received": + ReceivedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "recipient": + Recipient = (List)value; + return this; + case "sender": + Sender = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "payload": + Payload = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs index 329e3d0fe4..cb39bb9a66 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)] + [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")] public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("CommunicationRequest#Payload", IsNestedType=true)] - [BackboneType("CommunicationRequest.payload")] + [FhirType("CommunicationRequest.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CommunicationRequest#Payload"; } } + public override string TypeName { get { return "CommunicationRequest.payload"; } } /// /// Message part content @@ -168,6 +167,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "content": + Content = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -838,6 +850,82 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "medium": + Medium = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "about": + About = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "payload": + Payload = (List)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "recipient": + Recipient = (List)value; + return this; + case "informationProvider": + InformationProvider = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs index 0738927d2b..c2787ca659 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)] + [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")] public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition#Resource", IsNestedType=true)] - [BackboneType("CompartmentDefinition.resource")] + [FhirType("CompartmentDefinition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CompartmentDefinition#Resource"; } } + public override string TypeName { get { return "CompartmentDefinition.resource"; } } /// /// Name of resource type @@ -343,6 +342,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Code)value; + return this; + case "param": + ParamElement = (List)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "startParam": + StartParamElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "endParam": + EndParamElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -988,6 +1012,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "code": + CodeElement = (Code)value; + return this; + case "search": + SearchElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "resource": + Resource = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs index 2ae820f7f1..72bd990dc3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)] + [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")] public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable< /// [Serializable] [DataContract] - [FhirType("Composition#Attester", IsNestedType=true)] - [BackboneType("Composition.attester")] + [FhirType("Composition.attester", IsBackboneType=true)] public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Attester"; } } + public override string TypeName { get { return "Composition.attester"; } } /// /// personal | professional | legal | official @@ -230,6 +229,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "mode": + Mode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "time": + TimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -249,14 +267,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Event", IsNestedType=true)] - [BackboneType("Composition.event")] + [FhirType("Composition.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Event"; } } + public override string TypeName { get { return "Composition.event"; } } /// /// The period covered by the documentation @@ -369,6 +386,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -386,14 +419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Section", IsNestedType=true)] - [BackboneType("Composition.section")] + [FhirType("Composition.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Section"; } } + public override string TypeName { get { return "Composition.section"; } } /// /// Label for section (e.g. for ToC) @@ -681,6 +713,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "author": + Author = (List)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "text": + Text = (Hl7.Fhir.Model.Narrative)value; + return this; + case "orderedBy": + OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "entry": + Entry = (List)value; + return this; + case "emptyReason": + EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "section": + Section = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1299,6 +1368,73 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "note": + Note = (List)value; + return this; + case "attester": + Attester = (List)value; + return this; + case "custodian": + Custodian = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "relatesTo": + RelatesTo = (List)value; + return this; + case "event": + Event = (List)value; + return this; + case "section": + Section = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs index 760184b384..dcd1841456 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)] + [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")] public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -228,14 +228,13 @@ public enum ConceptMapGroupUnmappedMode /// [Serializable] [DataContract] - [FhirType("ConceptMap#Property", IsNestedType=true)] - [BackboneType("ConceptMap.property")] + [FhirType("ConceptMap.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Property"; } } + public override string TypeName { get { return "ConceptMap.property"; } } /// /// Identifies the property on the mappings, and when referred to in the $translate operation @@ -503,6 +502,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "uri": + UriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "system": + SystemElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -524,14 +548,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#AdditionalAttribute", IsNestedType=true)] - [BackboneType("ConceptMap.additionalAttribute")] + [FhirType("ConceptMap.additionalAttribute", IsBackboneType=true)] public partial class AdditionalAttributeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#AdditionalAttribute"; } } + public override string TypeName { get { return "ConceptMap.additionalAttribute"; } } /// /// Identifies this additional attribute through this resource @@ -760,6 +783,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "uri": + UriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -779,14 +824,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#Group", IsNestedType=true)] - [BackboneType("ConceptMap.group")] + [FhirType("ConceptMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Group"; } } + public override string TypeName { get { return "ConceptMap.group"; } } /// /// Source system where concepts to be mapped are defined @@ -976,6 +1020,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "source": + SourceElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "target": + TargetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "element": + Element = (List)value; + return this; + case "unmapped": + Unmapped = (Hl7.Fhir.Model.ConceptMap.UnmappedComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -996,14 +1062,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#SourceElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element")] + [FhirType("ConceptMap.group.element", IsBackboneType=true)] public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#SourceElement"; } } + public override string TypeName { get { return "ConceptMap.group.element"; } } /// /// Identifies element being mapped @@ -1250,6 +1315,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "noMap": + NoMapElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "target": + Target = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1271,14 +1361,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#TargetElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target")] + [FhirType("ConceptMap.group.element.target", IsBackboneType=true)] public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#TargetElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target"; } } /// /// Code that identifies the target element @@ -1611,6 +1700,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "relationship": + RelationshipElement = (Code)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "property": + Property = (List)value; + return this; + case "dependsOn": + DependsOn = (List)value; + return this; + case "product": + Product = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1634,14 +1757,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#MappingProperty", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target.property")] + [FhirType("ConceptMap.group.element.target.property", IsBackboneType=true)] public partial class MappingPropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#MappingProperty"; } } + public override string TypeName { get { return "ConceptMap.group.element.target.property"; } } /// /// Reference to ConceptMap.property.code @@ -1774,6 +1896,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1791,14 +1929,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#OtherElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target.dependsOn")] + [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)] public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#OtherElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } } /// /// A reference to a mapping attribute defined in ConceptMap.additionalAttribute @@ -1969,6 +2106,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "attribute": + AttributeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1988,14 +2144,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#Unmapped", IsNestedType=true)] - [BackboneType("ConceptMap.group.unmapped")] + [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)] public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Unmapped"; } } + public override string TypeName { get { return "ConceptMap.group.unmapped"; } } /// /// use-source-code | fixed | other-map @@ -2303,6 +2458,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "mode": + ModeElement = (Code)value; + return this; + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "relationship": + RelationshipElement = (Code)value; + return this; + case "otherMap": + OtherMapElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3312,6 +3495,109 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "additionalAttribute": + AdditionalAttribute = (List)value; + return this; + case "sourceScope": + SourceScope = (Hl7.Fhir.Model.DataType)value; + return this; + case "targetScope": + TargetScope = (Hl7.Fhir.Model.DataType)value; + return this; + case "group": + Group = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs index eb03f2196a..209528f3fd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)] + [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")] public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -165,14 +165,13 @@ public enum ConditionVerificationStatus /// [Serializable] [DataContract] - [FhirType("Condition#Participant", IsNestedType=true)] - [BackboneType("Condition.participant")] + [FhirType("Condition.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Participant"; } } + public override string TypeName { get { return "Condition.participant"; } } /// /// Type of involvement @@ -287,6 +286,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -304,14 +319,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Condition#Stage", IsNestedType=true)] - [BackboneType("Condition.stage")] + [FhirType("Condition.stage", IsBackboneType=true)] public partial class StageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Stage"; } } + public override string TypeName { get { return "Condition.stage"; } } /// /// Simple summary (disease specific) @@ -448,6 +462,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "summary": + Summary = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "assessment": + Assessment = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -905,6 +938,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "clinicalStatus": + ClinicalStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "verificationStatus": + VerificationStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "severity": + Severity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onset": + Onset = (Hl7.Fhir.Model.DataType)value; + return this; + case "abatement": + Abatement = (Hl7.Fhir.Model.DataType)value; + return this; + case "recordedDate": + RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "stage": + Stage = (List)value; + return this; + case "evidence": + Evidence = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs index 1ce9c242f0..c543b5d591 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ConditionDefinition","http://hl7.org/fhir/StructureDefinition/ConditionDefinition", IsResource=true)] + [FhirType("ConditionDefinition","http://hl7.org/fhir/StructureDefinition/ConditionDefinition")] public partial class ConditionDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum ConditionQuestionnairePurpose /// [Serializable] [DataContract] - [FhirType("ConditionDefinition#Observation", IsNestedType=true)] - [BackboneType("ConditionDefinition.observation")] + [FhirType("ConditionDefinition.observation", IsBackboneType=true)] public partial class ObservationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConditionDefinition#Observation"; } } + public override string TypeName { get { return "ConditionDefinition.observation"; } } /// /// Category that is relevant @@ -234,6 +233,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -248,14 +263,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConditionDefinition#Medication", IsNestedType=true)] - [BackboneType("ConditionDefinition.medication")] + [FhirType("ConditionDefinition.medication", IsBackboneType=true)] public partial class MedicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConditionDefinition#Medication"; } } + public override string TypeName { get { return "ConditionDefinition.medication"; } } /// /// Category that is relevant @@ -368,6 +382,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -385,14 +415,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConditionDefinition#Precondition", IsNestedType=true)] - [BackboneType("ConditionDefinition.precondition")] + [FhirType("ConditionDefinition.precondition", IsBackboneType=true)] public partial class PreconditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConditionDefinition#Precondition"; } } + public override string TypeName { get { return "ConditionDefinition.precondition"; } } /// /// sensitive | specific @@ -549,6 +578,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -564,14 +612,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConditionDefinition#Questionnaire", IsNestedType=true)] - [BackboneType("ConditionDefinition.questionnaire")] + [FhirType("ConditionDefinition.questionnaire", IsBackboneType=true)] public partial class QuestionnaireComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConditionDefinition#Questionnaire"; } } + public override string TypeName { get { return "ConditionDefinition.questionnaire"; } } /// /// preadmit | diff-diagnosis | outcome @@ -706,6 +753,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "purpose": + PurposeElement = (Code)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -720,14 +783,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConditionDefinition#Plan", IsNestedType=true)] - [BackboneType("ConditionDefinition.plan")] + [FhirType("ConditionDefinition.plan", IsBackboneType=true)] public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConditionDefinition#Plan"; } } + public override string TypeName { get { return "ConditionDefinition.plan"; } } /// /// Use for the plan @@ -841,6 +903,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1804,6 +1882,103 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "severity": + Severity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "stage": + Stage = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "hasSeverity": + HasSeverityElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "hasBodySite": + HasBodySiteElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "hasStage": + HasStageElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "definition": + DefinitionElement = (List)value; + return this; + case "observation": + Observation = (List)value; + return this; + case "medication": + Medication = (List)value; + return this; + case "precondition": + Precondition = (List)value; + return this; + case "team": + Team = (List)value; + return this; + case "questionnaire": + Questionnaire = (List)value; + return this; + case "plan": + Plan = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs index 672c522735..daa29d66d0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)] + [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")] public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum ConsentState /// [Serializable] [DataContract] - [FhirType("Consent#PolicyBasis", IsNestedType=true)] - [BackboneType("Consent.policyBasis")] + [FhirType("Consent.policyBasis", IsBackboneType=true)] public partial class PolicyBasisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#PolicyBasis"; } } + public override string TypeName { get { return "Consent.policyBasis"; } } /// /// Reference backing policy resource @@ -252,6 +251,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -269,14 +284,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Verification", IsNestedType=true)] - [BackboneType("Consent.verification")] + [FhirType("Consent.verification", IsBackboneType=true)] public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Verification"; } } + public override string TypeName { get { return "Consent.verification"; } } /// /// Has been verified @@ -493,6 +507,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "verified": + VerifiedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "verificationType": + VerificationType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "verifiedBy": + VerifiedBy = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "verifiedWith": + VerifiedWith = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "verificationDate": + VerificationDateElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -513,14 +552,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provision", IsNestedType=true)] - [BackboneType("Consent.provision")] + [FhirType("Consent.provision", IsBackboneType=true)] public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provision"; } } + public override string TypeName { get { return "Consent.provision"; } } /// /// Timeframe for this provision @@ -856,6 +894,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "actor": + Actor = (List)value; + return this; + case "action": + Action = (List)value; + return this; + case "securityLabel": + SecurityLabel = (List)value; + return this; + case "purpose": + Purpose = (List)value; + return this; + case "documentType": + DocumentType = (List)value; + return this; + case "resourceType": + ResourceType = (List)value; + return this; + case "code": + Code = (List)value; + return this; + case "dataPeriod": + DataPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "data": + Data = (List)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + case "provision": + Provision = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -883,14 +967,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionActor", IsNestedType=true)] - [BackboneType("Consent.provision.actor")] + [FhirType("Consent.provision.actor", IsBackboneType=true)] public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionActor"; } } + public override string TypeName { get { return "Consent.provision.actor"; } } /// /// How the actor is involved @@ -1004,6 +1087,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1021,14 +1120,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#provisionData", IsNestedType=true)] - [BackboneType("Consent.provision.data")] + [FhirType("Consent.provision.data", IsBackboneType=true)] public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#provisionData"; } } + public override string TypeName { get { return "Consent.provision.data"; } } /// /// instance | related | dependents | authoredby @@ -1163,6 +1261,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "meaning": + MeaningElement = (Code)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1706,6 +1820,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "grantor": + Grantor = (List)value; + return this; + case "grantee": + Grantee = (List)value; + return this; + case "manager": + Manager = (List)value; + return this; + case "controller": + Controller = (List)value; + return this; + case "sourceAttachment": + SourceAttachment = (List)value; + return this; + case "sourceReference": + SourceReference = (List)value; + return this; + case "regulatoryBasis": + RegulatoryBasis = (List)value; + return this; + case "policyBasis": + PolicyBasis = (Hl7.Fhir.Model.Consent.PolicyBasisComponent)value; + return this; + case "policyText": + PolicyText = (List)value; + return this; + case "verification": + Verification = (List)value; + return this; + case "decision": + DecisionElement = (Code)value; + return this; + case "provision": + Provision = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs index e7bae941a7..7e96670667 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)] + [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")] public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Contract#ContentDefinition", IsNestedType=true)] - [BackboneType("Contract.contentDefinition")] + [FhirType("Contract.contentDefinition", IsBackboneType=true)] public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContentDefinition"; } } + public override string TypeName { get { return "Contract.contentDefinition"; } } /// /// Content structure and use @@ -531,6 +530,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "publisher": + Publisher = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "publicationDate": + PublicationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publicationStatus": + PublicationStatusElement = (Code)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -552,14 +579,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Term", IsNestedType=true)] - [BackboneType("Contract.term")] + [FhirType("Contract.term", IsBackboneType=true)] public partial class TermComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Term"; } } + public override string TypeName { get { return "Contract.term"; } } /// /// Contract Term Number @@ -926,6 +952,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "applies": + Applies = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "securityLabel": + SecurityLabel = (List)value; + return this; + case "offer": + Offer = (Hl7.Fhir.Model.Contract.ContractOfferComponent)value; + return this; + case "asset": + Asset = (List)value; + return this; + case "action": + Action = (List)value; + return this; + case "group": + Group = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -955,14 +1027,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#SecurityLabel", IsNestedType=true)] - [BackboneType("Contract.term.securityLabel")] + [FhirType("Contract.term.securityLabel", IsBackboneType=true)] public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#SecurityLabel"; } } + public override string TypeName { get { return "Contract.term.securityLabel"; } } /// /// Link to Security Labels @@ -1140,6 +1211,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "number": + NumberElement = (List)value; + return this; + case "classification": + Classification = (Hl7.Fhir.Model.Coding)value; + return this; + case "category": + Category = (List)value; + return this; + case "control": + Control = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1159,14 +1252,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractOffer", IsNestedType=true)] - [BackboneType("Contract.term.offer")] + [FhirType("Contract.term.offer", IsBackboneType=true)] public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractOffer"; } } + public override string TypeName { get { return "Contract.term.offer"; } } /// /// Offer business ID @@ -1510,6 +1602,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "party": + Party = (List)value; + return this; + case "topic": + Topic = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "decision": + Decision = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "decisionMode": + DecisionMode = (List)value; + return this; + case "answer": + Answer = (List)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "linkId": + LinkIdElement = (List)value; + return this; + case "securityLabelNumber": + SecurityLabelNumberElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1532,14 +1664,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractParty", IsNestedType=true)] - [BackboneType("Contract.term.offer.party")] + [FhirType("Contract.term.offer.party", IsBackboneType=true)] public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractParty"; } } + public override string TypeName { get { return "Contract.term.offer.party"; } } /// /// Referenced entity @@ -1655,6 +1786,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (List)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1669,14 +1816,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Answer", IsNestedType=true)] - [BackboneType("Contract.term.offer.answer")] + [FhirType("Contract.term.offer.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Answer"; } } + public override string TypeName { get { return "Contract.term.offer.answer"; } } /// /// The actual answer response @@ -1770,6 +1916,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1783,14 +1942,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ContractAsset", IsNestedType=true)] - [BackboneType("Contract.term.asset")] + [FhirType("Contract.term.asset", IsBackboneType=true)] public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ContractAsset"; } } + public override string TypeName { get { return "Contract.term.asset"; } } /// /// Range of asset @@ -2264,6 +2422,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "scope": + Scope = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (List)value; + return this; + case "typeReference": + TypeReference = (List)value; + return this; + case "subtype": + Subtype = (List)value; + return this; + case "relationship": + Relationship = (Hl7.Fhir.Model.Coding)value; + return this; + case "context": + Context = (List)value; + return this; + case "condition": + ConditionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "periodType": + PeriodType = (List)value; + return this; + case "period": + Period = (List)value; + return this; + case "usePeriod": + UsePeriod = (List)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "linkId": + LinkIdElement = (List)value; + return this; + case "answer": + Answer = (List)value; + return this; + case "securityLabelNumber": + SecurityLabelNumberElement = (List)value; + return this; + case "valuedItem": + ValuedItem = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2291,14 +2504,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#AssetContext", IsNestedType=true)] - [BackboneType("Contract.term.asset.context")] + [FhirType("Contract.term.asset.context", IsBackboneType=true)] public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#AssetContext"; } } + public override string TypeName { get { return "Contract.term.asset.context"; } } /// /// Creator,custodian or owner @@ -2452,6 +2664,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "code": + Code = (List)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2467,14 +2698,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ValuedItem", IsNestedType=true)] - [BackboneType("Contract.term.asset.valuedItem")] + [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)] public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ValuedItem"; } } + public override string TypeName { get { return "Contract.term.asset.valuedItem"; } } /// /// Contract Valued Item Type @@ -2972,6 +3202,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "entity": + Entity = (Hl7.Fhir.Model.DataType)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "effectiveTime": + EffectiveTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "points": + PointsElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "payment": + PaymentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "paymentDate": + PaymentDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "responsible": + Responsible = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "recipient": + Recipient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "linkId": + LinkIdElement = (List)value; + return this; + case "securityLabelNumber": + SecurityLabelNumberElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3003,14 +3285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Action", IsNestedType=true)] - [BackboneType("Contract.term.action")] + [FhirType("Contract.term.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Action"; } } + public override string TypeName { get { return "Contract.term.action"; } } /// /// True if the term prohibits the action @@ -3632,6 +3913,73 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "intent": + Intent = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "linkId": + LinkIdElement = (List)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "context": + Context = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "contextLinkId": + ContextLinkIdElement = (List)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "requester": + Requester = (List)value; + return this; + case "requesterLinkId": + RequesterLinkIdElement = (List)value; + return this; + case "performerType": + PerformerType = (List)value; + return this; + case "performerRole": + PerformerRole = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performerLinkId": + PerformerLinkIdElement = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "reasonLinkId": + ReasonLinkIdElement = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "securityLabelNumber": + SecurityLabelNumberElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3663,14 +4011,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ActionSubject", IsNestedType=true)] - [BackboneType("Contract.term.action.subject")] + [FhirType("Contract.term.action.subject", IsBackboneType=true)] public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ActionSubject"; } } + public override string TypeName { get { return "Contract.term.action.subject"; } } /// /// Entity of the action @@ -3785,6 +4132,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (List)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3804,14 +4167,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Signatory", IsNestedType=true)] - [BackboneType("Contract.signer")] + [FhirType("Contract.signer", IsBackboneType=true)] public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Signatory"; } } + public override string TypeName { get { return "Contract.signer"; } } /// /// Contract Signatory Role @@ -3949,6 +4311,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.Coding)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "signature": + Signature = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3967,14 +4348,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#FriendlyLanguage", IsNestedType=true)] - [BackboneType("Contract.friendly")] + [FhirType("Contract.friendly", IsBackboneType=true)] public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#FriendlyLanguage"; } } + public override string TypeName { get { return "Contract.friendly"; } } /// /// Easily comprehended representation of this Contract @@ -4068,6 +4448,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "content": + Content = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4084,14 +4477,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#LegalLanguage", IsNestedType=true)] - [BackboneType("Contract.legal")] + [FhirType("Contract.legal", IsBackboneType=true)] public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#LegalLanguage"; } } + public override string TypeName { get { return "Contract.legal"; } } /// /// Contract Legal Text @@ -4185,6 +4577,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "content": + Content = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4201,14 +4606,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ComputableLanguage", IsNestedType=true)] - [BackboneType("Contract.rule")] + [FhirType("Contract.rule", IsBackboneType=true)] public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ComputableLanguage"; } } + public override string TypeName { get { return "Contract.rule"; } } /// /// Computable Contract Rules @@ -4302,6 +4706,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "content": + Content = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5278,6 +5695,115 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "legalState": + LegalState = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonical = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "contentDerivative": + ContentDerivative = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "applies": + Applies = (Hl7.Fhir.Model.Period)value; + return this; + case "expirationType": + ExpirationType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "authority": + Authority = (List)value; + return this; + case "domain": + Domain = (List)value; + return this; + case "site": + Site = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "alias": + AliasElement = (List)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "scope": + Scope = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "topic": + Topic = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (List)value; + return this; + case "contentDefinition": + ContentDefinition = (Hl7.Fhir.Model.Contract.ContentDefinitionComponent)value; + return this; + case "term": + Term = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "relevantHistory": + RelevantHistory = (List)value; + return this; + case "signer": + Signer = (List)value; + return this; + case "friendly": + Friendly = (List)value; + return this; + case "legal": + Legal = (List)value; + return this; + case "rule": + Rule = (List)value; + return this; + case "legallyBinding": + LegallyBinding = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs index 961341e866..9faf6faba5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -264,6 +264,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Count.cs b/src/Hl7.Fhir.R5/Model/Generated/Count.cs index 4fcaa016dd..137d7073fd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Count.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Count.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs index 2846ec4858..1155ea6953 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)] + [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")] public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum CoverageKindCode /// [Serializable] [DataContract] - [FhirType("Coverage#PaymentBy", IsNestedType=true)] - [BackboneType("Coverage.paymentBy")] + [FhirType("Coverage.paymentBy", IsBackboneType=true)] public partial class PaymentByComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#PaymentBy"; } } + public override string TypeName { get { return "Coverage.paymentBy"; } } /// /// Parties performing self-payment @@ -235,6 +234,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "responsibility": + ResponsibilityElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -253,14 +268,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#Class", IsNestedType=true)] - [BackboneType("Coverage.class")] + [FhirType("Coverage.class", IsBackboneType=true)] public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Class"; } } + public override string TypeName { get { return "Coverage.class"; } } /// /// Type of class such as 'group' or 'plan' @@ -413,6 +427,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.Identifier)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -432,14 +465,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary")] + [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)] public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#CostToBeneficiary"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary"; } } /// /// Cost category @@ -663,6 +695,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "network": + Network = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unit": + Unit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "term": + Term = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "exception": + Exception = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -685,14 +748,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Coverage#Exemption", IsNestedType=true)] - [BackboneType("Coverage.costToBeneficiary.exception")] + [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)] public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Exemption"; } } + public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } } /// /// Exception category @@ -805,6 +867,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1438,6 +1516,76 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "kind": + KindElement = (Code)value; + return this; + case "paymentBy": + PaymentBy = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "policyHolder": + PolicyHolder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subscriber": + Subscriber = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subscriberId": + SubscriberId = (List)value; + return this; + case "beneficiary": + Beneficiary = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "dependent": + DependentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "relationship": + Relationship = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "class": + Class = (List)value; + return this; + case "order": + OrderElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "network": + NetworkElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "costToBeneficiary": + CostToBeneficiary = (List)value; + return this; + case "subrogation": + SubrogationElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "contract": + Contract = (List)value; + return this; + case "insurancePlan": + InsurancePlan = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs index 8832cda149..324eff3969 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)] + [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")] public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum EligibilityRequestPurpose /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Event", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.event")] + [FhirType("CoverageEligibilityRequest.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Event"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.event"; } } /// /// Specific event @@ -224,6 +223,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -242,14 +257,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.supportingInfo")] + [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } } /// /// Information instance identifier @@ -421,6 +435,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "information": + Information = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "appliesToAll": + AppliesToAllElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -440,14 +473,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.insurance")] + [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } } /// /// Applicable coverage @@ -618,6 +650,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "focal": + FocalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "businessArrangement": + BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -636,14 +687,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item")] + [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item"; } } /// /// Applicable exception or supporting information @@ -953,6 +1003,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "supportingInfoSequence": + SupportingInfoSequenceElement = (List)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "facility": + Facility = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -978,14 +1068,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)] - [BackboneType("CoverageEligibilityRequest.item.diagnosis")] + [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } } + public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } } /// /// Nature of illness or problem @@ -1079,6 +1168,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "diagnosis": + Diagnosis = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1552,6 +1654,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "purpose": + PurposeElement = (List>)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "event": + Event = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "enterer": + Enterer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "facility": + Facility = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs index cdf5bab505..a350274366 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)] + [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")] public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -135,14 +135,13 @@ public enum EligibilityOutcome /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Event", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.event")] + [FhirType("CoverageEligibilityResponse.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Event"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.event"; } } /// /// Specific event @@ -258,6 +257,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -276,14 +291,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance")] + [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } } /// /// Insurance information @@ -458,6 +472,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "inforce": + InforceElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "benefitPeriod": + BenefitPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -477,14 +513,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item")] + [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)] public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } } /// /// Benefit classification @@ -949,6 +984,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "excluded": + ExcludedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "network": + Network = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unit": + Unit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "term": + Term = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "benefit": + Benefit = (List)value; + return this; + case "authorizationRequired": + AuthorizationRequiredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "authorizationSupporting": + AuthorizationSupporting = (List)value; + return this; + case "authorizationUrl": + AuthorizationUrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -978,14 +1065,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")] + [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } } /// /// Benefit classification @@ -1123,6 +1209,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "allowed": + Allowed = (Hl7.Fhir.Model.DataType)value; + return this; + case "used": + Used = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1141,14 +1246,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)] - [BackboneType("CoverageEligibilityResponse.error")] + [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)] public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } } + public override string TypeName { get { return "CoverageEligibilityResponse.error"; } } /// /// Error code detailing processing issues @@ -1280,6 +1384,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "expression": + ExpressionElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1830,6 +1950,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "purpose": + PurposeElement = (List>)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "event": + Event = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requestor": + Requestor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outcome": + OutcomeElement = (Code)value; + return this; + case "disposition": + DispositionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "preAuthRef": + PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "error": + Error = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs index 9d4c7f11ad..d9a1d26473 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -141,14 +141,13 @@ public enum SortDirection /// [Serializable] [DataContract] - [FhirType("DataRequirement#CodeFilter", IsNestedType=true)] - [BackboneType("DataRequirement.codeFilter")] + [FhirType("DataRequirement.codeFilter", IsBackboneType=true)] public partial class CodeFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#CodeFilter"; } } + public override string TypeName { get { return "DataRequirement.codeFilter"; } } /// /// A code-valued attribute to filter on @@ -356,6 +355,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "searchParam": + SearchParamElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "code": + Code = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -375,14 +396,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#DateFilter", IsNestedType=true)] - [BackboneType("DataRequirement.dateFilter")] + [FhirType("DataRequirement.dateFilter", IsBackboneType=true)] public partial class DateFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#DateFilter"; } } + public override string TypeName { get { return "DataRequirement.dateFilter"; } } /// /// A date-valued attribute to filter on @@ -552,6 +572,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "searchParam": + SearchParamElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -570,14 +609,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#ValueFilter", IsNestedType=true)] - [BackboneType("DataRequirement.valueFilter")] + [FhirType("DataRequirement.valueFilter", IsBackboneType=true)] public partial class ValueFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#ValueFilter"; } } + public override string TypeName { get { return "DataRequirement.valueFilter"; } } /// /// An attribute to filter on @@ -788,6 +826,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "searchParam": + SearchParamElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "comparator": + ComparatorElement = (Code)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -808,14 +868,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#Sort", IsNestedType=true)] - [BackboneType("DataRequirement.sort")] + [FhirType("DataRequirement.sort", IsBackboneType=true)] public partial class SortComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#Sort"; } } + public override string TypeName { get { return "DataRequirement.sort"; } } /// /// The name of the attribute to perform the sort @@ -966,6 +1025,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "direction": + DirectionElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1316,6 +1391,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "profile": + ProfileElement = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "mustSupport": + MustSupportElement = (List)value; + return this; + case "codeFilter": + CodeFilter = (List)value; + return this; + case "dateFilter": + DateFilter = (List)value; + return this; + case "valueFilter": + ValueFilter = (List)value; + return this; + case "limit": + LimitElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "sort": + Sort = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs index 4821502b6d..9dfe431de9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)] + [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")] public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -129,14 +129,13 @@ public enum DetectedIssueSeverity /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Evidence", IsNestedType=true)] - [BackboneType("DetectedIssue.evidence")] + [FhirType("DetectedIssue.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Evidence"; } } + public override string TypeName { get { return "DetectedIssue.evidence"; } } /// /// Manifestation @@ -252,6 +251,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -269,14 +284,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Mitigation", IsNestedType=true)] - [BackboneType("DetectedIssue.mitigation")] + [FhirType("DetectedIssue.mitigation", IsBackboneType=true)] public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Mitigation"; } } + public override string TypeName { get { return "DetectedIssue.mitigation"; } } /// /// What mitigation? @@ -452,6 +466,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -920,6 +956,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "severity": + SeverityElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "identified": + Identified = (Hl7.Fhir.Model.DataType)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "implicated": + Implicated = (List)value; + return this; + case "evidence": + Evidence = (List)value; + return this; + case "detail": + DetailElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "reference": + ReferenceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "mitigation": + Mitigation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Device.cs b/src/Hl7.Fhir.R5/Model/Generated/Device.cs index de19e391ee..736dfbac61 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Device.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)] + [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")] public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -148,14 +148,13 @@ public enum UDIEntryType /// [Serializable] [DataContract] - [FhirType("Device#UdiCarrier", IsNestedType=true)] - [BackboneType("Device.udiCarrier")] + [FhirType("Device.udiCarrier", IsBackboneType=true)] public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#UdiCarrier"; } } + public override string TypeName { get { return "Device.udiCarrier"; } } /// /// Mandatory fixed portion of UDI @@ -462,6 +461,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "deviceIdentifier": + DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "issuer": + IssuerElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "jurisdiction": + JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "carrierAIDC": + CarrierAIDCElement = (Hl7.Fhir.Model.Base64Binary)value; + return this; + case "carrierHRF": + CarrierHRFElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "entryType": + EntryTypeElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -483,14 +510,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Name", IsNestedType=true)] - [BackboneType("Device.name")] + [FhirType("Device.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Name"; } } + public override string TypeName { get { return "Device.name"; } } /// /// The term that names the device @@ -680,6 +706,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -695,14 +740,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Version", IsNestedType=true)] - [BackboneType("Device.version")] + [FhirType("Device.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Version"; } } + public override string TypeName { get { return "Device.version"; } } /// /// The type of the device version, e.g. manufacturer, approved, internal @@ -893,6 +937,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "component": + Component = (Hl7.Fhir.Model.Identifier)value; + return this; + case "installDate": + InstallDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -912,14 +978,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#ConformsTo", IsNestedType=true)] - [BackboneType("Device.conformsTo")] + [FhirType("Device.conformsTo", IsBackboneType=true)] public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#ConformsTo"; } } + public override string TypeName { get { return "Device.conformsTo"; } } /// /// Describes the common type of the standard, specification, or formal guidance. communication | performance | measurement @@ -1072,6 +1137,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specification": + Specification = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1091,14 +1175,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Device#Property", IsNestedType=true)] - [BackboneType("Device.property")] + [FhirType("Device.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Property"; } } + public override string TypeName { get { return "Device.property"; } } /// /// Code that specifies the property being represented @@ -1214,6 +1297,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2172,6 +2271,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "displayName": + DisplayNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "definition": + Definition = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "udiCarrier": + UdiCarrier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "availabilityStatus": + AvailabilityStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "biologicalSourceEvent": + BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value; + return this; + case "manufacturer": + ManufacturerElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "manufactureDate": + ManufactureDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "expirationDate": + ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "lotNumber": + LotNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "serialNumber": + SerialNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "name": + Name = (List)value; + return this; + case "modelNumber": + ModelNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "partNumber": + PartNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "category": + Category = (List)value; + return this; + case "type": + Type = (List)value; + return this; + case "version": + Version = (List)value; + return this; + case "conformsTo": + ConformsTo = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "mode": + Mode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "cycle": + Cycle = (Hl7.Fhir.Model.Count)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.Duration)value; + return this; + case "owner": + Owner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "gateway": + Gateway = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "safety": + Safety = (List)value; + return this; + case "parent": + Parent = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs index 86128da464..9e49f32a36 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceAssociation","http://hl7.org/fhir/StructureDefinition/DeviceAssociation", IsResource=true)] + [FhirType("DeviceAssociation","http://hl7.org/fhir/StructureDefinition/DeviceAssociation")] public partial class DeviceAssociation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum DeviceAssociationCodes /// [Serializable] [DataContract] - [FhirType("DeviceAssociation#Operation", IsNestedType=true)] - [BackboneType("DeviceAssociation.operation")] + [FhirType("DeviceAssociation.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceAssociation#Operation"; } } + public override string TypeName { get { return "DeviceAssociation.operation"; } } /// /// Device operational condition @@ -245,6 +244,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "operator": + Operator = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -527,6 +545,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "category": + Category = (List)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusReason": + StatusReason = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "bodyStructure": + BodyStructure = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "operation": + Operation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs index 1aa261c725..59ae062fc0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)] + [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")] public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -170,14 +170,13 @@ public enum DeviceCorrectiveActionScope /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)] - [BackboneType("DeviceDefinition.udiDeviceIdentifier")] + [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)] public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } } + public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } } /// /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdiction provided in the DeviceDefinition.udiDeviceIdentifier @@ -388,6 +387,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "deviceIdentifier": + DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "issuer": + IssuerElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "jurisdiction": + JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "marketDistribution": + MarketDistribution = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -407,14 +428,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#UdiDeviceIdentifierMarketDistribution", IsNestedType=true)] - [BackboneType("DeviceDefinition.udiDeviceIdentifier.marketDistribution")] + [FhirType("DeviceDefinition.udiDeviceIdentifier.marketDistribution", IsBackboneType=true)] public partial class UdiDeviceIdentifierMarketDistributionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifierMarketDistribution"; } } + public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier.marketDistribution"; } } /// /// Begin and end dates for the commercial distribution of the device @@ -545,6 +565,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "marketPeriod": + MarketPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "subJurisdiction": + SubJurisdictionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -563,14 +599,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#RegulatoryIdentifier", IsNestedType=true)] - [BackboneType("DeviceDefinition.regulatoryIdentifier")] + [FhirType("DeviceDefinition.regulatoryIdentifier", IsBackboneType=true)] public partial class RegulatoryIdentifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#RegulatoryIdentifier"; } } + public override string TypeName { get { return "DeviceDefinition.regulatoryIdentifier"; } } /// /// basic | master | license @@ -801,6 +836,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "deviceIdentifier": + DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "issuer": + IssuerElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "jurisdiction": + JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -817,14 +874,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)] - [BackboneType("DeviceDefinition.deviceName")] + [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)] public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#DeviceName"; } } + public override string TypeName { get { return "DeviceDefinition.deviceName"; } } /// /// A name that is used to refer to the device @@ -975,6 +1031,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -992,14 +1064,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Classification", IsNestedType=true)] - [BackboneType("DeviceDefinition.classification")] + [FhirType("DeviceDefinition.classification", IsBackboneType=true)] public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Classification"; } } + public override string TypeName { get { return "DeviceDefinition.classification"; } } /// /// A classification or risk class of the device model @@ -1113,6 +1184,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "justification": + Justification = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1130,14 +1217,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#ConformsTo", IsNestedType=true)] - [BackboneType("DeviceDefinition.conformsTo")] + [FhirType("DeviceDefinition.conformsTo", IsBackboneType=true)] public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#ConformsTo"; } } + public override string TypeName { get { return "DeviceDefinition.conformsTo"; } } /// /// Describes the common type of the standard, specification, or formal guidance @@ -1313,6 +1399,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specification": + Specification = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "version": + VersionElement = (List)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1332,14 +1440,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#HasPart", IsNestedType=true)] - [BackboneType("DeviceDefinition.hasPart")] + [FhirType("DeviceDefinition.hasPart", IsBackboneType=true)] public partial class HasPartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#HasPart"; } } + public override string TypeName { get { return "DeviceDefinition.hasPart"; } } /// /// Reference to the part @@ -1471,6 +1578,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "count": + CountElement = (Hl7.Fhir.Model.Integer)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1485,14 +1608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Packaging", IsNestedType=true)] - [BackboneType("DeviceDefinition.packaging")] + [FhirType("DeviceDefinition.packaging", IsBackboneType=true)] public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Packaging"; } } + public override string TypeName { get { return "DeviceDefinition.packaging"; } } /// /// Business identifier of the packaged medication @@ -1708,6 +1830,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "count": + CountElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "distributor": + Distributor = (List)value; + return this; + case "udiDeviceIdentifier": + UdiDeviceIdentifier = (List)value; + return this; + case "packaging": + Packaging = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1726,14 +1876,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#PackagingDistributor", IsNestedType=true)] - [BackboneType("DeviceDefinition.packaging.distributor")] + [FhirType("DeviceDefinition.packaging.distributor", IsBackboneType=true)] public partial class PackagingDistributorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#PackagingDistributor"; } } + public override string TypeName { get { return "DeviceDefinition.packaging.distributor"; } } /// /// Distributor's human-readable name @@ -1865,6 +2014,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "organizationReference": + OrganizationReference = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1879,14 +2044,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Version", IsNestedType=true)] - [BackboneType("DeviceDefinition.version")] + [FhirType("DeviceDefinition.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Version"; } } + public override string TypeName { get { return "DeviceDefinition.version"; } } /// /// The type of the device version, e.g. manufacturer, approved, internal @@ -2037,6 +2201,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "component": + Component = (Hl7.Fhir.Model.Identifier)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2056,14 +2239,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Property", IsNestedType=true)] - [BackboneType("DeviceDefinition.property")] + [FhirType("DeviceDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Property"; } } + public override string TypeName { get { return "DeviceDefinition.property"; } } /// /// Code that specifies the property being represented @@ -2179,6 +2361,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2193,14 +2391,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Link", IsNestedType=true)] - [BackboneType("DeviceDefinition.link")] + [FhirType("DeviceDefinition.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Link"; } } + public override string TypeName { get { return "DeviceDefinition.link"; } } /// /// The type indicates the relationship of the related device to the device instance @@ -2314,6 +2511,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "relation": + Relation = (Hl7.Fhir.Model.Coding)value; + return this; + case "relatedDevice": + RelatedDevice = (Hl7.Fhir.Model.CodeableReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2328,14 +2541,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Material", IsNestedType=true)] - [BackboneType("DeviceDefinition.material")] + [FhirType("DeviceDefinition.material", IsBackboneType=true)] public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Material"; } } + public override string TypeName { get { return "DeviceDefinition.material"; } } /// /// A relevant substance that the device contains, may contain, or is made of @@ -2504,6 +2716,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "substance": + Substance = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "alternate": + AlternateElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "allergenicIndicator": + AllergenicIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2522,14 +2753,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#Guideline", IsNestedType=true)] - [BackboneType("DeviceDefinition.guideline")] + [FhirType("DeviceDefinition.guideline", IsBackboneType=true)] public partial class GuidelineComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#Guideline"; } } + public override string TypeName { get { return "DeviceDefinition.guideline"; } } /// /// The circumstances that form the setting for using the device @@ -2786,6 +3016,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "useContext": + UseContext = (List)value; + return this; + case "usageInstruction": + UsageInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "indication": + Indication = (List)value; + return this; + case "contraindication": + Contraindication = (List)value; + return this; + case "warning": + Warning = (List)value; + return this; + case "intendedUse": + IntendedUseElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2805,14 +3066,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#CorrectiveAction", IsNestedType=true)] - [BackboneType("DeviceDefinition.correctiveAction")] + [FhirType("DeviceDefinition.correctiveAction", IsBackboneType=true)] public partial class CorrectiveActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#CorrectiveAction"; } } + public override string TypeName { get { return "DeviceDefinition.correctiveAction"; } } /// /// Whether the corrective action was a recall @@ -2984,6 +3244,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "recall": + RecallElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "scope": + ScopeElement = (Code)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2999,14 +3278,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DeviceDefinition#ChargeItem", IsNestedType=true)] - [BackboneType("DeviceDefinition.chargeItem")] + [FhirType("DeviceDefinition.chargeItem", IsBackboneType=true)] public partial class ChargeItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDefinition#ChargeItem"; } } + public override string TypeName { get { return "DeviceDefinition.chargeItem"; } } /// /// The code or reference for the charge item @@ -3162,6 +3440,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "chargeItemCode": + ChargeItemCode = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "count": + Count = (Hl7.Fhir.Model.Quantity)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3886,6 +4186,94 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "udiDeviceIdentifier": + UdiDeviceIdentifier = (List)value; + return this; + case "regulatoryIdentifier": + RegulatoryIdentifier = (List)value; + return this; + case "partNumber": + PartNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "manufacturer": + Manufacturer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "deviceName": + DeviceName = (List)value; + return this; + case "modelNumber": + ModelNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "classification": + Classification = (List)value; + return this; + case "conformsTo": + ConformsTo = (List)value; + return this; + case "hasPart": + HasPart = (List)value; + return this; + case "packaging": + Packaging = (List)value; + return this; + case "version": + Version = (List)value; + return this; + case "safety": + Safety = (List)value; + return this; + case "shelfLifeStorage": + ShelfLifeStorage = (List)value; + return this; + case "languageCode": + LanguageCode = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "owner": + Owner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "link": + Link = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "material": + Material = (List)value; + return this; + case "productionIdentifierInUDI": + ProductionIdentifierInUDIElement = (List>)value; + return this; + case "guideline": + Guideline = (Hl7.Fhir.Model.DeviceDefinition.GuidelineComponent)value; + return this; + case "correctiveAction": + CorrectiveAction = (Hl7.Fhir.Model.DeviceDefinition.CorrectiveActionComponent)value; + return this; + case "chargeItem": + ChargeItem = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs index 56641019d6..869e265088 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceDispense","http://hl7.org/fhir/StructureDefinition/DeviceDispense", IsResource=true)] + [FhirType("DeviceDispense","http://hl7.org/fhir/StructureDefinition/DeviceDispense")] public partial class DeviceDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -131,14 +131,13 @@ public enum DeviceDispenseStatusCodes /// [Serializable] [DataContract] - [FhirType("DeviceDispense#Performer", IsNestedType=true)] - [BackboneType("DeviceDispense.performer")] + [FhirType("DeviceDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceDispense#Performer"; } } + public override string TypeName { get { return "DeviceDispense.performer"; } } /// /// Who performed the dispense and what they did @@ -252,6 +251,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -875,6 +890,79 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "category": + Category = (List)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "receiver": + Receiver = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "preparedDate": + PreparedDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "whenHandedOver": + WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "destination": + Destination = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "note": + Note = (List)value; + return this; + case "usageInstruction": + UsageInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "eventHistory": + EventHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs index fecd768fe3..b35d9509cd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)] + [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")] public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -201,14 +201,13 @@ public enum DeviceMetricCalibrationState /// [Serializable] [DataContract] - [FhirType("DeviceMetric#Calibration", IsNestedType=true)] - [BackboneType("DeviceMetric.calibration")] + [FhirType("DeviceMetric.calibration", IsBackboneType=true)] public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceMetric#Calibration"; } } + public override string TypeName { get { return "DeviceMetric.calibration"; } } /// /// unspecified | offset | gain | two-point @@ -398,6 +397,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "state": + StateElement = (Code)value; + return this; + case "time": + TimeElement = (Hl7.Fhir.Model.Instant)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -733,6 +751,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unit": + Unit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "operationalStatus": + OperationalStatusElement = (Code)value; + return this; + case "color": + ColorElement = (Hl7.Fhir.Model.Code)value; + return this; + case "category": + CategoryElement = (Code)value; + return this; + case "measurementFrequency": + MeasurementFrequency = (Hl7.Fhir.Model.Quantity)value; + return this; + case "calibration": + Calibration = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs index 590a3db24d..99682d6e16 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)] + [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")] public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("DeviceRequest#Parameter", IsNestedType=true)] - [BackboneType("DeviceRequest.parameter")] + [FhirType("DeviceRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceRequest#Parameter"; } } + public override string TypeName { get { return "DeviceRequest.parameter"; } } /// /// Device detail @@ -188,6 +187,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1014,6 +1029,94 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "quantity": + QuantityElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "asNeeded": + AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "asNeededFor": + AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "relevantHistory": + RelevantHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs index 4eb0e67d1a..55918b3339 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceUsage","http://hl7.org/fhir/StructureDefinition/DeviceUsage", IsResource=true)] + [FhirType("DeviceUsage","http://hl7.org/fhir/StructureDefinition/DeviceUsage")] public partial class DeviceUsage : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum DeviceUsageStatus /// [Serializable] [DataContract] - [FhirType("DeviceUsage#Adherence", IsNestedType=true)] - [BackboneType("DeviceUsage.adherence")] + [FhirType("DeviceUsage.adherence", IsBackboneType=true)] public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceUsage#Adherence"; } } + public override string TypeName { get { return "DeviceUsage.adherence"; } } /// /// always | never | sometimes @@ -241,6 +240,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -738,6 +753,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "derivedFrom": + DerivedFrom = (List)value; + return this; + case "context": + Context = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "dateAsserted": + DateAssertedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "usageStatus": + UsageStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "usageReason": + UsageReason = (List)value; + return this; + case "adherence": + Adherence = (Hl7.Fhir.Model.DeviceUsage.AdherenceComponent)value; + return this; + case "informationSource": + InformationSource = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs index 79f578134b..51718c0809 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)] + [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")] public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -144,14 +144,13 @@ public enum DiagnosticReportStatus /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#SupportingInfo", IsNestedType=true)] - [BackboneType("DiagnosticReport.supportingInfo")] + [FhirType("DiagnosticReport.supportingInfo", IsBackboneType=true)] public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#SupportingInfo"; } } + public override string TypeName { get { return "DiagnosticReport.supportingInfo"; } } /// /// Supporting information role code @@ -267,6 +266,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -284,14 +299,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#Media", IsNestedType=true)] - [BackboneType("DiagnosticReport.media")] + [FhirType("DiagnosticReport.media", IsBackboneType=true)] public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#Media"; } } + public override string TypeName { get { return "DiagnosticReport.media"; } } /// /// Comment about the image or data (e.g. explanation) @@ -423,6 +437,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "link": + Link = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1036,6 +1066,79 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "effective": + Effective = (Hl7.Fhir.Model.DataType)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "resultsInterpreter": + ResultsInterpreter = (List)value; + return this; + case "specimen": + Specimen = (List)value; + return this; + case "result": + Result = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "study": + Study = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "media": + Media = (List)value; + return this; + case "composition": + Composition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "conclusion": + ConclusionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "conclusionCode": + ConclusionCode = (List)value; + return this; + case "presentedForm": + PresentedForm = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Distance.cs b/src/Hl7.Fhir.R5/Model/Generated/Distance.cs index 4cba6e0efe..14fabec10e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Distance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Distance.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs index e26a1b81d8..78278700a3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)] + [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")] public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -97,14 +97,13 @@ public enum DocumentReferenceStatus /// [Serializable] [DataContract] - [FhirType("DocumentReference#Attester", IsNestedType=true)] - [BackboneType("DocumentReference.attester")] + [FhirType("DocumentReference.attester", IsBackboneType=true)] public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Attester"; } } + public override string TypeName { get { return "DocumentReference.attester"; } } /// /// personal | professional | legal | official @@ -258,6 +257,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "mode": + Mode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "time": + TimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -277,14 +295,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#RelatesTo", IsNestedType=true)] - [BackboneType("DocumentReference.relatesTo")] + [FhirType("DocumentReference.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#RelatesTo"; } } + public override string TypeName { get { return "DocumentReference.relatesTo"; } } /// /// The relationship type with another document @@ -400,6 +417,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "target": + Target = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -418,14 +451,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Content", IsNestedType=true)] - [BackboneType("DocumentReference.content")] + [FhirType("DocumentReference.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Content"; } } + public override string TypeName { get { return "DocumentReference.content"; } } /// /// Where to access the document @@ -538,6 +570,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "attachment": + Attachment = (Hl7.Fhir.Model.Attachment)value; + return this; + case "profile": + Profile = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -557,14 +605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Profile", IsNestedType=true)] - [BackboneType("DocumentReference.content.profile")] + [FhirType("DocumentReference.content.profile", IsBackboneType=true)] public partial class ProfileComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Profile"; } } + public override string TypeName { get { return "DocumentReference.content.profile"; } } /// /// Code|uri|canonical @@ -658,6 +705,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1343,6 +1403,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "docStatus": + DocStatusElement = (Code)value; + return this; + case "modality": + Modality = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "context": + Context = (List)value; + return this; + case "event": + Event = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "facilityType": + FacilityType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "practiceSetting": + PracticeSetting = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "author": + Author = (List)value; + return this; + case "attester": + Attester = (List)value; + return this; + case "custodian": + Custodian = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "relatesTo": + RelatesTo = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "securityLabel": + SecurityLabel = (List)value; + return this; + case "content": + Content = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs index 8e06be11c5..8cddb0447e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType /// [Serializable] [DataContract] - [FhirType("Dosage#DoseAndRate", IsNestedType=true)] - [BackboneType("Dosage.doseAndRate")] + [FhirType("Dosage.doseAndRate", IsBackboneType=true)] public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Dosage#DoseAndRate"; } } + public override string TypeName { get { return "Dosage.doseAndRate"; } } /// /// The kind of dose or rate specified @@ -211,6 +210,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "dose": + Dose = (Hl7.Fhir.Model.DataType)value; + return this; + case "rate": + Rate = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -663,6 +681,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "additionalInstruction": + AdditionalInstruction = (List)value; + return this; + case "patientInstruction": + PatientInstructionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.Timing)value; + return this; + case "asNeeded": + AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "asNeededFor": + AsNeededFor = (List)value; + return this; + case "site": + Site = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "route": + Route = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "doseAndRate": + DoseAndRate = (List)value; + return this; + case "maxDosePerPeriod": + MaxDosePerPeriod = (List)value; + return this; + case "maxDosePerAdministration": + MaxDosePerAdministration = (Hl7.Fhir.Model.Quantity)value; + return this; + case "maxDosePerLifetime": + MaxDosePerLifetime = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Duration.cs b/src/Hl7.Fhir.R5/Model/Generated/Duration.cs index 7bdf484887..6f31af421d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Duration.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Duration.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs index 7abb580d16..01366c5a5b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)] + [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")] public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -104,14 +104,13 @@ public enum EncounterLocationStatus /// [Serializable] [DataContract] - [FhirType("Encounter#Participant", IsNestedType=true)] - [BackboneType("Encounter.participant")] + [FhirType("Encounter.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Participant"; } } + public override string TypeName { get { return "Encounter.participant"; } } /// /// Role of participant in encounter @@ -247,6 +246,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -268,14 +286,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Reason", IsNestedType=true)] - [BackboneType("Encounter.reason")] + [FhirType("Encounter.reason", IsBackboneType=true)] public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Reason"; } } + public override string TypeName { get { return "Encounter.reason"; } } /// /// What the reason value should be used for/as @@ -390,6 +407,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "use": + Use = (List)value; + return this; + case "value": + Value = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -407,14 +440,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Diagnosis", IsNestedType=true)] - [BackboneType("Encounter.diagnosis")] + [FhirType("Encounter.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Diagnosis"; } } + public override string TypeName { get { return "Encounter.diagnosis"; } } /// /// The diagnosis relevant to the encounter @@ -529,6 +561,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "condition": + Condition = (List)value; + return this; + case "use": + Use = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -549,14 +597,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Admission", IsNestedType=true)] - [BackboneType("Encounter.admission")] + [FhirType("Encounter.admission", IsBackboneType=true)] public partial class AdmissionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Admission"; } } + public override string TypeName { get { return "Encounter.admission"; } } /// /// Pre-admission identifier @@ -758,6 +805,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "preAdmissionIdentifier": + PreAdmissionIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "origin": + Origin = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "admitSource": + AdmitSource = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reAdmission": + ReAdmission = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "destination": + Destination = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "dischargeDisposition": + DischargeDisposition = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -780,14 +855,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Location", IsNestedType=true)] - [BackboneType("Encounter.location")] + [FhirType("Encounter.location", IsBackboneType=true)] public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Location"; } } + public override string TypeName { get { return "Encounter.location"; } } /// /// Location the encounter takes place @@ -964,6 +1038,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1730,6 +1826,100 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "class": + Class = (List)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (List)value; + return this; + case "serviceType": + ServiceType = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subjectStatus": + SubjectStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "episodeOfCare": + EpisodeOfCare = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "careTeam": + CareTeam = (List)value; + return this; + case "partOf": + PartOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "serviceProvider": + ServiceProvider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "appointment": + Appointment = (List)value; + return this; + case "virtualService": + VirtualService = (List)value; + return this; + case "actualPeriod": + ActualPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "plannedStartDate": + PlannedStartDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "plannedEndDate": + PlannedEndDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "length": + Length = (Hl7.Fhir.Model.Duration)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "account": + Account = (List)value; + return this; + case "dietPreference": + DietPreference = (List)value; + return this; + case "specialArrangement": + SpecialArrangement = (List)value; + return this; + case "specialCourtesy": + SpecialCourtesy = (List)value; + return this; + case "admission": + Admission = (Hl7.Fhir.Model.Encounter.AdmissionComponent)value; + return this; + case "location": + Location = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs index b58520d466..c184ea1470 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EncounterHistory","http://hl7.org/fhir/StructureDefinition/EncounterHistory", IsResource=true)] + [FhirType("EncounterHistory","http://hl7.org/fhir/StructureDefinition/EncounterHistory")] public partial class EncounterHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class EncounterHistory : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("EncounterHistory#Location", IsNestedType=true)] - [BackboneType("EncounterHistory.location")] + [FhirType("EncounterHistory.location", IsBackboneType=true)] public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EncounterHistory#Location"; } } + public override string TypeName { get { return "EncounterHistory.location"; } } /// /// Location the encounter takes place @@ -190,6 +189,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -611,6 +626,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "class": + Class = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (List)value; + return this; + case "serviceType": + ServiceType = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subjectStatus": + SubjectStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actualPeriod": + ActualPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "plannedStartDate": + PlannedStartDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "plannedEndDate": + PlannedEndDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "length": + Length = (Hl7.Fhir.Model.Duration)value; + return this; + case "location": + Location = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs index dd8542bf48..30e9d15290 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)] + [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")] public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -108,14 +108,13 @@ public enum EndpointStatus /// [Serializable] [DataContract] - [FhirType("Endpoint#Payload", IsNestedType=true)] - [BackboneType("Endpoint.payload")] + [FhirType("Endpoint.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Endpoint#Payload"; } } + public override string TypeName { get { return "Endpoint.payload"; } } /// /// The type of content that may be used at this endpoint (e.g. XDS Discharge summaries) @@ -248,6 +247,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "mimeType": + MimeTypeElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -682,6 +697,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "connectionType": + ConnectionType = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "environmentType": + EnvironmentType = (List)value; + return this; + case "managingOrganization": + ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "payload": + Payload = (List)value; + return this; + case "address": + AddressElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + case "header": + HeaderElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs index 0a472848a5..eeb67ac26e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)] + [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")] public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -322,6 +322,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "candidate": + Candidate = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs index 6859e11c8d..5f59243c8e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)] + [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")] public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -413,6 +413,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outcome": + OutcomeElement = (Code)value; + return this; + case "disposition": + DispositionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestProvider": + RequestProvider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs index 3f05f86a88..3d30b9ce02 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)] + [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")] public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)] - [BackboneType("EpisodeOfCare.statusHistory")] + [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } } + public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } } /// /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error @@ -259,6 +258,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "status": + StatusElement = (Code)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -279,14 +294,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#Reason", IsNestedType=true)] - [BackboneType("EpisodeOfCare.reason")] + [FhirType("EpisodeOfCare.reason", IsBackboneType=true)] public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#Reason"; } } + public override string TypeName { get { return "EpisodeOfCare.reason"; } } /// /// What the reason value should be used for/as @@ -400,6 +414,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "use": + Use = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -418,14 +448,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)] - [BackboneType("EpisodeOfCare.diagnosis")] + [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } } + public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } } /// /// The medical condition that was addressed during the episode of care @@ -539,6 +568,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "condition": + Condition = (List)value; + return this; + case "use": + Use = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -933,6 +978,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusHistory": + StatusHistory = (List)value; + return this; + case "type": + Type = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "managingOrganization": + ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "referralRequest": + ReferralRequest = (List)value; + return this; + case "careManager": + CareManager = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "careTeam": + CareTeam = (List)value; + return this; + case "account": + Account = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs index 3094482ff7..2ad2d0ddf6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)] + [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")] public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -1068,6 +1068,106 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "trigger": + Trigger = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs index c12b5d211c..085f59c07c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)] + [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")] public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Evidence#VariableDefinition", IsNestedType=true)] - [BackboneType("Evidence.variableDefinition")] + [FhirType("Evidence.variableDefinition", IsBackboneType=true)] public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#VariableDefinition"; } } + public override string TypeName { get { return "Evidence.variableDefinition"; } } /// /// A text description or summary of the variable @@ -292,6 +291,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "variableRole": + VariableRole = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "observed": + Observed = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "intended": + Intended = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "directnessMatch": + DirectnessMatch = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -310,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Statistic", IsNestedType=true)] - [BackboneType("Evidence.statistic")] + [FhirType("Evidence.statistic", IsBackboneType=true)] public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Statistic"; } } + public override string TypeName { get { return "Evidence.statistic"; } } /// /// Description of content @@ -654,6 +680,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "statisticType": + StatisticType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "numberOfEvents": + NumberOfEventsElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "numberAffected": + NumberAffectedElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "sampleSize": + SampleSize = (Hl7.Fhir.Model.Evidence.SampleSizeComponent)value; + return this; + case "attributeEstimate": + AttributeEstimate = (List)value; + return this; + case "modelCharacteristic": + ModelCharacteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -676,14 +742,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#SampleSize", IsNestedType=true)] - [BackboneType("Evidence.statistic.sampleSize")] + [FhirType("Evidence.statistic.sampleSize", IsBackboneType=true)] public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#SampleSize"; } } + public override string TypeName { get { return "Evidence.statistic.sampleSize"; } } /// /// Textual description of sample size for statistic @@ -930,6 +995,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "numberOfStudies": + NumberOfStudiesElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "numberOfParticipants": + NumberOfParticipantsElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "knownDataCount": + KnownDataCountElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -950,14 +1040,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#AttributeEstimate", IsNestedType=true)] - [BackboneType("Evidence.statistic.attributeEstimate")] + [FhirType("Evidence.statistic.attributeEstimate", IsBackboneType=true)] public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#AttributeEstimate"; } } + public override string TypeName { get { return "Evidence.statistic.attributeEstimate"; } } /// /// Textual description of the attribute estimate @@ -1212,6 +1301,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "level": + LevelElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "range": + Range = (Hl7.Fhir.Model.Range)value; + return this; + case "attributeEstimate": + AttributeEstimate = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1234,14 +1354,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#ModelCharacteristic", IsNestedType=true)] - [BackboneType("Evidence.statistic.modelCharacteristic")] + [FhirType("Evidence.statistic.modelCharacteristic", IsBackboneType=true)] public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#ModelCharacteristic"; } } + public override string TypeName { get { return "Evidence.statistic.modelCharacteristic"; } } /// /// Model specification @@ -1398,6 +1517,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.Quantity)value; + return this; + case "variable": + Variable = (List)value; + return this; + case "attributeEstimate": + AttributeEstimate = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1414,14 +1555,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Variable", IsNestedType=true)] - [BackboneType("Evidence.statistic.modelCharacteristic.variable")] + [FhirType("Evidence.statistic.modelCharacteristic.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Variable"; } } + public override string TypeName { get { return "Evidence.statistic.modelCharacteristic.variable"; } } /// /// Description of the variable @@ -1621,6 +1761,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "variableDefinition": + VariableDefinition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "handling": + HandlingElement = (Code)value; + return this; + case "valueCategory": + ValueCategory = (List)value; + return this; + case "valueQuantity": + ValueQuantity = (List)value; + return this; + case "valueRange": + ValueRange = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1641,14 +1806,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Evidence#Certainty", IsNestedType=true)] - [BackboneType("Evidence.certainty")] + [FhirType("Evidence.certainty", IsBackboneType=true)] public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Evidence#Certainty"; } } + public override string TypeName { get { return "Evidence.certainty"; } } /// /// Textual description of certainty @@ -1883,6 +2047,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "rating": + Rating = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "rater": + RaterElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subcomponent": + Subcomponent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2909,6 +3101,109 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "citeAs": + CiteAs = (Hl7.Fhir.Model.DataType)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "assertion": + AssertionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "variableDefinition": + VariableDefinition = (List)value; + return this; + case "synthesisType": + SynthesisType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "studyDesign": + StudyDesign = (List)value; + return this; + case "statistic": + Statistic = (List)value; + return this; + case "certainty": + Certainty = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs index fe1ea6133d..0bd861e8bb 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport", IsResource=true)] + [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport")] public partial class EvidenceReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -126,14 +126,13 @@ public enum ReportRelationshipType /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Subject", IsNestedType=true)] - [BackboneType("EvidenceReport.subject")] + [FhirType("EvidenceReport.subject", IsBackboneType=true)] public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Subject"; } } + public override string TypeName { get { return "EvidenceReport.subject"; } } /// /// Characteristic @@ -246,6 +245,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "characteristic": + Characteristic = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -260,14 +275,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Characteristic", IsNestedType=true)] - [BackboneType("EvidenceReport.subject.characteristic")] + [FhirType("EvidenceReport.subject.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Characteristic"; } } + public override string TypeName { get { return "EvidenceReport.subject.characteristic"; } } /// /// Characteristic code @@ -444,6 +458,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "exclude": + ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -464,14 +500,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#RelatesTo", IsNestedType=true)] - [BackboneType("EvidenceReport.relatesTo")] + [FhirType("EvidenceReport.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#RelatesTo"; } } + public override string TypeName { get { return "EvidenceReport.relatesTo"; } } /// /// replaces | amends | appends | transforms | replacedWith | amendedWith | appendedWith | transformedWith @@ -604,6 +639,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Code)value; + return this; + case "target": + Target = (Hl7.Fhir.Model.EvidenceReport.TargetComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -621,14 +672,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Target", IsNestedType=true)] - [BackboneType("EvidenceReport.relatesTo.target")] + [FhirType("EvidenceReport.relatesTo.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Target"; } } + public override string TypeName { get { return "EvidenceReport.relatesTo.target"; } } /// /// Target of the relationship URL @@ -819,6 +869,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "resource": + Resource = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -838,14 +910,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceReport#Section", IsNestedType=true)] - [BackboneType("EvidenceReport.section")] + [FhirType("EvidenceReport.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceReport#Section"; } } + public override string TypeName { get { return "EvidenceReport.section"; } } /// /// Label for section (e.g. for ToC) @@ -1219,6 +1290,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "focusReference": + FocusReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "author": + Author = (List)value; + return this; + case "text": + Text = (Hl7.Fhir.Model.Narrative)value; + return this; + case "mode": + ModeElement = (Code)value; + return this; + case "orderedBy": + OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "entryClassifier": + EntryClassifier = (List)value; + return this; + case "entryReference": + EntryReference = (List)value; + return this; + case "entryQuantity": + EntryQuantity = (List)value; + return this; + case "emptyReason": + EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "section": + Section = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1759,6 +1876,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "relatedIdentifier": + RelatedIdentifier = (List)value; + return this; + case "citeAs": + CiteAs = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "note": + Note = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.EvidenceReport.SubjectComponent)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatesTo": + RelatesTo = (List)value; + return this; + case "section": + Section = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs index 40e426f686..19291b108f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)] + [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")] public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -121,14 +121,13 @@ public enum CharacteristicCombinationCode /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic")] + [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#Characteristic"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic"; } } /// /// Label for internal linking @@ -589,6 +588,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "exclude": + ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "definitionReference": + DefinitionReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "definitionCanonical": + DefinitionCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "definitionCodeableConcept": + DefinitionCodeableConcept = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "definitionExpression": + DefinitionExpression = (Hl7.Fhir.Model.Expression)value; + return this; + case "definitionId": + DefinitionIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "definitionByTypeAndValue": + DefinitionByTypeAndValue = (Hl7.Fhir.Model.EvidenceVariable.DefinitionByTypeAndValueComponent)value; + return this; + case "definitionByCombination": + DefinitionByCombination = (Hl7.Fhir.Model.EvidenceVariable.DefinitionByCombinationComponent)value; + return this; + case "instances": + Instances = (Hl7.Fhir.Model.DataType)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.DataType)value; + return this; + case "timeFromEvent": + TimeFromEvent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -618,14 +669,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#DefinitionByTypeAndValue", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic.definitionByTypeAndValue")] + [FhirType("EvidenceVariable.characteristic.definitionByTypeAndValue", IsBackboneType=true)] public partial class DefinitionByTypeAndValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#DefinitionByTypeAndValue"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic.definitionByTypeAndValue"; } } /// /// Expresses the type of characteristic @@ -809,6 +859,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "method": + Method = (List)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "offset": + Offset = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -829,14 +904,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#DefinitionByCombination", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic.definitionByCombination")] + [FhirType("EvidenceVariable.characteristic.definitionByCombination", IsBackboneType=true)] public partial class DefinitionByCombinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#DefinitionByCombination"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic.definitionByCombination"; } } /// /// all-of | any-of | at-least | at-most | statistical | net-effect | dataset @@ -1008,6 +1082,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Code)value; + return this; + case "threshold": + ThresholdElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1023,14 +1116,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#TimeFromEvent", IsNestedType=true)] - [BackboneType("EvidenceVariable.characteristic.timeFromEvent")] + [FhirType("EvidenceVariable.characteristic.timeFromEvent", IsBackboneType=true)] public partial class TimeFromEventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#TimeFromEvent"; } } + public override string TypeName { get { return "EvidenceVariable.characteristic.timeFromEvent"; } } /// /// Human readable description @@ -1226,6 +1318,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "event": + Event = (Hl7.Fhir.Model.DataType)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "range": + Range = (Hl7.Fhir.Model.Range)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1243,14 +1360,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EvidenceVariable#Category", IsNestedType=true)] - [BackboneType("EvidenceVariable.category")] + [FhirType("EvidenceVariable.category", IsBackboneType=true)] public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EvidenceVariable#Category"; } } + public override string TypeName { get { return "EvidenceVariable.category"; } } /// /// Description of the grouping @@ -1381,6 +1497,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2413,6 +2545,106 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "shortTitle": + ShortTitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "actual": + ActualElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "handling": + HandlingElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs index c3f672c6e0..6ce5ac6d92 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)] + [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")] public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifia /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Actor", IsNestedType=true)] - [BackboneType("ExampleScenario.actor")] + [FhirType("ExampleScenario.actor", IsBackboneType=true)] public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Actor"; } } + public override string TypeName { get { return "ExampleScenario.actor"; } } /// /// ID or acronym of the actor @@ -301,6 +300,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "key": + KeyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -320,14 +341,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Instance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance")] + [FhirType("ExampleScenario.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Instance"; } } + public override string TypeName { get { return "ExampleScenario.instance"; } } /// /// ID or acronym of the instance @@ -665,6 +685,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "key": + KeyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "structureType": + StructureType = (Hl7.Fhir.Model.Coding)value; + return this; + case "structureVersion": + StructureVersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "structureProfile": + StructureProfile = (Hl7.Fhir.Model.DataType)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "content": + Content = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "version": + Version = (List)value; + return this; + case "containedInstance": + ContainedInstance = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -690,14 +747,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Version", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.version")] + [FhirType("ExampleScenario.instance.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Version"; } } + public override string TypeName { get { return "ExampleScenario.instance.version"; } } /// /// ID or acronym of the version @@ -906,6 +962,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "key": + KeyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "content": + Content = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -925,14 +1003,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)] - [BackboneType("ExampleScenario.instance.containedInstance")] + [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)] public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } } + public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } } /// /// Key of contained instance @@ -1080,6 +1157,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "instanceReference": + InstanceReferenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionReference": + VersionReferenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1098,14 +1191,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Process", IsNestedType=true)] - [BackboneType("ExampleScenario.process")] + [FhirType("ExampleScenario.process", IsBackboneType=true)] public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Process"; } } + public override string TypeName { get { return "ExampleScenario.process"; } } /// /// Label for procss @@ -1353,6 +1445,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "preConditions": + PreConditionsElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "postConditions": + PostConditionsElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "step": + Step = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1373,14 +1490,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Step", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step")] + [FhirType("ExampleScenario.process.step", IsBackboneType=true)] public partial class StepComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Step"; } } + public override string TypeName { get { return "ExampleScenario.process.step"; } } /// /// Sequential number of the step @@ -1630,6 +1746,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "number": + NumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "process": + Process = (Hl7.Fhir.Model.ExampleScenario.ProcessComponent)value; + return this; + case "workflow": + WorkflowElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "operation": + Operation = (Hl7.Fhir.Model.ExampleScenario.OperationComponent)value; + return this; + case "alternative": + Alternative = (List)value; + return this; + case "pause": + PauseElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1651,14 +1795,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Operation", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.operation")] + [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Operation"; } } + public override string TypeName { get { return "ExampleScenario.process.step.operation"; } } /// /// Kind of action @@ -2025,6 +2168,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.Coding)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "initiator": + InitiatorElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "receiver": + ReceiverElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "initiatorActive": + InitiatorActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "receiverActive": + ReceiverActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ExampleScenario.ContainedInstanceComponent)value; + return this; + case "response": + Response = (Hl7.Fhir.Model.ExampleScenario.ContainedInstanceComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2049,14 +2229,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExampleScenario#Alternative", IsNestedType=true)] - [BackboneType("ExampleScenario.process.step.alternative")] + [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)] public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExampleScenario#Alternative"; } } + public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } } /// /// Label for alternative @@ -2226,6 +2405,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "step": + Step = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2954,6 +3152,76 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "actor": + Actor = (List)value; + return this; + case "instance": + Instance = (List)value; + return this; + case "process": + Process = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs index 05dd646d92..335ac4cf54 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)] + [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")] public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.related")] + [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } } + public override string TypeName { get { return "ExplanationOfBenefit.related"; } } /// /// Reference to the related claim @@ -244,6 +243,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "claim": + Claim = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "relationship": + Relationship = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.Identifier)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -262,14 +280,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Event", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.event")] + [FhirType("ExplanationOfBenefit.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Event"; } } + public override string TypeName { get { return "ExplanationOfBenefit.event"; } } /// /// Specific event @@ -385,6 +402,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -403,14 +436,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payee")] + [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payee"; } } /// /// Category of recipient @@ -524,6 +556,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -541,14 +589,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.careTeam")] + [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } } + public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } } /// /// Order of care team @@ -764,6 +811,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "responsible": + ResponsibleElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specialty": + Specialty = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -785,14 +857,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.supportingInfo")] + [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } } + public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } } /// /// Information instance identifier @@ -1015,6 +1086,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.Coding)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1036,14 +1135,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.diagnosis")] + [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } } + public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } } /// /// Diagnosis instance identifier @@ -1223,6 +1321,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "diagnosis": + Diagnosis = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (List)value; + return this; + case "onAdmission": + OnAdmission = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1242,14 +1362,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.procedure")] + [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } } + public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } } /// /// Procedure instance identifier @@ -1470,6 +1589,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "type": + Type = (List)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "procedure": + Procedure = (Hl7.Fhir.Model.DataType)value; + return this; + case "udi": + Udi = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1491,14 +1635,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.insurance")] + [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } } /// /// Coverage to be used for adjudication @@ -1671,6 +1814,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "focal": + FocalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "coverage": + Coverage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "preAuthRef": + PreAuthRefElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1689,14 +1851,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.accident")] + [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } } + public override string TypeName { get { return "ExplanationOfBenefit.accident"; } } /// /// When the incident occurred @@ -1850,6 +2011,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1868,14 +2048,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item")] + [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Item"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item"; } } /// /// Item instance identifier @@ -2691,6 +2870,100 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "careTeamSequence": + CareTeamSequenceElement = (List)value; + return this; + case "diagnosisSequence": + DiagnosisSequenceElement = (List)value; + return this; + case "procedureSequence": + ProcedureSequenceElement = (List)value; + return this; + case "informationSequence": + InformationSequenceElement = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "request": + Request = (List)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "encounter": + Encounter = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2734,14 +3007,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#ItemBodySite", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.bodySite")] + [FhirType("ExplanationOfBenefit.item.bodySite", IsBackboneType=true)] public partial class ItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#ItemBodySite"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.bodySite"; } } /// /// Location @@ -2856,6 +3128,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "site": + Site = (List)value; + return this; + case "subSite": + SubSite = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2873,14 +3161,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#ReviewOutcome", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.reviewOutcome")] + [FhirType("ExplanationOfBenefit.item.reviewOutcome", IsBackboneType=true)] public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#ReviewOutcome"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.reviewOutcome"; } } /// /// Result of the adjudication @@ -3054,6 +3341,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "decision": + Decision = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "preAuthRef": + PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthPeriod": + PreAuthPeriod = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3073,14 +3382,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.adjudication")] + [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } } /// /// Type of adjudication information @@ -3236,6 +3544,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3255,14 +3585,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail")] + [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } } /// /// Product or service provided @@ -3800,6 +4129,73 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "subDetail": + SubDetail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3834,14 +4230,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail.subDetail")] + [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } } /// /// Product or service provided @@ -4357,6 +4752,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "udi": + Udi = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4390,14 +4849,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem")] + [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } } /// /// Item sequence number @@ -5087,6 +5545,88 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "itemSequence": + ItemSequenceElement = (List)value; + return this; + case "detailSequence": + DetailSequenceElement = (List)value; + return this; + case "subDetailSequence": + SubDetailSequenceElement = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "provider": + Provider = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "request": + Request = (List)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "programCode": + ProgramCode = (List)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.DataType)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "detail": + Detail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5126,14 +5666,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemBodySite", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.bodySite")] + [FhirType("ExplanationOfBenefit.addItem.bodySite", IsBackboneType=true)] public partial class AddedItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemBodySite"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.bodySite"; } } /// /// Location @@ -5248,6 +5787,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "site": + Site = (List)value; + return this; + case "subSite": + SubSite = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5265,14 +5820,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail")] + [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)] public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } } /// /// Number for tracking @@ -5701,6 +6255,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "subDetail": + SubDetail = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5731,14 +6340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")] + [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)] public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } } /// /// Number for tracking @@ -6145,6 +6753,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "traceNumber": + TraceNumber = (List)value; + return this; + case "revenue": + Revenue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrService": + ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "productOrServiceEnd": + ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "modifier": + Modifier = (List)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "unitPrice": + UnitPrice = (Hl7.Fhir.Model.Money)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tax": + Tax = (Hl7.Fhir.Model.Money)value; + return this; + case "net": + Net = (Hl7.Fhir.Model.Money)value; + return this; + case "noteNumber": + NoteNumberElement = (List)value; + return this; + case "reviewOutcome": + ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -6175,14 +6835,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.total")] + [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)] public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Total"; } } + public override string TypeName { get { return "ExplanationOfBenefit.total"; } } /// /// Type of adjudication information @@ -6296,6 +6955,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -6313,14 +6988,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payment")] + [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payment"; } } /// /// Partial or complete payment @@ -6535,6 +7209,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "adjustment": + Adjustment = (Hl7.Fhir.Model.Money)value; + return this; + case "adjustmentReason": + AdjustmentReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -6556,14 +7258,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.processNote")] + [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Note"; } } + public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } } /// /// Note instance identifier @@ -6754,6 +7455,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "number": + NumberElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -6770,14 +7493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance")] + [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)] public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } } /// /// Benefit classification @@ -7074,6 +7796,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "excluded": + ExcludedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "network": + Network = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unit": + Unit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "term": + Term = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "financial": + Financial = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -7097,14 +7853,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance.financial")] + [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } } /// /// Benefit classification @@ -7242,6 +7997,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "allowed": + Allowed = (Hl7.Fhir.Model.DataType)value; + return this; + case "used": + Used = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -8536,6 +9310,163 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "traceNumber": + TraceNumber = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subType": + SubType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "use": + UseElement = (Code)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "billablePeriod": + BillablePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "enterer": + Enterer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "insurer": + Insurer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "provider": + Provider = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "fundsReserveRequested": + FundsReserveRequested = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "fundsReserve": + FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "related": + Related = (List)value; + return this; + case "prescription": + Prescription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "originalPrescription": + OriginalPrescription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "event": + Event = (List)value; + return this; + case "payee": + Payee = (Hl7.Fhir.Model.ExplanationOfBenefit.PayeeComponent)value; + return this; + case "referral": + Referral = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (List)value; + return this; + case "facility": + Facility = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "claim": + Claim = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "claimResponse": + ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outcome": + OutcomeElement = (Code)value; + return this; + case "decision": + Decision = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "disposition": + DispositionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preAuthRef": + PreAuthRefElement = (List)value; + return this; + case "preAuthRefPeriod": + PreAuthRefPeriod = (List)value; + return this; + case "diagnosisRelatedGroup": + DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "careTeam": + CareTeam = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "diagnosis": + Diagnosis = (List)value; + return this; + case "procedure": + Procedure = (List)value; + return this; + case "precedence": + PrecedenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "accident": + Accident = (Hl7.Fhir.Model.ExplanationOfBenefit.AccidentComponent)value; + return this; + case "patientPaid": + PatientPaid = (Hl7.Fhir.Model.Money)value; + return this; + case "item": + Item = (List)value; + return this; + case "addItem": + AddItem = (List)value; + return this; + case "adjudication": + Adjudication = (List)value; + return this; + case "total": + Total = (List)value; + return this; + case "payment": + Payment = (Hl7.Fhir.Model.ExplanationOfBenefit.PaymentComponent)value; + return this; + case "formCode": + FormCode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.Attachment)value; + return this; + case "processNote": + ProcessNote = (List)value; + return this; + case "benefitPeriod": + BenefitPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "benefitBalance": + BenefitBalance = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs index bde6c46024..7c789c6a44 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -322,6 +322,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.Code)value; + return this; + case "language": + LanguageElement = (Hl7.Fhir.Model.Code)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "reference": + ReferenceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs index 9983e6e2af..e74a7d7daf 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -258,6 +258,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "purpose": + Purpose = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "name": + Name = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "address": + Address = (Hl7.Fhir.Model.Address)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs index 0606045fee..90ea1ad342 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)] + [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")] public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum FamilyHistoryStatus /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Participant", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.participant")] + [FhirType("FamilyMemberHistory.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Participant"; } } + public override string TypeName { get { return "FamilyMemberHistory.participant"; } } /// /// Type of involvement @@ -223,6 +222,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -240,14 +255,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.condition")] + [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Condition"; } } + public override string TypeName { get { return "FamilyMemberHistory.condition"; } } /// /// Condition suffered by relation @@ -445,6 +459,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "outcome": + Outcome = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "contributedToDeath": + ContributedToDeathElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "onset": + Onset = (Hl7.Fhir.Model.DataType)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -465,14 +504,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Procedure", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.procedure")] + [FhirType("FamilyMemberHistory.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Procedure"; } } + public override string TypeName { get { return "FamilyMemberHistory.procedure"; } } /// /// Procedures performed on the related person @@ -670,6 +708,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "outcome": + Outcome = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "contributedToDeath": + ContributedToDeathElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "performed": + Performed = (Hl7.Fhir.Model.DataType)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1283,6 +1346,73 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "dataAbsentReason": + DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "relationship": + Relationship = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "sex": + Sex = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "born": + Born = (Hl7.Fhir.Model.DataType)value; + return this; + case "age": + Age = (Hl7.Fhir.Model.DataType)value; + return this; + case "estimatedAge": + EstimatedAgeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "deceased": + Deceased = (Hl7.Fhir.Model.DataType)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "condition": + Condition = (List)value; + return this; + case "procedure": + Procedure = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs index d567674fa0..b8df1620ab 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)] + [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")] public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -357,6 +357,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs index 2d30958c49..f86a0828bf 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("FormularyItem","http://hl7.org/fhir/StructureDefinition/FormularyItem", IsResource=true)] + [FhirType("FormularyItem","http://hl7.org/fhir/StructureDefinition/FormularyItem")] public partial class FormularyItem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -241,6 +241,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs index 6bd6a57e6b..ee0994767c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GenomicStudy","http://hl7.org/fhir/StructureDefinition/GenomicStudy", IsResource=true)] + [FhirType("GenomicStudy","http://hl7.org/fhir/StructureDefinition/GenomicStudy")] public partial class GenomicStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum GenomicStudyStatus /// [Serializable] [DataContract] - [FhirType("GenomicStudy#Analysis", IsNestedType=true)] - [BackboneType("GenomicStudy.analysis")] + [FhirType("GenomicStudy.analysis", IsBackboneType=true)] public partial class AnalysisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GenomicStudy#Analysis"; } } + public override string TypeName { get { return "GenomicStudy.analysis"; } } /// /// Identifiers for the analysis event @@ -658,6 +657,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "methodType": + MethodType = (List)value; + return this; + case "changeType": + ChangeType = (List)value; + return this; + case "genomeBuild": + GenomeBuild = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "specimen": + Specimen = (List)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "note": + Note = (List)value; + return this; + case "protocolPerformed": + ProtocolPerformed = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "regionsStudied": + RegionsStudied = (List)value; + return this; + case "regionsCalled": + RegionsCalled = (List)value; + return this; + case "input": + Input = (List)value; + return this; + case "output": + Output = (List)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "device": + Device = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -688,14 +751,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GenomicStudy#Input", IsNestedType=true)] - [BackboneType("GenomicStudy.analysis.input")] + [FhirType("GenomicStudy.analysis.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GenomicStudy#Input"; } } + public override string TypeName { get { return "GenomicStudy.analysis.input"; } } /// /// File containing input data @@ -833,6 +895,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "file": + File = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "generatedBy": + GeneratedBy = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -848,14 +929,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GenomicStudy#Output", IsNestedType=true)] - [BackboneType("GenomicStudy.analysis.output")] + [FhirType("GenomicStudy.analysis.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GenomicStudy#Output"; } } + public override string TypeName { get { return "GenomicStudy.analysis.output"; } } /// /// File containing output data @@ -969,6 +1049,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "file": + File = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -983,14 +1079,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GenomicStudy#Performer", IsNestedType=true)] - [BackboneType("GenomicStudy.analysis.performer")] + [FhirType("GenomicStudy.analysis.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GenomicStudy#Performer"; } } + public override string TypeName { get { return "GenomicStudy.analysis.performer"; } } /// /// The organization, healthcare professional, or others who participated in performing this analysis @@ -1103,6 +1198,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1117,14 +1228,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GenomicStudy#Device", IsNestedType=true)] - [BackboneType("GenomicStudy.analysis.device")] + [FhirType("GenomicStudy.analysis.device", IsBackboneType=true)] public partial class DeviceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GenomicStudy#Device"; } } + public override string TypeName { get { return "GenomicStudy.analysis.device"; } } /// /// Device used for the analysis @@ -1237,6 +1347,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1742,6 +1868,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "startDate": + StartDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "referrer": + Referrer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "interpreter": + Interpreter = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "note": + Note = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "analysis": + Analysis = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs index b97cf08c0b..441647a3a6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)] + [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")] public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -133,14 +133,13 @@ public enum GoalLifecycleStatus /// [Serializable] [DataContract] - [FhirType("Goal#Target", IsNestedType=true)] - [BackboneType("Goal.target")] + [FhirType("Goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Goal#Target"; } } + public override string TypeName { get { return "Goal.target"; } } /// /// The parameter whose value is being tracked @@ -278,6 +277,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "measure": + Measure = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "detail": + Detail = (Hl7.Fhir.Model.DataType)value; + return this; + case "due": + Due = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -790,6 +808,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "lifecycleStatus": + LifecycleStatusElement = (Code)value; + return this; + case "achievementStatus": + AchievementStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "continuous": + ContinuousElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + Description = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "start": + Start = (Hl7.Fhir.Model.DataType)value; + return this; + case "target": + Target = (List)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "statusReason": + StatusReasonElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "addresses": + Addresses = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "outcome": + Outcome = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs index a3f09f859d..d3f2e7febc 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)] + [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")] public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -120,14 +120,13 @@ public enum GraphCompartmentRule /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Node", IsNestedType=true)] - [BackboneType("GraphDefinition.node")] + [FhirType("GraphDefinition.node", IsBackboneType=true)] public partial class NodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Node"; } } + public override string TypeName { get { return "GraphDefinition.node"; } } /// /// Internal ID - target for link references @@ -356,6 +355,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "nodeId": + NodeIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "profile": + ProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -372,14 +393,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Link", IsNestedType=true)] - [BackboneType("GraphDefinition.link")] + [FhirType("GraphDefinition.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Link"; } } + public override string TypeName { get { return "GraphDefinition.link"; } } /// /// Why this link is specified @@ -784,6 +804,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "min": + MinElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "max": + MaxElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "sourceId": + SourceIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "sliceName": + SliceNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "targetId": + TargetIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "params": + ParamsElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "compartment": + Compartment = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -805,14 +862,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Compartment", IsNestedType=true)] - [BackboneType("GraphDefinition.link.compartment")] + [FhirType("GraphDefinition.link.compartment", IsBackboneType=true)] public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Compartment"; } } + public override string TypeName { get { return "GraphDefinition.link.compartment"; } } /// /// where | requires @@ -1085,6 +1141,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "use": + UseElement = (Code)value; + return this; + case "rule": + RuleElement = (Code)value; + return this; + case "code": + CodeElement = (Code)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1834,6 +1915,76 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "start": + StartElement = (Hl7.Fhir.Model.Id)value; + return this; + case "node": + Node = (List)value; + return this; + case "link": + Link = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Group.cs b/src/Hl7.Fhir.R5/Model/Generated/Group.cs index cbb32fc209..92addf61ba 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Group.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)] + [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")] public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -161,14 +161,13 @@ public enum GroupMembershipBasis /// [Serializable] [DataContract] - [FhirType("Group#Characteristic", IsNestedType=true)] - [BackboneType("Group.characteristic")] + [FhirType("Group.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Characteristic"; } } + public override string TypeName { get { return "Group.characteristic"; } } /// /// Kind of characteristic @@ -346,6 +345,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "exclude": + ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -365,14 +386,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Group#Member", IsNestedType=true)] - [BackboneType("Group.member")] + [FhirType("Group.member", IsBackboneType=true)] public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Member"; } } + public override string TypeName { get { return "Group.member"; } } /// /// Reference to the group member @@ -525,6 +545,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "entity": + Entity = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "inactive": + InactiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -954,6 +993,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "membership": + MembershipElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "quantity": + QuantityElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "managingEntity": + ManagingEntity = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "member": + Member = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs index a427225e51..ca2941b21b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)] + [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")] public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -528,6 +528,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "requestIdentifier": + RequestIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "module": + Module = (Hl7.Fhir.Model.DataType)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrenceDateTime": + OccurrenceDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "evaluationMessage": + EvaluationMessage = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outputParameters": + OutputParameters = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "result": + Result = (List)value; + return this; + case "dataRequirement": + DataRequirement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs index ecd4c2a443..4b65a5a40d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)] + [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")] public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("HealthcareService#Eligibility", IsNestedType=true)] - [BackboneType("HealthcareService.eligibility")] + [FhirType("HealthcareService.eligibility", IsBackboneType=true)] public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#Eligibility"; } } + public override string TypeName { get { return "HealthcareService.eligibility"; } } /// /// Coded value for the eligibility @@ -201,6 +200,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -886,6 +901,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "providedBy": + ProvidedBy = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "offeredIn": + OfferedIn = (List)value; + return this; + case "category": + Category = (List)value; + return this; + case "type": + Type = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "location": + Location = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "extraDetails": + ExtraDetailsElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "photo": + Photo = (Hl7.Fhir.Model.Attachment)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "coverageArea": + CoverageArea = (List)value; + return this; + case "serviceProvisionCode": + ServiceProvisionCode = (List)value; + return this; + case "eligibility": + Eligibility = (List)value; + return this; + case "program": + Program = (List)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "communication": + Communication = (List)value; + return this; + case "referralMethod": + ReferralMethod = (List)value; + return this; + case "appointmentRequired": + AppointmentRequiredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "availability": + Availability = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs index 0b23796e6b..d4c5eeb206 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -439,6 +439,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "use": + UseElement = (Code)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "family": + FamilyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "given": + GivenElement = (List)value; + return this; + case "prefix": + PrefixElement = (List)value; + return this; + case "suffix": + SuffixElement = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs b/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs index 9156d49060..a3da15928c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs b/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs index 5f782e160e..7b376eb6d5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs index dc9a736d06..c190c1a61b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingSelection","http://hl7.org/fhir/StructureDefinition/ImagingSelection", IsResource=true)] + [FhirType("ImagingSelection","http://hl7.org/fhir/StructureDefinition/ImagingSelection")] public partial class ImagingSelection : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -181,14 +181,13 @@ public enum ImagingSelection3DGraphicType /// [Serializable] [DataContract] - [FhirType("ImagingSelection#Performer", IsNestedType=true)] - [BackboneType("ImagingSelection.performer")] + [FhirType("ImagingSelection.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingSelection#Performer"; } } + public override string TypeName { get { return "ImagingSelection.performer"; } } /// /// Type of performer @@ -302,6 +301,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -319,14 +334,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingSelection#Instance", IsNestedType=true)] - [BackboneType("ImagingSelection.instance")] + [FhirType("ImagingSelection.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingSelection#Instance"; } } + public override string TypeName { get { return "ImagingSelection.instance"; } } /// /// DICOM SOP Instance UID @@ -580,6 +594,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "uid": + UidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "number": + NumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "sopClass": + SopClass = (Hl7.Fhir.Model.Coding)value; + return this; + case "subset": + SubsetElement = (List)value; + return this; + case "imageRegion2D": + ImageRegion2D = (List)value; + return this; + case "imageRegion3D": + ImageRegion3D = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -602,14 +644,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingSelection#ImageRegion2D", IsNestedType=true)] - [BackboneType("ImagingSelection.instance.imageRegion2D")] + [FhirType("ImagingSelection.instance.imageRegion2D", IsBackboneType=true)] public partial class ImageRegion2DComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingSelection#ImageRegion2D"; } } + public override string TypeName { get { return "ImagingSelection.instance.imageRegion2D"; } } /// /// point | polyline | interpolated | circle | ellipse @@ -760,6 +801,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "regionType": + RegionTypeElement = (Code)value; + return this; + case "coordinate": + CoordinateElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -777,14 +834,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingSelection#ImageRegion3D", IsNestedType=true)] - [BackboneType("ImagingSelection.instance.imageRegion3D")] + [FhirType("ImagingSelection.instance.imageRegion3D", IsBackboneType=true)] public partial class ImageRegion3DComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingSelection#ImageRegion3D"; } } + public override string TypeName { get { return "ImagingSelection.instance.imageRegion3D"; } } /// /// point | multipoint | polyline | polygon | ellipse | ellipsoid @@ -935,6 +991,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "regionType": + RegionTypeElement = (Code)value; + return this; + case "coordinate": + CoordinateElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1503,6 +1575,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "studyUid": + StudyUidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "derivedFrom": + DerivedFrom = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "seriesUid": + SeriesUidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "seriesNumber": + SeriesNumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "frameOfReferenceUid": + FrameOfReferenceUidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "instance": + Instance = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs index 9e410f785d..448345a2a1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)] + [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")] public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum ImagingStudyStatus /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Series", IsNestedType=true)] - [BackboneType("ImagingStudy.series")] + [FhirType("ImagingStudy.series", IsBackboneType=true)] public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Series"; } } + public override string TypeName { get { return "ImagingStudy.series"; } } /// /// DICOM Series Instance UID for the series @@ -538,6 +537,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "uid": + UidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "number": + NumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "modality": + Modality = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "numberOfInstances": + NumberOfInstancesElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "laterality": + Laterality = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specimen": + Specimen = (List)value; + return this; + case "started": + StartedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "instance": + Instance = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -566,14 +611,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Performer", IsNestedType=true)] - [BackboneType("ImagingStudy.series.performer")] + [FhirType("ImagingStudy.series.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Performer"; } } + public override string TypeName { get { return "ImagingStudy.series.performer"; } } /// /// Type of performance @@ -688,6 +732,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -705,14 +765,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Instance", IsNestedType=true)] - [BackboneType("ImagingStudy.series.instance")] + [FhirType("ImagingStudy.series.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Instance"; } } + public override string TypeName { get { return "ImagingStudy.series.instance"; } } /// /// DICOM SOP Instance UID @@ -922,6 +981,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "uid": + UidElement = (Hl7.Fhir.Model.Id)value; + return this; + case "sopClass": + SopClass = (Hl7.Fhir.Model.Coding)value; + return this; + case "number": + NumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1500,6 +1581,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "modality": + Modality = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "started": + StartedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "referrer": + Referrer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "numberOfSeries": + NumberOfSeriesElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "numberOfInstances": + NumberOfInstancesElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "procedure": + Procedure = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "series": + Series = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs index a397cd2f38..026b8b43ce 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)] + [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")] public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes /// [Serializable] [DataContract] - [FhirType("Immunization#Performer", IsNestedType=true)] - [BackboneType("Immunization.performer")] + [FhirType("Immunization.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Performer"; } } + public override string TypeName { get { return "Immunization.performer"; } } /// /// What type of performance was done @@ -217,6 +216,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -234,14 +249,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#ProgramEligibility", IsNestedType=true)] - [BackboneType("Immunization.programEligibility")] + [FhirType("Immunization.programEligibility", IsBackboneType=true)] public partial class ProgramEligibilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#ProgramEligibility"; } } + public override string TypeName { get { return "Immunization.programEligibility"; } } /// /// The program that eligibility is declared for @@ -356,6 +370,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "program": + Program = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "programStatus": + ProgramStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -374,14 +404,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Reaction", IsNestedType=true)] - [BackboneType("Immunization.reaction")] + [FhirType("Immunization.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Reaction"; } } + public override string TypeName { get { return "Immunization.reaction"; } } /// /// When reaction started @@ -549,6 +578,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "manifestation": + Manifestation = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "reported": + ReportedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -567,14 +615,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#ProtocolApplied", IsNestedType=true)] - [BackboneType("Immunization.protocolApplied")] + [FhirType("Immunization.protocolApplied", IsBackboneType=true)] public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#ProtocolApplied"; } } + public override string TypeName { get { return "Immunization.protocolApplied"; } } /// /// Name of vaccine series @@ -807,6 +854,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "series": + SeriesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "authority": + Authority = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "targetDisease": + TargetDisease = (List)value; + return this; + case "doseNumber": + DoseNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "seriesDoses": + SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1602,6 +1674,100 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "vaccineCode": + VaccineCode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "administeredProduct": + AdministeredProduct = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "manufacturer": + Manufacturer = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "lotNumber": + LotNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expirationDate": + ExpirationDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "primarySource": + PrimarySourceElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "informationSource": + InformationSource = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "site": + Site = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "route": + Route = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "doseQuantity": + DoseQuantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "isSubpotent": + IsSubpotentElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subpotentReason": + SubpotentReason = (List)value; + return this; + case "programEligibility": + ProgramEligibility = (List)value; + return this; + case "fundingSource": + FundingSource = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reaction": + Reaction = (List)value; + return this; + case "protocolApplied": + ProtocolApplied = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs index a1bfd17a8f..1755a40282 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)] + [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")] public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -549,6 +549,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "authority": + Authority = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "targetDisease": + TargetDisease = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "immunizationEvent": + ImmunizationEvent = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "doseStatus": + DoseStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "doseStatusReason": + DoseStatusReason = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "series": + SeriesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "doseNumber": + DoseNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "seriesDoses": + SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs index c9fe7cecd6..a19fe20850 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)] + [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")] public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation")] + [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)] public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } } /// /// Vaccine or vaccine group recommendation applies to @@ -484,6 +483,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "vaccineCode": + VaccineCode = (List)value; + return this; + case "targetDisease": + TargetDisease = (List)value; + return this; + case "contraindicatedVaccineCode": + ContraindicatedVaccineCode = (List)value; + return this; + case "forecastStatus": + ForecastStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "forecastReason": + ForecastReason = (List)value; + return this; + case "dateCriterion": + DateCriterion = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "series": + SeriesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "doseNumber": + DoseNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "seriesDoses": + SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "supportingImmunization": + SupportingImmunization = (List)value; + return this; + case "supportingPatientInformation": + SupportingPatientInformation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -511,14 +556,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")] + [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)] public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } } /// /// Type of date @@ -650,6 +694,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -859,6 +919,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "authority": + Authority = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "recommendation": + Recommendation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs index a64308725c..8802d4f262 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)] + [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")] public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -2187,14 +2187,13 @@ public enum GuidePageGeneration /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)] - [BackboneType("ImplementationGuide.dependsOn")] + [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)] public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#DependsOn"; } } + public override string TypeName { get { return "ImplementationGuide.dependsOn"; } } /// /// Identity of the IG that this depends on @@ -2420,6 +2419,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "uri": + UriElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "packageId": + PackageIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "reason": + ReasonElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2440,14 +2461,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Global", IsNestedType=true)] - [BackboneType("ImplementationGuide.global")] + [FhirType("ImplementationGuide.global", IsBackboneType=true)] public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Global"; } } + public override string TypeName { get { return "ImplementationGuide.global"; } } /// /// Type this profile applies to @@ -2598,6 +2618,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "profile": + ProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2616,14 +2652,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Definition", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition")] + [FhirType("ImplementationGuide.definition", IsBackboneType=true)] public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Definition"; } } + public override string TypeName { get { return "ImplementationGuide.definition"; } } /// /// Grouping used to present related resources in the IG @@ -2801,6 +2836,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "grouping": + Grouping = (List)value; + return this; + case "resource": + Resource = (List)value; + return this; + case "page": + Page = (Hl7.Fhir.Model.ImplementationGuide.PageComponent)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "template": + Template = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2822,14 +2882,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Grouping", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.grouping")] + [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)] public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Grouping"; } } + public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } } /// /// Descriptive name for the package @@ -2977,6 +3036,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2994,14 +3069,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Resource", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.resource")] + [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Resource"; } } + public override string TypeName { get { return "ImplementationGuide.definition.resource"; } } /// /// Location of the resource @@ -3332,6 +3406,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "fhirVersion": + FhirVersionElement = (List>)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "isExample": + IsExampleElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "profile": + ProfileElement = (List)value; + return this; + case "groupingId": + GroupingIdElement = (Hl7.Fhir.Model.Id)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3355,14 +3460,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Page", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.page")] + [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)] public partial class PageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Page"; } } + public override string TypeName { get { return "ImplementationGuide.definition.page"; } } /// /// Source for page @@ -3598,6 +3702,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "source": + Source = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "generation": + GenerationElement = (Code)value; + return this; + case "page": + Page = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3619,14 +3748,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Parameter", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.parameter")] + [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Parameter"; } } + public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } } /// /// Code that identifies parameter @@ -3757,6 +3885,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.Coding)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3771,14 +3915,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Template", IsNestedType=true)] - [BackboneType("ImplementationGuide.definition.template")] + [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)] public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Template"; } } + public override string TypeName { get { return "ImplementationGuide.definition.template"; } } /// /// Type of template specified @@ -3966,6 +4109,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "source": + SourceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "scope": + ScopeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3984,14 +4146,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Manifest", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest")] + [FhirType("ImplementationGuide.manifest", IsBackboneType=true)] public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Manifest"; } } + public override string TypeName { get { return "ImplementationGuide.manifest"; } } /// /// Location of rendered implementation guide @@ -4223,6 +4384,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "rendering": + RenderingElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + case "resource": + Resource = (List)value; + return this; + case "page": + Page = (List)value; + return this; + case "image": + ImageElement = (List)value; + return this; + case "other": + OtherElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4243,14 +4429,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.resource")] + [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)] public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } } /// /// Location of the resource @@ -4461,6 +4646,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "isExample": + IsExampleElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "profile": + ProfileElement = (List)value; + return this; + case "relativePath": + RelativePathElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4480,14 +4687,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)] - [BackboneType("ImplementationGuide.manifest.page")] + [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)] public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } } + public override string TypeName { get { return "ImplementationGuide.manifest.page"; } } /// /// HTML page name @@ -4675,6 +4881,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "anchor": + AnchorElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5548,6 +5773,88 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "packageId": + PackageIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "license": + LicenseElement = (Code)value; + return this; + case "fhirVersion": + FhirVersionElement = (List>)value; + return this; + case "dependsOn": + DependsOn = (List)value; + return this; + case "global": + Global = (List)value; + return this; + case "definition": + Definition = (Hl7.Fhir.Model.ImplementationGuide.DefinitionComponent)value; + return this; + case "manifest": + Manifest = (Hl7.Fhir.Model.ImplementationGuide.ManifestComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs index 6014af8ddc..a303b1e105 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient", IsResource=true)] + [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient")] public partial class Ingredient : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -92,14 +92,13 @@ public enum IngredientManufacturerRole /// [Serializable] [DataContract] - [FhirType("Ingredient#Manufacturer", IsNestedType=true)] - [BackboneType("Ingredient.manufacturer")] + [FhirType("Ingredient.manufacturer", IsBackboneType=true)] public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Manufacturer"; } } + public override string TypeName { get { return "Ingredient.manufacturer"; } } /// /// allowed | possible | actual @@ -233,6 +232,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + RoleElement = (Code)value; + return this; + case "manufacturer": + Manufacturer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -247,14 +262,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#Substance", IsNestedType=true)] - [BackboneType("Ingredient.substance")] + [FhirType("Ingredient.substance", IsBackboneType=true)] public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Substance"; } } + public override string TypeName { get { return "Ingredient.substance"; } } /// /// A code or full resource that represents the ingredient substance @@ -368,6 +382,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "strength": + Strength = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -385,14 +415,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#Strength", IsNestedType=true)] - [BackboneType("Ingredient.substance.strength")] + [FhirType("Ingredient.substance.strength", IsBackboneType=true)] public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#Strength"; } } + public override string TypeName { get { return "Ingredient.substance.strength"; } } /// /// The quantity of substance in the unit of presentation @@ -690,6 +719,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "presentation": + Presentation = (Hl7.Fhir.Model.DataType)value; + return this; + case "textPresentation": + TextPresentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "concentration": + Concentration = (Hl7.Fhir.Model.DataType)value; + return this; + case "textConcentration": + TextConcentrationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "basis": + Basis = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "measurementPoint": + MeasurementPointElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "country": + Country = (List)value; + return this; + case "referenceStrength": + ReferenceStrength = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -713,14 +776,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Ingredient#ReferenceStrength", IsNestedType=true)] - [BackboneType("Ingredient.substance.strength.referenceStrength")] + [FhirType("Ingredient.substance.strength.referenceStrength", IsBackboneType=true)] public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Ingredient#ReferenceStrength"; } } + public override string TypeName { get { return "Ingredient.substance.strength.referenceStrength"; } } /// /// Relevant reference substance @@ -898,6 +960,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "substance": + Substance = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "strength": + Strength = (Hl7.Fhir.Model.DataType)value; + return this; + case "measurementPoint": + MeasurementPointElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "country": + Country = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1254,6 +1338,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "for": + For = (List)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "function": + Function = (List)value; + return this; + case "group": + Group = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "allergenicIndicator": + AllergenicIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "substance": + Substance = (Hl7.Fhir.Model.Ingredient.SubstanceComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs index 1a4c635044..3086a61cf4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)] + [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")] public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -92,14 +92,13 @@ public enum BenefitCostApplicability /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Coverage", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage")] + [FhirType("InsurancePlan.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Coverage"; } } + public override string TypeName { get { return "InsurancePlan.coverage"; } } /// /// Type of coverage @@ -236,6 +235,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "network": + Network = (List)value; + return this; + case "benefit": + Benefit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -254,14 +272,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit")] + [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)] public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } } /// /// Type of benefit @@ -413,6 +430,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "requirement": + RequirementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "limit": + Limit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -431,14 +467,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Limit", IsNestedType=true)] - [BackboneType("InsurancePlan.coverage.benefit.limit")] + [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)] public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Limit"; } } + public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } } /// /// Maximum value allowed @@ -549,6 +584,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.Quantity)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -566,14 +617,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Plan", IsNestedType=true)] - [BackboneType("InsurancePlan.plan")] + [FhirType("InsurancePlan.plan", IsBackboneType=true)] public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Plan"; } } + public override string TypeName { get { return "InsurancePlan.plan"; } } /// /// Business Identifier for Product @@ -777,6 +827,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "coverageArea": + CoverageArea = (List)value; + return this; + case "network": + Network = (List)value; + return this; + case "generalCost": + GeneralCost = (List)value; + return this; + case "specificCost": + SpecificCost = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -798,14 +876,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.generalCost")] + [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)] public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#GeneralCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } } /// /// Type of cost @@ -994,6 +1071,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "groupSize": + GroupSizeElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "cost": + Cost = (Hl7.Fhir.Model.Money)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1013,14 +1112,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost")] + [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)] public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#SpecificCost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } } /// /// General category of benefit @@ -1133,6 +1231,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "benefit": + Benefit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1150,14 +1264,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit")] + [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)] public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } } /// /// Type of specific benefit @@ -1270,6 +1383,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "cost": + Cost = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1287,14 +1416,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InsurancePlan#Cost", IsNestedType=true)] - [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")] + [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InsurancePlan#Cost"; } } + public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } } /// /// Type of cost @@ -1450,6 +1578,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "applicability": + Applicability = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "qualifiers": + Qualifiers = (List)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1900,6 +2050,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "alias": + AliasElement = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "ownedBy": + OwnedBy = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "administeredBy": + AdministeredBy = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "coverageArea": + CoverageArea = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "network": + Network = (List)value; + return this; + case "coverage": + Coverage = (List)value; + return this; + case "plan": + Plan = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs index 1fdf00fb19..b0249b5666 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("InventoryItem","http://hl7.org/fhir/StructureDefinition/InventoryItem", IsResource=true)] + [FhirType("InventoryItem","http://hl7.org/fhir/StructureDefinition/InventoryItem")] public partial class InventoryItem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -98,14 +98,13 @@ public enum InventoryItemStatusCodes /// [Serializable] [DataContract] - [FhirType("InventoryItem#Name", IsNestedType=true)] - [BackboneType("InventoryItem.name")] + [FhirType("InventoryItem.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#Name"; } } + public override string TypeName { get { return "InventoryItem.name"; } } /// /// The type of name e.g. 'brand-name', 'functional-name', 'common-name' @@ -279,6 +278,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "nameType": + NameType = (Hl7.Fhir.Model.Coding)value; + return this; + case "language": + LanguageElement = (Code)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -294,14 +312,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryItem#ResponsibleOrganization", IsNestedType=true)] - [BackboneType("InventoryItem.responsibleOrganization")] + [FhirType("InventoryItem.responsibleOrganization", IsBackboneType=true)] public partial class ResponsibleOrganizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#ResponsibleOrganization"; } } + public override string TypeName { get { return "InventoryItem.responsibleOrganization"; } } /// /// The role of the organization e.g. manufacturer, distributor, or other @@ -416,6 +433,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -433,14 +466,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryItem#Description", IsNestedType=true)] - [BackboneType("InventoryItem.description")] + [FhirType("InventoryItem.description", IsBackboneType=true)] public partial class DescriptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#Description"; } } + public override string TypeName { get { return "InventoryItem.description"; } } /// /// The language that is used in the item description @@ -589,6 +621,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + LanguageElement = (Code)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -603,14 +651,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryItem#Association", IsNestedType=true)] - [BackboneType("InventoryItem.association")] + [FhirType("InventoryItem.association", IsBackboneType=true)] public partial class AssociationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#Association"; } } + public override string TypeName { get { return "InventoryItem.association"; } } /// /// The type of association between the device and the other item @@ -747,6 +794,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "associationType": + AssociationType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "relatedItem": + RelatedItem = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Ratio)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -765,14 +831,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryItem#Characteristic", IsNestedType=true)] - [BackboneType("InventoryItem.characteristic")] + [FhirType("InventoryItem.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#Characteristic"; } } + public override string TypeName { get { return "InventoryItem.characteristic"; } } /// /// The characteristic that is being defined @@ -887,6 +952,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "characteristicType": + CharacteristicType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -901,14 +982,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryItem#Instance", IsNestedType=true)] - [BackboneType("InventoryItem.instance")] + [FhirType("InventoryItem.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryItem#Instance"; } } + public override string TypeName { get { return "InventoryItem.instance"; } } /// /// The identifier for the physical instance, typically a serial number @@ -1123,6 +1203,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "lotNumber": + LotNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expiry": + ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1529,6 +1634,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (List)value; + return this; + case "name": + Name = (List)value; + return this; + case "responsibleOrganization": + ResponsibleOrganization = (List)value; + return this; + case "description": + Description = (Hl7.Fhir.Model.InventoryItem.DescriptionComponent)value; + return this; + case "inventoryStatus": + InventoryStatus = (List)value; + return this; + case "baseUnit": + BaseUnit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "netContent": + NetContent = (Hl7.Fhir.Model.Quantity)value; + return this; + case "association": + Association = (List)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "instance": + Instance = (Hl7.Fhir.Model.InventoryItem.InstanceComponent)value; + return this; + case "productReference": + ProductReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs index 719c598cfe..da86476d9c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("InventoryReport","http://hl7.org/fhir/StructureDefinition/InventoryReport", IsResource=true)] + [FhirType("InventoryReport","http://hl7.org/fhir/StructureDefinition/InventoryReport")] public partial class InventoryReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -117,14 +117,13 @@ public enum InventoryCountType /// [Serializable] [DataContract] - [FhirType("InventoryReport#InventoryListing", IsNestedType=true)] - [BackboneType("InventoryReport.inventoryListing")] + [FhirType("InventoryReport.inventoryListing", IsBackboneType=true)] public partial class InventoryListingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryReport#InventoryListing"; } } + public override string TypeName { get { return "InventoryReport.inventoryListing"; } } /// /// Location of the inventory items @@ -298,6 +297,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "itemStatus": + ItemStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "countingDateTime": + CountingDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -314,14 +335,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("InventoryReport#Item", IsNestedType=true)] - [BackboneType("InventoryReport.inventoryListing.item")] + [FhirType("InventoryReport.inventoryListing.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "InventoryReport#Item"; } } + public override string TypeName { get { return "InventoryReport.inventoryListing.item"; } } /// /// The inventory category or classification of the items being reported @@ -455,6 +475,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -810,6 +849,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "countType": + CountTypeElement = (Code)value; + return this; + case "operationType": + OperationType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "operationTypeReason": + OperationTypeReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reportedDateTime": + ReportedDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "reporter": + Reporter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reportingPeriod": + ReportingPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "inventoryListing": + InventoryListing = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs index 5d347538d9..31e5052d41 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)] + [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")] public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum InvoiceStatus /// [Serializable] [DataContract] - [FhirType("Invoice#Participant", IsNestedType=true)] - [BackboneType("Invoice.participant")] + [FhirType("Invoice.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#Participant"; } } + public override string TypeName { get { return "Invoice.participant"; } } /// /// Type of involvement in creation of this Invoice @@ -228,6 +227,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -245,14 +260,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Invoice#LineItem", IsNestedType=true)] - [BackboneType("Invoice.lineItem")] + [FhirType("Invoice.lineItem", IsBackboneType=true)] public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Invoice#LineItem"; } } + public override string TypeName { get { return "Invoice.lineItem"; } } /// /// Sequence number of line item @@ -430,6 +444,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "serviced": + Serviced = (Hl7.Fhir.Model.DataType)value; + return this; + case "chargeItem": + ChargeItem = (Hl7.Fhir.Model.DataType)value; + return this; + case "priceComponent": + PriceComponent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -996,6 +1032,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "cancelledReason": + CancelledReasonElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "recipient": + Recipient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "creation": + CreationElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.DataType)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "issuer": + Issuer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "account": + Account = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "lineItem": + LineItem = (List)value; + return this; + case "totalPriceComponent": + TotalPriceComponent = (List)value; + return this; + case "totalNet": + TotalNet = (Hl7.Fhir.Model.Money)value; + return this; + case "totalGross": + TotalGross = (Hl7.Fhir.Model.Money)value; + return this; + case "paymentTerms": + PaymentTermsElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Library.cs b/src/Hl7.Fhir.R5/Model/Generated/Library.cs index 0014d8b6a6..b714fbc386 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Library.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)] + [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")] public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -1135,6 +1135,115 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "dataRequirement": + DataRequirement = (List)value; + return this; + case "content": + Content = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs index 7b21913cfc..30f42fd889 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)] + [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")] public partial class Linkage : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum LinkageType /// [Serializable] [DataContract] - [FhirType("Linkage#Item", IsNestedType=true)] - [BackboneType("Linkage.item")] + [FhirType("Linkage.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Linkage#Item"; } } + public override string TypeName { get { return "Linkage.item"; } } /// /// source | alternate | historical @@ -237,6 +236,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "resource": + Resource = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -397,6 +412,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/List.cs b/src/Hl7.Fhir.R5/Model/Generated/List.cs index a96e889227..3a22a84f32 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/List.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)] + [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")] public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum ListStatus /// [Serializable] [DataContract] - [FhirType("List#Entry", IsNestedType=true)] - [BackboneType("List.entry")] + [FhirType("List.entry", IsBackboneType=true)] public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "List#Entry"; } } + public override string TypeName { get { return "List.entry"; } } /// /// Status/Workflow information about this item @@ -296,6 +295,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "flag": + Flag = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "deleted": + DeletedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "item": + Item = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -740,6 +761,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "mode": + ModeElement = (Code)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "orderedBy": + OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "note": + Note = (List)value; + return this; + case "entry": + Entry = (List)value; + return this; + case "emptyReason": + EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Location.cs b/src/Hl7.Fhir.R5/Model/Generated/Location.cs index 40fda88670..bcca17ac4a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Location.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)] + [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")] public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -118,14 +118,13 @@ public enum LocationMode /// [Serializable] [DataContract] - [FhirType("Location#Position", IsNestedType=true)] - [BackboneType("Location.position")] + [FhirType("Location.position", IsBackboneType=true)] public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#Position"; } } + public override string TypeName { get { return "Location.position"; } } /// /// Longitude with WGS84 datum @@ -313,6 +312,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "longitude": + LongitudeElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "latitude": + LatitudeElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "altitude": + AltitudeElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -882,6 +900,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "operationalStatus": + OperationalStatus = (Hl7.Fhir.Model.Coding)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "alias": + AliasElement = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "mode": + ModeElement = (Code)value; + return this; + case "type": + Type = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "address": + Address = (Hl7.Fhir.Model.Address)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "position": + Position = (Hl7.Fhir.Model.Location.PositionComponent)value; + return this; + case "managingOrganization": + ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "partOf": + PartOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "hoursOfOperation": + HoursOfOperation = (List)value; + return this; + case "virtualService": + VirtualService = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs index 4de2f6d2cd..d8277a2ffd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition", IsResource=true)] + [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition")] public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition#Property", IsNestedType=true)] - [BackboneType("ManufacturedItemDefinition.property")] + [FhirType("ManufacturedItemDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ManufacturedItemDefinition#Property"; } } + public override string TypeName { get { return "ManufacturedItemDefinition.property"; } } /// /// A code expressing the type of characteristic @@ -184,6 +183,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -198,14 +213,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition#Component", IsNestedType=true)] - [BackboneType("ManufacturedItemDefinition.component")] + [FhirType("ManufacturedItemDefinition.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ManufacturedItemDefinition#Component"; } } + public override string TypeName { get { return "ManufacturedItemDefinition.component"; } } /// /// Defining type of the component e.g. shell, layer, ink @@ -406,6 +420,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "function": + Function = (List)value; + return this; + case "amount": + Amount = (List)value; + return this; + case "constituent": + Constituent = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -424,14 +466,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ManufacturedItemDefinition#Constituent", IsNestedType=true)] - [BackboneType("ManufacturedItemDefinition.component.constituent")] + [FhirType("ManufacturedItemDefinition.component.constituent", IsBackboneType=true)] public partial class ConstituentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ManufacturedItemDefinition#Constituent"; } } + public override string TypeName { get { return "ManufacturedItemDefinition.component.constituent"; } } /// /// The measurable amount of the substance, expressable in different ways (e.g. by mass or volume) @@ -588,6 +629,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "amount": + Amount = (List)value; + return this; + case "location": + Location = (List)value; + return this; + case "function": + Function = (List)value; + return this; + case "hasIngredient": + HasIngredient = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -929,6 +992,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "manufacturedDoseForm": + ManufacturedDoseForm = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "unitOfPresentation": + UnitOfPresentation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "marketingStatus": + MarketingStatus = (List)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs index abea0c143e..5880ece8ff 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -247,6 +247,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "country": + Country = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "jurisdiction": + Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "dateRange": + DateRange = (Hl7.Fhir.Model.Period)value; + return this; + case "restoreDate": + RestoreDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs index 3e9cdf1e91..aaa2c33c57 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)] + [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")] public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Measure#Term", IsNestedType=true)] - [BackboneType("Measure.term")] + [FhirType("Measure.term", IsBackboneType=true)] public partial class TermComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Term"; } } + public override string TypeName { get { return "Measure.term"; } } /// /// What term? @@ -204,6 +203,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "definition": + DefinitionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -221,14 +236,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Group", IsNestedType=true)] - [BackboneType("Measure.group")] + [FhirType("Measure.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Group"; } } + public override string TypeName { get { return "Measure.group"; } } /// /// Unique id for group in measure @@ -675,6 +689,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "type": + Type = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "basis": + BasisElement = (Code)value; + return this; + case "scoring": + Scoring = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "scoringUnit": + ScoringUnit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "rateAggregation": + RateAggregationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "improvementNotation": + ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "library": + LibraryElement = (List)value; + return this; + case "population": + Population = (List)value; + return this; + case "stratifier": + Stratifier = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -703,14 +766,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Population", IsNestedType=true)] - [BackboneType("Measure.group.population")] + [FhirType("Measure.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Population"; } } + public override string TypeName { get { return "Measure.group.population"; } } /// /// Unique id for population in measure @@ -984,6 +1046,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "criteria": + Criteria = (Hl7.Fhir.Model.Expression)value; + return this; + case "groupDefinition": + GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "inputPopulationId": + InputPopulationIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "aggregateMethod": + AggregateMethod = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1006,14 +1099,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Stratifier", IsNestedType=true)] - [BackboneType("Measure.group.stratifier")] + [FhirType("Measure.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Stratifier"; } } + public override string TypeName { get { return "Measure.group.stratifier"; } } /// /// Unique id for stratifier in measure @@ -1248,6 +1340,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "criteria": + Criteria = (Hl7.Fhir.Model.Expression)value; + return this; + case "groupDefinition": + GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1270,14 +1390,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Component", IsNestedType=true)] - [BackboneType("Measure.group.stratifier.component")] + [FhirType("Measure.group.stratifier.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Component"; } } + public override string TypeName { get { return "Measure.group.stratifier.component"; } } /// /// Unique id for stratifier component in measure @@ -1490,6 +1609,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "criteria": + Criteria = (Hl7.Fhir.Model.Expression)value; + return this; + case "groupDefinition": + GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1511,14 +1655,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#SupplementalData", IsNestedType=true)] - [BackboneType("Measure.supplementalData")] + [FhirType("Measure.supplementalData", IsBackboneType=true)] public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#SupplementalData"; } } + public override string TypeName { get { return "Measure.supplementalData"; } } /// /// Unique id for supplementalData in measure @@ -1732,6 +1875,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "usage": + Usage = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "criteria": + Criteria = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3223,6 +3391,151 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "basis": + BasisElement = (Code)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "library": + LibraryElement = (List)value; + return this; + case "disclaimer": + DisclaimerElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "scoring": + Scoring = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "scoringUnit": + ScoringUnit = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "compositeScoring": + CompositeScoring = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (List)value; + return this; + case "riskAdjustment": + RiskAdjustmentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "rateAggregation": + RateAggregationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "rationale": + RationaleElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "clinicalRecommendationStatement": + ClinicalRecommendationStatementElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "improvementNotation": + ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "term": + Term = (List)value; + return this; + case "guidance": + GuidanceElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "group": + Group = (List)value; + return this; + case "supplementalData": + SupplementalData = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs index f930eced41..1b055bb0d8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)] + [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")] public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -151,14 +151,13 @@ public enum SubmitDataUpdateType /// [Serializable] [DataContract] - [FhirType("MeasureReport#Group", IsNestedType=true)] - [BackboneType("MeasureReport.group")] + [FhirType("MeasureReport.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Group"; } } + public override string TypeName { get { return "MeasureReport.group"; } } /// /// Pointer to specific group from Measure @@ -378,6 +377,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "population": + Population = (List)value; + return this; + case "measureScore": + MeasureScore = (Hl7.Fhir.Model.DataType)value; + return this; + case "stratifier": + Stratifier = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -399,14 +426,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Population", IsNestedType=true)] - [BackboneType("MeasureReport.group.population")] + [FhirType("MeasureReport.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Population"; } } + public override string TypeName { get { return "MeasureReport.group.population"; } } /// /// Pointer to specific population from Measure @@ -645,6 +671,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "count": + CountElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "subjectResults": + SubjectResults = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subjectReport": + SubjectReport = (List)value; + return this; + case "subjects": + Subjects = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -666,14 +720,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Stratifier", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier")] + [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Stratifier"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier"; } } /// /// Pointer to specific stratifier from Measure @@ -825,6 +878,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "stratum": + Stratum = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -843,14 +915,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum")] + [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)] public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroup"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } } /// /// The stratum value, e.g. male @@ -1010,6 +1081,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "component": + Component = (List)value; + return this; + case "population": + Population = (List)value; + return this; + case "measureScore": + MeasureScore = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1029,14 +1122,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Component", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.component")] + [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Component"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } } /// /// Pointer to specific stratifier component from Measure @@ -1192,6 +1284,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1210,14 +1321,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.population")] + [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)] public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } } /// /// Pointer to specific population from Measure @@ -1456,6 +1566,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "count": + CountElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "subjectResults": + SubjectResults = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subjectReport": + SubjectReport = (List)value; + return this; + case "subjects": + Subjects = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2014,6 +2152,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "dataUpdateType": + DataUpdateTypeElement = (Code)value; + return this; + case "measure": + MeasureElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "reporter": + Reporter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reportingVendor": + ReportingVendor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "inputParameters": + InputParameters = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "scoring": + Scoring = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "improvementNotation": + ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "group": + Group = (List)value; + return this; + case "supplementalData": + SupplementalData = (List)value; + return this; + case "evaluatedResource": + EvaluatedResource = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs index 3f59e6ccdf..7248b00f03 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)] + [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")] public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum MedicationStatusCodes /// [Serializable] [DataContract] - [FhirType("Medication#Ingredient", IsNestedType=true)] - [BackboneType("Medication.ingredient")] + [FhirType("Medication.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Ingredient"; } } + public override string TypeName { get { return "Medication.ingredient"; } } /// /// The ingredient (substance or medication) that the ingredient.strength relates to @@ -258,6 +257,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "isActive": + IsActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "strength": + Strength = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -276,14 +294,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Batch", IsNestedType=true)] - [BackboneType("Medication.batch")] + [FhirType("Medication.batch", IsBackboneType=true)] public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Batch"; } } + public override string TypeName { get { return "Medication.batch"; } } /// /// Identifier assigned to batch @@ -430,6 +447,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "lotNumber": + LotNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expirationDate": + ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -725,6 +758,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "marketingAuthorizationHolder": + MarketingAuthorizationHolder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "doseForm": + DoseForm = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "totalVolume": + TotalVolume = (Hl7.Fhir.Model.Quantity)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "batch": + Batch = (Hl7.Fhir.Model.Medication.BatchComponent)value; + return this; + case "definition": + Definition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs index 51f84cb7cc..568ed75011 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)] + [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")] public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Performer", IsNestedType=true)] - [BackboneType("MedicationAdministration.performer")] + [FhirType("MedicationAdministration.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Performer"; } } + public override string TypeName { get { return "MedicationAdministration.performer"; } } /// /// Type of performance @@ -239,6 +238,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.CodeableReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -256,14 +271,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Dosage", IsNestedType=true)] - [BackboneType("MedicationAdministration.dosage")] + [FhirType("MedicationAdministration.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Dosage"; } } + public override string TypeName { get { return "MedicationAdministration.dosage"; } } /// /// Free text dosage instructions e.g. SIG @@ -481,6 +495,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "site": + Site = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "route": + Route = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "dose": + Dose = (Hl7.Fhir.Model.Quantity)value; + return this; + case "rate": + Rate = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1097,6 +1139,79 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (List)value; + return this; + case "category": + Category = (List)value; + return this; + case "medication": + Medication = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "occurence": + Occurence = (Hl7.Fhir.Model.DataType)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "isSubPotent": + IsSubPotentElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subPotentReason": + SubPotentReason = (List)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "device": + Device = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "dosage": + Dosage = (Hl7.Fhir.Model.MedicationAdministration.DosageComponent)value; + return this; + case "eventHistory": + EventHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs index 15fac37333..170cfbca7b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)] + [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")] public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Performer", IsNestedType=true)] - [BackboneType("MedicationDispense.performer")] + [FhirType("MedicationDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Performer"; } } + public override string TypeName { get { return "MedicationDispense.performer"; } } /// /// Who performed the dispense and what they did @@ -253,6 +252,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -270,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Substitution", IsNestedType=true)] - [BackboneType("MedicationDispense.substitution")] + [FhirType("MedicationDispense.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Substitution"; } } + public override string TypeName { get { return "MedicationDispense.substitution"; } } /// /// Whether a substitution was or was not performed on the dispense @@ -454,6 +468,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "wasSubstituted": + WasSubstitutedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "responsibleParty": + ResponsibleParty = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1249,6 +1285,97 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "notPerformedReason": + NotPerformedReason = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "statusChanged": + StatusChangedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "category": + Category = (List)value; + return this; + case "medication": + Medication = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "authorizingPrescription": + AuthorizingPrescription = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "daysSupply": + DaysSupply = (Hl7.Fhir.Model.Quantity)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "whenPrepared": + WhenPreparedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "whenHandedOver": + WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "destination": + Destination = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "receiver": + Receiver = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "renderedDosageInstruction": + RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "dosageInstruction": + DosageInstruction = (List)value; + return this; + case "substitution": + Substitution = (Hl7.Fhir.Model.MedicationDispense.SubstitutionComponent)value; + return this; + case "eventHistory": + EventHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs index e66b7583e2..9c6c633ae8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)] + [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")] public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)] - [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")] + [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)] public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } } + public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } } /// /// Category of medicationKnowledge @@ -217,6 +216,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reference": + Reference = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -231,14 +246,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monograph")] + [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)] public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Monograph"; } } + public override string TypeName { get { return "MedicationKnowledge.monograph"; } } /// /// The category of medication document @@ -351,6 +365,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -368,14 +398,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Cost", IsNestedType=true)] - [BackboneType("MedicationKnowledge.cost")] + [FhirType("MedicationKnowledge.cost", IsBackboneType=true)] public partial class CostComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Cost"; } } + public override string TypeName { get { return "MedicationKnowledge.cost"; } } /// /// The date range for which the cost is effective @@ -552,6 +581,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "effectiveDate": + EffectiveDate = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + SourceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "cost": + Cost = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -571,14 +622,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)] - [BackboneType("MedicationKnowledge.monitoringProgram")] + [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)] public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } } + public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } } /// /// Type of program under which the medication is monitored @@ -707,6 +757,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -724,14 +790,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#IndicationGuideline", IsNestedType=true)] - [BackboneType("MedicationKnowledge.indicationGuideline")] + [FhirType("MedicationKnowledge.indicationGuideline", IsBackboneType=true)] public partial class IndicationGuidelineComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#IndicationGuideline"; } } + public override string TypeName { get { return "MedicationKnowledge.indicationGuideline"; } } /// /// Indication for use that applies to the specific administration guideline @@ -844,6 +909,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "indication": + Indication = (List)value; + return this; + case "dosingGuideline": + DosingGuideline = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -861,14 +942,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#DosingGuideline", IsNestedType=true)] - [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline")] + [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline", IsBackboneType=true)] public partial class DosingGuidelineComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#DosingGuideline"; } } + public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline"; } } /// /// Intention of the treatment @@ -1023,6 +1103,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "treatmentIntent": + TreatmentIntent = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "dosage": + Dosage = (List)value; + return this; + case "administrationTreatment": + AdministrationTreatment = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "patientCharacteristic": + PatientCharacteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1039,14 +1141,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)] - [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.dosage")] + [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Dosage"; } } + public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline.dosage"; } } /// /// Category of dosage for a medication @@ -1159,6 +1260,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "dosage": + Dosage = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1176,14 +1293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#PatientCharacteristic", IsNestedType=true)] - [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic")] + [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic", IsBackboneType=true)] public partial class PatientCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristic"; } } + public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic"; } } /// /// Categorization of specific characteristic that is relevant to the administration guideline @@ -1297,6 +1413,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1311,14 +1443,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)] - [BackboneType("MedicationKnowledge.medicineClassification")] + [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)] public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } } + public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } } /// /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification) @@ -1454,6 +1585,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.DataType)value; + return this; + case "classification": + Classification = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1472,14 +1622,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)] - [BackboneType("MedicationKnowledge.packaging")] + [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)] public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Packaging"; } } + public override string TypeName { get { return "MedicationKnowledge.packaging"; } } /// /// Cost of the packaged medication @@ -1593,6 +1742,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "cost": + Cost = (List)value; + return this; + case "packagedProduct": + PackagedProduct = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1610,14 +1775,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#StorageGuideline", IsNestedType=true)] - [BackboneType("MedicationKnowledge.storageGuideline")] + [FhirType("MedicationKnowledge.storageGuideline", IsBackboneType=true)] public partial class StorageGuidelineComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#StorageGuideline"; } } + public override string TypeName { get { return "MedicationKnowledge.storageGuideline"; } } /// /// Reference to additional information @@ -1790,6 +1954,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "reference": + ReferenceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "note": + Note = (List)value; + return this; + case "stabilityDuration": + StabilityDuration = (Hl7.Fhir.Model.Duration)value; + return this; + case "environmentalSetting": + EnvironmentalSetting = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1809,14 +1995,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#EnvironmentalSetting", IsNestedType=true)] - [BackboneType("MedicationKnowledge.storageGuideline.environmentalSetting")] + [FhirType("MedicationKnowledge.storageGuideline.environmentalSetting", IsBackboneType=true)] public partial class EnvironmentalSettingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#EnvironmentalSetting"; } } + public override string TypeName { get { return "MedicationKnowledge.storageGuideline.environmentalSetting"; } } /// /// Categorization of the setting @@ -1931,6 +2116,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1945,14 +2146,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory")] + [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)] public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory"; } } /// /// Specifies the authority of the regulation @@ -2110,6 +2310,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "regulatoryAuthority": + RegulatoryAuthority = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "substitution": + Substitution = (List)value; + return this; + case "schedule": + Schedule = (List)value; + return this; + case "maxDispense": + MaxDispense = (Hl7.Fhir.Model.MedicationKnowledge.MaxDispenseComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2126,14 +2348,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.substitution")] + [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Substitution"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } } /// /// Specifies the type of substitution allowed @@ -2264,6 +2485,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "allowed": + AllowedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2278,14 +2515,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)] - [BackboneType("MedicationKnowledge.regulatory.maxDispense")] + [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)] public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } } + public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } } /// /// The maximum number of units of the medication that can be dispensed @@ -2397,6 +2633,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Duration)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2414,14 +2666,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Definitional", IsNestedType=true)] - [BackboneType("MedicationKnowledge.definitional")] + [FhirType("MedicationKnowledge.definitional", IsBackboneType=true)] public partial class DefinitionalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Definitional"; } } + public override string TypeName { get { return "MedicationKnowledge.definitional"; } } /// /// Definitional resources that provide more information about this medication @@ -2603,6 +2854,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "definition": + Definition = (List)value; + return this; + case "doseForm": + DoseForm = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intendedRoute": + IntendedRoute = (List)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "drugCharacteristic": + DrugCharacteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2623,14 +2899,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)] - [BackboneType("MedicationKnowledge.definitional.ingredient")] + [FhirType("MedicationKnowledge.definitional.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } } + public override string TypeName { get { return "MedicationKnowledge.definitional.ingredient"; } } /// /// Substances contained in the medication @@ -2767,6 +3042,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "strength": + Strength = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2785,14 +3079,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)] - [BackboneType("MedicationKnowledge.definitional.drugCharacteristic")] + [FhirType("MedicationKnowledge.definitional.drugCharacteristic", IsBackboneType=true)] public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } } + public override string TypeName { get { return "MedicationKnowledge.definitional.drugCharacteristic"; } } /// /// Code specifying the type of characteristic of medication @@ -2906,6 +3199,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3482,6 +3791,76 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "intendedJurisdiction": + IntendedJurisdiction = (List)value; + return this; + case "name": + NameElement = (List)value; + return this; + case "relatedMedicationKnowledge": + RelatedMedicationKnowledge = (List)value; + return this; + case "associatedMedication": + AssociatedMedication = (List)value; + return this; + case "productType": + ProductType = (List)value; + return this; + case "monograph": + Monograph = (List)value; + return this; + case "preparationInstruction": + PreparationInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "cost": + Cost = (List)value; + return this; + case "monitoringProgram": + MonitoringProgram = (List)value; + return this; + case "indicationGuideline": + IndicationGuideline = (List)value; + return this; + case "medicineClassification": + MedicineClassification = (List)value; + return this; + case "packaging": + Packaging = (List)value; + return this; + case "clinicalUseIssue": + ClinicalUseIssue = (List)value; + return this; + case "storageGuideline": + StorageGuideline = (List)value; + return this; + case "regulatory": + Regulatory = (List)value; + return this; + case "definitional": + Definitional = (Hl7.Fhir.Model.MedicationKnowledge.DefinitionalComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs index 4cbc8441a9..9e8253c1f1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)] + [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")] public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -189,14 +189,13 @@ public enum MedicationRequestIntent /// [Serializable] [DataContract] - [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest")] + [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)] public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } } /// /// First fill details @@ -476,6 +475,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "initialFill": + InitialFill = (Hl7.Fhir.Model.MedicationRequest.InitialFillComponent)value; + return this; + case "dispenseInterval": + DispenseInterval = (Hl7.Fhir.Model.Duration)value; + return this; + case "validityPeriod": + ValidityPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "numberOfRepeatsAllowed": + NumberOfRepeatsAllowedElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "expectedSupplyDuration": + ExpectedSupplyDuration = (Hl7.Fhir.Model.Duration)value; + return this; + case "dispenser": + Dispenser = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "dispenserInstruction": + DispenserInstruction = (List)value; + return this; + case "doseAdministrationAid": + DoseAdministrationAid = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -501,14 +537,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#InitialFill", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest.initialFill")] + [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)] public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#InitialFill"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } } /// /// First fill quantity @@ -619,6 +654,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.Duration)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -636,14 +687,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#Substitution", IsNestedType=true)] - [BackboneType("MedicationRequest.substitution")] + [FhirType("MedicationRequest.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#Substitution"; } } + public override string TypeName { get { return "MedicationRequest.substitution"; } } /// /// Whether substitution is allowed or not @@ -759,6 +809,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "allowed": + Allowed = (Hl7.Fhir.Model.DataType)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1724,6 +1790,115 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "priorPrescription": + PriorPrescription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusChanged": + StatusChangedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "medication": + Medication = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "informationSource": + InformationSource = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reported": + ReportedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "performerType": + PerformerType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "device": + Device = (List)value; + return this; + case "recorder": + Recorder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "courseOfTherapyType": + CourseOfTherapyType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "renderedDosageInstruction": + RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "effectiveDosePeriod": + EffectiveDosePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "dosageInstruction": + DosageInstruction = (List)value; + return this; + case "dispenseRequest": + DispenseRequest = (Hl7.Fhir.Model.MedicationRequest.DispenseRequestComponent)value; + return this; + case "substitution": + Substitution = (Hl7.Fhir.Model.MedicationRequest.SubstitutionComponent)value; + return this; + case "eventHistory": + EventHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs index 4b3b9adb35..c4ec09019b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)] + [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")] public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -97,14 +97,13 @@ public enum MedicationStatementStatusCodes /// [Serializable] [DataContract] - [FhirType("MedicationStatement#Adherence", IsNestedType=true)] - [BackboneType("MedicationStatement.adherence")] + [FhirType("MedicationStatement.adherence", IsBackboneType=true)] public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationStatement#Adherence"; } } + public override string TypeName { get { return "MedicationStatement.adherence"; } } /// /// Type of adherence @@ -218,6 +217,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -738,6 +753,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "medication": + Medication = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "effective": + Effective = (Hl7.Fhir.Model.DataType)value; + return this; + case "dateAsserted": + DateAssertedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "informationSource": + InformationSource = (List)value; + return this; + case "derivedFrom": + DerivedFrom = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "relatedClinicalInformation": + RelatedClinicalInformation = (List)value; + return this; + case "renderedDosageInstruction": + RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "dosage": + Dosage = (List)value; + return this; + case "adherence": + Adherence = (Hl7.Fhir.Model.MedicationStatement.AdherenceComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs index d4b596ee77..286873e849 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition", IsResource=true)] + [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition")] public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Contact", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.contact")] + [FhirType("MedicinalProductDefinition.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Contact"; } } + public override string TypeName { get { return "MedicinalProductDefinition.contact"; } } /// /// Allows the contact to be classified, for example QPPV, Pharmacovigilance Enquiry Information @@ -186,6 +185,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "contact": + Contact = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -200,14 +215,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Name", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name")] + [FhirType("MedicinalProductDefinition.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Name"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name"; } } /// /// The full product name @@ -382,6 +396,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "productName": + ProductNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "part": + Part = (List)value; + return this; + case "usage": + Usage = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -398,14 +434,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Part", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name.part")] + [FhirType("MedicinalProductDefinition.name.part", IsBackboneType=true)] public partial class PartComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Part"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name.part"; } } /// /// A fragment of a product name @@ -537,6 +572,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "part": + PartElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -554,14 +605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Usage", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.name.usage")] + [FhirType("MedicinalProductDefinition.name.usage", IsBackboneType=true)] public partial class UsageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Usage"; } } + public override string TypeName { get { return "MedicinalProductDefinition.name.usage"; } } /// /// Country code for where this name applies @@ -698,6 +748,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "country": + Country = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "jurisdiction": + Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -716,14 +785,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#CrossReference", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.crossReference")] + [FhirType("MedicinalProductDefinition.crossReference", IsBackboneType=true)] public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#CrossReference"; } } + public override string TypeName { get { return "MedicinalProductDefinition.crossReference"; } } /// /// Reference to another product, e.g. for linking authorised to investigational product @@ -836,6 +904,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "product": + Product = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -853,14 +937,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Operation", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.operation")] + [FhirType("MedicinalProductDefinition.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Operation"; } } + public override string TypeName { get { return "MedicinalProductDefinition.operation"; } } /// /// The type of manufacturing operation e.g. manufacturing itself, re-packaging @@ -1017,6 +1100,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "effectiveDate": + EffectiveDate = (Hl7.Fhir.Model.Period)value; + return this; + case "organization": + Organization = (List)value; + return this; + case "confidentialityIndicator": + ConfidentialityIndicator = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1036,14 +1141,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicinalProductDefinition#Characteristic", IsNestedType=true)] - [BackboneType("MedicinalProductDefinition.characteristic")] + [FhirType("MedicinalProductDefinition.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicinalProductDefinition#Characteristic"; } } + public override string TypeName { get { return "MedicinalProductDefinition.characteristic"; } } /// /// A code expressing the type of characteristic @@ -1158,6 +1262,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1957,6 +2077,103 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "domain": + Domain = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "combinedPharmaceuticalDoseForm": + CombinedPharmaceuticalDoseForm = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "route": + Route = (List)value; + return this; + case "indication": + IndicationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "legalStatusOfSupply": + LegalStatusOfSupply = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "additionalMonitoringIndicator": + AdditionalMonitoringIndicator = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specialMeasures": + SpecialMeasures = (List)value; + return this; + case "pediatricUseIndicator": + PediatricUseIndicator = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "classification": + Classification = (List)value; + return this; + case "marketingStatus": + MarketingStatus = (List)value; + return this; + case "packagedMedicinalProduct": + PackagedMedicinalProduct = (List)value; + return this; + case "comprisedOf": + ComprisedOf = (List)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "impurity": + Impurity = (List)value; + return this; + case "attachedDocument": + AttachedDocument = (List)value; + return this; + case "masterFile": + MasterFile = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "clinicalTrial": + ClinicalTrial = (List)value; + return this; + case "code": + Code = (List)value; + return this; + case "name": + Name = (List)value; + return this; + case "crossReference": + CrossReference = (List)value; + return this; + case "operation": + Operation = (List)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs index 2e7cd172e8..5ef560d330 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)] + [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")] public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -130,14 +130,13 @@ public enum MessageheaderResponseRequest /// [Serializable] [DataContract] - [FhirType("MessageDefinition#Focus", IsNestedType=true)] - [BackboneType("MessageDefinition.focus")] + [FhirType("MessageDefinition.focus", IsBackboneType=true)] public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#Focus"; } } + public override string TypeName { get { return "MessageDefinition.focus"; } } /// /// Type of resource @@ -366,6 +365,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Code)value; + return this; + case "profile": + ProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "min": + MinElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "max": + MaxElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -386,14 +407,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)] - [BackboneType("MessageDefinition.allowedResponse")] + [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)] public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } } + public override string TypeName { get { return "MessageDefinition.allowedResponse"; } } /// /// Reference to allowed message definition response @@ -541,6 +561,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "message": + MessageElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "situation": + SituationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1512,6 +1548,94 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "replaces": + ReplacesElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "base": + BaseElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "parent": + ParentElement = (List)value; + return this; + case "event": + Event = (Hl7.Fhir.Model.DataType)value; + return this; + case "category": + CategoryElement = (Code)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "responseRequired": + ResponseRequiredElement = (Code)value; + return this; + case "allowedResponse": + AllowedResponse = (List)value; + return this; + case "graph": + GraphElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs index 7530a6c70b..9fcf1a2558 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)] + [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")] public partial class MessageHeader : Hl7.Fhir.Model.DomainResource { /// @@ -96,14 +96,13 @@ public enum ResponseType /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageDestination", IsNestedType=true)] - [BackboneType("MessageHeader.destination")] + [FhirType("MessageHeader.destination", IsBackboneType=true)] public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageDestination"; } } + public override string TypeName { get { return "MessageHeader.destination"; } } /// /// Actual destination address or Endpoint resource @@ -281,6 +280,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "endpoint": + Endpoint = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "target": + Target = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "receiver": + Receiver = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -300,14 +321,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageSource", IsNestedType=true)] - [BackboneType("MessageHeader.source")] + [FhirType("MessageHeader.source", IsBackboneType=true)] public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageSource"; } } + public override string TypeName { get { return "MessageHeader.source"; } } /// /// Actual source address or Endpoint resource @@ -538,6 +558,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "endpoint": + Endpoint = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "software": + SoftwareElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (Hl7.Fhir.Model.ContactPoint)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -558,14 +603,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#Response", IsNestedType=true)] - [BackboneType("MessageHeader.response")] + [FhirType("MessageHeader.response", IsBackboneType=true)] public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#Response"; } } + public override string TypeName { get { return "MessageHeader.response"; } } /// /// Bundle.identifier of original message @@ -721,6 +765,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "code": + CodeElement = (Code)value; + return this; + case "details": + Details = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1042,6 +1105,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "event": + Event = (Hl7.Fhir.Model.DataType)value; + return this; + case "destination": + Destination = (List)value; + return this; + case "sender": + Sender = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.MessageHeader.MessageSourceComponent)value; + return this; + case "responsible": + Responsible = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "response": + Response = (Hl7.Fhir.Model.MessageHeader.ResponseComponent)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "definition": + DefinitionElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs index 628dcce85f..40da909e00 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)] + [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")] public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -133,14 +133,13 @@ public enum StrandType /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Relative", IsNestedType=true)] - [BackboneType("MolecularSequence.relative")] + [FhirType("MolecularSequence.relative", IsBackboneType=true)] public partial class RelativeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Relative"; } } + public override string TypeName { get { return "MolecularSequence.relative"; } } /// /// Ways of identifying nucleotides or amino acids within a sequence @@ -335,6 +334,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "coordinateSystem": + CoordinateSystem = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "ordinalPosition": + OrdinalPositionElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "sequenceRange": + SequenceRange = (Hl7.Fhir.Model.Range)value; + return this; + case "startingSequence": + StartingSequence = (Hl7.Fhir.Model.MolecularSequence.StartingSequenceComponent)value; + return this; + case "edit": + Edit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -355,14 +379,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#StartingSequence", IsNestedType=true)] - [BackboneType("MolecularSequence.relative.startingSequence")] + [FhirType("MolecularSequence.relative.startingSequence", IsBackboneType=true)] public partial class StartingSequenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#StartingSequence"; } } + public override string TypeName { get { return "MolecularSequence.relative.startingSequence"; } } /// /// The genome assembly used for starting sequence, e.g. GRCh38 @@ -660,6 +683,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "genomeAssembly": + GenomeAssembly = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "chromosome": + Chromosome = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "sequence": + Sequence = (Hl7.Fhir.Model.DataType)value; + return this; + case "windowStart": + WindowStartElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "windowEnd": + WindowEndElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "orientation": + OrientationElement = (Code)value; + return this; + case "strand": + StrandElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -679,14 +733,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MolecularSequence#Edit", IsNestedType=true)] - [BackboneType("MolecularSequence.relative.edit")] + [FhirType("MolecularSequence.relative.edit", IsBackboneType=true)] public partial class EditComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MolecularSequence#Edit"; } } + public override string TypeName { get { return "MolecularSequence.relative.edit"; } } /// /// Start position of the edit on the starting sequence @@ -911,6 +964,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "start": + StartElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "end": + EndElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "replacementSequence": + ReplacementSequenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "replacedSequence": + ReplacedSequenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1253,6 +1328,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "specimen": + Specimen = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "literal": + LiteralElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "formatted": + Formatted = (List)value; + return this; + case "relative": + Relative = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs index d72dc1627a..fbc9e1a62d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -293,6 +293,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Money.cs b/src/Hl7.Fhir.R5/Model/Generated/Money.cs index fbd780e81d..470d98a40a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Money.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Money.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -203,6 +203,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + ValueElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "currency": + CurrencyElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs index a3db0319ce..caf5978002 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)] + [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")] public partial class NamingSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -142,14 +142,13 @@ public enum NamingSystemIdentifierType /// [Serializable] [DataContract] - [FhirType("NamingSystem#UniqueId", IsNestedType=true)] - [BackboneType("NamingSystem.uniqueId")] + [FhirType("NamingSystem.uniqueId", IsBackboneType=true)] public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NamingSystem#UniqueId"; } } + public override string TypeName { get { return "NamingSystem.uniqueId"; } } /// /// oid | uuid | uri | iri-stem | v2csmnemonic | other @@ -438,6 +437,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "authoritative": + AuthoritativeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1501,6 +1528,109 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "kind": + KindElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "responsible": + ResponsibleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "uniqueId": + UniqueId = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs index ec09950074..7073179e53 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionIntake","http://hl7.org/fhir/StructureDefinition/NutritionIntake", IsResource=true)] + [FhirType("NutritionIntake","http://hl7.org/fhir/StructureDefinition/NutritionIntake")] public partial class NutritionIntake : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class NutritionIntake : Hl7.Fhir.Model.DomainResource, IIdentifia /// [Serializable] [DataContract] - [FhirType("NutritionIntake#ConsumedItem", IsNestedType=true)] - [BackboneType("NutritionIntake.consumedItem")] + [FhirType("NutritionIntake.consumedItem", IsBackboneType=true)] public partial class ConsumedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionIntake#ConsumedItem"; } } + public override string TypeName { get { return "NutritionIntake.consumedItem"; } } /// /// The type of food or fluid product @@ -310,6 +309,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "nutritionProduct": + NutritionProduct = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "schedule": + Schedule = (Hl7.Fhir.Model.Timing)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + case "rate": + Rate = (Hl7.Fhir.Model.Quantity)value; + return this; + case "notConsumed": + NotConsumedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "notConsumedReason": + NotConsumedReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -333,14 +363,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionIntake#IngredientLabel", IsNestedType=true)] - [BackboneType("NutritionIntake.ingredientLabel")] + [FhirType("NutritionIntake.ingredientLabel", IsBackboneType=true)] public partial class IngredientLabelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionIntake#IngredientLabel"; } } + public override string TypeName { get { return "NutritionIntake.ingredientLabel"; } } /// /// Total nutrient consumed @@ -454,6 +483,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "nutrient": + Nutrient = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -471,14 +516,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionIntake#Performer", IsNestedType=true)] - [BackboneType("NutritionIntake.performer")] + [FhirType("NutritionIntake.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionIntake#Performer"; } } + public override string TypeName { get { return "NutritionIntake.performer"; } } /// /// Type of performer @@ -593,6 +637,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1199,6 +1259,76 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "reported": + Reported = (Hl7.Fhir.Model.DataType)value; + return this; + case "consumedItem": + ConsumedItem = (List)value; + return this; + case "ingredientLabel": + IngredientLabel = (List)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "derivedFrom": + DerivedFrom = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs index 638c788602..97a2ddc3aa 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)] + [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")] public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("NutritionOrder#OralDiet", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet")] + [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)] public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#OralDiet"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet"; } } /// /// Type of oral diet or diet restrictions that describe what can be consumed orally @@ -294,6 +293,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "schedule": + Schedule = (Hl7.Fhir.Model.NutritionOrder.OralDietScheduleComponent)value; + return this; + case "nutrient": + Nutrient = (List)value; + return this; + case "texture": + Texture = (List)value; + return this; + case "fluidConsistencyType": + FluidConsistencyType = (List)value; + return this; + case "instruction": + InstructionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -315,14 +342,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#OralDietSchedule", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.schedule")] + [FhirType("NutritionOrder.oralDiet.schedule", IsBackboneType=true)] public partial class OralDietScheduleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#OralDietSchedule"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.schedule"; } } /// /// Scheduled frequency of diet @@ -474,6 +500,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "timing": + Timing = (List)value; + return this; + case "asNeeded": + AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "asNeededFor": + AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -492,14 +537,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Nutrient", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.nutrient")] + [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Nutrient"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } } /// /// Type of nutrient that is being modified @@ -611,6 +655,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "modifier": + Modifier = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -628,14 +688,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Texture", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.texture")] + [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)] public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Texture"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } } /// /// Code to indicate how to alter the texture of the foods, e.g. pureed @@ -748,6 +807,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "modifier": + Modifier = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "foodType": + FoodType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -765,14 +840,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Supplement", IsNestedType=true)] - [BackboneType("NutritionOrder.supplement")] + [FhirType("NutritionOrder.supplement", IsBackboneType=true)] public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Supplement"; } } + public override string TypeName { get { return "NutritionOrder.supplement"; } } /// /// Type of supplement product requested @@ -983,6 +1057,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "productName": + ProductNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "schedule": + Schedule = (Hl7.Fhir.Model.NutritionOrder.SupplementScheduleComponent)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "instruction": + InstructionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1003,14 +1102,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#SupplementSchedule", IsNestedType=true)] - [BackboneType("NutritionOrder.supplement.schedule")] + [FhirType("NutritionOrder.supplement.schedule", IsBackboneType=true)] public partial class SupplementScheduleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#SupplementSchedule"; } } + public override string TypeName { get { return "NutritionOrder.supplement.schedule"; } } /// /// Scheduled frequency of diet @@ -1162,6 +1260,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "timing": + Timing = (List)value; + return this; + case "asNeeded": + AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "asNeededFor": + AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1180,14 +1297,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula")] + [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)] public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula"; } } /// /// Type of enteral or infant formula @@ -1486,6 +1602,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "baseFormulaType": + BaseFormulaType = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "baseFormulaProductName": + BaseFormulaProductNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "deliveryDevice": + DeliveryDevice = (List)value; + return this; + case "additive": + Additive = (List)value; + return this; + case "caloricDensity": + CaloricDensity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "routeOfAdministration": + RouteOfAdministration = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "administration": + Administration = (List)value; + return this; + case "maxVolumeToDeliver": + MaxVolumeToDeliver = (Hl7.Fhir.Model.Quantity)value; + return this; + case "administrationInstruction": + AdministrationInstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1510,14 +1663,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Additive", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.additive")] + [FhirType("NutritionOrder.enteralFormula.additive", IsBackboneType=true)] public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Additive"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.additive"; } } /// /// Type of modular component to add to the feeding @@ -1668,6 +1820,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "productName": + ProductNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1687,14 +1858,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Administration", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.administration")] + [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)] public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Administration"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } } /// /// Scheduling information for enteral formula products @@ -1828,6 +1998,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "schedule": + Schedule = (Hl7.Fhir.Model.NutritionOrder.EnteralFormulaScheduleComponent)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "rate": + Rate = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1846,14 +2035,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#EnteralFormulaSchedule", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.administration.schedule")] + [FhirType("NutritionOrder.enteralFormula.administration.schedule", IsBackboneType=true)] public partial class EnteralFormulaScheduleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#EnteralFormulaSchedule"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.administration.schedule"; } } /// /// Scheduled frequency of enteral formula @@ -2005,6 +2193,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "timing": + Timing = (List)value; + return this; + case "asNeeded": + AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "asNeededFor": + AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2747,6 +2954,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "instantiates": + InstantiatesElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supportingInformation": + SupportingInformation = (List)value; + return this; + case "dateTime": + DateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "orderer": + Orderer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "allergyIntolerance": + AllergyIntolerance = (List)value; + return this; + case "foodPreferenceModifier": + FoodPreferenceModifier = (List)value; + return this; + case "excludeFoodModifier": + ExcludeFoodModifier = (List)value; + return this; + case "outsideFoodAllowed": + OutsideFoodAllowedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "oralDiet": + OralDiet = (Hl7.Fhir.Model.NutritionOrder.OralDietComponent)value; + return this; + case "supplement": + Supplement = (List)value; + return this; + case "enteralFormula": + EnteralFormula = (Hl7.Fhir.Model.NutritionOrder.EnteralFormulaComponent)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs index 37a572f979..f17d8647e6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct", IsResource=true)] + [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct")] public partial class NutritionProduct : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum NutritionProductStatus /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Nutrient", IsNestedType=true)] - [BackboneType("NutritionProduct.nutrient")] + [FhirType("NutritionProduct.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Nutrient"; } } + public override string TypeName { get { return "NutritionProduct.nutrient"; } } /// /// The (relevant) nutrients in the product @@ -215,6 +214,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "amount": + Amount = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -229,14 +244,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Ingredient", IsNestedType=true)] - [BackboneType("NutritionProduct.ingredient")] + [FhirType("NutritionProduct.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Ingredient"; } } + public override string TypeName { get { return "NutritionProduct.ingredient"; } } /// /// The ingredient contained in the product @@ -349,6 +363,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "amount": + Amount = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -363,14 +393,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Characteristic", IsNestedType=true)] - [BackboneType("NutritionProduct.characteristic")] + [FhirType("NutritionProduct.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Characteristic"; } } + public override string TypeName { get { return "NutritionProduct.characteristic"; } } /// /// Code specifying the type of characteristic @@ -486,6 +515,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -503,14 +548,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionProduct#Instance", IsNestedType=true)] - [BackboneType("NutritionProduct.instance")] + [FhirType("NutritionProduct.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionProduct#Instance"; } } + public override string TypeName { get { return "NutritionProduct.instance"; } } /// /// The amount of items or instances @@ -799,6 +843,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "lotNumber": + LotNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expiry": + ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "useBy": + UseByElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "biologicalSourceEvent": + BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1124,6 +1199,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "nutrient": + Nutrient = (List)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + case "knownAllergen": + KnownAllergen = (List)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "instance": + Instance = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs index 84a070964f..12e5adb9da 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)] + [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")] public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum TriggeredBytype /// [Serializable] [DataContract] - [FhirType("Observation#TriggeredBy", IsNestedType=true)] - [BackboneType("Observation.triggeredBy")] + [FhirType("Observation.triggeredBy", IsBackboneType=true)] public partial class TriggeredByComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#TriggeredBy"; } } + public override string TypeName { get { return "Observation.triggeredBy"; } } /// /// Triggering observation @@ -277,6 +276,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "observation": + Observation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "reason": + ReasonElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -296,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#ReferenceRange", IsNestedType=true)] - [BackboneType("Observation.referenceRange")] + [FhirType("Observation.referenceRange", IsBackboneType=true)] public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#ReferenceRange"; } } + public override string TypeName { get { return "Observation.referenceRange"; } } /// /// Low Range, if relevant @@ -541,6 +558,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "low": + Low = (Hl7.Fhir.Model.Quantity)value; + return this; + case "high": + High = (Hl7.Fhir.Model.Quantity)value; + return this; + case "normalValue": + NormalValue = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "appliesTo": + AppliesTo = (List)value; + return this; + case "age": + Age = (Hl7.Fhir.Model.Range)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -564,14 +612,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#Component", IsNestedType=true)] - [BackboneType("Observation.component")] + [FhirType("Observation.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#Component"; } } + public override string TypeName { get { return "Observation.component"; } } /// /// Type of component observation (code / type) @@ -754,6 +801,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "dataAbsentReason": + DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "interpretation": + Interpretation = (List)value; + return this; + case "referenceRange": + ReferenceRange = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1491,6 +1563,97 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiates": + Instantiates = (Hl7.Fhir.Model.DataType)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "triggeredBy": + TriggeredBy = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "effective": + Effective = (Hl7.Fhir.Model.DataType)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "dataAbsentReason": + DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "interpretation": + Interpretation = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "bodyStructure": + BodyStructure = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specimen": + Specimen = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "referenceRange": + ReferenceRange = (List)value; + return this; + case "hasMember": + HasMember = (List)value; + return this; + case "derivedFrom": + DerivedFrom = (List)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs index fb7318a5e0..df7e5eed1d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)] + [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")] public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -172,14 +172,13 @@ public enum ObservationRangeCategory /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#QualifiedValue", IsNestedType=true)] - [BackboneType("ObservationDefinition.qualifiedValue")] + [FhirType("ObservationDefinition.qualifiedValue", IsBackboneType=true)] public partial class QualifiedValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#QualifiedValue"; } } + public override string TypeName { get { return "ObservationDefinition.qualifiedValue"; } } /// /// Context qualifier for the set of qualified values @@ -633,6 +632,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "context": + Context = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "appliesTo": + AppliesTo = (List)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "age": + Age = (Hl7.Fhir.Model.Range)value; + return this; + case "gestationalAge": + GestationalAge = (Hl7.Fhir.Model.Range)value; + return this; + case "condition": + ConditionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "rangeCategory": + RangeCategoryElement = (Code)value; + return this; + case "range": + Range = (Hl7.Fhir.Model.Range)value; + return this; + case "validCodedValueSet": + ValidCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "normalCodedValueSet": + NormalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "abnormalCodedValueSet": + AbnormalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "criticalCodedValueSet": + CriticalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -660,14 +705,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ObservationDefinition#Component", IsNestedType=true)] - [BackboneType("ObservationDefinition.component")] + [FhirType("ObservationDefinition.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ObservationDefinition#Component"; } } + public override string TypeName { get { return "ObservationDefinition.component"; } } /// /// Type of observation @@ -846,6 +890,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "permittedDataType": + PermittedDataTypeElement = (List>)value; + return this; + case "permittedUnit": + PermittedUnit = (List)value; + return this; + case "qualifiedValue": + QualifiedValue = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2079,6 +2145,127 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "derivedFromCanonical": + DerivedFromCanonicalElement = (List)value; + return this; + case "derivedFromUri": + DerivedFromUriElement = (List)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "performerType": + PerformerType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "permittedDataType": + PermittedDataTypeElement = (List>)value; + return this; + case "multipleResultsAllowed": + MultipleResultsAllowedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "specimen": + Specimen = (List)value; + return this; + case "device": + Device = (List)value; + return this; + case "preferredReportName": + PreferredReportNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "permittedUnit": + PermittedUnit = (List)value; + return this; + case "qualifiedValue": + QualifiedValue = (List)value; + return this; + case "hasMember": + HasMember = (List)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs index 8509193aef..2353efce2c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)] + [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")] public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -118,14 +118,13 @@ public enum OperationParameterScope /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Parameter", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter")] + [FhirType("OperationDefinition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Parameter"; } } + public override string TypeName { get { return "OperationDefinition.parameter"; } } /// /// Name in Parameters.parameter.name or in URL @@ -666,6 +665,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Code)value; + return this; + case "use": + UseElement = (Code)value; + return this; + case "scope": + ScopeElement = (List>)value; + return this; + case "min": + MinElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "max": + MaxElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "allowedType": + AllowedTypeElement = (List>)value; + return this; + case "targetProfile": + TargetProfileElement = (List)value; + return this; + case "searchType": + SearchTypeElement = (Code)value; + return this; + case "binding": + Binding = (Hl7.Fhir.Model.OperationDefinition.BindingComponent)value; + return this; + case "referencedFrom": + ReferencedFrom = (List)value; + return this; + case "part": + Part = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -694,14 +742,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Binding", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.binding")] + [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)] public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Binding"; } } + public override string TypeName { get { return "OperationDefinition.parameter.binding"; } } /// /// required | extensible | preferred | example @@ -852,6 +899,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "strength": + StrengthElement = (Code)value; + return this; + case "valueSet": + ValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -870,14 +933,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.referencedFrom")] + [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)] public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } } + public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } } /// /// Referencing parameter @@ -1025,6 +1087,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "source": + SourceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "sourceId": + SourceIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1043,14 +1121,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Overload", IsNestedType=true)] - [BackboneType("OperationDefinition.overload")] + [FhirType("OperationDefinition.overload", IsBackboneType=true)] public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Overload"; } } + public override string TypeName { get { return "OperationDefinition.overload"; } } /// /// Name of parameter to include in overload @@ -1198,6 +1275,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "parameterName": + ParameterNameElement = (List)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2343,6 +2436,106 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "kind": + KindElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "affectsState": + AffectsStateElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "base": + BaseElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "resource": + ResourceElement = (List>)value; + return this; + case "system": + SystemElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + TypeElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "instance": + InstanceElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "inputProfile": + InputProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "outputProfile": + OutputProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "overload": + Overload = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs index 37058df76c..77e23eb271 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)] + [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")] public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Organization#Qualification", IsNestedType=true)] - [BackboneType("Organization.qualification")] + [FhirType("Organization.qualification", IsBackboneType=true)] public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Organization#Qualification"; } } + public override string TypeName { get { return "Organization.qualification"; } } /// /// An identifier for this qualification for the organization @@ -233,6 +232,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "issuer": + Issuer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -606,6 +627,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + Type = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "alias": + AliasElement = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "partOf": + PartOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + case "qualification": + Qualification = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs index 58de081e63..0a450ddae9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)] + [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")] public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -417,6 +417,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "participatingOrganization": + ParticipatingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "network": + Network = (List)value; + return this; + case "code": + Code = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "location": + Location = (List)value; + return this; + case "healthcareService": + HealthcareService = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs index 9a223411cc..b84e4e6ed3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition", IsResource=true)] + [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition")] public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#LegalStatusOfSupply", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.legalStatusOfSupply")] + [FhirType("PackagedProductDefinition.legalStatusOfSupply", IsBackboneType=true)] public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#LegalStatusOfSupply"; } } + public override string TypeName { get { return "PackagedProductDefinition.legalStatusOfSupply"; } } /// /// The actual status of supply. In what situation this package type may be supplied for use @@ -181,6 +180,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "jurisdiction": + Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -198,14 +213,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#Packaging", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.packaging")] + [FhirType("PackagedProductDefinition.packaging", IsBackboneType=true)] public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#Packaging"; } } + public override string TypeName { get { return "PackagedProductDefinition.packaging"; } } /// /// An identifier that is specific to this particular part of the packaging. Including possibly a Data Carrier Identifier @@ -554,6 +568,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "componentPart": + ComponentPartElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "quantity": + QuantityElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "material": + Material = (List)value; + return this; + case "alternateMaterial": + AlternateMaterial = (List)value; + return this; + case "shelfLifeStorage": + ShelfLifeStorage = (List)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "containedItem": + ContainedItem = (List)value; + return this; + case "packaging": + Packaging = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -577,14 +634,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#Property", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.packaging.property")] + [FhirType("PackagedProductDefinition.packaging.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#Property"; } } + public override string TypeName { get { return "PackagedProductDefinition.packaging.property"; } } /// /// A code expressing the type of characteristic @@ -699,6 +755,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -713,14 +785,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PackagedProductDefinition#ContainedItem", IsNestedType=true)] - [BackboneType("PackagedProductDefinition.packaging.containedItem")] + [FhirType("PackagedProductDefinition.packaging.containedItem", IsBackboneType=true)] public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PackagedProductDefinition#ContainedItem"; } } + public override string TypeName { get { return "PackagedProductDefinition.packaging.containedItem"; } } /// /// The actual item(s) of medication, as manufactured, or a device, or other medically related item (food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package @@ -832,6 +903,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1313,6 +1400,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "packageFor": + PackageFor = (List)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "containedItemQuantity": + ContainedItemQuantity = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "legalStatusOfSupply": + LegalStatusOfSupply = (List)value; + return this; + case "marketingStatus": + MarketingStatus = (List)value; + return this; + case "copackagedIndicator": + CopackagedIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "attachedDocument": + AttachedDocument = (List)value; + return this; + case "packaging": + Packaging = (Hl7.Fhir.Model.PackagedProductDefinition.PackagingComponent)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs index 75a9ebc240..eee08e3459 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -405,6 +405,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Code)value; + return this; + case "use": + UseElement = (Code)value; + return this; + case "min": + MinElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "max": + MaxElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "profile": + ProfileElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs index 9a66f0065d..1c94108e60 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)] + [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")] public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum LinkType /// [Serializable] [DataContract] - [FhirType("Patient#Contact", IsNestedType=true)] - [BackboneType("Patient.contact")] + [FhirType("Patient.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Contact"; } } + public override string TypeName { get { return "Patient.contact"; } } /// /// The kind of relationship @@ -349,6 +348,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "relationship": + Relationship = (List)value; + return this; + case "name": + Name = (Hl7.Fhir.Model.HumanName)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "address": + Address = (Hl7.Fhir.Model.Address)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -371,14 +401,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Communication", IsNestedType=true)] - [BackboneType("Patient.communication")] + [FhirType("Patient.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Communication"; } } + public override string TypeName { get { return "Patient.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health @@ -509,6 +538,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -526,14 +571,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Link", IsNestedType=true)] - [BackboneType("Patient.link")] + [FhirType("Patient.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Link"; } } + public override string TypeName { get { return "Patient.link"; } } /// /// The other patient or related person resource that the link refers to @@ -668,6 +712,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "other": + Other = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1156,6 +1216,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "name": + Name = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "birthDate": + BirthDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "deceased": + Deceased = (Hl7.Fhir.Model.DataType)value; + return this; + case "address": + Address = (List)value; + return this; + case "maritalStatus": + MaritalStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "multipleBirth": + MultipleBirth = (Hl7.Fhir.Model.DataType)value; + return this; + case "photo": + Photo = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "communication": + Communication = (List)value; + return this; + case "generalPractitioner": + GeneralPractitioner = (List)value; + return this; + case "managingOrganization": + ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "link": + Link = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs index 8f213d09da..995124c7f6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)] + [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")] public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -454,6 +454,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "response": + Response = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "reporter": + Reporter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "payment": + Payment = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "paymentDate": + PaymentDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "payee": + Payee = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "recipient": + Recipient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "paymentStatus": + PaymentStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs index a6dad8ed1d..953416e778 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)] + [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")] public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum PaymentOutcome /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Allocation", IsNestedType=true)] - [BackboneType("PaymentReconciliation.allocation")] + [FhirType("PaymentReconciliation.allocation", IsBackboneType=true)] public partial class AllocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Allocation"; } } + public override string TypeName { get { return "PaymentReconciliation.allocation"; } } /// /// Business identifier of the payment detail @@ -485,6 +484,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "predecessor": + Predecessor = (Hl7.Fhir.Model.Identifier)value; + return this; + case "target": + Target = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "targetItem": + TargetItem = (Hl7.Fhir.Model.DataType)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "account": + Account = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "submitter": + Submitter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "response": + Response = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "responsible": + Responsible = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "payee": + Payee = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -513,14 +561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Notes", IsNestedType=true)] - [BackboneType("PaymentReconciliation.processNote")] + [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)] public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Notes"; } } + public override string TypeName { get { return "PaymentReconciliation.processNote"; } } /// /// display | print | printoper @@ -669,6 +716,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1581,6 +1644,103 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "kind": + Kind = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "enterer": + Enterer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "issuerType": + IssuerType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "paymentIssuer": + PaymentIssuer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "request": + Request = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestor": + Requestor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "outcome": + OutcomeElement = (Code)value; + return this; + case "disposition": + DispositionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "cardBrand": + CardBrandElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "accountNumber": + AccountNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expirationDate": + ExpirationDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "processor": + ProcessorElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "referenceNumber": + ReferenceNumberElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "authorization": + AuthorizationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "tenderedAmount": + TenderedAmount = (Hl7.Fhir.Model.Money)value; + return this; + case "returnedAmount": + ReturnedAmount = (Hl7.Fhir.Model.Money)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Money)value; + return this; + case "paymentIdentifier": + PaymentIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "allocation": + Allocation = (List)value; + return this; + case "formCode": + FormCode = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "processNote": + ProcessNote = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs index 8b18a9f40f..0e2dcdb70e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Permission","http://hl7.org/fhir/StructureDefinition/Permission", IsResource=true)] + [FhirType("Permission","http://hl7.org/fhir/StructureDefinition/Permission")] public partial class Permission : Hl7.Fhir.Model.DomainResource { /// @@ -144,14 +144,13 @@ public enum PermissionRuleCombining /// [Serializable] [DataContract] - [FhirType("Permission#Justification", IsNestedType=true)] - [BackboneType("Permission.justification")] + [FhirType("Permission.justification", IsBackboneType=true)] public partial class JustificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Permission#Justification"; } } + public override string TypeName { get { return "Permission.justification"; } } /// /// The regulatory grounds upon which this Permission builds @@ -267,6 +266,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "basis": + Basis = (List)value; + return this; + case "evidence": + Evidence = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -284,14 +299,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Permission#Rule", IsNestedType=true)] - [BackboneType("Permission.rule")] + [FhirType("Permission.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Permission#Rule"; } } + public override string TypeName { get { return "Permission.rule"; } } /// /// deny | permit @@ -468,6 +482,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "data": + Data = (List)value; + return this; + case "activity": + Activity = (List)value; + return this; + case "limit": + Limit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -487,14 +523,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Permission#Data", IsNestedType=true)] - [BackboneType("Permission.rule.data")] + [FhirType("Permission.rule.data", IsBackboneType=true)] public partial class DataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Permission#Data"; } } + public override string TypeName { get { return "Permission.rule.data"; } } /// /// Explicit FHIR Resource references @@ -650,6 +685,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "resource": + Resource = (List)value; + return this; + case "security": + Security = (List)value; + return this; + case "period": + Period = (List)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -666,14 +723,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Permission#Resource", IsNestedType=true)] - [BackboneType("Permission.rule.data.resource")] + [FhirType("Permission.rule.data.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Permission#Resource"; } } + public override string TypeName { get { return "Permission.rule.data.resource"; } } /// /// instance | related | dependents | authoredby @@ -808,6 +864,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "meaning": + MeaningElement = (Code)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -822,14 +894,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Permission#Activity", IsNestedType=true)] - [BackboneType("Permission.rule.activity")] + [FhirType("Permission.rule.activity", IsBackboneType=true)] public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Permission#Activity"; } } + public override string TypeName { get { return "Permission.rule.activity"; } } /// /// Authorized actor(s) @@ -968,6 +1039,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "actor": + Actor = (List)value; + return this; + case "action": + Action = (List)value; + return this; + case "purpose": + Purpose = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1256,6 +1346,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "status": + StatusElement = (Code)value; + return this; + case "asserter": + Asserter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "date": + DateElement = (List)value; + return this; + case "validity": + Validity = (Hl7.Fhir.Model.Period)value; + return this; + case "justification": + Justification = (Hl7.Fhir.Model.Permission.JustificationComponent)value; + return this; + case "combining": + CombiningElement = (Code)value; + return this; + case "rule": + Rule = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Person.cs b/src/Hl7.Fhir.R5/Model/Generated/Person.cs index 9b37fe74c2..7b5d3771c5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Person.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)] + [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")] public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -103,14 +103,13 @@ public enum IdentityAssuranceLevel /// [Serializable] [DataContract] - [FhirType("Person#Communication", IsNestedType=true)] - [BackboneType("Person.communication")] + [FhirType("Person.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Person#Communication"; } } + public override string TypeName { get { return "Person.communication"; } } /// /// The language which can be used to communicate with the person about his or her health @@ -241,6 +240,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -255,14 +270,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Person#Link", IsNestedType=true)] - [BackboneType("Person.link")] + [FhirType("Person.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Person#Link"; } } + public override string TypeName { get { return "Person.link"; } } /// /// The resource to which this actual person is associated @@ -396,6 +410,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "target": + Target = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "assurance": + AssuranceElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -815,6 +845,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "name": + Name = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "birthDate": + BirthDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "deceased": + Deceased = (Hl7.Fhir.Model.DataType)value; + return this; + case "address": + Address = (List)value; + return this; + case "maritalStatus": + MaritalStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "photo": + Photo = (List)value; + return this; + case "communication": + Communication = (List)value; + return this; + case "managingOrganization": + ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "link": + Link = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs index 6c8ff8090a..e81484469f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)] + [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")] public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Goal", IsNestedType=true)] - [BackboneType("PlanDefinition.goal")] + [FhirType("PlanDefinition.goal", IsBackboneType=true)] public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Goal"; } } + public override string TypeName { get { return "PlanDefinition.goal"; } } /// /// E.g. Treatment, dietary, behavioral @@ -299,6 +298,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + Description = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "priority": + Priority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "start": + Start = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "addresses": + Addresses = (List)value; + return this; + case "documentation": + Documentation = (List)value; + return this; + case "target": + Target = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -321,14 +351,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Target", IsNestedType=true)] - [BackboneType("PlanDefinition.goal.target")] + [FhirType("PlanDefinition.goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Target"; } } + public override string TypeName { get { return "PlanDefinition.goal.target"; } } /// /// The parameter whose value is to be tracked @@ -463,6 +492,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "measure": + Measure = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "detail": + Detail = (Hl7.Fhir.Model.DataType)value; + return this; + case "due": + Due = (Hl7.Fhir.Model.Duration)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -481,14 +529,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Actor", IsNestedType=true)] - [BackboneType("PlanDefinition.actor")] + [FhirType("PlanDefinition.actor", IsBackboneType=true)] public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Actor"; } } + public override string TypeName { get { return "PlanDefinition.actor"; } } /// /// User-visible title @@ -657,6 +704,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "option": + Option = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -675,14 +741,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Option", IsNestedType=true)] - [BackboneType("PlanDefinition.actor.option")] + [FhirType("PlanDefinition.actor.option", IsBackboneType=true)] public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Option"; } } + public override string TypeName { get { return "PlanDefinition.actor.option"; } } /// /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson @@ -876,6 +941,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "typeCanonical": + TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "typeReference": + TypeReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -896,14 +983,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Action", IsNestedType=true)] - [BackboneType("PlanDefinition.action")] + [FhirType("PlanDefinition.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Action"; } } + public override string TypeName { get { return "PlanDefinition.action"; } } /// /// Unique id for the action in the PlanDefinition @@ -1849,6 +1935,103 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "prefix": + PrefixElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "textEquivalent": + TextEquivalentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "documentation": + Documentation = (List)value; + return this; + case "goalId": + GoalIdElement = (List)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "trigger": + Trigger = (List)value; + return this; + case "condition": + Condition = (List)value; + return this; + case "input": + Input = (List)value; + return this; + case "output": + Output = (List)value; + return this; + case "relatedAction": + RelatedAction = (List)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "groupingBehavior": + GroupingBehaviorElement = (Code)value; + return this; + case "selectionBehavior": + SelectionBehaviorElement = (Code)value; + return this; + case "requiredBehavior": + RequiredBehaviorElement = (Code)value; + return this; + case "precheckBehavior": + PrecheckBehaviorElement = (Code)value; + return this; + case "cardinalityBehavior": + CardinalityBehaviorElement = (Code)value; + return this; + case "definition": + Definition = (Hl7.Fhir.Model.DataType)value; + return this; + case "transform": + TransformElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "dynamicValue": + DynamicValue = (List)value; + return this; + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1894,14 +2077,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Condition", IsNestedType=true)] - [BackboneType("PlanDefinition.action.condition")] + [FhirType("PlanDefinition.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Condition"; } } + public override string TypeName { get { return "PlanDefinition.action.condition"; } } /// /// applicability | start | stop @@ -2033,6 +2215,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "kind": + KindElement = (Code)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2050,14 +2248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Input", IsNestedType=true)] - [BackboneType("PlanDefinition.action.input")] + [FhirType("PlanDefinition.action.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Input"; } } + public override string TypeName { get { return "PlanDefinition.action.input"; } } /// /// User-visible title @@ -2225,6 +2422,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requirement": + Requirement = (Hl7.Fhir.Model.DataRequirement)value; + return this; + case "relatedData": + RelatedDataElement = (Hl7.Fhir.Model.Id)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2243,14 +2459,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Output", IsNestedType=true)] - [BackboneType("PlanDefinition.action.output")] + [FhirType("PlanDefinition.action.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Output"; } } + public override string TypeName { get { return "PlanDefinition.action.output"; } } /// /// User-visible title @@ -2418,6 +2633,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requirement": + Requirement = (Hl7.Fhir.Model.DataRequirement)value; + return this; + case "relatedData": + RelatedDataElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2437,14 +2671,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)] - [BackboneType("PlanDefinition.action.relatedAction")] + [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#RelatedAction"; } } + public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } } /// /// What action is this related to @@ -2659,6 +2892,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "targetId": + TargetIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "relationship": + RelationshipElement = (Code)value; + return this; + case "endRelationship": + EndRelationshipElement = (Code)value; + return this; + case "offset": + Offset = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2678,14 +2933,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Participant", IsNestedType=true)] - [BackboneType("PlanDefinition.action.participant")] + [FhirType("PlanDefinition.action.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Participant"; } } + public override string TypeName { get { return "PlanDefinition.action.participant"; } } /// /// What actor @@ -2940,6 +3194,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "actorId": + ActorIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "typeCanonical": + TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "typeReference": + TypeReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2962,14 +3244,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("PlanDefinition.action.dynamicValue")] + [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#DynamicValue"; } } + public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } } /// /// The path to the element to be set dynamically @@ -3098,6 +3379,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4246,6 +4543,121 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "subtitle": + SubtitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "usage": + UsageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "topic": + Topic = (List)value; + return this; + case "author": + Author = (List)value; + return this; + case "editor": + Editor = (List)value; + return this; + case "reviewer": + Reviewer = (List)value; + return this; + case "endorser": + Endorser = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "library": + LibraryElement = (List)value; + return this; + case "goal": + Goal = (List)value; + return this; + case "actor": + Actor = (List)value; + return this; + case "action": + Action = (List)value; + return this; + case "asNeeded": + AsNeeded = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs index 473d8b08fc..78fcfee3d0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)] + [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")] public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -69,14 +69,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Practitioner#Qualification", IsNestedType=true)] - [BackboneType("Practitioner.qualification")] + [FhirType("Practitioner.qualification", IsBackboneType=true)] public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Practitioner#Qualification"; } } + public override string TypeName { get { return "Practitioner.qualification"; } } /// /// An identifier for this qualification for the practitioner @@ -234,6 +233,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "issuer": + Issuer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -256,14 +277,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Practitioner#Communication", IsNestedType=true)] - [BackboneType("Practitioner.communication")] + [FhirType("Practitioner.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Practitioner#Communication"; } } + public override string TypeName { get { return "Practitioner.communication"; } } /// /// The language code used to communicate with the practitioner @@ -394,6 +414,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -768,6 +804,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "name": + Name = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "birthDate": + BirthDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "deceased": + Deceased = (Hl7.Fhir.Model.DataType)value; + return this; + case "address": + Address = (List)value; + return this; + case "photo": + Photo = (List)value; + return this; + case "qualification": + Qualification = (List)value; + return this; + case "communication": + Communication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs index 9e9fce22d3..4348f7fd85 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)] + [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")] public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -464,6 +464,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "practitioner": + Practitioner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "code": + Code = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "location": + Location = (List)value; + return this; + case "healthcareService": + HealthcareService = (List)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "characteristic": + Characteristic = (List)value; + return this; + case "communication": + Communication = (List)value; + return this; + case "availability": + Availability = (List)value; + return this; + case "endpoint": + Endpoint = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs index a54d2c327f..0915409b08 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)] + [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")] public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable
  • [Serializable] [DataContract] - [FhirType("Procedure#Performer", IsNestedType=true)] - [BackboneType("Procedure.performer")] + [FhirType("Procedure.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#Performer"; } } + public override string TypeName { get { return "Procedure.performer"; } } /// /// Type of performance @@ -233,6 +232,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onBehalfOf": + OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -252,14 +273,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Procedure#FocalDevice", IsNestedType=true)] - [BackboneType("Procedure.focalDevice")] + [FhirType("Procedure.focalDevice", IsBackboneType=true)] public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#FocalDevice"; } } + public override string TypeName { get { return "Procedure.focalDevice"; } } /// /// Kind of change to device @@ -374,6 +394,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "manipulated": + Manipulated = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1164,6 +1200,100 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "recorder": + Recorder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reported": + Reported = (Hl7.Fhir.Model.DataType)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "outcome": + Outcome = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "report": + Report = (List)value; + return this; + case "complication": + Complication = (List)value; + return this; + case "followUp": + FollowUp = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "focalDevice": + FocalDevice = (List)value; + return this; + case "used": + Used = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs index 346d2d8eab..c8698349ab 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -189,6 +189,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.DataType)value; + return this; + case "specialPrecautionsForStorage": + SpecialPrecautionsForStorage = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs index 9b9a4d8a92..0a3e1f27da 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)] + [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")] public partial class Provenance : Hl7.Fhir.Model.DomainResource { /// @@ -109,14 +109,13 @@ public enum ProvenanceEntityRole /// [Serializable] [DataContract] - [FhirType("Provenance#Agent", IsNestedType=true)] - [BackboneType("Provenance.agent")] + [FhirType("Provenance.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Agent"; } } + public override string TypeName { get { return "Provenance.agent"; } } /// /// How the agent participated @@ -277,6 +276,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "role": + Role = (List)value; + return this; + case "who": + Who = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onBehalfOf": + OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -293,14 +314,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Provenance#Entity", IsNestedType=true)] - [BackboneType("Provenance.entity")] + [FhirType("Provenance.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Entity"; } } + public override string TypeName { get { return "Provenance.entity"; } } /// /// revision | quotation | source | instantiates | removal @@ -457,6 +477,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + RoleElement = (Code)value; + return this; + case "what": + What = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "agent": + Agent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -864,6 +903,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "target": + Target = (List)value; + return this; + case "occurred": + Occurred = (Hl7.Fhir.Model.DataType)value; + return this; + case "recorded": + RecordedElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "policy": + PolicyElement = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "authorization": + Authorization = (List)value; + return this; + case "activity": + Activity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "agent": + Agent = (List)value; + return this; + case "entity": + Entity = (List)value; + return this; + case "signature": + Signature = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs index d8eaaefee3..76c6d8385d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)] + [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")] public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -298,14 +298,13 @@ public enum QuestionnaireItemOperator /// [Serializable] [DataContract] - [FhirType("Questionnaire#Item", IsNestedType=true)] - [BackboneType("Questionnaire.item")] + [FhirType("Questionnaire.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Item"; } } + public override string TypeName { get { return "Questionnaire.item"; } } /// /// Unique id for item in questionnaire @@ -1002,6 +1001,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "definition": + DefinitionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "code": + Code = (List)value; + return this; + case "prefix": + PrefixElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "enableWhen": + EnableWhen = (List)value; + return this; + case "enableBehavior": + EnableBehaviorElement = (Code)value; + return this; + case "disabledDisplay": + DisabledDisplayElement = (Code)value; + return this; + case "required": + RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "repeats": + RepeatsElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "readOnly": + ReadOnlyElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "maxLength": + MaxLengthElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "answerConstraint": + AnswerConstraintElement = (Code)value; + return this; + case "answerValueSet": + AnswerValueSetElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "answerOption": + AnswerOption = (List)value; + return this; + case "initial": + Initial = (List)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1036,14 +1099,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#EnableWhen", IsNestedType=true)] - [BackboneType("Questionnaire.item.enableWhen")] + [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)] public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#EnableWhen"; } } + public override string TypeName { get { return "Questionnaire.item.enableWhen"; } } /// /// The linkId of question that determines whether item is enabled/disabled @@ -1220,6 +1282,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "question": + QuestionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "operator": + OperatorElement = (Code)value; + return this; + case "answer": + Answer = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1239,14 +1320,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#AnswerOption", IsNestedType=true)] - [BackboneType("Questionnaire.item.answerOption")] + [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)] public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#AnswerOption"; } } + public override string TypeName { get { return "Questionnaire.item.answerOption"; } } /// /// Answer value @@ -1380,6 +1460,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "initialSelected": + InitialSelectedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1398,14 +1494,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#Initial", IsNestedType=true)] - [BackboneType("Questionnaire.item.initial")] + [FhirType("Questionnaire.item.initial", IsBackboneType=true)] public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Initial"; } } + public override string TypeName { get { return "Questionnaire.item.initial"; } } /// /// Actual value for initializing the question @@ -1500,6 +1595,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2386,6 +2494,88 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFrom": + DerivedFromElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subjectType": + SubjectTypeElement = (List>)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "code": + Code = (List)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs index 3c78d3fe35..be8a1b1ca7 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)] + [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")] public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Item", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item")] + [FhirType("QuestionnaireResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Item"; } } + public override string TypeName { get { return "QuestionnaireResponse.item"; } } /// /// Pointer to specific item from Questionnaire @@ -347,6 +346,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "definition": + DefinitionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "text": + TextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "answer": + Answer = (List)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -368,14 +392,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item.answer")] + [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Answer"; } } + public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } } /// /// Single-valued answer to the question @@ -492,6 +515,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -875,6 +914,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "questionnaire": + QuestionnaireElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "authored": + AuthoredElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "item": + Item = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs index d9c4437827..2c482cf2a1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -169,6 +169,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "numerator": + Numerator = (Hl7.Fhir.Model.Quantity)value; + return this; + case "denominator": + Denominator = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs index 1970196d90..bc866d60fd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -190,6 +190,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "lowNumerator": + LowNumerator = (Hl7.Fhir.Model.Quantity)value; + return this; + case "highNumerator": + HighNumerator = (Hl7.Fhir.Model.Quantity)value; + return this; + case "denominator": + Denominator = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs index 6ae84bad29..9939432b27 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization", IsResource=true)] + [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization")] public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId /// [Serializable] [DataContract] - [FhirType("RegulatedAuthorization#Case", IsNestedType=true)] - [BackboneType("RegulatedAuthorization.case")] + [FhirType("RegulatedAuthorization.case", IsBackboneType=true)] public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RegulatedAuthorization#Case"; } } + public override string TypeName { get { return "RegulatedAuthorization.case"; } } /// /// Identifier by which this case can be referenced @@ -253,6 +252,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + Date = (Hl7.Fhir.Model.DataType)value; + return this; + case "application": + Application = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -704,6 +728,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "subject": + Subject = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "region": + Region = (List)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "validityPeriod": + ValidityPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "indication": + Indication = (List)value; + return this; + case "intendedUse": + IntendedUse = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "basis": + Basis = (List)value; + return this; + case "holder": + Holder = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "regulator": + Regulator = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "attachedDocument": + AttachedDocument = (List)value; + return this; + case "case": + Case = (Hl7.Fhir.Model.RegulatedAuthorization.CaseComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs index 6e27e510c6..c1277772c3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)] + [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")] public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("RelatedPerson#Communication", IsNestedType=true)] - [BackboneType("RelatedPerson.communication")] + [FhirType("RelatedPerson.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RelatedPerson#Communication"; } } + public override string TypeName { get { return "RelatedPerson.communication"; } } /// /// The language which can be used to communicate with the related person about the patient's health @@ -205,6 +204,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -602,6 +617,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "relationship": + Relationship = (List)value; + return this; + case "name": + Name = (List)value; + return this; + case "telecom": + Telecom = (List)value; + return this; + case "gender": + GenderElement = (Code)value; + return this; + case "birthDate": + BirthDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "address": + Address = (List)value; + return this; + case "photo": + Photo = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "communication": + Communication = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs index 4e691f70d6..e3dec8d082 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RequestOrchestration","http://hl7.org/fhir/StructureDefinition/RequestOrchestration", IsResource=true)] + [FhirType("RequestOrchestration","http://hl7.org/fhir/StructureDefinition/RequestOrchestration")] public partial class RequestOrchestration : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RequestOrchestration : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#Action", IsNestedType=true)] - [BackboneType("RequestOrchestration.action")] + [FhirType("RequestOrchestration.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#Action"; } } + public override string TypeName { get { return "RequestOrchestration.action"; } } /// /// Pointer to specific item from the PlanDefinition @@ -958,6 +957,97 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "prefix": + PrefixElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "textEquivalent": + TextEquivalentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "code": + Code = (List)value; + return this; + case "documentation": + Documentation = (List)value; + return this; + case "goal": + Goal = (List)value; + return this; + case "condition": + Condition = (List)value; + return this; + case "input": + Input = (List)value; + return this; + case "output": + Output = (List)value; + return this; + case "relatedAction": + RelatedAction = (List)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "groupingBehavior": + GroupingBehaviorElement = (Code)value; + return this; + case "selectionBehavior": + SelectionBehaviorElement = (Code)value; + return this; + case "requiredBehavior": + RequiredBehaviorElement = (Code)value; + return this; + case "precheckBehavior": + PrecheckBehaviorElement = (Code)value; + return this; + case "cardinalityBehavior": + CardinalityBehaviorElement = (Code)value; + return this; + case "resource": + Resource = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "definition": + Definition = (Hl7.Fhir.Model.DataType)value; + return this; + case "transform": + TransformElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "dynamicValue": + DynamicValue = (List)value; + return this; + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1001,14 +1091,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#Condition", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.condition")] + [FhirType("RequestOrchestration.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#Condition"; } } + public override string TypeName { get { return "RequestOrchestration.action.condition"; } } /// /// applicability | start | stop @@ -1140,6 +1229,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "kind": + KindElement = (Code)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1157,14 +1262,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#Input", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.input")] + [FhirType("RequestOrchestration.action.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#Input"; } } + public override string TypeName { get { return "RequestOrchestration.action.input"; } } /// /// User-visible title @@ -1332,6 +1436,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requirement": + Requirement = (Hl7.Fhir.Model.DataRequirement)value; + return this; + case "relatedData": + RelatedDataElement = (Hl7.Fhir.Model.Id)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1350,14 +1473,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#Output", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.output")] + [FhirType("RequestOrchestration.action.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#Output"; } } + public override string TypeName { get { return "RequestOrchestration.action.output"; } } /// /// User-visible title @@ -1525,6 +1647,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requirement": + Requirement = (Hl7.Fhir.Model.DataRequirement)value; + return this; + case "relatedData": + RelatedDataElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1543,14 +1684,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#RelatedAction", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.relatedAction")] + [FhirType("RequestOrchestration.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#RelatedAction"; } } + public override string TypeName { get { return "RequestOrchestration.action.relatedAction"; } } /// /// What action this is related to @@ -1765,6 +1905,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "targetId": + TargetIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "relationship": + RelationshipElement = (Code)value; + return this; + case "endRelationship": + EndRelationshipElement = (Code)value; + return this; + case "offset": + Offset = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1785,14 +1947,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#Participant", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.participant")] + [FhirType("RequestOrchestration.action.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#Participant"; } } + public override string TypeName { get { return "RequestOrchestration.action.participant"; } } /// /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson @@ -2032,6 +2193,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "typeCanonical": + TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "typeReference": + TypeReference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2054,14 +2243,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestOrchestration#DynamicValue", IsNestedType=true)] - [BackboneType("RequestOrchestration.action.dynamicValue")] + [FhirType("RequestOrchestration.action.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestOrchestration#DynamicValue"; } } + public override string TypeName { get { return "RequestOrchestration.action.dynamicValue"; } } /// /// The path to the element to be set dynamically @@ -2190,6 +2378,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expression": + Expression = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2785,6 +2989,70 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "author": + Author = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "goal": + Goal = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs index f1c60b6c23..b9e2e0e395 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Requirements","http://hl7.org/fhir/StructureDefinition/Requirements", IsResource=true)] + [FhirType("Requirements","http://hl7.org/fhir/StructureDefinition/Requirements")] public partial class Requirements : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum ConformanceExpectation /// [Serializable] [DataContract] - [FhirType("Requirements#Statement", IsNestedType=true)] - [BackboneType("Requirements.statement")] + [FhirType("Requirements.statement", IsBackboneType=true)] public partial class StatementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Requirements#Statement"; } } + public override string TypeName { get { return "Requirements.statement"; } } /// /// Key that identifies this statement @@ -559,6 +558,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "key": + KeyElement = (Hl7.Fhir.Model.Id)value; + return this; + case "label": + LabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "conformance": + ConformanceElement = (List>)value; + return this; + case "conditionality": + ConditionalityElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "requirement": + RequirementElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "derivedFrom": + DerivedFromElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "parent": + ParentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "satisfiedBy": + SatisfiedByElement = (List)value; + return this; + case "reference": + ReferenceElement = (List)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1370,6 +1409,79 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFrom": + DerivedFromElement = (List)value; + return this; + case "reference": + ReferenceElement = (List)value; + return this; + case "actor": + ActorElement = (List)value; + return this; + case "statement": + Statement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs index 72150a5a5a..3d3025e629 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)] + [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")] public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -65,14 +65,13 @@ public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Label", IsNestedType=true)] - [BackboneType("ResearchStudy.label")] + [FhirType("ResearchStudy.label", IsBackboneType=true)] public partial class LabelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Label"; } } + public override string TypeName { get { return "ResearchStudy.label"; } } /// /// primary | official | scientific | plain-language | subtitle | short-title | acronym | earlier-title | language | auto-translated | human-use | machine-use | duplicate-uid @@ -202,6 +201,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -219,14 +234,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#AssociatedParty", IsNestedType=true)] - [BackboneType("ResearchStudy.associatedParty")] + [FhirType("ResearchStudy.associatedParty", IsBackboneType=true)] public partial class AssociatedPartyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#AssociatedParty"; } } + public override string TypeName { get { return "ResearchStudy.associatedParty"; } } /// /// Name of associated party @@ -425,6 +439,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "period": + Period = (List)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + case "party": + Party = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -442,14 +481,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#ProgressStatus", IsNestedType=true)] - [BackboneType("ResearchStudy.progressStatus")] + [FhirType("ResearchStudy.progressStatus", IsBackboneType=true)] public partial class ProgressStatusComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#ProgressStatus"; } } + public override string TypeName { get { return "ResearchStudy.progressStatus"; } } /// /// Label for status or state (e.g. recruitment status) @@ -601,6 +639,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "state": + State = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actual": + ActualElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -616,14 +673,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Recruitment", IsNestedType=true)] - [BackboneType("ResearchStudy.recruitment")] + [FhirType("ResearchStudy.recruitment", IsBackboneType=true)] public partial class RecruitmentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Recruitment"; } } + public override string TypeName { get { return "ResearchStudy.recruitment"; } } /// /// Estimated total number of participants to be enrolled @@ -816,6 +872,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "targetNumber": + TargetNumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "actualNumber": + ActualNumberElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "eligibility": + Eligibility = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "actualGroup": + ActualGroup = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -836,14 +914,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#ComparisonGroup", IsNestedType=true)] - [BackboneType("ResearchStudy.comparisonGroup")] + [FhirType("ResearchStudy.comparisonGroup", IsBackboneType=true)] public partial class ComparisonGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#ComparisonGroup"; } } + public override string TypeName { get { return "ResearchStudy.comparisonGroup"; } } /// /// Allows the comparisonGroup for the study and the comparisonGroup for the subject to be linked easily @@ -1099,6 +1176,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "linkId": + LinkIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "intendedExposure": + IntendedExposure = (List)value; + return this; + case "observedGroup": + ObservedGroup = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1120,14 +1225,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Objective", IsNestedType=true)] - [BackboneType("ResearchStudy.objective")] + [FhirType("ResearchStudy.objective", IsBackboneType=true)] public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Objective"; } } + public override string TypeName { get { return "ResearchStudy.objective"; } } /// /// Label for the objective @@ -1296,6 +1400,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1315,14 +1438,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ResearchStudy#OutcomeMeasure", IsNestedType=true)] - [BackboneType("ResearchStudy.outcomeMeasure")] + [FhirType("ResearchStudy.outcomeMeasure", IsBackboneType=true)] public partial class OutcomeMeasureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#OutcomeMeasure"; } } + public override string TypeName { get { return "ResearchStudy.outcomeMeasure"; } } /// /// Label for the outcome @@ -1515,6 +1637,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "reference": + Reference = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2450,6 +2594,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "label": + Label = (List)value; + return this; + case "protocol": + Protocol = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "relatedArtifact": + RelatedArtifact = (List)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "primaryPurposeType": + PrimaryPurposeType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "phase": + Phase = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "studyDesign": + StudyDesign = (List)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "condition": + Condition = (List)value; + return this; + case "keyword": + Keyword = (List)value; + return this; + case "region": + Region = (List)value; + return this; + case "descriptionSummary": + DescriptionSummaryElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "site": + Site = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "classifier": + Classifier = (List)value; + return this; + case "associatedParty": + AssociatedParty = (List)value; + return this; + case "progressStatus": + ProgressStatus = (List)value; + return this; + case "whyStopped": + WhyStopped = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "recruitment": + Recruitment = (Hl7.Fhir.Model.ResearchStudy.RecruitmentComponent)value; + return this; + case "comparisonGroup": + ComparisonGroup = (List)value; + return this; + case "objective": + Objective = (List)value; + return this; + case "outcomeMeasure": + OutcomeMeasure = (List)value; + return this; + case "result": + Result = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs index 7cfc7f53f4..30225977fc 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)] + [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")] public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -158,14 +158,13 @@ public enum ResearchSubjectState /// [Serializable] [DataContract] - [FhirType("ResearchSubject#Progress", IsNestedType=true)] - [BackboneType("ResearchSubject.progress")] + [FhirType("ResearchSubject.progress", IsBackboneType=true)] public partial class ProgressComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchSubject#Progress"; } } + public override string TypeName { get { return "ResearchSubject.progress"; } } /// /// state | milestone @@ -400,6 +399,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subjectState": + SubjectState = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "milestone": + Milestone = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "startDate": + StartDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "endDate": + EndDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -739,6 +766,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "progress": + Progress = (List)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "study": + Study = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "assignedComparisonGroup": + AssignedComparisonGroupElement = (Hl7.Fhir.Model.Id)value; + return this; + case "actualComparisonGroup": + ActualComparisonGroupElement = (Hl7.Fhir.Model.Id)value; + return this; + case "consent": + Consent = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs index 50ae6ee53d..95a7336eba 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)] + [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")] public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("RiskAssessment#Prediction", IsNestedType=true)] - [BackboneType("RiskAssessment.prediction")] + [FhirType("RiskAssessment.prediction", IsBackboneType=true)] public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskAssessment#Prediction"; } } + public override string TypeName { get { return "RiskAssessment.prediction"; } } /// /// Possible outcome for the subject @@ -312,6 +311,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "outcome": + Outcome = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "probability": + Probability = (Hl7.Fhir.Model.DataType)value; + return this; + case "qualitativeRisk": + QualitativeRisk = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "relativeRisk": + RelativeRiskElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "when": + When = (Hl7.Fhir.Model.DataType)value; + return this; + case "rationale": + RationaleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -792,6 +819,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "parent": + Parent = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "condition": + Condition = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performer": + Performer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "basis": + Basis = (List)value; + return this; + case "prediction": + Prediction = (List)value; + return this; + case "mitigation": + MitigationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs index db69a0301f..679e41fd5a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -503,6 +503,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "origin": + Origin = (Hl7.Fhir.Model.Quantity)value; + return this; + case "interval": + IntervalElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "intervalUnit": + IntervalUnitElement = (Hl7.Fhir.Model.Code)value; + return this; + case "factor": + FactorElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "lowerLimit": + LowerLimitElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "upperLimit": + UpperLimitElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "dimensions": + DimensionsElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "codeMap": + CodeMapElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "offsets": + OffsetsElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "data": + DataElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs index b005276c89..b98ac57d11 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)] + [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")] public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -378,6 +378,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "active": + ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "serviceCategory": + ServiceCategory = (List)value; + return this; + case "serviceType": + ServiceType = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "actor": + Actor = (List)value; + return this; + case "planningHorizon": + PlanningHorizon = (Hl7.Fhir.Model.Period)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs index 408f1826b3..cfcf1b5345 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)] + [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")] public partial class SearchParameter : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum SearchProcessingModeType /// [Serializable] [DataContract] - [FhirType("SearchParameter#Component", IsNestedType=true)] - [BackboneType("SearchParameter.component")] + [FhirType("SearchParameter.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SearchParameter#Component"; } } + public override string TypeName { get { return "SearchParameter.component"; } } /// /// Defines how the part works @@ -252,6 +251,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "definition": + DefinitionElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1464,6 +1479,109 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFrom": + DerivedFromElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "base": + BaseElement = (List>)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "processingMode": + ProcessingModeElement = (Code)value; + return this; + case "constraint": + ConstraintElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "target": + TargetElement = (List>)value; + return this; + case "multipleOr": + MultipleOrElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "multipleAnd": + MultipleAndElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "comparator": + ComparatorElement = (List>)value; + return this; + case "modifier": + ModifierElement = (List>)value; + return this; + case "chain": + ChainElement = (List)value; + return this; + case "component": + Component = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs index 254b640545..e5890fe20d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)] + [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")] public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("ServiceRequest#OrderDetail", IsNestedType=true)] - [BackboneType("ServiceRequest.orderDetail")] + [FhirType("ServiceRequest.orderDetail", IsBackboneType=true)] public partial class OrderDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ServiceRequest#OrderDetail"; } } + public override string TypeName { get { return "ServiceRequest.orderDetail"; } } /// /// The context of the order details by reference @@ -187,6 +186,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "parameterFocus": + ParameterFocus = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -201,14 +216,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ServiceRequest#Parameter", IsNestedType=true)] - [BackboneType("ServiceRequest.orderDetail.parameter")] + [FhirType("ServiceRequest.orderDetail.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ServiceRequest#Parameter"; } } + public override string TypeName { get { return "ServiceRequest.orderDetail.parameter"; } } /// /// The detail of the order being requested @@ -324,6 +338,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -341,14 +371,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ServiceRequest#PatientInstruction", IsNestedType=true)] - [BackboneType("ServiceRequest.patientInstruction")] + [FhirType("ServiceRequest.patientInstruction", IsBackboneType=true)] public partial class PatientInstructionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ServiceRequest#PatientInstruction"; } } + public override string TypeName { get { return "ServiceRequest.patientInstruction"; } } /// /// Patient or consumer-oriented instructions @@ -441,6 +470,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "instruction": + Instruction = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1399,6 +1441,115 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (List)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "replaces": + Replaces = (List)value; + return this; + case "requisition": + Requisition = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "orderDetail": + OrderDetail = (List)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.DataType)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "focus": + Focus = (List)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "asNeeded": + AsNeeded = (Hl7.Fhir.Model.DataType)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performerType": + PerformerType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "supportingInfo": + SupportingInfo = (List)value; + return this; + case "specimen": + Specimen = (List)value; + return this; + case "bodySite": + BodySite = (List)value; + return this; + case "bodyStructure": + BodyStructure = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "note": + Note = (List)value; + return this; + case "patientInstruction": + PatientInstruction = (List)value; + return this; + case "relevantHistory": + RelevantHistory = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs index 7c1ca9f471..4c2a9f5a41 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)] + [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")] public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -503,6 +503,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "serviceCategory": + ServiceCategory = (List)value; + return this; + case "serviceType": + ServiceType = (List)value; + return this; + case "specialty": + Specialty = (List)value; + return this; + case "appointmentType": + AppointmentType = (List)value; + return this; + case "schedule": + Schedule = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "start": + StartElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "end": + EndElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "overbooked": + OverbookedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs index 3c31f8f073..84e43cdc67 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)] + [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")] public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum SpecimenCombined /// [Serializable] [DataContract] - [FhirType("Specimen#Feature", IsNestedType=true)] - [BackboneType("Specimen.feature")] + [FhirType("Specimen.feature", IsBackboneType=true)] public partial class FeatureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Feature"; } } + public override string TypeName { get { return "Specimen.feature"; } } /// /// Highlighted feature @@ -262,6 +261,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -279,14 +294,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Collection", IsNestedType=true)] - [BackboneType("Specimen.collection")] + [FhirType("Specimen.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Collection"; } } + public override string TypeName { get { return "Specimen.collection"; } } /// /// Who collected the specimen @@ -556,6 +570,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "collector": + Collector = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "collected": + Collected = (Hl7.Fhir.Model.DataType)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.Duration)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "device": + Device = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "procedure": + Procedure = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "bodySite": + BodySite = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "fastingStatus": + FastingStatus = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -580,14 +631,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Processing", IsNestedType=true)] - [BackboneType("Specimen.processing")] + [FhirType("Specimen.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Processing"; } } + public override string TypeName { get { return "Specimen.processing"; } } /// /// Textual description of procedure @@ -764,6 +814,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "additive": + Additive = (List)value; + return this; + case "time": + Time = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -783,14 +855,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Container", IsNestedType=true)] - [BackboneType("Specimen.container")] + [FhirType("Specimen.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Container"; } } + public override string TypeName { get { return "Specimen.container"; } } /// /// Device resource for the container @@ -927,6 +998,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "device": + Device = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "specimenQuantity": + SpecimenQuantity = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1418,6 +1508,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "accessionIdentifier": + AccessionIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "receivedTime": + ReceivedTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "parent": + Parent = (List)value; + return this; + case "request": + Request = (List)value; + return this; + case "combined": + CombinedElement = (Code)value; + return this; + case "role": + Role = (List)value; + return this; + case "feature": + Feature = (List)value; + return this; + case "collection": + Collection = (Hl7.Fhir.Model.Specimen.CollectionComponent)value; + return this; + case "processing": + Processing = (List)value; + return this; + case "container": + Container = (List)value; + return this; + case "condition": + Condition = (List)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs index e0f0722ca0..d21fb73018 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)] + [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")] public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -89,14 +89,13 @@ public enum SpecimenContainedPreference /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested")] + [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)] public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested"; } } /// /// Primary or secondary specimen @@ -456,6 +455,46 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "isDerived": + IsDerivedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preference": + PreferenceElement = (Code)value; + return this; + case "container": + Container = (Hl7.Fhir.Model.SpecimenDefinition.ContainerComponent)value; + return this; + case "requirement": + RequirementElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "retentionTime": + RetentionTime = (Hl7.Fhir.Model.Duration)value; + return this; + case "singleUse": + SingleUseElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "rejectionCriterion": + RejectionCriterion = (List)value; + return this; + case "handling": + Handling = (List)value; + return this; + case "testingDestination": + TestingDestination = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -478,14 +517,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Container", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container")] + [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Container"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } } /// /// The material type used for the container @@ -764,6 +802,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "material": + Material = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "cap": + Cap = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "capacity": + Capacity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "minimumVolume": + MinimumVolume = (Hl7.Fhir.Model.DataType)value; + return this; + case "additive": + Additive = (List)value; + return this; + case "preparation": + PreparationElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -787,14 +859,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Additive", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.container.additive")] + [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)] public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Additive"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } } /// /// Additive associated with container @@ -889,6 +960,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "additive": + Additive = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -905,14 +989,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SpecimenDefinition#Handling", IsNestedType=true)] - [BackboneType("SpecimenDefinition.typeTested.handling")] + [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)] public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SpecimenDefinition#Handling"; } } + public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } } /// /// Qualifies the interval of temperature @@ -1084,6 +1167,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "temperatureQualifier": + TemperatureQualifier = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "temperatureRange": + TemperatureRange = (Hl7.Fhir.Model.Range)value; + return this; + case "maxDuration": + MaxDuration = (Hl7.Fhir.Model.Duration)value; + return this; + case "instruction": + InstructionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2078,6 +2183,100 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFromCanonical": + DerivedFromCanonicalElement = (List)value; + return this; + case "derivedFromUri": + DerivedFromUriElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "subject": + Subject = (Hl7.Fhir.Model.DataType)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "typeCollected": + TypeCollected = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "patientPreparation": + PatientPreparation = (List)value; + return this; + case "timeAspect": + TimeAspectElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "collection": + Collection = (List)value; + return this; + case "typeTested": + TypeTested = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs index 3802fd1a41..32e289d8e9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)] + [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")] public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -329,14 +329,13 @@ public enum StructureMapTransform /// [Serializable] [DataContract] - [FhirType("StructureMap#Structure", IsNestedType=true)] - [BackboneType("StructureMap.structure")] + [FhirType("StructureMap.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Structure"; } } + public override string TypeName { get { return "StructureMap.structure"; } } /// /// Canonical reference to structure definition @@ -565,6 +564,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "mode": + ModeElement = (Code)value; + return this; + case "alias": + AliasElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -584,14 +605,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Const", IsNestedType=true)] - [BackboneType("StructureMap.const")] + [FhirType("StructureMap.const", IsBackboneType=true)] public partial class ConstComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Const"; } } + public override string TypeName { get { return "StructureMap.const"; } } /// /// Constant name @@ -738,6 +758,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Id)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -755,14 +791,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Group", IsNestedType=true)] - [BackboneType("StructureMap.group")] + [FhirType("StructureMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Group"; } } + public override string TypeName { get { return "StructureMap.group"; } } /// /// Human-readable label @@ -1034,6 +1069,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Id)value; + return this; + case "extends": + ExtendsElement = (Hl7.Fhir.Model.Id)value; + return this; + case "typeMode": + TypeModeElement = (Code)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "input": + Input = (List)value; + return this; + case "rule": + Rule = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1056,14 +1119,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Input", IsNestedType=true)] - [BackboneType("StructureMap.group.input")] + [FhirType("StructureMap.group.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Input"; } } + public override string TypeName { get { return "StructureMap.group.input"; } } /// /// Name for this instance of data @@ -1292,6 +1354,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Id)value; + return this; + case "type": + TypeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "mode": + ModeElement = (Code)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1308,14 +1392,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Rule", IsNestedType=true)] - [BackboneType("StructureMap.group.rule")] + [FhirType("StructureMap.group.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Rule"; } } + public override string TypeName { get { return "StructureMap.group.rule"; } } /// /// Name of the rule for internal references @@ -1550,6 +1633,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Id)value; + return this; + case "source": + Source = (List)value; + return this; + case "target": + Target = (List)value; + return this; + case "rule": + Rule = (List)value; + return this; + case "dependent": + Dependent = (List)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1568,14 +1679,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Source", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.source")] + [FhirType("StructureMap.group.rule.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Source"; } } + public override string TypeName { get { return "StructureMap.group.rule.source"; } } /// /// Type or variable this rule applies to @@ -2076,6 +2186,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "context": + ContextElement = (Hl7.Fhir.Model.Id)value; + return this; + case "min": + MinElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "max": + MaxElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + TypeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "defaultValue": + DefaultValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "element": + ElementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "listMode": + ListModeElement = (Code)value; + return this; + case "variable": + VariableElement = (Hl7.Fhir.Model.Id)value; + return this; + case "condition": + ConditionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "check": + CheckElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "logMessage": + LogMessageElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2099,14 +2252,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Target", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target")] + [FhirType("StructureMap.group.rule.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Target"; } } + public override string TypeName { get { return "StructureMap.group.rule.target"; } } /// /// Variable this rule applies to @@ -2436,6 +2588,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "context": + ContextElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "element": + ElementElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "variable": + VariableElement = (Hl7.Fhir.Model.Id)value; + return this; + case "listMode": + ListModeElement = (List>)value; + return this; + case "listRuleId": + ListRuleIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "transform": + TransformElement = (Code)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2455,14 +2638,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Parameter", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target.parameter")] + [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Parameter"; } } + public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } } /// /// Parameter value - variable or literal @@ -2555,6 +2737,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2568,14 +2763,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Dependent", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.dependent")] + [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)] public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Dependent"; } } + public override string TypeName { get { return "StructureMap.group.rule.dependent"; } } /// /// Name of a rule or group to apply @@ -2706,6 +2900,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Id)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3475,6 +3685,79 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "structure": + Structure = (List)value; + return this; + case "import": + ImportElement = (List)value; + return this; + case "const": + Const = (List)value; + return this; + case "group": + Group = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs index cc0843b5eb..cf37379f5a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)] + [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")] public partial class Subscription : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum SubscriptionPayloadContent /// [Serializable] [DataContract] - [FhirType("Subscription#FilterBy", IsNestedType=true)] - [BackboneType("Subscription.filterBy")] + [FhirType("Subscription.filterBy", IsBackboneType=true)] public partial class FilterByComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Subscription#FilterBy"; } } + public override string TypeName { get { return "Subscription.filterBy"; } } /// /// Allowed Resource (reference to definition) for this Subscription filter @@ -373,6 +372,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "resourceType": + ResourceTypeElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "filterParameter": + FilterParameterElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "comparator": + ComparatorElement = (Code)value; + return this; + case "modifier": + ModifierElement = (Code)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -394,14 +418,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Subscription#Parameter", IsNestedType=true)] - [BackboneType("Subscription.parameter")] + [FhirType("Subscription.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Subscription#Parameter"; } } + public override string TypeName { get { return "Subscription.parameter"; } } /// /// Name (key) of the parameter @@ -550,6 +573,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1198,6 +1237,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "topic": + TopicElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "end": + EndElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "managingEntity": + ManagingEntity = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + ReasonElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "filterBy": + FilterBy = (List)value; + return this; + case "channelType": + ChannelType = (Hl7.Fhir.Model.Coding)value; + return this; + case "endpoint": + EndpointElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "heartbeatPeriod": + HeartbeatPeriodElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "timeout": + TimeoutElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + case "contentType": + ContentTypeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "content": + ContentElement = (Code)value; + return this; + case "maxCount": + MaxCountElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs index 17d4ce3156..75d83880a4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus", IsResource=true)] + [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus")] public partial class SubscriptionStatus : Hl7.Fhir.Model.DomainResource { /// @@ -107,14 +107,13 @@ public enum SubscriptionNotificationType /// [Serializable] [DataContract] - [FhirType("SubscriptionStatus#NotificationEvent", IsNestedType=true)] - [BackboneType("SubscriptionStatus.notificationEvent")] + [FhirType("SubscriptionStatus.notificationEvent", IsBackboneType=true)] public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionStatus#NotificationEvent"; } } + public override string TypeName { get { return "SubscriptionStatus.notificationEvent"; } } /// /// Sequencing index of this event @@ -309,6 +308,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "eventNumber": + EventNumberElement = (Hl7.Fhir.Model.Integer64)value; + return this; + case "timestamp": + TimestampElement = (Hl7.Fhir.Model.Instant)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "additionalContext": + AdditionalContext = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -617,6 +638,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "status": + StatusElement = (Code)value; + return this; + case "type": + TypeElement = (Code)value; + return this; + case "eventsSinceSubscriptionStart": + EventsSinceSubscriptionStartElement = (Hl7.Fhir.Model.Integer64)value; + return this; + case "notificationEvent": + NotificationEvent = (List)value; + return this; + case "subscription": + Subscription = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "topic": + TopicElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "error": + Error = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs index e90869c470..b218e117ba 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic", IsResource=true)] + [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic")] public partial class SubscriptionTopic : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -117,14 +117,13 @@ public enum CriteriaNotExistsBehavior /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#ResourceTrigger", IsNestedType=true)] - [BackboneType("SubscriptionTopic.resourceTrigger")] + [FhirType("SubscriptionTopic.resourceTrigger", IsBackboneType=true)] public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#ResourceTrigger"; } } + public override string TypeName { get { return "SubscriptionTopic.resourceTrigger"; } } /// /// Text representation of the resource trigger @@ -375,6 +374,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "supportedInteraction": + SupportedInteractionElement = (List>)value; + return this; + case "queryCriteria": + QueryCriteria = (Hl7.Fhir.Model.SubscriptionTopic.QueryCriteriaComponent)value; + return this; + case "fhirPathCriteria": + FhirPathCriteriaElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -395,14 +419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#QueryCriteria", IsNestedType=true)] - [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")] + [FhirType("SubscriptionTopic.resourceTrigger.queryCriteria", IsBackboneType=true)] public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#QueryCriteria"; } } + public override string TypeName { get { return "SubscriptionTopic.resourceTrigger.queryCriteria"; } } /// /// Rule applied to previous resource state @@ -670,6 +693,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "previous": + PreviousElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "resultForCreate": + ResultForCreateElement = (Code)value; + return this; + case "current": + CurrentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "resultForDelete": + ResultForDeleteElement = (Code)value; + return this; + case "requireBoth": + RequireBothElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -690,14 +738,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#EventTrigger", IsNestedType=true)] - [BackboneType("SubscriptionTopic.eventTrigger")] + [FhirType("SubscriptionTopic.eventTrigger", IsBackboneType=true)] public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#EventTrigger"; } } + public override string TypeName { get { return "SubscriptionTopic.eventTrigger"; } } /// /// Text representation of the event trigger @@ -869,6 +916,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "event": + Event = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -887,14 +953,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#CanFilterBy", IsNestedType=true)] - [BackboneType("SubscriptionTopic.canFilterBy")] + [FhirType("SubscriptionTopic.canFilterBy", IsBackboneType=true)] public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#CanFilterBy"; } } + public override string TypeName { get { return "SubscriptionTopic.canFilterBy"; } } /// /// Description of this filter parameter @@ -1205,6 +1270,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "filterParameter": + FilterParameterElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "filterDefinition": + FilterDefinitionElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "comparator": + ComparatorElement = (List>)value; + return this; + case "modifier": + ModifierElement = (List>)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1226,14 +1319,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubscriptionTopic#NotificationShape", IsNestedType=true)] - [BackboneType("SubscriptionTopic.notificationShape")] + [FhirType("SubscriptionTopic.notificationShape", IsBackboneType=true)] public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubscriptionTopic#NotificationShape"; } } + public override string TypeName { get { return "SubscriptionTopic.notificationShape"; } } /// /// URL of the Resource that is the focus (main) resource in a notification shape @@ -1423,6 +1515,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "include": + IncludeElement = (List)value; + return this; + case "revInclude": + RevIncludeElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2313,6 +2424,91 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "derivedFrom": + DerivedFromElement = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "approvalDate": + ApprovalDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "lastReviewDate": + LastReviewDateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "effectivePeriod": + EffectivePeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "resourceTrigger": + ResourceTrigger = (List)value; + return this; + case "eventTrigger": + EventTrigger = (List)value; + return this; + case "canFilterBy": + CanFilterBy = (List)value; + return this; + case "notificationShape": + NotificationShape = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs index f64259023a..9561af9056 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)] + [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")] public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus /// [Serializable] [DataContract] - [FhirType("Substance#Ingredient", IsNestedType=true)] - [BackboneType("Substance.ingredient")] + [FhirType("Substance.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Ingredient"; } } + public override string TypeName { get { return "Substance.ingredient"; } } /// /// Optional amount (concentration) @@ -215,6 +214,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "quantity": + Quantity = (Hl7.Fhir.Model.Ratio)value; + return this; + case "substance": + Substance = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -563,6 +578,43 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instance": + InstanceElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "category": + Category = (List)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "expiry": + ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "ingredient": + Ingredient = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs index 6e6effd751..1f2be3dccf 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition", IsResource=true)] + [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition")] public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -61,14 +61,13 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Moiety", IsNestedType=true)] - [BackboneType("SubstanceDefinition.moiety")] + [FhirType("SubstanceDefinition.moiety", IsBackboneType=true)] public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Moiety"; } } + public override string TypeName { get { return "SubstanceDefinition.moiety"; } } /// /// Role that the moiety is playing @@ -346,6 +345,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "role": + Role = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "stereochemistry": + Stereochemistry = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "opticalActivity": + OpticalActivity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "molecularFormula": + MolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.DataType)value; + return this; + case "measurementType": + MeasurementType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -366,14 +399,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Characterization", IsNestedType=true)] - [BackboneType("SubstanceDefinition.characterization")] + [FhirType("SubstanceDefinition.characterization", IsBackboneType=true)] public partial class CharacterizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Characterization"; } } + public override string TypeName { get { return "SubstanceDefinition.characterization"; } } /// /// The method used to find the characterization e.g. HPLC @@ -547,6 +579,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "technique": + Technique = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "form": + Form = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "file": + File = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -563,14 +617,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Property", IsNestedType=true)] - [BackboneType("SubstanceDefinition.property")] + [FhirType("SubstanceDefinition.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Property"; } } + public override string TypeName { get { return "SubstanceDefinition.property"; } } /// /// A code expressing the type of property @@ -685,6 +738,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -702,14 +771,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#MolecularWeight", IsNestedType=true)] - [BackboneType("SubstanceDefinition.molecularWeight")] + [FhirType("SubstanceDefinition.molecularWeight", IsBackboneType=true)] public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#MolecularWeight"; } } + public override string TypeName { get { return "SubstanceDefinition.molecularWeight"; } } /// /// The method by which the weight was determined @@ -844,6 +912,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "method": + Method = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -859,14 +946,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Structure", IsNestedType=true)] - [BackboneType("SubstanceDefinition.structure")] + [FhirType("SubstanceDefinition.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Structure"; } } + public override string TypeName { get { return "SubstanceDefinition.structure"; } } /// /// Stereochemistry type @@ -1147,6 +1233,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "stereochemistry": + Stereochemistry = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "opticalActivity": + OpticalActivity = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "molecularFormula": + MolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "molecularFormulaByMoiety": + MolecularFormulaByMoietyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "molecularWeight": + MolecularWeight = (Hl7.Fhir.Model.SubstanceDefinition.MolecularWeightComponent)value; + return this; + case "technique": + Technique = (List)value; + return this; + case "sourceDocument": + SourceDocument = (List)value; + return this; + case "representation": + Representation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1167,14 +1287,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Representation", IsNestedType=true)] - [BackboneType("SubstanceDefinition.structure.representation")] + [FhirType("SubstanceDefinition.structure.representation", IsBackboneType=true)] public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Representation"; } } + public override string TypeName { get { return "SubstanceDefinition.structure.representation"; } } /// /// The kind of structural representation (e.g. full, partial) @@ -1349,6 +1468,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "representation": + RepresentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "format": + Format = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "document": + Document = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1365,14 +1506,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Code", IsNestedType=true)] - [BackboneType("SubstanceDefinition.code")] + [FhirType("SubstanceDefinition.code", IsBackboneType=true)] public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Code"; } } + public override string TypeName { get { return "SubstanceDefinition.code"; } } /// /// The specific code @@ -1569,6 +1709,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "note": + Note = (List)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1586,14 +1751,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Name", IsNestedType=true)] - [BackboneType("SubstanceDefinition.name")] + [FhirType("SubstanceDefinition.name", IsBackboneType=true)] public partial class NameComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Name"; } } + public override string TypeName { get { return "SubstanceDefinition.name"; } } /// /// The actual name @@ -1944,6 +2108,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "preferred": + PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "language": + Language = (List)value; + return this; + case "domain": + Domain = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "synonym": + Synonym = (List)value; + return this; + case "translation": + Translation = (List)value; + return this; + case "official": + Official = (List)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1967,14 +2174,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Official", IsNestedType=true)] - [BackboneType("SubstanceDefinition.name.official")] + [FhirType("SubstanceDefinition.name.official", IsBackboneType=true)] public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Official"; } } + public override string TypeName { get { return "SubstanceDefinition.name.official"; } } /// /// Which authority uses this official name @@ -2126,6 +2332,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "authority": + Authority = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2144,14 +2369,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#Relationship", IsNestedType=true)] - [BackboneType("SubstanceDefinition.relationship")] + [FhirType("SubstanceDefinition.relationship", IsBackboneType=true)] public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#Relationship"; } } + public override string TypeName { get { return "SubstanceDefinition.relationship"; } } /// /// A pointer to another substance, as a resource or a representational code @@ -2396,6 +2620,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "substanceDefinition": + SubstanceDefinition = (Hl7.Fhir.Model.DataType)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "isDefining": + IsDefiningElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.DataType)value; + return this; + case "ratioHighLimitAmount": + RatioHighLimitAmount = (Hl7.Fhir.Model.Ratio)value; + return this; + case "comparator": + Comparator = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2418,14 +2673,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceDefinition#SourceMaterial", IsNestedType=true)] - [BackboneType("SubstanceDefinition.sourceMaterial")] + [FhirType("SubstanceDefinition.sourceMaterial", IsBackboneType=true)] public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceDefinition#SourceMaterial"; } } + public override string TypeName { get { return "SubstanceDefinition.sourceMaterial"; } } /// /// Classification of the origin of the raw material. e.g. cat hair is an Animal source type @@ -2605,6 +2859,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "genus": + Genus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "species": + Species = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "part": + Part = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "countryOfOrigin": + CountryOfOrigin = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3257,6 +3536,88 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + Status = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "classification": + Classification = (List)value; + return this; + case "domain": + Domain = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "grade": + Grade = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "informationSource": + InformationSource = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "manufacturer": + Manufacturer = (List)value; + return this; + case "supplier": + Supplier = (List)value; + return this; + case "moiety": + Moiety = (List)value; + return this; + case "characterization": + Characterization = (List)value; + return this; + case "property": + Property = (List)value; + return this; + case "referenceInformation": + ReferenceInformation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "molecularWeight": + MolecularWeight = (List)value; + return this; + case "structure": + Structure = (Hl7.Fhir.Model.SubstanceDefinition.StructureComponent)value; + return this; + case "code": + Code = (List)value; + return this; + case "name": + Name = (List)value; + return this; + case "relationship": + Relationship = (List)value; + return this; + case "nucleicAcid": + NucleicAcid = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "polymer": + Polymer = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "protein": + Protein = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "sourceMaterial": + SourceMaterial = (Hl7.Fhir.Model.SubstanceDefinition.SourceMaterialComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs index 9ca538af52..eaa7334187 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid", IsResource=true)] + [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid")] public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Subunit", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit")] + [FhirType("SubstanceNucleicAcid.subunit", IsBackboneType=true)] public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Subunit"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit"; } } /// /// Index of linear sequences of nucleic acids in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts @@ -361,6 +360,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "subunit": + SubunitElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "sequence": + SequenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "length": + LengthElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "sequenceAttachment": + SequenceAttachment = (Hl7.Fhir.Model.Attachment)value; + return this; + case "fivePrime": + FivePrime = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "threePrime": + ThreePrime = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "linkage": + Linkage = (List)value; + return this; + case "sugar": + Sugar = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -381,14 +414,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Linkage", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit.linkage")] + [FhirType("SubstanceNucleicAcid.subunit.linkage", IsBackboneType=true)] public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Linkage"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit.linkage"; } } /// /// The entity that links the sugar residues together should also be captured for nearly all naturally occurring nucleic acid the linkage is a phosphate group. For many synthetic oligonucleotides phosphorothioate linkages are often seen. Linkage connectivity is assumed to be 3’-5’. If the linkage is either 3’-3’ or 5’-5’ this should be specified @@ -595,6 +627,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "connectivity": + ConnectivityElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "residueSite": + ResidueSiteElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -611,14 +665,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceNucleicAcid#Sugar", IsNestedType=true)] - [BackboneType("SubstanceNucleicAcid.subunit.sugar")] + [FhirType("SubstanceNucleicAcid.subunit.sugar", IsBackboneType=true)] public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceNucleicAcid#Sugar"; } } + public override string TypeName { get { return "SubstanceNucleicAcid.subunit.sugar"; } } /// /// The Substance ID of the sugar or sugar-like component that make up the nucleotide @@ -786,6 +839,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "residueSite": + ResidueSiteElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1005,6 +1077,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequenceType": + SequenceType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "numberOfSubunits": + NumberOfSubunitsElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "areaOfHybridisation": + AreaOfHybridisationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "oligoNucleotideType": + OligoNucleotideType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subunit": + Subunit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs index 1dd813a416..015d398d4c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer", IsResource=true)] + [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer")] public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -61,14 +61,13 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#MonomerSet", IsNestedType=true)] - [BackboneType("SubstancePolymer.monomerSet")] + [FhirType("SubstancePolymer.monomerSet", IsBackboneType=true)] public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#MonomerSet"; } } + public override string TypeName { get { return "SubstancePolymer.monomerSet"; } } /// /// Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio @@ -180,6 +179,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "ratioType": + RatioType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "startingMaterial": + StartingMaterial = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -194,14 +209,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#StartingMaterial", IsNestedType=true)] - [BackboneType("SubstancePolymer.monomerSet.startingMaterial")] + [FhirType("SubstancePolymer.monomerSet.startingMaterial", IsBackboneType=true)] public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#StartingMaterial"; } } + public override string TypeName { get { return "SubstancePolymer.monomerSet.startingMaterial"; } } /// /// The type of substance for this starting material @@ -372,6 +386,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "isDefining": + IsDefiningElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.Quantity)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -388,14 +424,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#Repeat", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat")] + [FhirType("SubstancePolymer.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#Repeat"; } } + public override string TypeName { get { return "SubstancePolymer.repeat"; } } /// /// A representation of an (average) molecular formula from a polymer @@ -546,6 +581,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "averageMolecularFormula": + AverageMolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "repeatUnitAmountType": + RepeatUnitAmountType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "repeatUnit": + RepeatUnit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -561,14 +615,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#RepeatUnit", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit")] + [FhirType("SubstancePolymer.repeat.repeatUnit", IsBackboneType=true)] public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#RepeatUnit"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit"; } } /// /// Structural repeat units are essential elements for defining polymers @@ -780,6 +833,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "unit": + UnitElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "orientation": + Orientation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + AmountElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "degreeOfPolymerisation": + DegreeOfPolymerisation = (List)value; + return this; + case "structuralRepresentation": + StructuralRepresentation = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -797,14 +875,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#DegreeOfPolymerisation", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")] + [FhirType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation", IsBackboneType=true)] public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#DegreeOfPolymerisation"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation"; } } /// /// The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio @@ -1011,6 +1088,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "average": + AverageElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "low": + LowElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "high": + HighElement = (Hl7.Fhir.Model.Integer)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1027,14 +1126,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstancePolymer#StructuralRepresentation", IsNestedType=true)] - [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")] + [FhirType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation", IsBackboneType=true)] public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstancePolymer#StructuralRepresentation"; } } + public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.structuralRepresentation"; } } /// /// The type of structure (e.g. Full, Partial, Representative) @@ -1205,6 +1303,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "representation": + RepresentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "format": + Format = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "attachment": + Attachment = (Hl7.Fhir.Model.Attachment)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1453,6 +1573,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "class": + Class = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "geometry": + Geometry = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "copolymerConnectivity": + CopolymerConnectivity = (List)value; + return this; + case "modification": + ModificationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "monomerSet": + MonomerSet = (List)value; + return this; + case "repeat": + Repeat = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs index 7ad66207a9..f53b6b2520 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein", IsResource=true)] + [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein")] public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceProtein#Subunit", IsNestedType=true)] - [BackboneType("SubstanceProtein.subunit")] + [FhirType("SubstanceProtein.subunit", IsBackboneType=true)] public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceProtein#Subunit"; } } + public override string TypeName { get { return "SubstanceProtein.subunit"; } } /// /// Index of primary sequences of amino acids linked through peptide bonds in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts @@ -395,6 +394,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "subunit": + SubunitElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "sequence": + SequenceElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "length": + LengthElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "sequenceAttachment": + SequenceAttachment = (Hl7.Fhir.Model.Attachment)value; + return this; + case "nTerminalModificationId": + NTerminalModificationId = (Hl7.Fhir.Model.Identifier)value; + return this; + case "nTerminalModification": + NTerminalModificationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "cTerminalModificationId": + CTerminalModificationId = (Hl7.Fhir.Model.Identifier)value; + return this; + case "cTerminalModification": + CTerminalModificationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -599,6 +632,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequenceType": + SequenceType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "numberOfSubunits": + NumberOfSubunitsElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "disulfideLinkage": + DisulfideLinkageElement = (List)value; + return this; + case "subunit": + Subunit = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs index 5f35448771..ae7662f21b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation", IsResource=true)] + [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation")] public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#Gene", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.gene")] + [FhirType("SubstanceReferenceInformation.gene", IsBackboneType=true)] public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#Gene"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.gene"; } } /// /// Todo @@ -203,6 +202,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "geneSequenceOrigin": + GeneSequenceOrigin = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "gene": + Gene = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -218,14 +236,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#GeneElement", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.geneElement")] + [FhirType("SubstanceReferenceInformation.geneElement", IsBackboneType=true)] public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#GeneElement"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.geneElement"; } } /// /// Todo @@ -360,6 +377,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "element": + Element = (Hl7.Fhir.Model.Identifier)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -375,14 +411,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceReferenceInformation#Target", IsNestedType=true)] - [BackboneType("SubstanceReferenceInformation.target")] + [FhirType("SubstanceReferenceInformation.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceReferenceInformation#Target"; } } + public override string TypeName { get { return "SubstanceReferenceInformation.target"; } } /// /// Todo @@ -624,6 +659,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "target": + Target = (Hl7.Fhir.Model.Identifier)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "interaction": + Interaction = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "organism": + Organism = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "organismType": + OrganismType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "amount": + Amount = (Hl7.Fhir.Model.DataType)value; + return this; + case "amountType": + AmountType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -811,6 +880,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "comment": + CommentElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "gene": + Gene = (List)value; + return this; + case "geneElement": + GeneElement = (List)value; + return this; + case "target": + Target = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs index d82ff9d933..c27876c8f3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial", IsResource=true)] + [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial")] public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource { /// @@ -61,14 +61,13 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#FractionDescription", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.fractionDescription")] + [FhirType("SubstanceSourceMaterial.fractionDescription", IsBackboneType=true)] public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#FractionDescription"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.fractionDescription"; } } /// /// This element is capturing information about the fraction of a plant part, or human plasma for fractionation @@ -197,6 +196,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "fraction": + FractionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "materialType": + MaterialType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -211,14 +226,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Organism", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism")] + [FhirType("SubstanceSourceMaterial.organism", IsBackboneType=true)] public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Organism"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism"; } } /// /// The family of an organism shall be specified @@ -474,6 +488,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "family": + Family = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "genus": + Genus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "species": + Species = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intraspecificType": + IntraspecificType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intraspecificDescription": + IntraspecificDescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "author": + Author = (List)value; + return this; + case "hybrid": + Hybrid = (Hl7.Fhir.Model.SubstanceSourceMaterial.HybridComponent)value; + return this; + case "organismGeneral": + OrganismGeneral = (Hl7.Fhir.Model.SubstanceSourceMaterial.OrganismGeneralComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -494,14 +542,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Author", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.author")] + [FhirType("SubstanceSourceMaterial.organism.author", IsBackboneType=true)] public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Author"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.author"; } } /// /// The type of author of an organism species shall be specified. The parenthetical author of an organism species refers to the first author who published the plant/animal name (of any rank). The primary author of an organism species refers to the first author(s), who validly published the plant/animal name @@ -630,6 +677,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "authorType": + AuthorType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "authorDescription": + AuthorDescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -644,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#Hybrid", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.hybrid")] + [FhirType("SubstanceSourceMaterial.organism.hybrid", IsBackboneType=true)] public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#Hybrid"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.hybrid"; } } /// /// The identifier of the maternal species constituting the hybrid organism shall be specified based on a controlled vocabulary. For plants, the parents aren’t always known, and it is unlikely that it will be known which is maternal and which is paternal @@ -897,6 +959,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "maternalOrganismId": + MaternalOrganismIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "maternalOrganismName": + MaternalOrganismNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "paternalOrganismId": + PaternalOrganismIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "paternalOrganismName": + PaternalOrganismNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "hybridType": + HybridType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -914,14 +1001,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#OrganismGeneral", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")] + [FhirType("SubstanceSourceMaterial.organism.organismGeneral", IsBackboneType=true)] public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#OrganismGeneral"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.organism.organismGeneral"; } } /// /// The kingdom of an organism shall be specified @@ -1074,6 +1160,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "kingdom": + Kingdom = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "phylum": + Phylum = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "class": + Class = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "order": + Order = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1090,14 +1198,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SubstanceSourceMaterial#PartDescription", IsNestedType=true)] - [BackboneType("SubstanceSourceMaterial.partDescription")] + [FhirType("SubstanceSourceMaterial.partDescription", IsBackboneType=true)] public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SubstanceSourceMaterial#PartDescription"; } } + public override string TypeName { get { return "SubstanceSourceMaterial.partDescription"; } } /// /// Entity of anatomical origin of source material within an organism @@ -1208,6 +1315,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "part": + Part = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "partLocation": + PartLocation = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1617,6 +1740,55 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sourceMaterialClass": + SourceMaterialClass = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "sourceMaterialType": + SourceMaterialType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "sourceMaterialState": + SourceMaterialState = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "organismId": + OrganismId = (Hl7.Fhir.Model.Identifier)value; + return this; + case "organismName": + OrganismNameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "parentSubstanceId": + ParentSubstanceId = (List)value; + return this; + case "parentSubstanceName": + ParentSubstanceNameElement = (List)value; + return this; + case "countryOfOrigin": + CountryOfOrigin = (List)value; + return this; + case "geographicalLocation": + GeographicalLocationElement = (List)value; + return this; + case "developmentStage": + DevelopmentStage = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "fractionDescription": + FractionDescription = (List)value; + return this; + case "organism": + Organism = (Hl7.Fhir.Model.SubstanceSourceMaterial.OrganismComponent)value; + return this; + case "partDescription": + PartDescription = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs index 92f2cd8574..9d1e949242 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)] + [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")] public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -129,14 +129,13 @@ public enum SupplyDeliverySupplyItemType /// [Serializable] [DataContract] - [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)] - [BackboneType("SupplyDelivery.suppliedItem")] + [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)] public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } } + public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } } /// /// Amount supplied @@ -251,6 +250,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "item": + Item = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -600,6 +615,49 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "suppliedItem": + SuppliedItem = (List)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "supplier": + Supplier = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "destination": + Destination = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "receiver": + Receiver = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs index 9ac707dc07..50a5ca5734 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)] + [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")] public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum SupplyRequestStatus /// [Serializable] [DataContract] - [FhirType("SupplyRequest#Parameter", IsNestedType=true)] - [BackboneType("SupplyRequest.parameter")] + [FhirType("SupplyRequest.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyRequest#Parameter"; } } + public override string TypeName { get { return "SupplyRequest.parameter"; } } /// /// Item detail @@ -240,6 +239,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -736,6 +751,64 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "category": + Category = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "deliverFor": + DeliverFor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "item": + Item = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "quantity": + Quantity = (Hl7.Fhir.Model.Quantity)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "occurrence": + Occurrence = (Hl7.Fhir.Model.DataType)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "supplier": + Supplier = (List)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "deliverFrom": + DeliverFrom = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "deliverTo": + DeliverTo = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Task.cs b/src/Hl7.Fhir.R5/Model/Generated/Task.cs index d759c681a6..4f86e3763a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Task.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)] + [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")] public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -210,14 +210,13 @@ public enum TaskIntent /// [Serializable] [DataContract] - [FhirType("Task#Performer", IsNestedType=true)] - [BackboneType("Task.performer")] + [FhirType("Task.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Performer"; } } + public override string TypeName { get { return "Task.performer"; } } /// /// Type of performance @@ -332,6 +331,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "function": + Function = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "actor": + Actor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -350,14 +365,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Restriction", IsNestedType=true)] - [BackboneType("Task.restriction")] + [FhirType("Task.restriction", IsBackboneType=true)] public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Restriction"; } } + public override string TypeName { get { return "Task.restriction"; } } /// /// How many times to repeat @@ -510,6 +524,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "repetitions": + RepetitionsElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "recipient": + Recipient = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -528,14 +561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Input", IsNestedType=true)] - [BackboneType("Task.input")] + [FhirType("Task.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Input"; } } + public override string TypeName { get { return "Task.input"; } } /// /// Label for the input @@ -651,6 +683,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -668,14 +716,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Output", IsNestedType=true)] - [BackboneType("Task.output")] + [FhirType("Task.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Output"; } } + public override string TypeName { get { return "Task.output"; } } /// /// Label for output @@ -791,6 +838,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1768,6 +1831,115 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "businessStatus": + BusinessStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "doNotPerform": + DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "for": + For = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestedPeriod": + RequestedPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "executionPeriod": + ExecutionPeriod = (Hl7.Fhir.Model.Period)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "lastModified": + LastModifiedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "requestedPerformer": + RequestedPerformer = (List)value; + return this; + case "owner": + Owner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performer": + Performer = (List)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (List)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "relevantHistory": + RelevantHistory = (List)value; + return this; + case "restriction": + Restriction = (Hl7.Fhir.Model.Task.RestrictionComponent)value; + return this; + case "input": + Input = (List)value; + return this; + case "output": + Output = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs b/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs index b9ea06b3bd..8c47fd21d5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using Hl7.Fhir.Utility; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs b/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs index 51c5b76b73..7ac0a9ad94 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; diff --git a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs index e26962e1c8..964e3264e6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)] + [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")] public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum CodeSearchSupport /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Software", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.software")] + [FhirType("TerminologyCapabilities.software", IsBackboneType=true)] public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Software"; } } + public override string TypeName { get { return "TerminologyCapabilities.software"; } } /// /// A name the software is known by @@ -250,6 +249,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -267,14 +282,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.implementation")] + [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)] public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } } + public override string TypeName { get { return "TerminologyCapabilities.implementation"; } } /// /// Describes this specific instance @@ -422,6 +436,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -440,14 +470,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem")] + [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)] public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } } /// /// Canonical identifier for the code system, represented as a URI @@ -658,6 +687,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "uri": + UriElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "version": + Version = (List)value; + return this; + case "content": + ContentElement = (Code)value; + return this; + case "subsumption": + SubsumptionElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -678,14 +729,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Version", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version")] + [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)] public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Version"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } } /// /// Version identifier for this version @@ -975,6 +1025,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "isDefault": + IsDefaultElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "compositional": + CompositionalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "language": + LanguageElement = (List>)value; + return this; + case "filter": + Filter = (List)value; + return this; + case "property": + PropertyElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -993,14 +1071,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.codeSystem.version.filter")] + [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Filter"; } } + public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } } /// /// Code of the property supported @@ -1149,6 +1226,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "code": + CodeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "op": + OpElement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1163,14 +1256,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion")] + [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)] public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion"; } } /// /// Whether the server can return nested value sets @@ -1417,6 +1509,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "hierarchical": + HierarchicalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "paging": + PagingElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "incomplete": + IncompleteElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "parameter": + Parameter = (List)value; + return this; + case "textFilter": + TextFilterElement = (Hl7.Fhir.Model.Markdown)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1434,14 +1551,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.expansion.parameter")] + [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } } + public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } } /// /// Name of the supported expansion parameter @@ -1589,6 +1705,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.Code)value; + return this; + case "documentation": + DocumentationElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1603,14 +1735,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.validateCode")] + [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)] public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } } + public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } } /// /// Whether translations are validated @@ -1719,6 +1850,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "translations": + TranslationsElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1732,14 +1876,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.translation")] + [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)] public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Translation"; } } + public override string TypeName { get { return "TerminologyCapabilities.translation"; } } /// /// Whether the client must identify the map @@ -1848,6 +1991,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "needsMap": + NeedsMapElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1864,14 +2020,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)] - [BackboneType("TerminologyCapabilities.closure")] + [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)] public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TerminologyCapabilities#Closure"; } } + public override string TypeName { get { return "TerminologyCapabilities.closure"; } } /// /// If cross-system closure is supported @@ -1979,6 +2134,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "translation": + TranslationElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2910,6 +3078,97 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "kind": + KindElement = (Code)value; + return this; + case "software": + Software = (Hl7.Fhir.Model.TerminologyCapabilities.SoftwareComponent)value; + return this; + case "implementation": + Implementation = (Hl7.Fhir.Model.TerminologyCapabilities.ImplementationComponent)value; + return this; + case "lockedDate": + LockedDateElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "codeSystem": + CodeSystem = (List)value; + return this; + case "expansion": + Expansion = (Hl7.Fhir.Model.TerminologyCapabilities.ExpansionComponent)value; + return this; + case "codeSearch": + CodeSearchElement = (Code)value; + return this; + case "validateCode": + ValidateCode = (Hl7.Fhir.Model.TerminologyCapabilities.ValidateCodeComponent)value; + return this; + case "translation": + Translation = (Hl7.Fhir.Model.TerminologyCapabilities.TranslationComponent)value; + return this; + case "closure": + Closure = (Hl7.Fhir.Model.TerminologyCapabilities.ClosureComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs index 7d3398fa8e..e2a5a25651 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestPlan","http://hl7.org/fhir/StructureDefinition/TestPlan", IsResource=true)] + [FhirType("TestPlan","http://hl7.org/fhir/StructureDefinition/TestPlan")] public partial class TestPlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class TestPlan : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("TestPlan#Dependency", IsNestedType=true)] - [BackboneType("TestPlan.dependency")] + [FhirType("TestPlan.dependency", IsBackboneType=true)] public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#Dependency"; } } + public override string TypeName { get { return "TestPlan.dependency"; } } /// /// Description of the dependency criterium @@ -203,6 +202,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "predecessor": + Predecessor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -220,14 +235,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#TestCase", IsNestedType=true)] - [BackboneType("TestPlan.testCase")] + [FhirType("TestPlan.testCase", IsBackboneType=true)] public partial class TestCaseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#TestCase"; } } + public override string TypeName { get { return "TestPlan.testCase"; } } /// /// Sequence of test case in the test plan @@ -445,6 +459,34 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "sequence": + SequenceElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "scope": + Scope = (List)value; + return this; + case "dependency": + Dependency = (List)value; + return this; + case "testRun": + TestRun = (List)value; + return this; + case "testData": + TestData = (List)value; + return this; + case "assertion": + Assertion = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -466,14 +508,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#TestCaseDependency", IsNestedType=true)] - [BackboneType("TestPlan.testCase.dependency")] + [FhirType("TestPlan.testCase.dependency", IsBackboneType=true)] public partial class TestCaseDependencyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#TestCaseDependency"; } } + public override string TypeName { get { return "TestPlan.testCase.dependency"; } } /// /// Description of the criteria @@ -602,6 +643,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "predecessor": + Predecessor = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -616,14 +673,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#TestRun", IsNestedType=true)] - [BackboneType("TestPlan.testCase.testRun")] + [FhirType("TestPlan.testCase.testRun", IsBackboneType=true)] public partial class TestRunComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#TestRun"; } } + public override string TypeName { get { return "TestPlan.testCase.testRun"; } } /// /// The narrative description of the tests @@ -752,6 +808,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "narrative": + NarrativeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "script": + Script = (Hl7.Fhir.Model.TestPlan.ScriptComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -766,14 +838,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#Script", IsNestedType=true)] - [BackboneType("TestPlan.testCase.testRun.script")] + [FhirType("TestPlan.testCase.testRun.script", IsBackboneType=true)] public partial class ScriptComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#Script"; } } + public override string TypeName { get { return "TestPlan.testCase.testRun.script"; } } /// /// The language for the test cases e.g. 'gherkin', 'testscript' @@ -886,6 +957,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "language": + Language = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -900,14 +987,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#TestData", IsNestedType=true)] - [BackboneType("TestPlan.testCase.testData")] + [FhirType("TestPlan.testCase.testData", IsBackboneType=true)] public partial class TestDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#TestData"; } } + public override string TypeName { get { return "TestPlan.testCase.testData"; } } /// /// The type of test data description, e.g. 'synthea' @@ -1042,6 +1128,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.Coding)value; + return this; + case "content": + Content = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "source": + Source = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1060,14 +1165,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestPlan#Assertion", IsNestedType=true)] - [BackboneType("TestPlan.testCase.assertion")] + [FhirType("TestPlan.testCase.assertion", IsBackboneType=true)] public partial class AssertionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestPlan#Assertion"; } } + public override string TypeName { get { return "TestPlan.testCase.assertion"; } } /// /// Assertion type - for example 'informative' or 'required' @@ -1202,6 +1306,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (List)value; + return this; + case "object": + Object = (List)value; + return this; + case "result": + Result = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2031,6 +2154,85 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "category": + Category = (List)value; + return this; + case "scope": + Scope = (List)value; + return this; + case "testTools": + TestToolsElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "dependency": + Dependency = (List)value; + return this; + case "exitCriteria": + ExitCriteriaElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "testCase": + TestCase = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs index 022d6a4ea0..b0490e5dcb 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)] + [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")] public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -200,14 +200,13 @@ public enum TestReportActionResult /// [Serializable] [DataContract] - [FhirType("TestReport#Participant", IsNestedType=true)] - [BackboneType("TestReport.participant")] + [FhirType("TestReport.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Participant"; } } + public override string TypeName { get { return "TestReport.participant"; } } /// /// test-engine | client | server @@ -397,6 +396,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "uri": + UriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "display": + DisplayElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -412,14 +430,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Setup", IsNestedType=true)] - [BackboneType("TestReport.setup")] + [FhirType("TestReport.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Setup"; } } + public override string TypeName { get { return "TestReport.setup"; } } /// /// A setup operation or assert that was executed @@ -510,6 +527,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -527,14 +557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#SetupAction", IsNestedType=true)] - [BackboneType("TestReport.setup.action")] + [FhirType("TestReport.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#SetupAction"; } } + public override string TypeName { get { return "TestReport.setup.action"; } } /// /// The operation to perform @@ -645,6 +674,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value; + return this; + case "assert": + Assert = (Hl7.Fhir.Model.TestReport.AssertComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -662,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Operation", IsNestedType=true)] - [BackboneType("TestReport.setup.action.operation")] + [FhirType("TestReport.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Operation"; } } + public override string TypeName { get { return "TestReport.setup.action.operation"; } } /// /// pass | skip | fail | warning | error @@ -858,6 +902,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "result": + ResultElement = (Code)value; + return this; + case "message": + MessageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "detail": + DetailElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -876,14 +939,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Assert", IsNestedType=true)] - [BackboneType("TestReport.setup.action.assert")] + [FhirType("TestReport.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Assert"; } } + public override string TypeName { get { return "TestReport.setup.action.assert"; } } /// /// pass | skip | fail | warning | error @@ -1094,6 +1156,28 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "result": + ResultElement = (Code)value; + return this; + case "message": + MessageElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "detail": + DetailElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requirement": + Requirement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1114,14 +1198,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Requirement", IsNestedType=true)] - [BackboneType("TestReport.setup.action.assert.requirement")] + [FhirType("TestReport.setup.action.assert.requirement", IsBackboneType=true)] public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Requirement"; } } + public override string TypeName { get { return "TestReport.setup.action.assert.requirement"; } } /// /// Link or reference to the testing requirement @@ -1213,6 +1296,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "link": + Link = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1226,14 +1322,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Test", IsNestedType=true)] - [BackboneType("TestReport.test")] + [FhirType("TestReport.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Test"; } } + public override string TypeName { get { return "TestReport.test"; } } /// /// Tracking/logging name of this test @@ -1402,6 +1497,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1421,14 +1535,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TestAction", IsNestedType=true)] - [BackboneType("TestReport.test.action")] + [FhirType("TestReport.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TestAction"; } } + public override string TypeName { get { return "TestReport.test.action"; } } /// /// The operation performed @@ -1539,6 +1652,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value; + return this; + case "assert": + Assert = (Hl7.Fhir.Model.TestReport.AssertComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1556,14 +1685,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Teardown", IsNestedType=true)] - [BackboneType("TestReport.teardown")] + [FhirType("TestReport.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Teardown"; } } + public override string TypeName { get { return "TestReport.teardown"; } } /// /// One or more teardown operations performed @@ -1654,6 +1782,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1671,14 +1812,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TeardownAction", IsNestedType=true)] - [BackboneType("TestReport.teardown.action")] + [FhirType("TestReport.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TeardownAction"; } } + public override string TypeName { get { return "TestReport.teardown.action"; } } /// /// The teardown operation performed @@ -1769,6 +1909,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2233,6 +2386,52 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "testScript": + TestScriptElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "result": + ResultElement = (Code)value; + return this; + case "score": + ScoreElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "tester": + TesterElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "issued": + IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "participant": + Participant = (List)value; + return this; + case "setup": + Setup = (Hl7.Fhir.Model.TestReport.SetupComponent)value; + return this; + case "test": + Test = (List)value; + return this; + case "teardown": + Teardown = (Hl7.Fhir.Model.TestReport.TeardownComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs index 57eb3ac89c..d67360c274 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)] + [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")] public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -532,14 +532,13 @@ public enum AssertionResponseTypes /// [Serializable] [DataContract] - [FhirType("TestScript#Origin", IsNestedType=true)] - [BackboneType("TestScript.origin")] + [FhirType("TestScript.origin", IsBackboneType=true)] public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Origin"; } } + public override string TypeName { get { return "TestScript.origin"; } } /// /// The index of the abstract origin server starting at 1 @@ -710,6 +709,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "index": + IndexElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "profile": + Profile = (Hl7.Fhir.Model.Coding)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -729,14 +747,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Destination", IsNestedType=true)] - [BackboneType("TestScript.destination")] + [FhirType("TestScript.destination", IsBackboneType=true)] public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Destination"; } } + public override string TypeName { get { return "TestScript.destination"; } } /// /// The index of the abstract destination server starting at 1 @@ -907,6 +924,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "index": + IndexElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "profile": + Profile = (Hl7.Fhir.Model.Coding)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUrl)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -925,14 +961,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Metadata", IsNestedType=true)] - [BackboneType("TestScript.metadata")] + [FhirType("TestScript.metadata", IsBackboneType=true)] public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Metadata"; } } + public override string TypeName { get { return "TestScript.metadata"; } } /// /// Links to the FHIR specification @@ -1045,6 +1080,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "link": + Link = (List)value; + return this; + case "capability": + Capability = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1062,14 +1113,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Link", IsNestedType=true)] - [BackboneType("TestScript.metadata.link")] + [FhirType("TestScript.metadata.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Link"; } } + public override string TypeName { get { return "TestScript.metadata.link"; } } /// /// URL to the specification @@ -1217,6 +1267,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1235,14 +1301,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Capability", IsNestedType=true)] - [BackboneType("TestScript.metadata.capability")] + [FhirType("TestScript.metadata.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Capability"; } } + public override string TypeName { get { return "TestScript.metadata.capability"; } } /// /// Are the capabilities required? @@ -1589,6 +1654,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "required": + RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "validated": + ValidatedElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "origin": + OriginElement = (List)value; + return this; + case "destination": + DestinationElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "link": + LinkElement = (List)value; + return this; + case "capabilities": + CapabilitiesElement = (Hl7.Fhir.Model.Canonical)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1611,14 +1707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Scope", IsNestedType=true)] - [BackboneType("TestScript.scope")] + [FhirType("TestScript.scope", IsBackboneType=true)] public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Scope"; } } + public override string TypeName { get { return "TestScript.scope"; } } /// /// The specific conformance artifact being tested @@ -1771,6 +1866,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "artifact": + ArtifactElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "conformance": + Conformance = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "phase": + Phase = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1789,14 +1903,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Fixture", IsNestedType=true)] - [BackboneType("TestScript.fixture")] + [FhirType("TestScript.fixture", IsBackboneType=true)] public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Fixture"; } } + public override string TypeName { get { return "TestScript.fixture"; } } /// /// Whether or not to implicitly create the fixture during setup @@ -1968,6 +2081,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "autocreate": + AutocreateElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "autodelete": + AutodeleteElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "resource": + Resource = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1987,14 +2119,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Variable", IsNestedType=true)] - [BackboneType("TestScript.variable")] + [FhirType("TestScript.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Variable"; } } + public override string TypeName { get { return "TestScript.variable"; } } /// /// Descriptive name for this variable @@ -2376,6 +2507,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "defaultValue": + DefaultValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "headerField": + HeaderFieldElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "hint": + HintElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "sourceId": + SourceIdElement = (Hl7.Fhir.Model.Id)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2396,14 +2561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Setup", IsNestedType=true)] - [BackboneType("TestScript.setup")] + [FhirType("TestScript.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Setup"; } } + public override string TypeName { get { return "TestScript.setup"; } } /// /// A setup operation or assert to perform @@ -2494,6 +2658,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2511,14 +2688,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#SetupAction", IsNestedType=true)] - [BackboneType("TestScript.setup.action")] + [FhirType("TestScript.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#SetupAction"; } } + public override string TypeName { get { return "TestScript.setup.action"; } } /// /// The setup operation to perform @@ -2629,6 +2805,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value; + return this; + case "assert": + Assert = (Hl7.Fhir.Model.TestScript.AssertComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -2646,14 +2838,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Operation", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation")] + [FhirType("TestScript.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Operation"; } } + public override string TypeName { get { return "TestScript.setup.action.operation"; } } /// /// The operation code type that will be executed @@ -3357,6 +3548,67 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.Coding)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "label": + LabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "accept": + AcceptElement = (Hl7.Fhir.Model.Code)value; + return this; + case "contentType": + ContentTypeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "destination": + DestinationElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "encodeRequestUrl": + EncodeRequestUrlElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "method": + MethodElement = (Code)value; + return this; + case "origin": + OriginElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "params": + ParamsElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requestHeader": + RequestHeader = (List)value; + return this; + case "requestId": + RequestIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "responseId": + ResponseIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "sourceId": + SourceIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "targetId": + TargetIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "url": + UrlElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3390,14 +3642,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RequestHeader", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation.requestHeader")] + [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)] public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RequestHeader"; } } + public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } } /// /// HTTP header field name @@ -3546,6 +3797,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "field": + FieldElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -3564,14 +3831,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Assert", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert")] + [FhirType("TestScript.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Assert"; } } + public override string TypeName { get { return "TestScript.setup.action.assert"; } } /// /// Tracking/logging assertion label @@ -4612,6 +4878,91 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "label": + LabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "direction": + DirectionElement = (Code)value; + return this; + case "compareToSourceId": + CompareToSourceIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "compareToSourceExpression": + CompareToSourceExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "compareToSourcePath": + CompareToSourcePathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contentType": + ContentTypeElement = (Hl7.Fhir.Model.Code)value; + return this; + case "defaultManualCompletion": + DefaultManualCompletionElement = (Code)value; + return this; + case "expression": + ExpressionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "headerField": + HeaderFieldElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "minimumId": + MinimumIdElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "navigationLinks": + NavigationLinksElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "operator": + OperatorElement = (Code)value; + return this; + case "path": + PathElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "requestMethod": + RequestMethodElement = (Code)value; + return this; + case "requestURL": + RequestURLElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "resource": + ResourceElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "response": + ResponseElement = (Code)value; + return this; + case "responseCode": + ResponseCodeElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "sourceId": + SourceIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "stopTestOnFail": + StopTestOnFailElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "validateProfileId": + ValidateProfileIdElement = (Hl7.Fhir.Model.Id)value; + return this; + case "value": + ValueElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "warningOnly": + WarningOnlyElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "requirement": + Requirement = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4653,14 +5004,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Requirement", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.requirement")] + [FhirType("TestScript.setup.action.assert.requirement", IsBackboneType=true)] public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Requirement"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.requirement"; } } /// /// Link or reference to the testing requirement @@ -4752,6 +5102,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "link": + Link = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4765,14 +5128,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Test", IsNestedType=true)] - [BackboneType("TestScript.test")] + [FhirType("TestScript.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Test"; } } + public override string TypeName { get { return "TestScript.test"; } } /// /// Tracking/logging name of this test @@ -4941,6 +5303,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -4960,14 +5341,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TestAction", IsNestedType=true)] - [BackboneType("TestScript.test.action")] + [FhirType("TestScript.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TestAction"; } } + public override string TypeName { get { return "TestScript.test.action"; } } /// /// The setup operation to perform @@ -5078,6 +5458,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value; + return this; + case "assert": + Assert = (Hl7.Fhir.Model.TestScript.AssertComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5095,14 +5491,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Teardown", IsNestedType=true)] - [BackboneType("TestScript.teardown")] + [FhirType("TestScript.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Teardown"; } } + public override string TypeName { get { return "TestScript.teardown"; } } /// /// One or more teardown operations to perform @@ -5193,6 +5588,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "action": + Action = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -5210,14 +5618,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TeardownAction", IsNestedType=true)] - [BackboneType("TestScript.teardown.action")] + [FhirType("TestScript.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TeardownAction"; } } + public override string TypeName { get { return "TestScript.teardown.action"; } } /// /// The teardown operation to perform @@ -5308,6 +5715,19 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "operation": + Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -6204,6 +6624,97 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "url": + UrlElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "identifier": + Identifier = (List)value; + return this; + case "version": + VersionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "versionAlgorithm": + VersionAlgorithm = (Hl7.Fhir.Model.DataType)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "title": + TitleElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "experimental": + ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "publisher": + PublisherElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "contact": + Contact = (List)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "useContext": + UseContext = (List)value; + return this; + case "jurisdiction": + Jurisdiction = (List)value; + return this; + case "purpose": + PurposeElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyright": + CopyrightElement = (Hl7.Fhir.Model.Markdown)value; + return this; + case "copyrightLabel": + CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "origin": + Origin = (List)value; + return this; + case "destination": + Destination = (List)value; + return this; + case "metadata": + Metadata = (Hl7.Fhir.Model.TestScript.MetadataComponent)value; + return this; + case "scope": + Scope = (List)value; + return this; + case "fixture": + Fixture = (List)value; + return this; + case "profile": + ProfileElement = (List)value; + return this; + case "variable": + Variable = (List)value; + return this; + case "setup": + Setup = (Hl7.Fhir.Model.TestScript.SetupComponent)value; + return this; + case "test": + Test = (List)value; + return this; + case "teardown": + Teardown = (Hl7.Fhir.Model.TestScript.TeardownComponent)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs index 4f38ca0682..46cafff927 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -293,14 +293,13 @@ public enum EventTiming /// [Serializable] [DataContract] - [FhirType("Timing#Repeat", IsNestedType=true)] - [BackboneType("Timing.repeat")] + [FhirType("Timing.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Timing#Repeat"; } } + public override string TypeName { get { return "Timing.repeat"; } } /// /// Length/Range of lengths, or (Start and/or end) limits @@ -949,6 +948,61 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "bounds": + Bounds = (Hl7.Fhir.Model.DataType)value; + return this; + case "count": + CountElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "countMax": + CountMaxElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "duration": + DurationElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "durationMax": + DurationMaxElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "durationUnit": + DurationUnitElement = (Code)value; + return this; + case "frequency": + FrequencyElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "frequencyMax": + FrequencyMaxElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "period": + PeriodElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "periodMax": + PeriodMaxElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "periodUnit": + PeriodUnitElement = (Code)value; + return this; + case "dayOfWeek": + DayOfWeekElement = (List>)value; + return this; + case "timeOfDay": + TimeOfDayElement = (List)value; + return this; + case "when": + WhenElement = (List>)value; + return this; + case "offset": + OffsetElement = (Hl7.Fhir.Model.UnsignedInt)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1121,6 +1175,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "event": + EventElement = (List)value; + return this; + case "repeat": + Repeat = (Hl7.Fhir.Model.Timing.RepeatComponent)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs index f59f4ad788..ee6113df0b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Transport","http://hl7.org/fhir/StructureDefinition/Transport", IsResource=true)] + [FhirType("Transport","http://hl7.org/fhir/StructureDefinition/Transport")] public partial class Transport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -177,14 +177,13 @@ public enum TransportIntent /// [Serializable] [DataContract] - [FhirType("Transport#Restriction", IsNestedType=true)] - [BackboneType("Transport.restriction")] + [FhirType("Transport.restriction", IsBackboneType=true)] public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Transport#Restriction"; } } + public override string TypeName { get { return "Transport.restriction"; } } /// /// How many times to repeat @@ -337,6 +336,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "repetitions": + RepetitionsElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "period": + Period = (Hl7.Fhir.Model.Period)value; + return this; + case "recipient": + Recipient = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -355,14 +373,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Transport#Parameter", IsNestedType=true)] - [BackboneType("Transport.input")] + [FhirType("Transport.input", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Transport#Parameter"; } } + public override string TypeName { get { return "Transport.input"; } } /// /// Label for the input @@ -478,6 +495,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -495,14 +528,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Transport#Output", IsNestedType=true)] - [BackboneType("Transport.output")] + [FhirType("Transport.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Transport#Output"; } } + public override string TypeName { get { return "Transport.output"; } } /// /// Label for output @@ -618,6 +650,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + Type = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "value": + Value = (Hl7.Fhir.Model.DataType)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1578,6 +1626,112 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "instantiatesCanonical": + InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "instantiatesUri": + InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value; + return this; + case "basedOn": + BasedOn = (List)value; + return this; + case "groupIdentifier": + GroupIdentifier = (Hl7.Fhir.Model.Identifier)value; + return this; + case "partOf": + PartOf = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusReason": + StatusReason = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "intent": + IntentElement = (Code)value; + return this; + case "priority": + PriorityElement = (Code)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "description": + DescriptionElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "focus": + Focus = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "for": + For = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "completionTime": + CompletionTimeElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "authoredOn": + AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "lastModified": + LastModifiedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "requester": + Requester = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "performerType": + PerformerType = (List)value; + return this; + case "owner": + Owner = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "location": + Location = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "insurance": + Insurance = (List)value; + return this; + case "note": + Note = (List)value; + return this; + case "relevantHistory": + RelevantHistory = (List)value; + return this; + case "restriction": + Restriction = (Hl7.Fhir.Model.Transport.RestrictionComponent)value; + return this; + case "input": + Input = (List)value; + return this; + case "output": + Output = (List)value; + return this; + case "requestedLocation": + RequestedLocation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "currentLocation": + CurrentLocation = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "reason": + Reason = (Hl7.Fhir.Model.CodeableReference)value; + return this; + case "history": + History = (Hl7.Fhir.Model.ResourceReference)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs index 862fab8ce2..cf2b696f2e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -393,6 +393,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "type": + TypeElement = (Code)value; + return this; + case "name": + NameElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "code": + Code = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "subscriptionTopic": + SubscriptionTopicElement = (Hl7.Fhir.Model.Canonical)value; + return this; + case "timing": + Timing = (Hl7.Fhir.Model.DataType)value; + return this; + case "data": + Data = (List)value; + return this; + case "condition": + Condition = (Hl7.Fhir.Model.Expression)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs index aebb4d5d72..bc3dffba68 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)] + [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")] public partial class VerificationResult : Hl7.Fhir.Model.DomainResource { /// @@ -113,14 +113,13 @@ public enum StatusCode /// [Serializable] [DataContract] - [FhirType("VerificationResult#PrimarySource", IsNestedType=true)] - [BackboneType("VerificationResult.primarySource")] + [FhirType("VerificationResult.primarySource", IsBackboneType=true)] public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#PrimarySource"; } } + public override string TypeName { get { return "VerificationResult.primarySource"; } } /// /// Reference to the primary source @@ -364,6 +363,37 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "who": + Who = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "type": + Type = (List)value; + return this; + case "communicationMethod": + CommunicationMethod = (List)value; + return this; + case "validationStatus": + ValidationStatus = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "validationDate": + ValidationDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "canPushUpdates": + CanPushUpdates = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "pushTypeAvailable": + PushTypeAvailable = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -383,14 +413,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Attestation", IsNestedType=true)] - [BackboneType("VerificationResult.attestation")] + [FhirType("VerificationResult.attestation", IsBackboneType=true)] public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Attestation"; } } + public override string TypeName { get { return "VerificationResult.attestation"; } } /// /// The individual or organization attesting to information @@ -686,6 +715,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "who": + Who = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "onBehalfOf": + OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "communicationMethod": + CommunicationMethod = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "date": + DateElement = (Hl7.Fhir.Model.Date)value; + return this; + case "sourceIdentityCertificate": + SourceIdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "proxyIdentityCertificate": + ProxyIdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "proxySignature": + ProxySignature = (Hl7.Fhir.Model.Signature)value; + return this; + case "sourceSignature": + SourceSignature = (Hl7.Fhir.Model.Signature)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -706,14 +769,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VerificationResult#Validator", IsNestedType=true)] - [BackboneType("VerificationResult.validator")] + [FhirType("VerificationResult.validator", IsBackboneType=true)] public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VerificationResult#Validator"; } } + public override string TypeName { get { return "VerificationResult.validator"; } } /// /// Reference to the organization validating information @@ -866,6 +928,25 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "organization": + Organization = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "identityCertificate": + IdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "attestationSignature": + AttestationSignature = (Hl7.Fhir.Model.Signature)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1341,6 +1422,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "target": + Target = (List)value; + return this; + case "targetLocation": + TargetLocationElement = (List)value; + return this; + case "need": + Need = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "statusDate": + StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "validationType": + ValidationType = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "validationProcess": + ValidationProcess = (List)value; + return this; + case "frequency": + Frequency = (Hl7.Fhir.Model.Timing)value; + return this; + case "lastPerformed": + LastPerformedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "nextScheduled": + NextScheduledElement = (Hl7.Fhir.Model.Date)value; + return this; + case "failureAction": + FailureAction = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "primarySource": + PrimarySource = (List)value; + return this; + case "attestation": + Attestation = (Hl7.Fhir.Model.VerificationResult.AttestationComponent)value; + return this; + case "validator": + Validator = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs index 341f9f79a6..5debd6acc2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -286,6 +286,31 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "channelType": + ChannelType = (Hl7.Fhir.Model.Coding)value; + return this; + case "address": + Address = (Hl7.Fhir.Model.DataType)value; + return this; + case "additionalInfo": + AdditionalInfoElement = (List)value; + return this; + case "maxParticipants": + MaxParticipantsElement = (Hl7.Fhir.Model.PositiveInt)value; + return this; + case "sessionKey": + SessionKeyElement = (Hl7.Fhir.Model.FhirString)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs index f8aa7de79c..d97523ed97 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 using System; using System.Collections.Generic; @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)] + [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")] public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum VisionBase /// [Serializable] [DataContract] - [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification")] + [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)] public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#LensSpecification"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification"; } } /// /// Product to be supplied @@ -680,6 +679,58 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "product": + Product = (Hl7.Fhir.Model.CodeableConcept)value; + return this; + case "eye": + EyeElement = (Code)value; + return this; + case "sphere": + SphereElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "cylinder": + CylinderElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "axis": + AxisElement = (Hl7.Fhir.Model.Integer)value; + return this; + case "prism": + Prism = (List)value; + return this; + case "add": + AddElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "power": + PowerElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "backCurve": + BackCurveElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "diameter": + DiameterElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "duration": + Duration = (Hl7.Fhir.Model.Quantity)value; + return this; + case "color": + ColorElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "brand": + BrandElement = (Hl7.Fhir.Model.FhirString)value; + return this; + case "note": + Note = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -709,14 +760,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("VisionPrescription#Prism", IsNestedType=true)] - [BackboneType("VisionPrescription.lensSpecification.prism")] + [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)] public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#Prism"; } } + public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } } /// /// Amount of adjustment @@ -867,6 +917,22 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "amount": + AmountElement = (Hl7.Fhir.Model.FhirDecimal)value; + return this; + case "base": + BaseElement = (Code)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; @@ -1182,6 +1248,40 @@ protected override bool TryGetValue(string key, out object value) } + protected override Base SetValue(string key, object value) + { + switch (key) + { + case "identifier": + Identifier = (List)value; + return this; + case "status": + StatusElement = (Code)value; + return this; + case "created": + CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "patient": + Patient = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "encounter": + Encounter = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "dateWritten": + DateWrittenElement = (Hl7.Fhir.Model.FhirDateTime)value; + return this; + case "prescriber": + Prescriber = (Hl7.Fhir.Model.ResourceReference)value; + return this; + case "lensSpecification": + LensSpecification = (List)value; + return this; + default: + return base.SetValue(key, value); + } + + } + protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs b/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs index 2db4829611..d9e52ff9b0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs @@ -1,5 +1,5 @@ // -// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0 +// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0 // Generated Shared Enumeration: ActionCardinalityBehavior (http://hl7.org/fhir/ValueSet/action-cardinality-behavior) // Used in model class (resource): PlanDefinition.action.cardinalityBehavior diff --git a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs index 508b850b7c..9b6ebe23c9 100644 --- a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs +++ b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs @@ -195,4 +195,4 @@ private static void ExtractExamplesFromResource(Dictionary exampleS } } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs index 6db3e1a1d4..4832c9169d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)] + [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")] public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -97,14 +97,13 @@ public enum AccountStatus /// [Serializable] [DataContract] - [FhirType("Account#Coverage", IsNestedType=true)] - [BackboneType("Account.coverage")] + [FhirType("Account.coverage", IsBackboneType=true)] public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Coverage"; } } + public override string TypeName { get { return "Account.coverage"; } } /// /// The party(s) that are responsible for covering the payment of this account @@ -269,14 +268,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Account#Guarantor", IsNestedType=true)] - [BackboneType("Account.guarantor")] + [FhirType("Account.guarantor", IsBackboneType=true)] public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Account#Guarantor"; } } + public override string TypeName { get { return "Account.guarantor"; } } /// /// Responsible entity diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs index ecd573e58b..3a13d19e83 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)] + [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")] public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdenti /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#Participant", IsNestedType=true)] - [BackboneType("ActivityDefinition.participant")] + [FhirType("ActivityDefinition.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#Participant"; } } + public override string TypeName { get { return "ActivityDefinition.participant"; } } /// /// patient | practitioner | related-person @@ -240,14 +239,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("ActivityDefinition.dynamicValue")] + [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } } + public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } } /// /// Natural language description of the dynamic value diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs index eb8506c65f..64674076e8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)] + [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")] public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -157,14 +157,13 @@ public enum AdverseEventCausality /// [Serializable] [DataContract] - [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)] - [BackboneType("AdverseEvent.suspectEntity")] + [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)] public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } } + public override string TypeName { get { return "AdverseEvent.suspectEntity"; } } /// /// Refers to the specific entity that caused the adverse event diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs index ef33cd5725..a06d428679 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)] + [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")] public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity /// [Serializable] [DataContract] - [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)] - [BackboneType("AllergyIntolerance.reaction")] + [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AllergyIntolerance#Reaction"; } } + public override string TypeName { get { return "AllergyIntolerance.reaction"; } } /// /// Specific substance or pharmaceutical product considered to be responsible for event diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs index 690d1daed2..578aa01bc8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)] + [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")] public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -150,14 +150,13 @@ public enum ParticipantRequired /// [Serializable] [DataContract] - [FhirType("Appointment#Participant", IsNestedType=true)] - [BackboneType("Appointment.participant")] + [FhirType("Appointment.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Appointment#Participant"; } } + public override string TypeName { get { return "Appointment.participant"; } } /// /// Role of participant in the appointment diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs index 64e4977b0d..e3b2043074 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)] + [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")] public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs index dca68dc889..c7e76a0029 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)] + [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")] public partial class AuditEvent : Hl7.Fhir.Model.DomainResource { /// @@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType /// [Serializable] [DataContract] - [FhirType("AuditEvent#Agent", IsNestedType=true)] - [BackboneType("AuditEvent.agent")] + [FhirType("AuditEvent.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Agent"; } } + public override string TypeName { get { return "AuditEvent.agent"; } } /// /// Agent role in the event @@ -643,14 +642,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Network", IsNestedType=true)] - [BackboneType("AuditEvent.agent.network")] + [FhirType("AuditEvent.agent.network", IsBackboneType=true)] public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Network"; } } + public override string TypeName { get { return "AuditEvent.agent.network"; } } /// /// Identifier for the network access point of the user device @@ -833,14 +831,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Source", IsNestedType=true)] - [BackboneType("AuditEvent.source")] + [FhirType("AuditEvent.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Source"; } } + public override string TypeName { get { return "AuditEvent.source"; } } /// /// Logical source location within the enterprise @@ -1031,14 +1028,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Entity", IsNestedType=true)] - [BackboneType("AuditEvent.entity")] + [FhirType("AuditEvent.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Entity"; } } + public override string TypeName { get { return "AuditEvent.entity"; } } /// /// Specific instance of object @@ -1444,14 +1440,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("AuditEvent#Detail", IsNestedType=true)] - [BackboneType("AuditEvent.entity.detail")] + [FhirType("AuditEvent.entity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "AuditEvent#Detail"; } } + public override string TypeName { get { return "AuditEvent.entity.detail"; } } /// /// Name of the property diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs index 285957a1e4..5db6a2a893 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)] + [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")] public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs index 2d71d938e4..2ed5c5c683 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("BodySite","http://hl7.org/fhir/StructureDefinition/BodySite", IsResource=true)] + [FhirType("BodySite","http://hl7.org/fhir/StructureDefinition/BodySite")] public partial class BodySite : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs index 3210f0c30e..eabadf2588 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement", IsResource=true)] + [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement")] public partial class CapabilityStatement : Hl7.Fhir.Model.DomainResource { /// @@ -423,14 +423,13 @@ public enum DocumentMode /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Software", IsNestedType=true)] - [BackboneType("CapabilityStatement.software")] + [FhirType("CapabilityStatement.software", IsBackboneType=true)] public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Software"; } } + public override string TypeName { get { return "CapabilityStatement.software"; } } /// /// A name the software is known by @@ -654,14 +653,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Implementation", IsNestedType=true)] - [BackboneType("CapabilityStatement.implementation")] + [FhirType("CapabilityStatement.implementation", IsBackboneType=true)] public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Implementation"; } } + public override string TypeName { get { return "CapabilityStatement.implementation"; } } /// /// Describes this specific instance @@ -845,14 +843,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Rest", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest")] + [FhirType("CapabilityStatement.rest", IsBackboneType=true)] public partial class RestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Rest"; } } + public override string TypeName { get { return "CapabilityStatement.rest"; } } /// /// client | server @@ -1208,14 +1205,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Security", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.security")] + [FhirType("CapabilityStatement.rest.security", IsBackboneType=true)] public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Security"; } } + public override string TypeName { get { return "CapabilityStatement.rest.security"; } } /// /// Adds CORS Headers (http://enable-cors.org/) @@ -1445,14 +1441,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Certificate", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.security.certificate")] + [FhirType("CapabilityStatement.rest.security.certificate", IsBackboneType=true)] public partial class CertificateComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Certificate"; } } + public override string TypeName { get { return "CapabilityStatement.rest.security.certificate"; } } /// /// Mime type for certificates @@ -1634,14 +1629,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Resource", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource")] + [FhirType("CapabilityStatement.rest.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Resource"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource"; } } /// /// A resource type that is supported @@ -2344,14 +2338,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#ResourceInteraction", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource.interaction")] + [FhirType("CapabilityStatement.rest.resource.interaction", IsBackboneType=true)] public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#ResourceInteraction"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource.interaction"; } } /// /// read | vread | update | patch | delete | history-instance | history-type | create | search-type @@ -2534,14 +2527,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SearchParam", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.resource.searchParam")] + [FhirType("CapabilityStatement.rest.resource.searchParam", IsBackboneType=true)] public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SearchParam"; } } + public override string TypeName { get { return "CapabilityStatement.rest.resource.searchParam"; } } /// /// Name of search parameter @@ -2811,14 +2803,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SystemInteraction", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.interaction")] + [FhirType("CapabilityStatement.rest.interaction", IsBackboneType=true)] public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SystemInteraction"; } } + public override string TypeName { get { return "CapabilityStatement.rest.interaction"; } } /// /// transaction | batch | search-system | history-system @@ -3001,14 +2992,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Operation", IsNestedType=true)] - [BackboneType("CapabilityStatement.rest.operation")] + [FhirType("CapabilityStatement.rest.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Operation"; } } + public override string TypeName { get { return "CapabilityStatement.rest.operation"; } } /// /// Name by which the operation/query is invoked @@ -3175,14 +3165,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Messaging", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging")] + [FhirType("CapabilityStatement.messaging", IsBackboneType=true)] public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Messaging"; } } + public override string TypeName { get { return "CapabilityStatement.messaging"; } } /// /// Where messages should be sent @@ -3440,14 +3429,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Endpoint", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging.endpoint")] + [FhirType("CapabilityStatement.messaging.endpoint", IsBackboneType=true)] public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Endpoint"; } } + public override string TypeName { get { return "CapabilityStatement.messaging.endpoint"; } } /// /// http | ftp | mllp + @@ -3613,14 +3601,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#SupportedMessage", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging.supportedMessage")] + [FhirType("CapabilityStatement.messaging.supportedMessage", IsBackboneType=true)] public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#SupportedMessage"; } } + public override string TypeName { get { return "CapabilityStatement.messaging.supportedMessage"; } } /// /// sender | receiver @@ -3789,14 +3776,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Event", IsNestedType=true)] - [BackboneType("CapabilityStatement.messaging.event")] + [FhirType("CapabilityStatement.messaging.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Event"; } } + public override string TypeName { get { return "CapabilityStatement.messaging.event"; } } /// /// Event type @@ -4153,14 +4139,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CapabilityStatement#Document", IsNestedType=true)] - [BackboneType("CapabilityStatement.document")] + [FhirType("CapabilityStatement.document", IsBackboneType=true)] public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CapabilityStatement#Document"; } } + public override string TypeName { get { return "CapabilityStatement.document"; } } /// /// producer | consumer diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs index 11fcf14ab5..31ebd76427 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)] + [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")] public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -205,14 +205,13 @@ public enum CarePlanActivityStatus /// [Serializable] [DataContract] - [FhirType("CarePlan#Activity", IsNestedType=true)] - [BackboneType("CarePlan.activity")] + [FhirType("CarePlan.activity", IsBackboneType=true)] public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Activity"; } } + public override string TypeName { get { return "CarePlan.activity"; } } /// /// Results of the activity @@ -439,14 +438,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CarePlan#Detail", IsNestedType=true)] - [BackboneType("CarePlan.activity.detail")] + [FhirType("CarePlan.activity.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CarePlan#Detail"; } } + public override string TypeName { get { return "CarePlan.activity.detail"; } } /// /// diet | drug | encounter | observation | procedure | supply | other diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs index a645511e6c..89c50968da 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)] + [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")] public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -107,14 +107,13 @@ public enum CareTeamStatus /// [Serializable] [DataContract] - [FhirType("CareTeam#Participant", IsNestedType=true)] - [BackboneType("CareTeam.participant")] + [FhirType("CareTeam.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CareTeam#Participant"; } } + public override string TypeName { get { return "CareTeam.participant"; } } /// /// Type of involvement diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs index efa2fcea69..3f7ac8818e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)] + [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")] public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -119,14 +119,13 @@ public enum ChargeItemStatus /// [Serializable] [DataContract] - [FhirType("ChargeItem#Participant", IsNestedType=true)] - [BackboneType("ChargeItem.participant")] + [FhirType("ChargeItem.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ChargeItem#Participant"; } } + public override string TypeName { get { return "ChargeItem.participant"; } } /// /// What type of performance was done diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs index 846d6d49a5..ed9e8c96a8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)] + [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")] public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum ClaimUseCode /// [Serializable] [DataContract] - [FhirType("Claim#RelatedClaim", IsNestedType=true)] - [BackboneType("Claim.related")] + [FhirType("Claim.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#RelatedClaim"; } } + public override string TypeName { get { return "Claim.related"; } } /// /// Reference to the related claim @@ -280,14 +279,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Payee", IsNestedType=true)] - [BackboneType("Claim.payee")] + [FhirType("Claim.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Payee"; } } + public override string TypeName { get { return "Claim.payee"; } } /// /// Type of party: Subscriber, Provider, other @@ -461,14 +459,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#CareTeam", IsNestedType=true)] - [BackboneType("Claim.careTeam")] + [FhirType("Claim.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#CareTeam"; } } + public override string TypeName { get { return "Claim.careTeam"; } } /// /// Number to covey order of careTeam @@ -729,14 +726,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SpecialCondition", IsNestedType=true)] - [BackboneType("Claim.information")] + [FhirType("Claim.information", IsBackboneType=true)] public partial class SpecialConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SpecialCondition"; } } + public override string TypeName { get { return "Claim.information"; } } /// /// Information instance identifier @@ -1008,14 +1004,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Diagnosis", IsNestedType=true)] - [BackboneType("Claim.diagnosis")] + [FhirType("Claim.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Diagnosis"; } } + public override string TypeName { get { return "Claim.diagnosis"; } } /// /// Number to covey order of diagnosis @@ -1236,14 +1231,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Procedure", IsNestedType=true)] - [BackboneType("Claim.procedure")] + [FhirType("Claim.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Procedure"; } } + public override string TypeName { get { return "Claim.procedure"; } } /// /// Procedure sequence for reference @@ -1454,14 +1448,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Insurance", IsNestedType=true)] - [BackboneType("Claim.insurance")] + [FhirType("Claim.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Insurance"; } } + public override string TypeName { get { return "Claim.insurance"; } } /// /// Service instance identifier @@ -1785,14 +1778,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Accident", IsNestedType=true)] - [BackboneType("Claim.accident")] + [FhirType("Claim.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Accident"; } } + public override string TypeName { get { return "Claim.accident"; } } /// /// When the accident occurred @@ -1988,14 +1980,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Item", IsNestedType=true)] - [BackboneType("Claim.item")] + [FhirType("Claim.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Item"; } } + public override string TypeName { get { return "Claim.item"; } } /// /// Service instance @@ -2750,14 +2741,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#Detail", IsNestedType=true)] - [BackboneType("Claim.item.detail")] + [FhirType("Claim.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#Detail"; } } + public override string TypeName { get { return "Claim.item.detail"; } } /// /// Service instance @@ -3199,14 +3189,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Claim#SubDetail", IsNestedType=true)] - [BackboneType("Claim.item.detail.subDetail")] + [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Claim#SubDetail"; } } + public override string TypeName { get { return "Claim.item.detail.subDetail"; } } /// /// Service instance diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs index 3b8ea44e29..d27c7a9047 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)] + [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")] public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Item", IsNestedType=true)] - [BackboneType("ClaimResponse.item")] + [FhirType("ClaimResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Item"; } } + public override string TypeName { get { return "ClaimResponse.item"; } } /// /// Service instance @@ -308,14 +307,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Adjudication", IsNestedType=true)] - [BackboneType("ClaimResponse.item.adjudication")] + [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Adjudication"; } } + public override string TypeName { get { return "ClaimResponse.item.adjudication"; } } /// /// Adjudication category such as co-pay, eligible, benefit, etc. @@ -530,14 +528,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail")] + [FhirType("ClaimResponse.item.detail", IsBackboneType=true)] public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#ItemDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail"; } } /// /// Service instance @@ -771,14 +768,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#SubDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.item.detail.subDetail")] + [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#SubDetail"; } } + public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } } /// /// Service instance @@ -986,14 +982,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItem", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem")] + [FhirType("ClaimResponse.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItem"; } } + public override string TypeName { get { return "ClaimResponse.addItem"; } } /// /// Service instances @@ -1357,14 +1352,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#AddedItemsDetail", IsNestedType=true)] - [BackboneType("ClaimResponse.addItem.detail")] + [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)] public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#AddedItemsDetail"; } } + public override string TypeName { get { return "ClaimResponse.addItem.detail"; } } /// /// Revenue or cost center code @@ -1658,14 +1652,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Error", IsNestedType=true)] - [BackboneType("ClaimResponse.error")] + [FhirType("ClaimResponse.error", IsBackboneType=true)] public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Error"; } } + public override string TypeName { get { return "ClaimResponse.error"; } } /// /// Item sequence number @@ -1915,14 +1908,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Payment", IsNestedType=true)] - [BackboneType("ClaimResponse.payment")] + [FhirType("ClaimResponse.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Payment"; } } + public override string TypeName { get { return "ClaimResponse.payment"; } } /// /// Partial or Complete @@ -2186,14 +2178,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Note", IsNestedType=true)] - [BackboneType("ClaimResponse.processNote")] + [FhirType("ClaimResponse.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Note"; } } + public override string TypeName { get { return "ClaimResponse.processNote"; } } /// /// Sequence Number for this note @@ -2425,14 +2416,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClaimResponse#Insurance", IsNestedType=true)] - [BackboneType("ClaimResponse.insurance")] + [FhirType("ClaimResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClaimResponse#Insurance"; } } + public override string TypeName { get { return "ClaimResponse.insurance"; } } /// /// Service instance identifier diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs index af7b0d2c96..d01a2e0c23 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)] + [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")] public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Investigation", IsNestedType=true)] - [BackboneType("ClinicalImpression.investigation")] + [FhirType("ClinicalImpression.investigation", IsBackboneType=true)] public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Investigation"; } } + public override string TypeName { get { return "ClinicalImpression.investigation"; } } /// /// A name/code for the set @@ -251,14 +250,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ClinicalImpression#Finding", IsNestedType=true)] - [BackboneType("ClinicalImpression.finding")] + [FhirType("ClinicalImpression.finding", IsBackboneType=true)] public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ClinicalImpression#Finding"; } } + public override string TypeName { get { return "ClinicalImpression.finding"; } } /// /// What was found diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs index 45a05b4daf..dd18243709 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem", IsResource=true)] + [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem")] public partial class CodeSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -181,14 +181,13 @@ public enum PropertyType /// [Serializable] [DataContract] - [FhirType("CodeSystem#Filter", IsNestedType=true)] - [BackboneType("CodeSystem.filter")] + [FhirType("CodeSystem.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Filter"; } } + public override string TypeName { get { return "CodeSystem.filter"; } } /// /// Code that identifies the filter @@ -459,14 +458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#Property", IsNestedType=true)] - [BackboneType("CodeSystem.property")] + [FhirType("CodeSystem.property", IsBackboneType=true)] public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Property"; } } + public override string TypeName { get { return "CodeSystem.property"; } } /// /// Identifies the property on the concepts, and when referred to in operations @@ -737,14 +735,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#ConceptDefinition", IsNestedType=true)] - [BackboneType("CodeSystem.concept")] + [FhirType("CodeSystem.concept", IsBackboneType=true)] public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#ConceptDefinition"; } } + public override string TypeName { get { return "CodeSystem.concept"; } } /// /// Code that identifies concept @@ -1046,14 +1043,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#Designation", IsNestedType=true)] - [BackboneType("CodeSystem.concept.designation")] + [FhirType("CodeSystem.concept.designation", IsBackboneType=true)] public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#Designation"; } } + public override string TypeName { get { return "CodeSystem.concept.designation"; } } /// /// Human language of the designation @@ -1261,14 +1257,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CodeSystem#ConceptProperty", IsNestedType=true)] - [BackboneType("CodeSystem.concept.property")] + [FhirType("CodeSystem.concept.property", IsBackboneType=true)] public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CodeSystem#ConceptProperty"; } } + public override string TypeName { get { return "CodeSystem.concept.property"; } } /// /// Reference to CodeSystem.property.code diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs index 76d6a853c4..7adb3980be 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)] + [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")] public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("Communication#Payload", IsNestedType=true)] - [BackboneType("Communication.payload")] + [FhirType("Communication.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Communication#Payload"; } } + public override string TypeName { get { return "Communication.payload"; } } /// /// Message part content diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs index dc40102f84..840b5ec975 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)] + [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")] public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden /// [Serializable] [DataContract] - [FhirType("CommunicationRequest#Payload", IsNestedType=true)] - [BackboneType("CommunicationRequest.payload")] + [FhirType("CommunicationRequest.payload", IsBackboneType=true)] public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CommunicationRequest#Payload"; } } + public override string TypeName { get { return "CommunicationRequest.payload"; } } /// /// Message part content @@ -197,14 +196,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("CommunicationRequest#Requester", IsNestedType=true)] - [BackboneType("CommunicationRequest.requester")] + [FhirType("CommunicationRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CommunicationRequest#Requester"; } } + public override string TypeName { get { return "CommunicationRequest.requester"; } } /// /// Individual making the request diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs index 9fa5a7f565..c591b78a2c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)] + [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")] public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource /// [Serializable] [DataContract] - [FhirType("CompartmentDefinition#Resource", IsNestedType=true)] - [BackboneType("CompartmentDefinition.resource")] + [FhirType("CompartmentDefinition.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "CompartmentDefinition#Resource"; } } + public override string TypeName { get { return "CompartmentDefinition.resource"; } } /// /// Name of resource type diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs index 130f5de9cf..c99b4deb68 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)] + [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")] public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -166,14 +166,13 @@ public enum CompositionAttestationMode /// [Serializable] [DataContract] - [FhirType("Composition#Attester", IsNestedType=true)] - [BackboneType("Composition.attester")] + [FhirType("Composition.attester", IsBackboneType=true)] public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Attester"; } } + public override string TypeName { get { return "Composition.attester"; } } /// /// personal | professional | legal | official @@ -384,14 +383,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#RelatesTo", IsNestedType=true)] - [BackboneType("Composition.relatesTo")] + [FhirType("Composition.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#RelatesTo"; } } + public override string TypeName { get { return "Composition.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -561,14 +559,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Event", IsNestedType=true)] - [BackboneType("Composition.event")] + [FhirType("Composition.event", IsBackboneType=true)] public partial class EventComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Event"; } } + public override string TypeName { get { return "Composition.event"; } } /// /// Code(s) that apply to the event being documented @@ -742,14 +739,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Composition#Section", IsNestedType=true)] - [BackboneType("Composition.section")] + [FhirType("Composition.section", IsBackboneType=true)] public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Composition#Section"; } } + public override string TypeName { get { return "Composition.section"; } } /// /// Label for section (e.g. for ToC) diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs index 55df6de544..e5ac9484a6 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)] + [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")] public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -165,14 +165,13 @@ public enum ConceptMapGroupUnmappedMode /// [Serializable] [DataContract] - [FhirType("ConceptMap#Group", IsNestedType=true)] - [BackboneType("ConceptMap.group")] + [FhirType("ConceptMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Group"; } } + public override string TypeName { get { return "ConceptMap.group"; } } /// /// Code System (if value set crosses code systems) @@ -490,14 +489,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#SourceElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element")] + [FhirType("ConceptMap.group.element", IsBackboneType=true)] public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#SourceElement"; } } + public override string TypeName { get { return "ConceptMap.group.element"; } } /// /// Identifies element being mapped @@ -704,14 +702,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#TargetElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target")] + [FhirType("ConceptMap.group.element.target", IsBackboneType=true)] public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#TargetElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target"; } } /// /// Code that identifies the target element @@ -1031,14 +1028,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#OtherElement", IsNestedType=true)] - [BackboneType("ConceptMap.group.element.target.dependsOn")] + [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)] public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#OtherElement"; } } + public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } } /// /// Reference to property mapping depends on @@ -1307,14 +1303,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ConceptMap#Unmapped", IsNestedType=true)] - [BackboneType("ConceptMap.group.unmapped")] + [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)] public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ConceptMap#Unmapped"; } } + public override string TypeName { get { return "ConceptMap.group.unmapped"; } } /// /// provided | fixed | other-map diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs index 9868742ed1..28b4997bd3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)] + [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")] public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -153,14 +153,13 @@ public enum ConditionVerificationStatus /// [Serializable] [DataContract] - [FhirType("Condition#Stage", IsNestedType=true)] - [BackboneType("Condition.stage")] + [FhirType("Condition.stage", IsBackboneType=true)] public partial class StageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Stage"; } } + public override string TypeName { get { return "Condition.stage"; } } /// /// Simple summary (disease specific) @@ -309,14 +308,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Condition#Evidence", IsNestedType=true)] - [BackboneType("Condition.evidence")] + [FhirType("Condition.evidence", IsBackboneType=true)] public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Condition#Evidence"; } } + public override string TypeName { get { return "Condition.evidence"; } } /// /// Manifestation/symptom diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs index 08da0b2304..027f4a0114 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)] + [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")] public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -170,14 +170,13 @@ public enum ConsentExceptType /// [Serializable] [DataContract] - [FhirType("Consent#Actor", IsNestedType=true)] - [BackboneType("Consent.actor")] + [FhirType("Consent.actor", IsBackboneType=true)] public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Actor"; } } + public override string TypeName { get { return "Consent.actor"; } } /// /// How the actor is involved @@ -326,14 +325,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Policy", IsNestedType=true)] - [BackboneType("Consent.policy")] + [FhirType("Consent.policy", IsBackboneType=true)] public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Policy"; } } + public override string TypeName { get { return "Consent.policy"; } } /// /// Enforcement source for policy @@ -513,14 +511,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Data", IsNestedType=true)] - [BackboneType("Consent.data")] + [FhirType("Consent.data", IsBackboneType=true)] public partial class DataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Data"; } } + public override string TypeName { get { return "Consent.data"; } } /// /// instance | related | dependents | authoredby @@ -688,14 +685,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#Except", IsNestedType=true)] - [BackboneType("Consent.except")] + [FhirType("Consent.except", IsBackboneType=true)] public partial class ExceptComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#Except"; } } + public override string TypeName { get { return "Consent.except"; } } /// /// deny | permit @@ -1072,14 +1068,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#ExceptActor", IsNestedType=true)] - [BackboneType("Consent.except.actor")] + [FhirType("Consent.except.actor", IsBackboneType=true)] public partial class ExceptActorComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#ExceptActor"; } } + public override string TypeName { get { return "Consent.except.actor"; } } /// /// How the actor is involved @@ -1228,14 +1223,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Consent#ExceptData", IsNestedType=true)] - [BackboneType("Consent.except.data")] + [FhirType("Consent.except.data", IsBackboneType=true)] public partial class ExceptDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Consent#ExceptData"; } } + public override string TypeName { get { return "Consent.except.data"; } } /// /// instance | related | dependents | authoredby diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs index ba06730bf8..a5f6773141 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)] + [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")] public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -169,14 +169,13 @@ public enum ContractResourceStatusCodes /// [Serializable] [DataContract] - [FhirType("Contract#Agent", IsNestedType=true)] - [BackboneType("Contract.agent")] + [FhirType("Contract.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Agent"; } } + public override string TypeName { get { return "Contract.agent"; } } /// /// Contract Agent Type @@ -327,14 +326,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Signatory", IsNestedType=true)] - [BackboneType("Contract.signer")] + [FhirType("Contract.signer", IsBackboneType=true)] public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Signatory"; } } + public override string TypeName { get { return "Contract.signer"; } } /// /// Contract Signatory Role @@ -506,14 +504,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ValuedItem", IsNestedType=true)] - [BackboneType("Contract.valuedItem")] + [FhirType("Contract.valuedItem", IsBackboneType=true)] public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ValuedItem"; } } + public override string TypeName { get { return "Contract.valuedItem"; } } /// /// Contract Valued Item Type @@ -864,14 +861,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#Term", IsNestedType=true)] - [BackboneType("Contract.term")] + [FhirType("Contract.term", IsBackboneType=true)] public partial class TermComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#Term"; } } + public override string TypeName { get { return "Contract.term"; } } /// /// Contract Term Number @@ -1342,14 +1338,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#TermAgent", IsNestedType=true)] - [BackboneType("Contract.term.agent")] + [FhirType("Contract.term.agent", IsBackboneType=true)] public partial class TermAgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#TermAgent"; } } + public override string TypeName { get { return "Contract.term.agent"; } } /// /// Contract Term Agent Subject @@ -1498,14 +1493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#TermValuedItem", IsNestedType=true)] - [BackboneType("Contract.term.valuedItem")] + [FhirType("Contract.term.valuedItem", IsBackboneType=true)] public partial class TermValuedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#TermValuedItem"; } } + public override string TypeName { get { return "Contract.term.valuedItem"; } } /// /// Contract Term Valued Item Type @@ -1856,14 +1850,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#FriendlyLanguage", IsNestedType=true)] - [BackboneType("Contract.friendly")] + [FhirType("Contract.friendly", IsBackboneType=true)] public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#FriendlyLanguage"; } } + public override string TypeName { get { return "Contract.friendly"; } } /// /// Easily comprehended representation of this Contract @@ -1986,14 +1979,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#LegalLanguage", IsNestedType=true)] - [BackboneType("Contract.legal")] + [FhirType("Contract.legal", IsBackboneType=true)] public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#LegalLanguage"; } } + public override string TypeName { get { return "Contract.legal"; } } /// /// Contract Legal Text @@ -2116,14 +2108,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Contract#ComputableLanguage", IsNestedType=true)] - [BackboneType("Contract.rule")] + [FhirType("Contract.rule", IsBackboneType=true)] public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Contract#ComputableLanguage"; } } + public override string TypeName { get { return "Contract.rule"; } } /// /// Computable Contract Rules diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs index 77d3ca22dc..5fb168cc7c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)] + [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")] public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Coverage#Group", IsNestedType=true)] - [BackboneType("Coverage.grouping")] + [FhirType("Coverage.grouping", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Coverage#Group"; } } + public override string TypeName { get { return "Coverage.grouping"; } } /// /// An identifier for the group diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs index f3d8c177eb..fb3ba46c58 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DataElement","http://hl7.org/fhir/StructureDefinition/DataElement", IsResource=true)] + [FhirType("DataElement","http://hl7.org/fhir/StructureDefinition/DataElement")] public partial class DataElement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum DataElementStringency /// [Serializable] [DataContract] - [FhirType("DataElement#Mapping", IsNestedType=true)] - [BackboneType("DataElement.mapping")] + [FhirType("DataElement.mapping", IsBackboneType=true)] public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataElement#Mapping"; } } + public override string TypeName { get { return "DataElement.mapping"; } } /// /// Internal id when this mapping is used diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs index c943cc5bd7..bc5588b83a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs @@ -67,14 +67,13 @@ public partial class DataRequirement : Hl7.Fhir.Model.DataType /// [Serializable] [DataContract] - [FhirType("DataRequirement#CodeFilter", IsNestedType=true)] - [BackboneType("DataRequirement.codeFilter")] + [FhirType("DataRequirement.codeFilter", IsBackboneType=true)] public partial class CodeFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#CodeFilter"; } } + public override string TypeName { get { return "DataRequirement.codeFilter"; } } /// /// The code-valued attribute of the filter @@ -336,14 +335,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DataRequirement#DateFilter", IsNestedType=true)] - [BackboneType("DataRequirement.dateFilter")] + [FhirType("DataRequirement.dateFilter", IsBackboneType=true)] public partial class DateFilterComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "DataRequirement#DateFilter"; } } + public override string TypeName { get { return "DataRequirement.dateFilter"; } } /// /// The date-valued attribute of the filter diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs index d00c45524b..9565c5185e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)] + [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")] public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -95,14 +95,13 @@ public enum DetectedIssueSeverity /// [Serializable] [DataContract] - [FhirType("DetectedIssue#Mitigation", IsNestedType=true)] - [BackboneType("DetectedIssue.mitigation")] + [FhirType("DetectedIssue.mitigation", IsBackboneType=true)] public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DetectedIssue#Mitigation"; } } + public override string TypeName { get { return "DetectedIssue.mitigation"; } } /// /// What mitigation? diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs index 6d87622278..5580aaa184 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)] + [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")] public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -148,14 +148,13 @@ public enum UDIEntryType /// [Serializable] [DataContract] - [FhirType("Device#Udi", IsNestedType=true)] - [BackboneType("Device.udi")] + [FhirType("Device.udi", IsBackboneType=true)] public partial class UdiComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Device#Udi"; } } + public override string TypeName { get { return "Device.udi"; } } /// /// Mandatory fixed portion of UDI diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs index 3765cdce83..d68d619928 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceComponent","http://hl7.org/fhir/StructureDefinition/DeviceComponent", IsResource=true)] + [FhirType("DeviceComponent","http://hl7.org/fhir/StructureDefinition/DeviceComponent")] public partial class DeviceComponent : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -144,14 +144,13 @@ public enum MeasmntPrinciple /// [Serializable] [DataContract] - [FhirType("DeviceComponent#ProductionSpecification", IsNestedType=true)] - [BackboneType("DeviceComponent.productionSpecification")] + [FhirType("DeviceComponent.productionSpecification", IsBackboneType=true)] public partial class ProductionSpecificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceComponent#ProductionSpecification"; } } + public override string TypeName { get { return "DeviceComponent.productionSpecification"; } } /// /// Type or kind of production specification, for example serial number or software revision diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs index a92c939785..5fc6135d83 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)] + [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")] public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState /// [Serializable] [DataContract] - [FhirType("DeviceMetric#Calibration", IsNestedType=true)] - [BackboneType("DeviceMetric.calibration")] + [FhirType("DeviceMetric.calibration", IsBackboneType=true)] public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceMetric#Calibration"; } } + public override string TypeName { get { return "DeviceMetric.calibration"; } } /// /// unspecified | offset | gain | two-point diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs index 0dc60f05e1..63893be528 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)] + [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")] public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl /// [Serializable] [DataContract] - [FhirType("DeviceRequest#Requester", IsNestedType=true)] - [BackboneType("DeviceRequest.requester")] + [FhirType("DeviceRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DeviceRequest#Requester"; } } + public override string TypeName { get { return "DeviceRequest.requester"; } } /// /// Individual making the request diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs index 8113928fb9..43e0773168 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)] + [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")] public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs index 3d1f341a45..1d6a6d1edb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)] + [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")] public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -138,14 +138,13 @@ public enum DiagnosticReportStatus /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#Performer", IsNestedType=true)] - [BackboneType("DiagnosticReport.performer")] + [FhirType("DiagnosticReport.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#Performer"; } } + public override string TypeName { get { return "DiagnosticReport.performer"; } } /// /// Type of performer @@ -293,14 +292,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DiagnosticReport#Image", IsNestedType=true)] - [BackboneType("DiagnosticReport.image")] + [FhirType("DiagnosticReport.image", IsBackboneType=true)] public partial class ImageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DiagnosticReport#Image"; } } + public override string TypeName { get { return "DiagnosticReport.image"; } } /// /// Comment about the image (e.g. explanation) diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs index c59a64d940..3ff6f9ff2e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)] + [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")] public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("DocumentManifest#Content", IsNestedType=true)] - [BackboneType("DocumentManifest.content")] + [FhirType("DocumentManifest.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentManifest#Content"; } } + public override string TypeName { get { return "DocumentManifest.content"; } } /// /// Contents of this set of documents @@ -198,14 +197,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentManifest#Related", IsNestedType=true)] - [BackboneType("DocumentManifest.related")] + [FhirType("DocumentManifest.related", IsBackboneType=true)] public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentManifest#Related"; } } + public override string TypeName { get { return "DocumentManifest.related"; } } /// /// Identifiers of things that are related diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs index 810bdce2f2..12a01d891e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)] + [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")] public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("DocumentReference#RelatesTo", IsNestedType=true)] - [BackboneType("DocumentReference.relatesTo")] + [FhirType("DocumentReference.relatesTo", IsBackboneType=true)] public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#RelatesTo"; } } + public override string TypeName { get { return "DocumentReference.relatesTo"; } } /// /// replaces | transforms | signs | appends @@ -243,14 +242,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Content", IsNestedType=true)] - [BackboneType("DocumentReference.content")] + [FhirType("DocumentReference.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Content"; } } + public override string TypeName { get { return "DocumentReference.content"; } } /// /// Where to access the document @@ -397,14 +395,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Context", IsNestedType=true)] - [BackboneType("DocumentReference.context")] + [FhirType("DocumentReference.context", IsBackboneType=true)] public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Context"; } } + public override string TypeName { get { return "DocumentReference.context"; } } /// /// Context of the document content @@ -683,14 +680,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("DocumentReference#Related", IsNestedType=true)] - [BackboneType("DocumentReference.context.related")] + [FhirType("DocumentReference.context.related", IsBackboneType=true)] public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "DocumentReference#Related"; } } + public override string TypeName { get { return "DocumentReference.context.related"; } } /// /// Identifier of related objects or events diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs index 900f858215..5d3fdcc191 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs @@ -254,14 +254,13 @@ public enum ConstraintSeverity /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Slicing", IsNestedType=true)] - [BackboneType("ElementDefinition.slicing")] + [FhirType("ElementDefinition.slicing", IsBackboneType=true)] public partial class SlicingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Slicing"; } } + public override string TypeName { get { return "ElementDefinition.slicing"; } } /// /// Element values that are used to distinguish the slices @@ -514,14 +513,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Discriminator", IsNestedType=true)] - [BackboneType("ElementDefinition.slicing.discriminator")] + [FhirType("ElementDefinition.slicing.discriminator", IsBackboneType=true)] public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Discriminator"; } } + public override string TypeName { get { return "ElementDefinition.slicing.discriminator"; } } /// /// value | exists | pattern | type | profile @@ -706,14 +704,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Base", IsNestedType=true)] - [BackboneType("ElementDefinition.base")] + [FhirType("ElementDefinition.base", IsBackboneType=true)] public partial class BaseComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Base"; } } + public override string TypeName { get { return "ElementDefinition.base"; } } /// /// Path that identifies the base element @@ -940,14 +937,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#TypeRef", IsNestedType=true)] - [BackboneType("ElementDefinition.type")] + [FhirType("ElementDefinition.type", IsBackboneType=true)] public partial class TypeRefComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#TypeRef"; } } + public override string TypeName { get { return "ElementDefinition.type"; } } /// /// Data type or Resource (reference to definition) @@ -1264,14 +1260,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Example", IsNestedType=true)] - [BackboneType("ElementDefinition.example")] + [FhirType("ElementDefinition.example", IsBackboneType=true)] public partial class ExampleComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Example"; } } + public override string TypeName { get { return "ElementDefinition.example"; } } /// /// Describes the purpose of this example @@ -1438,14 +1433,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Constraint", IsNestedType=true)] - [BackboneType("ElementDefinition.constraint")] + [FhirType("ElementDefinition.constraint", IsBackboneType=true)] public partial class ConstraintComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Constraint"; } } + public override string TypeName { get { return "ElementDefinition.constraint"; } } /// /// Target of 'condition' reference above @@ -1850,14 +1844,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#ElementDefinitionBinding", IsNestedType=true)] - [BackboneType("ElementDefinition.binding")] + [FhirType("ElementDefinition.binding", IsBackboneType=true)] public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#ElementDefinitionBinding"; } } + public override string TypeName { get { return "ElementDefinition.binding"; } } /// /// required | extensible | preferred | example @@ -2071,14 +2064,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ElementDefinition#Mapping", IsNestedType=true)] - [BackboneType("ElementDefinition.mapping")] + [FhirType("ElementDefinition.mapping", IsBackboneType=true)] public partial class MappingComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "ElementDefinition#Mapping"; } } + public override string TypeName { get { return "ElementDefinition.mapping"; } } /// /// Reference to mapping declaration diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs index fe35abec7a..307fb0c02a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EligibilityRequest","http://hl7.org/fhir/StructureDefinition/EligibilityRequest", IsResource=true)] + [FhirType("EligibilityRequest","http://hl7.org/fhir/StructureDefinition/EligibilityRequest")] public partial class EligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs index c12d5d9c3a..7d1eca272c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EligibilityResponse","http://hl7.org/fhir/StructureDefinition/EligibilityResponse", IsResource=true)] + [FhirType("EligibilityResponse","http://hl7.org/fhir/StructureDefinition/EligibilityResponse")] public partial class EligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class EligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdent /// [Serializable] [DataContract] - [FhirType("EligibilityResponse#Insurance", IsNestedType=true)] - [BackboneType("EligibilityResponse.insurance")] + [FhirType("EligibilityResponse.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EligibilityResponse#Insurance"; } } + public override string TypeName { get { return "EligibilityResponse.insurance"; } } /// /// Updated Coverage details @@ -248,14 +247,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EligibilityResponse#Benefits", IsNestedType=true)] - [BackboneType("EligibilityResponse.insurance.benefitBalance")] + [FhirType("EligibilityResponse.insurance.benefitBalance", IsBackboneType=true)] public partial class BenefitsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EligibilityResponse#Benefits"; } } + public override string TypeName { get { return "EligibilityResponse.insurance.benefitBalance"; } } /// /// Type of services covered @@ -635,14 +633,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EligibilityResponse#Benefit", IsNestedType=true)] - [BackboneType("EligibilityResponse.insurance.benefitBalance.financial")] + [FhirType("EligibilityResponse.insurance.benefitBalance.financial", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EligibilityResponse#Benefit"; } } + public override string TypeName { get { return "EligibilityResponse.insurance.benefitBalance.financial"; } } /// /// Deductable, visits, benefit amount @@ -817,14 +814,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EligibilityResponse#Errors", IsNestedType=true)] - [BackboneType("EligibilityResponse.error")] + [FhirType("EligibilityResponse.error", IsBackboneType=true)] public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EligibilityResponse#Errors"; } } + public override string TypeName { get { return "EligibilityResponse.error"; } } /// /// Error code detailing processing issues diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs index 39c1927ecd..b64c7a3aee 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)] + [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")] public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -168,14 +168,13 @@ public enum EncounterLocationStatus /// [Serializable] [DataContract] - [FhirType("Encounter#StatusHistory", IsNestedType=true)] - [BackboneType("Encounter.statusHistory")] + [FhirType("Encounter.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#StatusHistory"; } } + public override string TypeName { get { return "Encounter.statusHistory"; } } /// /// planned | arrived | triaged | in-progress | onleave | finished | cancelled + @@ -342,14 +341,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#ClassHistory", IsNestedType=true)] - [BackboneType("Encounter.classHistory")] + [FhirType("Encounter.classHistory", IsBackboneType=true)] public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#ClassHistory"; } } + public override string TypeName { get { return "Encounter.classHistory"; } } /// /// inpatient | outpatient | ambulatory | emergency + @@ -496,14 +494,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Participant", IsNestedType=true)] - [BackboneType("Encounter.participant")] + [FhirType("Encounter.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Participant"; } } + public override string TypeName { get { return "Encounter.participant"; } } /// /// Role of participant in encounter @@ -673,14 +670,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Diagnosis", IsNestedType=true)] - [BackboneType("Encounter.diagnosis")] + [FhirType("Encounter.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Diagnosis"; } } + public override string TypeName { get { return "Encounter.diagnosis"; } } /// /// Reason the encounter takes place (resource) @@ -872,14 +868,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Hospitalization", IsNestedType=true)] - [BackboneType("Encounter.hospitalization")] + [FhirType("Encounter.hospitalization", IsBackboneType=true)] public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Hospitalization"; } } + public override string TypeName { get { return "Encounter.hospitalization"; } } /// /// Pre-admission identifier @@ -1212,14 +1207,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Encounter#Location", IsNestedType=true)] - [BackboneType("Encounter.location")] + [FhirType("Encounter.location", IsBackboneType=true)] public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Encounter#Location"; } } + public override string TypeName { get { return "Encounter.location"; } } /// /// Location the encounter takes place diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs index a615b1e70c..50813b9012 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)] + [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")] public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs index f008b1fecd..9adb299b3c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)] + [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")] public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs index 2b8b3eb35e..a32569060f 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)] + [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")] public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs index 0e00f90009..73b3836fcb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)] + [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")] public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)] - [BackboneType("EpisodeOfCare.statusHistory")] + [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)] public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } } + public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } } /// /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error @@ -289,14 +288,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)] - [BackboneType("EpisodeOfCare.diagnosis")] + [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } } + public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } } /// /// Conditions/problems/diagnoses this episode of care is for diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs index 4d91b9a23e..47cf7b195a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExpansionProfile","http://hl7.org/fhir/StructureDefinition/ExpansionProfile", IsResource=true)] + [FhirType("ExpansionProfile","http://hl7.org/fhir/StructureDefinition/ExpansionProfile")] public partial class ExpansionProfile : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -95,14 +95,13 @@ public enum SystemVersionProcessingMode /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#FixedVersion", IsNestedType=true)] - [BackboneType("ExpansionProfile.fixedVersion")] + [FhirType("ExpansionProfile.fixedVersion", IsBackboneType=true)] public partial class FixedVersionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#FixedVersion"; } } + public override string TypeName { get { return "ExpansionProfile.fixedVersion"; } } /// /// System to have its version fixed @@ -331,14 +330,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#ExcludedSystem", IsNestedType=true)] - [BackboneType("ExpansionProfile.excludedSystem")] + [FhirType("ExpansionProfile.excludedSystem", IsBackboneType=true)] public partial class ExcludedSystemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#ExcludedSystem"; } } + public override string TypeName { get { return "ExpansionProfile.excludedSystem"; } } /// /// The specific code system to be excluded @@ -519,14 +517,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#Designation", IsNestedType=true)] - [BackboneType("ExpansionProfile.designation")] + [FhirType("ExpansionProfile.designation", IsBackboneType=true)] public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#Designation"; } } + public override string TypeName { get { return "ExpansionProfile.designation"; } } /// /// Designations to be included @@ -667,14 +664,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#DesignationInclude", IsNestedType=true)] - [BackboneType("ExpansionProfile.designation.include")] + [FhirType("ExpansionProfile.designation.include", IsBackboneType=true)] public partial class DesignationIncludeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#DesignationInclude"; } } + public override string TypeName { get { return "ExpansionProfile.designation.include"; } } /// /// The designation to be included @@ -795,14 +791,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#DesignationIncludeDesignation", IsNestedType=true)] - [BackboneType("ExpansionProfile.designation.include.designation")] + [FhirType("ExpansionProfile.designation.include.designation", IsBackboneType=true)] public partial class DesignationIncludeDesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#DesignationIncludeDesignation"; } } + public override string TypeName { get { return "ExpansionProfile.designation.include.designation"; } } /// /// Human language of the designation to be included @@ -963,14 +958,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#DesignationExclude", IsNestedType=true)] - [BackboneType("ExpansionProfile.designation.exclude")] + [FhirType("ExpansionProfile.designation.exclude", IsBackboneType=true)] public partial class DesignationExcludeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#DesignationExclude"; } } + public override string TypeName { get { return "ExpansionProfile.designation.exclude"; } } /// /// The designation to be excluded @@ -1091,14 +1085,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExpansionProfile#DesignationExcludeDesignation", IsNestedType=true)] - [BackboneType("ExpansionProfile.designation.exclude.designation")] + [FhirType("ExpansionProfile.designation.exclude.designation", IsBackboneType=true)] public partial class DesignationExcludeDesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExpansionProfile#DesignationExcludeDesignation"; } } + public override string TypeName { get { return "ExpansionProfile.designation.exclude.designation"; } } /// /// Human language of the designation to be excluded diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs index de2863473d..97e5d27d03 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)] + [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")] public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -258,14 +258,13 @@ public enum ActInvoiceGroupCode /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.related")] + [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)] public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } } + public override string TypeName { get { return "ExplanationOfBenefit.related"; } } /// /// Reference to the related claim @@ -437,14 +436,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payee")] + [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)] public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payee"; } } /// /// Type of party: Subscriber, Provider, other @@ -617,14 +615,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.information")] + [FhirType("ExplanationOfBenefit.information", IsBackboneType=true)] public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } } + public override string TypeName { get { return "ExplanationOfBenefit.information"; } } /// /// Information instance identifier @@ -896,14 +893,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.careTeam")] + [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)] public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } } + public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } } /// /// Number to covey order of careteam @@ -1164,14 +1160,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.diagnosis")] + [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)] public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } } + public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } } /// /// Number to covey order of diagnosis @@ -1392,14 +1387,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.procedure")] + [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)] public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } } + public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } } /// /// Procedure sequence for reference @@ -1610,14 +1604,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.insurance")] + [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)] public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } } /// /// Insurance information @@ -1782,14 +1775,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.accident")] + [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)] public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } } + public override string TypeName { get { return "ExplanationOfBenefit.accident"; } } /// /// When the accident occurred @@ -1980,14 +1972,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item")] + [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Item"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item"; } } /// /// Service instance @@ -2812,14 +2803,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.adjudication")] + [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)] public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } } /// /// Adjudication category such as co-pay, eligible, benefit, etc. @@ -3034,14 +3024,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail")] + [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)] public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } } /// /// Service instance @@ -3580,14 +3569,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.item.detail.subDetail")] + [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)] public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } } /// /// Service instance @@ -4100,14 +4088,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem")] + [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)] public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } } /// /// Service instances @@ -4471,14 +4458,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#AddedItemsDetail", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.addItem.detail")] + [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)] public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#AddedItemsDetail"; } } + public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } } /// /// Revenue or cost center code @@ -4772,14 +4758,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.payment")] + [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)] public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } } + public override string TypeName { get { return "ExplanationOfBenefit.payment"; } } /// /// Partial or Complete @@ -5043,14 +5028,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.processNote")] + [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)] public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Note"; } } + public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } } /// /// Sequence number for this note @@ -5279,14 +5263,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance")] + [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)] public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } } /// /// Type of services covered @@ -5666,14 +5649,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)] - [BackboneType("ExplanationOfBenefit.benefitBalance.financial")] + [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)] public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } } + public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } } /// /// Deductable, visits, benefit amount diff --git a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs index c62738ac35..67190ae965 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)] + [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")] public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -102,14 +102,13 @@ public enum FamilyHistoryStatus /// [Serializable] [DataContract] - [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)] - [BackboneType("FamilyMemberHistory.condition")] + [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "FamilyMemberHistory#Condition"; } } + public override string TypeName { get { return "FamilyMemberHistory.condition"; } } /// /// Condition suffered by relation diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs index 8027e2a970..fb775872be 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)] + [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")] public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs index 34cfaf74e9..32e51f61eb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)] + [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")] public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -156,14 +156,13 @@ public enum GoalStatus /// [Serializable] [DataContract] - [FhirType("Goal#Target", IsNestedType=true)] - [BackboneType("Goal.target")] + [FhirType("Goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Goal#Target"; } } + public override string TypeName { get { return "Goal.target"; } } /// /// The parameter whose value is being tracked diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs index 0ff21c86e8..7de3466d94 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)] + [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")] public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -98,14 +98,13 @@ public enum GraphCompartmentRule /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Link", IsNestedType=true)] - [BackboneType("GraphDefinition.link")] + [FhirType("GraphDefinition.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Link"; } } + public override string TypeName { get { return "GraphDefinition.link"; } } /// /// Path in the resource that contains the link @@ -438,14 +437,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Target", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target")] + [FhirType("GraphDefinition.link.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Target"; } } + public override string TypeName { get { return "GraphDefinition.link.target"; } } /// /// Type of resource this link refers to @@ -677,14 +675,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("GraphDefinition#Compartment", IsNestedType=true)] - [BackboneType("GraphDefinition.link.target.compartment")] + [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)] public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "GraphDefinition#Compartment"; } } + public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } } /// /// Identifies the compartment diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs index 1127a4cbac..25861612d2 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)] + [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")] public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum GroupType /// [Serializable] [DataContract] - [FhirType("Group#Characteristic", IsNestedType=true)] - [BackboneType("Group.characteristic")] + [FhirType("Group.characteristic", IsBackboneType=true)] public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Characteristic"; } } + public override string TypeName { get { return "Group.characteristic"; } } /// /// Kind of characteristic @@ -340,14 +339,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Group#Member", IsNestedType=true)] - [BackboneType("Group.member")] + [FhirType("Group.member", IsBackboneType=true)] public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Group#Member"; } } + public override string TypeName { get { return "Group.member"; } } /// /// Reference to the group member diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs index 93e342dcaf..528e51fd0a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)] + [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")] public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs index ae03ae0c72..c8633add82 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)] + [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")] public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -65,14 +65,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("HealthcareService#AvailableTime", IsNestedType=true)] - [BackboneType("HealthcareService.availableTime")] + [FhirType("HealthcareService.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#AvailableTime"; } } + public override string TypeName { get { return "HealthcareService.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -341,14 +340,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("HealthcareService#NotAvailable", IsNestedType=true)] - [BackboneType("HealthcareService.notAvailable")] + [FhirType("HealthcareService.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "HealthcareService#NotAvailable"; } } + public override string TypeName { get { return "HealthcareService.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs index 13b86fb031..d618a41183 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingManifest","http://hl7.org/fhir/StructureDefinition/ImagingManifest", IsResource=true)] + [FhirType("ImagingManifest","http://hl7.org/fhir/StructureDefinition/ImagingManifest")] public partial class ImagingManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -68,14 +68,13 @@ public partial class ImagingManifest : Hl7.Fhir.Model.DomainResource, IIdentifia /// [Serializable] [DataContract] - [FhirType("ImagingManifest#Study", IsNestedType=true)] - [BackboneType("ImagingManifest.study")] + [FhirType("ImagingManifest.study", IsBackboneType=true)] public partial class StudyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingManifest#Study"; } } + public override string TypeName { get { return "ImagingManifest.study"; } } /// /// Study instance UID @@ -295,14 +294,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingManifest#Series", IsNestedType=true)] - [BackboneType("ImagingManifest.study.series")] + [FhirType("ImagingManifest.study.series", IsBackboneType=true)] public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingManifest#Series"; } } + public override string TypeName { get { return "ImagingManifest.study.series"; } } /// /// Series instance UID @@ -495,14 +493,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingManifest#Instance", IsNestedType=true)] - [BackboneType("ImagingManifest.study.series.instance")] + [FhirType("ImagingManifest.study.series.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingManifest#Instance"; } } + public override string TypeName { get { return "ImagingManifest.study.series.instance"; } } /// /// SOP class UID of instance diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs index 28d2116a23..945ad7232c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)] + [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")] public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum InstanceAvailability /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Series", IsNestedType=true)] - [BackboneType("ImagingStudy.series")] + [FhirType("ImagingStudy.series", IsBackboneType=true)] public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Series"; } } + public override string TypeName { get { return "ImagingStudy.series"; } } /// /// Formal DICOM identifier for this series @@ -624,14 +623,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImagingStudy#Instance", IsNestedType=true)] - [BackboneType("ImagingStudy.series.instance")] + [FhirType("ImagingStudy.series.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImagingStudy#Instance"; } } + public override string TypeName { get { return "ImagingStudy.series.instance"; } } /// /// Formal DICOM identifier for this instance diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs index c376e29dcc..b2c6067657 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)] + [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")] public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -89,14 +89,13 @@ public enum ImmunizationStatusCodes /// [Serializable] [DataContract] - [FhirType("Immunization#Practitioner", IsNestedType=true)] - [BackboneType("Immunization.practitioner")] + [FhirType("Immunization.practitioner", IsBackboneType=true)] public partial class PractitionerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Practitioner"; } } + public override string TypeName { get { return "Immunization.practitioner"; } } /// /// What type of performance was done @@ -244,14 +243,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Explanation", IsNestedType=true)] - [BackboneType("Immunization.explanation")] + [FhirType("Immunization.explanation", IsBackboneType=true)] public partial class ExplanationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Explanation"; } } + public override string TypeName { get { return "Immunization.explanation"; } } /// /// Why immunization occurred @@ -400,14 +398,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#Reaction", IsNestedType=true)] - [BackboneType("Immunization.reaction")] + [FhirType("Immunization.reaction", IsBackboneType=true)] public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#Reaction"; } } + public override string TypeName { get { return "Immunization.reaction"; } } /// /// When reaction started @@ -614,14 +611,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Immunization#VaccinationProtocol", IsNestedType=true)] - [BackboneType("Immunization.vaccinationProtocol")] + [FhirType("Immunization.vaccinationProtocol", IsBackboneType=true)] public partial class VaccinationProtocolComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Immunization#VaccinationProtocol"; } } + public override string TypeName { get { return "Immunization.vaccinationProtocol"; } } /// /// Dose number within series diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs index 381ca3e25d..ba644883c4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)] + [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")] public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation")] + [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)] public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } } /// /// Date recommendation created @@ -438,14 +437,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")] + [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)] public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } } /// /// Type of date @@ -610,14 +608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImmunizationRecommendation#Protocol", IsNestedType=true)] - [BackboneType("ImmunizationRecommendation.recommendation.protocol")] + [FhirType("ImmunizationRecommendation.recommendation.protocol", IsBackboneType=true)] public partial class ProtocolComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImmunizationRecommendation#Protocol"; } } + public override string TypeName { get { return "ImmunizationRecommendation.recommendation.protocol"; } } /// /// Dose number within sequence diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs index 14c32c176c..58aac8268e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)] + [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")] public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource { /// @@ -147,14 +147,13 @@ public enum GuidePageKind /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Dependency", IsNestedType=true)] - [BackboneType("ImplementationGuide.dependency")] + [FhirType("ImplementationGuide.dependency", IsBackboneType=true)] public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Dependency"; } } + public override string TypeName { get { return "ImplementationGuide.dependency"; } } /// /// reference | inclusion @@ -338,14 +337,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Package", IsNestedType=true)] - [BackboneType("ImplementationGuide.package")] + [FhirType("ImplementationGuide.package", IsBackboneType=true)] public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Package"; } } + public override string TypeName { get { return "ImplementationGuide.package"; } } /// /// Name used .page.package @@ -552,14 +550,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Resource", IsNestedType=true)] - [BackboneType("ImplementationGuide.package.resource")] + [FhirType("ImplementationGuide.package.resource", IsBackboneType=true)] public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Resource"; } } + public override string TypeName { get { return "ImplementationGuide.package.resource"; } } /// /// If not an example, has its normal meaning @@ -883,14 +880,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Global", IsNestedType=true)] - [BackboneType("ImplementationGuide.global")] + [FhirType("ImplementationGuide.global", IsBackboneType=true)] public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Global"; } } + public override string TypeName { get { return "ImplementationGuide.global"; } } /// /// Type this profiles applies to @@ -1059,14 +1055,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ImplementationGuide#Page", IsNestedType=true)] - [BackboneType("ImplementationGuide.page")] + [FhirType("ImplementationGuide.page", IsBackboneType=true)] public partial class PageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ImplementationGuide#Page"; } } + public override string TypeName { get { return "ImplementationGuide.page"; } } /// /// Where to find that page diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs index 9e0e3a43fe..dd36aa991c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)] + [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")] public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs index 142a97c109..50ba095ffd 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)] + [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")] public partial class Linkage : Hl7.Fhir.Model.DomainResource { /// @@ -95,14 +95,13 @@ public enum LinkageType /// [Serializable] [DataContract] - [FhirType("Linkage#Item", IsNestedType=true)] - [BackboneType("Linkage.item")] + [FhirType("Linkage.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Linkage#Item"; } } + public override string TypeName { get { return "Linkage.item"; } } /// /// source | alternate | historical diff --git a/src/Hl7.Fhir.STU3/Model/Generated/List.cs b/src/Hl7.Fhir.STU3/Model/Generated/List.cs index d59cd21120..65af37d3bc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/List.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/List.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)] + [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")] public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -96,14 +96,13 @@ public enum ListStatus /// [Serializable] [DataContract] - [FhirType("List#Entry", IsNestedType=true)] - [BackboneType("List.entry")] + [FhirType("List.entry", IsBackboneType=true)] public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "List#Entry"; } } + public override string TypeName { get { return "List.entry"; } } /// /// Status/Workflow information about this item diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs index 590f6a7f6a..d73543d873 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)] + [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")] public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -117,14 +117,13 @@ public enum LocationMode /// [Serializable] [DataContract] - [FhirType("Location#Position", IsNestedType=true)] - [BackboneType("Location.position")] + [FhirType("Location.position", IsBackboneType=true)] public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Location#Position"; } } + public override string TypeName { get { return "Location.position"; } } /// /// Longitude with WGS84 datum diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs index 7336a3ccf2..a8dea950bc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)] + [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")] public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("Measure#Group", IsNestedType=true)] - [BackboneType("Measure.group")] + [FhirType("Measure.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Group"; } } + public override string TypeName { get { return "Measure.group"; } } /// /// Unique identifier @@ -332,14 +331,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Population", IsNestedType=true)] - [BackboneType("Measure.group.population")] + [FhirType("Measure.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Population"; } } + public override string TypeName { get { return "Measure.group.population"; } } /// /// Unique identifier @@ -614,14 +612,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#Stratifier", IsNestedType=true)] - [BackboneType("Measure.group.stratifier")] + [FhirType("Measure.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#Stratifier"; } } + public override string TypeName { get { return "Measure.group.stratifier"; } } /// /// The identifier for the stratifier used to coordinate the reported data back to this stratifier @@ -827,14 +824,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Measure#SupplementalData", IsNestedType=true)] - [BackboneType("Measure.supplementalData")] + [FhirType("Measure.supplementalData", IsBackboneType=true)] public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Measure#SupplementalData"; } } + public override string TypeName { get { return "Measure.supplementalData"; } } /// /// Identifier, unique within the measure diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs index e0f8fccc83..c0cef87fa3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)] + [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")] public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -123,14 +123,13 @@ public enum MeasureReportType /// [Serializable] [DataContract] - [FhirType("MeasureReport#Group", IsNestedType=true)] - [BackboneType("MeasureReport.group")] + [FhirType("MeasureReport.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Group"; } } + public override string TypeName { get { return "MeasureReport.group"; } } /// /// What group of the measure @@ -345,14 +344,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Population", IsNestedType=true)] - [BackboneType("MeasureReport.group.population")] + [FhirType("MeasureReport.group.population", IsBackboneType=true)] public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Population"; } } + public override string TypeName { get { return "MeasureReport.group.population"; } } /// /// Population identifier as defined in the measure @@ -567,14 +565,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#Stratifier", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier")] + [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)] public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#Stratifier"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier"; } } /// /// What stratifier of the group @@ -719,14 +716,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum")] + [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)] public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroup"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } } /// /// The stratum value, e.g. male @@ -933,14 +929,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)] - [BackboneType("MeasureReport.group.stratifier.stratum.population")] + [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)] public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } } + public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } } /// /// Population identifier as defined in the measure diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs index 1f076ab1db..6c2d90ccec 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)] + [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")] public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs index 65adfa6357..113ab1a24b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)] + [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")] public partial class Medication : Hl7.Fhir.Model.DomainResource { /// @@ -96,14 +96,13 @@ public enum MedicationStatus /// [Serializable] [DataContract] - [FhirType("Medication#Ingredient", IsNestedType=true)] - [BackboneType("Medication.ingredient")] + [FhirType("Medication.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Ingredient"; } } + public override string TypeName { get { return "Medication.ingredient"; } } /// /// The product contained @@ -294,14 +293,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Package", IsNestedType=true)] - [BackboneType("Medication.package")] + [FhirType("Medication.package", IsBackboneType=true)] public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Package"; } } + public override string TypeName { get { return "Medication.package"; } } /// /// E.g. box, vial, blister-pack @@ -473,14 +471,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Content", IsNestedType=true)] - [BackboneType("Medication.package.content")] + [FhirType("Medication.package.content", IsBackboneType=true)] public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Content"; } } + public override string TypeName { get { return "Medication.package.content"; } } /// /// The item in the package @@ -628,14 +625,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Medication#Batch", IsNestedType=true)] - [BackboneType("Medication.package.batch")] + [FhirType("Medication.package.batch", IsBackboneType=true)] public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Medication#Batch"; } } + public override string TypeName { get { return "Medication.package.batch"; } } /// /// Identifier assigned to batch diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs index 61dff5aeb5..fae77cc61c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)] + [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")] public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum MedicationAdministrationStatus /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Performer", IsNestedType=true)] - [BackboneType("MedicationAdministration.performer")] + [FhirType("MedicationAdministration.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Performer"; } } + public override string TypeName { get { return "MedicationAdministration.performer"; } } /// /// Individual who was performing @@ -270,14 +269,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationAdministration#Dosage", IsNestedType=true)] - [BackboneType("MedicationAdministration.dosage")] + [FhirType("MedicationAdministration.dosage", IsBackboneType=true)] public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationAdministration#Dosage"; } } + public override string TypeName { get { return "MedicationAdministration.dosage"; } } /// /// Free text dosage instructions e.g. SIG diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs index c44e54853b..2fa3324a81 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)] + [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")] public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -115,14 +115,13 @@ public enum MedicationDispenseStatus /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Performer", IsNestedType=true)] - [BackboneType("MedicationDispense.performer")] + [FhirType("MedicationDispense.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Performer"; } } + public override string TypeName { get { return "MedicationDispense.performer"; } } /// /// Individual who was performing @@ -271,14 +270,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationDispense#Substitution", IsNestedType=true)] - [BackboneType("MedicationDispense.substitution")] + [FhirType("MedicationDispense.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationDispense#Substitution"; } } + public override string TypeName { get { return "MedicationDispense.substitution"; } } /// /// Whether a substitution was or was not performed on the dispense diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs index 75adbec3e4..72c4fd9b1a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)] + [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")] public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -193,14 +193,13 @@ public enum MedicationRequestPriority /// [Serializable] [DataContract] - [FhirType("MedicationRequest#Requester", IsNestedType=true)] - [BackboneType("MedicationRequest.requester")] + [FhirType("MedicationRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#Requester"; } } + public override string TypeName { get { return "MedicationRequest.requester"; } } /// /// Who ordered the initial medication(s) @@ -349,14 +348,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)] - [BackboneType("MedicationRequest.dispenseRequest")] + [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)] public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } } + public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } } /// /// Time period supply is authorized for @@ -595,14 +593,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MedicationRequest#Substitution", IsNestedType=true)] - [BackboneType("MedicationRequest.substitution")] + [FhirType("MedicationRequest.substitution", IsBackboneType=true)] public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MedicationRequest#Substitution"; } } + public override string TypeName { get { return "MedicationRequest.substitution"; } } /// /// Whether substitution is allowed or not diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs index 64edeb5eb6..c5727f5cab 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs @@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)] + [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")] public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs index ef6d69af04..66cc816708 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)] + [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")] public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -68,14 +68,13 @@ public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentif /// [Serializable] [DataContract] - [FhirType("MessageDefinition#Focus", IsNestedType=true)] - [BackboneType("MessageDefinition.focus")] + [FhirType("MessageDefinition.focus", IsBackboneType=true)] public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#Focus"; } } + public override string TypeName { get { return "MessageDefinition.focus"; } } /// /// Type of resource @@ -329,14 +328,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)] - [BackboneType("MessageDefinition.allowedResponse")] + [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)] public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } } + public override string TypeName { get { return "MessageDefinition.allowedResponse"; } } /// /// Reference to allowed message definition response diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs index 21e95f6e3e..43ae423c7e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)] + [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")] public partial class MessageHeader : Hl7.Fhir.Model.DomainResource { /// @@ -96,14 +96,13 @@ public enum ResponseType /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageDestination", IsNestedType=true)] - [BackboneType("MessageHeader.destination")] + [FhirType("MessageHeader.destination", IsBackboneType=true)] public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageDestination"; } } + public override string TypeName { get { return "MessageHeader.destination"; } } /// /// Name of system @@ -311,14 +310,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#MessageSource", IsNestedType=true)] - [BackboneType("MessageHeader.source")] + [FhirType("MessageHeader.source", IsBackboneType=true)] public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#MessageSource"; } } + public override string TypeName { get { return "MessageHeader.source"; } } /// /// Name of system @@ -610,14 +608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("MessageHeader#Response", IsNestedType=true)] - [BackboneType("MessageHeader.response")] + [FhirType("MessageHeader.response", IsBackboneType=true)] public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "MessageHeader#Response"; } } + public override string TypeName { get { return "MessageHeader.response"; } } /// /// Id of original message diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs index 15716b09f3..398e271d22 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)] + [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")] public partial class NamingSystem : Hl7.Fhir.Model.DomainResource { /// @@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType /// [Serializable] [DataContract] - [FhirType("NamingSystem#UniqueId", IsNestedType=true)] - [BackboneType("NamingSystem.uniqueId")] + [FhirType("NamingSystem.uniqueId", IsBackboneType=true)] public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NamingSystem#UniqueId"; } } + public override string TypeName { get { return "NamingSystem.uniqueId"; } } /// /// oid | uuid | uri | other diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs index 602f7638c6..e3d78db401 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)] + [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")] public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -132,14 +132,13 @@ public enum NutritionOrderStatus /// [Serializable] [DataContract] - [FhirType("NutritionOrder#OralDiet", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet")] + [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)] public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#OralDiet"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet"; } } /// /// Type of oral diet or diet restrictions that describe what can be consumed orally @@ -408,14 +407,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Nutrient", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.nutrient")] + [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)] public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Nutrient"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } } /// /// Type of nutrient that is being modified @@ -560,14 +558,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Texture", IsNestedType=true)] - [BackboneType("NutritionOrder.oralDiet.texture")] + [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)] public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Texture"; } } + public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } } /// /// Code to indicate how to alter the texture of the foods, e.g. pureed @@ -713,14 +710,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Supplement", IsNestedType=true)] - [BackboneType("NutritionOrder.supplement")] + [FhirType("NutritionOrder.supplement", IsBackboneType=true)] public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Supplement"; } } + public override string TypeName { get { return "NutritionOrder.supplement"; } } /// /// Type of supplement product requested @@ -977,14 +973,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula")] + [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)] public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula"; } } /// /// Type of enteral or infant formula @@ -1362,14 +1357,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("NutritionOrder#Administration", IsNestedType=true)] - [BackboneType("NutritionOrder.enteralFormula.administration")] + [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)] public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "NutritionOrder#Administration"; } } + public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } } /// /// Scheduled frequency of enteral feeding diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs index f898ee726e..185cd5186b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)] + [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")] public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -115,14 +115,13 @@ public enum ObservationRelationshipType /// [Serializable] [DataContract] - [FhirType("Observation#ReferenceRange", IsNestedType=true)] - [BackboneType("Observation.referenceRange")] + [FhirType("Observation.referenceRange", IsBackboneType=true)] public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#ReferenceRange"; } } + public override string TypeName { get { return "Observation.referenceRange"; } } /// /// Low Range, if relevant @@ -388,14 +387,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#Related", IsNestedType=true)] - [BackboneType("Observation.related")] + [FhirType("Observation.related", IsBackboneType=true)] public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#Related"; } } + public override string TypeName { get { return "Observation.related"; } } /// /// has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by @@ -563,14 +561,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Observation#Component", IsNestedType=true)] - [BackboneType("Observation.component")] + [FhirType("Observation.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Observation#Component"; } } + public override string TypeName { get { return "Observation.component"; } } /// /// Type of component observation (code / type) diff --git a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs index 285dbb6dcf..9db7c6b0f3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)] + [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")] public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource { /// @@ -90,14 +90,13 @@ public enum OperationKind /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Parameter", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter")] + [FhirType("OperationDefinition.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Parameter"; } } + public override string TypeName { get { return "OperationDefinition.parameter"; } } /// /// Name in Parameters.parameter.name or in URL @@ -580,14 +579,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Binding", IsNestedType=true)] - [BackboneType("OperationDefinition.parameter.binding")] + [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)] public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Binding"; } } + public override string TypeName { get { return "OperationDefinition.parameter.binding"; } } /// /// required | extensible | preferred | example @@ -757,14 +755,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("OperationDefinition#Overload", IsNestedType=true)] - [BackboneType("OperationDefinition.overload")] + [FhirType("OperationDefinition.overload", IsBackboneType=true)] public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "OperationDefinition#Overload"; } } + public override string TypeName { get { return "OperationDefinition.overload"; } } /// /// Name of parameter to include in overload diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs index f740de161d..6874f08bf4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)] + [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")] public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Organization#Contact", IsNestedType=true)] - [BackboneType("Organization.contact")] + [FhirType("Organization.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Organization#Contact"; } } + public override string TypeName { get { return "Organization.contact"; } } /// /// The type of contact diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs index 5fce35f02f..9a4233879f 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)] + [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")] public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum LinkType /// [Serializable] [DataContract] - [FhirType("Patient#Contact", IsNestedType=true)] - [BackboneType("Patient.contact")] + [FhirType("Patient.contact", IsBackboneType=true)] public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Contact"; } } + public override string TypeName { get { return "Patient.contact"; } } /// /// The kind of relationship @@ -403,14 +402,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Animal", IsNestedType=true)] - [BackboneType("Patient.animal")] + [FhirType("Patient.animal", IsBackboneType=true)] public partial class AnimalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Animal"; } } + public override string TypeName { get { return "Patient.animal"; } } /// /// E.g. Dog, Cow @@ -584,14 +582,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Communication", IsNestedType=true)] - [BackboneType("Patient.communication")] + [FhirType("Patient.communication", IsBackboneType=true)] public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Communication"; } } + public override string TypeName { get { return "Patient.communication"; } } /// /// The language which can be used to communicate with the patient about his or her health @@ -757,14 +754,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Patient#Link", IsNestedType=true)] - [BackboneType("Patient.link")] + [FhirType("Patient.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Patient#Link"; } } + public override string TypeName { get { return "Patient.link"; } } /// /// The other patient or related person resource that the link refers to diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs index da7e41ef25..0ad8e324e8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)] + [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")] public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs index 36d867c734..385f15c0fb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)] + [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")] public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Details", IsNestedType=true)] - [BackboneType("PaymentReconciliation.detail")] + [FhirType("PaymentReconciliation.detail", IsBackboneType=true)] public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Details"; } } + public override string TypeName { get { return "PaymentReconciliation.detail"; } } /// /// Type code @@ -371,14 +370,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PaymentReconciliation#Notes", IsNestedType=true)] - [BackboneType("PaymentReconciliation.processNote")] + [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)] public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PaymentReconciliation#Notes"; } } + public override string TypeName { get { return "PaymentReconciliation.processNote"; } } /// /// display | print | printoper diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs index d5cc195f9c..e14a782e54 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)] + [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")] public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel /// [Serializable] [DataContract] - [FhirType("Person#Link", IsNestedType=true)] - [BackboneType("Person.link")] + [FhirType("Person.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Person#Link"; } } + public override string TypeName { get { return "Person.link"; } } /// /// The resource to which this actual person is associated diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs index 8c6ddebf29..0fec26c656 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)] + [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")] public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Goal", IsNestedType=true)] - [BackboneType("PlanDefinition.goal")] + [FhirType("PlanDefinition.goal", IsBackboneType=true)] public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Goal"; } } + public override string TypeName { get { return "PlanDefinition.goal"; } } /// /// E.g. Treatment, dietary, behavioral, etc @@ -352,14 +351,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Target", IsNestedType=true)] - [BackboneType("PlanDefinition.goal.target")] + [FhirType("PlanDefinition.goal.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Target"; } } + public override string TypeName { get { return "PlanDefinition.goal.target"; } } /// /// The parameter whose value is to be tracked @@ -531,14 +529,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Action", IsNestedType=true)] - [BackboneType("PlanDefinition.action")] + [FhirType("PlanDefinition.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Action"; } } + public override string TypeName { get { return "PlanDefinition.action"; } } /// /// User-visible label for the action (e.g. 1. or A.) @@ -1466,14 +1463,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Condition", IsNestedType=true)] - [BackboneType("PlanDefinition.action.condition")] + [FhirType("PlanDefinition.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Condition"; } } + public override string TypeName { get { return "PlanDefinition.action.condition"; } } /// /// applicability | start | stop @@ -1743,14 +1739,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)] - [BackboneType("PlanDefinition.action.relatedAction")] + [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#RelatedAction"; } } + public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } } /// /// What action is this related to @@ -1961,14 +1956,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#Participant", IsNestedType=true)] - [BackboneType("PlanDefinition.action.participant")] + [FhirType("PlanDefinition.action.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#Participant"; } } + public override string TypeName { get { return "PlanDefinition.action.participant"; } } /// /// patient | practitioner | related-person @@ -2134,14 +2128,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)] - [BackboneType("PlanDefinition.action.dynamicValue")] + [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)] public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PlanDefinition#DynamicValue"; } } + public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } } /// /// Natural language description of the dynamic value diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs index 6151d66f10..18ad5c4fe7 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)] + [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")] public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -65,14 +65,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("Practitioner#Qualification", IsNestedType=true)] - [BackboneType("Practitioner.qualification")] + [FhirType("Practitioner.qualification", IsBackboneType=true)] public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Practitioner#Qualification"; } } + public override string TypeName { get { return "Practitioner.qualification"; } } /// /// An identifier for this qualification for the practitioner diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs index 8d9d174073..d52cb205c6 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)] + [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")] public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)] - [BackboneType("PractitionerRole.availableTime")] + [FhirType("PractitionerRole.availableTime", IsBackboneType=true)] public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#AvailableTime"; } } + public override string TypeName { get { return "PractitionerRole.availableTime"; } } /// /// mon | tue | wed | thu | fri | sat | sun @@ -344,14 +343,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)] - [BackboneType("PractitionerRole.notAvailable")] + [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)] public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "PractitionerRole#NotAvailable"; } } + public override string TypeName { get { return "PractitionerRole.notAvailable"; } } /// /// Reason presented to the user explaining why time not available diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs index 020b8a4115..3153141786 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)] + [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")] public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable
  • [Serializable] [DataContract] - [FhirType("Procedure#Performer", IsNestedType=true)] - [BackboneType("Procedure.performer")] + [FhirType("Procedure.performer", IsBackboneType=true)] public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#Performer"; } } + public override string TypeName { get { return "Procedure.performer"; } } /// /// The role the actor was in @@ -249,14 +248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Procedure#FocalDevice", IsNestedType=true)] - [BackboneType("Procedure.focalDevice")] + [FhirType("Procedure.focalDevice", IsBackboneType=true)] public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Procedure#FocalDevice"; } } + public override string TypeName { get { return "Procedure.focalDevice"; } } /// /// Kind of change to device diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs index 9531a91ac4..df3a51bc57 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ProcedureRequest","http://hl7.org/fhir/StructureDefinition/ProcedureRequest", IsResource=true)] + [FhirType("ProcedureRequest","http://hl7.org/fhir/StructureDefinition/ProcedureRequest")] public partial class ProcedureRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -68,14 +68,13 @@ public partial class ProcedureRequest : Hl7.Fhir.Model.DomainResource, IIdentifi /// [Serializable] [DataContract] - [FhirType("ProcedureRequest#Requester", IsNestedType=true)] - [BackboneType("ProcedureRequest.requester")] + [FhirType("ProcedureRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ProcedureRequest#Requester"; } } + public override string TypeName { get { return "ProcedureRequest.requester"; } } /// /// Individual making the request diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs index 7530d7d761..a41fb5d822 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ProcessRequest","http://hl7.org/fhir/StructureDefinition/ProcessRequest", IsResource=true)] + [FhirType("ProcessRequest","http://hl7.org/fhir/StructureDefinition/ProcessRequest")] public partial class ProcessRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum ActionList /// [Serializable] [DataContract] - [FhirType("ProcessRequest#Items", IsNestedType=true)] - [BackboneType("ProcessRequest.item")] + [FhirType("ProcessRequest.item", IsBackboneType=true)] public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ProcessRequest#Items"; } } + public override string TypeName { get { return "ProcessRequest.item"; } } /// /// Service instance diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs index 0d00332027..77d69bb48d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ProcessResponse","http://hl7.org/fhir/StructureDefinition/ProcessResponse", IsResource=true)] + [FhirType("ProcessResponse","http://hl7.org/fhir/StructureDefinition/ProcessResponse")] public partial class ProcessResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ProcessResponse : Hl7.Fhir.Model.DomainResource, IIdentifia /// [Serializable] [DataContract] - [FhirType("ProcessResponse#ProcessNote", IsNestedType=true)] - [BackboneType("ProcessResponse.processNote")] + [FhirType("ProcessResponse.processNote", IsBackboneType=true)] public partial class ProcessNoteComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ProcessResponse#ProcessNote"; } } + public override string TypeName { get { return "ProcessResponse.processNote"; } } /// /// display | print | printoper diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs index b082a431c1..171abc6ff8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)] + [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")] public partial class Provenance : Hl7.Fhir.Model.DomainResource { /// @@ -109,14 +109,13 @@ public enum ProvenanceEntityRole /// [Serializable] [DataContract] - [FhirType("Provenance#Agent", IsNestedType=true)] - [BackboneType("Provenance.agent")] + [FhirType("Provenance.agent", IsBackboneType=true)] public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Agent"; } } + public override string TypeName { get { return "Provenance.agent"; } } /// /// What the agents role was @@ -320,14 +319,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Provenance#Entity", IsNestedType=true)] - [BackboneType("Provenance.entity")] + [FhirType("Provenance.entity", IsBackboneType=true)] public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Provenance#Entity"; } } + public override string TypeName { get { return "Provenance.entity"; } } /// /// derivation | revision | quotation | source | removal diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs index 1c616d44b5..3dfa393aa4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)] + [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")] public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -174,14 +174,13 @@ public enum QuestionnaireItemType /// [Serializable] [DataContract] - [FhirType("Questionnaire#Item", IsNestedType=true)] - [BackboneType("Questionnaire.item")] + [FhirType("Questionnaire.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Item"; } } + public override string TypeName { get { return "Questionnaire.item"; } } /// /// Unique id for item in questionnaire @@ -829,14 +828,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#EnableWhen", IsNestedType=true)] - [BackboneType("Questionnaire.item.enableWhen")] + [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)] public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#EnableWhen"; } } + public override string TypeName { get { return "Questionnaire.item.enableWhen"; } } /// /// Question that determines whether item is enabled @@ -1047,14 +1045,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Questionnaire#Option", IsNestedType=true)] - [BackboneType("Questionnaire.item.option")] + [FhirType("Questionnaire.item.option", IsBackboneType=true)] public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Questionnaire#Option"; } } + public override string TypeName { get { return "Questionnaire.item.option"; } } /// /// Answer value diff --git a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs index 99c0862c7f..c49032f8cf 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)] + [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")] public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Item", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item")] + [FhirType("QuestionnaireResponse.item", IsBackboneType=true)] public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Item"; } } + public override string TypeName { get { return "QuestionnaireResponse.item"; } } /// /// Pointer to specific item from Questionnaire @@ -420,14 +419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)] - [BackboneType("QuestionnaireResponse.item.answer")] + [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)] public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "QuestionnaireResponse#Answer"; } } + public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } } /// /// Single-valued answer to the question diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs index 24871f53bc..4148eddf47 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ReferralRequest","http://hl7.org/fhir/StructureDefinition/ReferralRequest", IsResource=true)] + [FhirType("ReferralRequest","http://hl7.org/fhir/StructureDefinition/ReferralRequest")] public partial class ReferralRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ReferralRequest : Hl7.Fhir.Model.DomainResource, IIdentifia /// [Serializable] [DataContract] - [FhirType("ReferralRequest#Requester", IsNestedType=true)] - [BackboneType("ReferralRequest.requester")] + [FhirType("ReferralRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ReferralRequest#Requester"; } } + public override string TypeName { get { return "ReferralRequest.requester"; } } /// /// Individual making the request diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs index 467f9d426c..b31780143d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)] + [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")] public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs index f4d143f257..f792a40c20 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)] + [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")] public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable /// [Serializable] [DataContract] - [FhirType("RequestGroup#Action", IsNestedType=true)] - [BackboneType("RequestGroup.action")] + [FhirType("RequestGroup.action", IsBackboneType=true)] public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Action"; } } + public override string TypeName { get { return "RequestGroup.action"; } } /// /// User-visible label for the action (e.g. 1. or A.) @@ -803,14 +802,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#Condition", IsNestedType=true)] - [BackboneType("RequestGroup.action.condition")] + [FhirType("RequestGroup.action.condition", IsBackboneType=true)] public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#Condition"; } } + public override string TypeName { get { return "RequestGroup.action.condition"; } } /// /// applicability | start | stop @@ -1079,14 +1077,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("RequestGroup#RelatedAction", IsNestedType=true)] - [BackboneType("RequestGroup.action.relatedAction")] + [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)] public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RequestGroup#RelatedAction"; } } + public override string TypeName { get { return "RequestGroup.action.relatedAction"; } } /// /// What action this is related to diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs index 0ec67bf632..094d0bb2bf 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)] + [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")] public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -114,14 +114,13 @@ public enum ResearchStudyStatus /// [Serializable] [DataContract] - [FhirType("ResearchStudy#Arm", IsNestedType=true)] - [BackboneType("ResearchStudy.arm")] + [FhirType("ResearchStudy.arm", IsBackboneType=true)] public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ResearchStudy#Arm"; } } + public override string TypeName { get { return "ResearchStudy.arm"; } } /// /// Label for study arm diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs index a3adf329ae..30ea90a599 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)] + [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")] public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs index a3ba1c3cdc..7aa7525aa3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)] + [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")] public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab /// [Serializable] [DataContract] - [FhirType("RiskAssessment#Prediction", IsNestedType=true)] - [BackboneType("RiskAssessment.prediction")] + [FhirType("RiskAssessment.prediction", IsBackboneType=true)] public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "RiskAssessment#Prediction"; } } + public override string TypeName { get { return "RiskAssessment.prediction"; } } /// /// Possible outcome for the subject diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs index 500497945a..18dbdfc66b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)] + [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")] public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs index dcda0e4c83..1bee272449 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs @@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)] + [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")] public partial class SearchParameter : Hl7.Fhir.Model.DomainResource { /// @@ -242,14 +242,13 @@ public enum SearchModifierCode /// [Serializable] [DataContract] - [FhirType("SearchParameter#Component", IsNestedType=true)] - [BackboneType("SearchParameter.component")] + [FhirType("SearchParameter.component", IsBackboneType=true)] public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SearchParameter#Component"; } } + public override string TypeName { get { return "SearchParameter.component"; } } /// /// Defines how the part works diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs index 0c93b7a8a3..54f11c3388 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Sequence","http://hl7.org/fhir/StructureDefinition/Sequence", IsResource=true)] + [FhirType("Sequence","http://hl7.org/fhir/StructureDefinition/Sequence")] public partial class Sequence : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -135,14 +135,13 @@ public enum RepositoryType /// [Serializable] [DataContract] - [FhirType("Sequence#ReferenceSeq", IsNestedType=true)] - [BackboneType("Sequence.referenceSeq")] + [FhirType("Sequence.referenceSeq", IsBackboneType=true)] public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Sequence#ReferenceSeq"; } } + public override string TypeName { get { return "Sequence.referenceSeq"; } } /// /// Chromosome containing genetic finding @@ -532,14 +531,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Sequence#Variant", IsNestedType=true)] - [BackboneType("Sequence.variant")] + [FhirType("Sequence.variant", IsBackboneType=true)] public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Sequence#Variant"; } } + public override string TypeName { get { return "Sequence.variant"; } } /// /// Start position of the variant on the reference sequence @@ -875,14 +873,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Sequence#Quality", IsNestedType=true)] - [BackboneType("Sequence.quality")] + [FhirType("Sequence.quality", IsBackboneType=true)] public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Sequence#Quality"; } } + public override string TypeName { get { return "Sequence.quality"; } } /// /// indel | snp | unknown @@ -1529,14 +1526,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Sequence#Repository", IsNestedType=true)] - [BackboneType("Sequence.repository")] + [FhirType("Sequence.repository", IsBackboneType=true)] public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Sequence#Repository"; } } + public override string TypeName { get { return "Sequence.repository"; } } /// /// directlink | openapi | login | oauth | other diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs index d0893c22ce..0b06216d19 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ServiceDefinition","http://hl7.org/fhir/StructureDefinition/ServiceDefinition", IsResource=true)] + [FhirType("ServiceDefinition","http://hl7.org/fhir/StructureDefinition/ServiceDefinition")] public partial class ServiceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs index 155585efe1..fd7d75e892 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)] + [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")] public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs index 658b93b57a..5cdfdec5fa 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)] + [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")] public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -101,14 +101,13 @@ public enum SpecimenStatus /// [Serializable] [DataContract] - [FhirType("Specimen#Collection", IsNestedType=true)] - [BackboneType("Specimen.collection")] + [FhirType("Specimen.collection", IsBackboneType=true)] public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Collection"; } } + public override string TypeName { get { return "Specimen.collection"; } } /// /// Who collected the specimen @@ -333,14 +332,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Processing", IsNestedType=true)] - [BackboneType("Specimen.processing")] + [FhirType("Specimen.processing", IsBackboneType=true)] public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Processing"; } } + public override string TypeName { get { return "Specimen.processing"; } } /// /// Textual description of procedure @@ -558,14 +556,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Specimen#Container", IsNestedType=true)] - [BackboneType("Specimen.container")] + [FhirType("Specimen.container", IsBackboneType=true)] public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Specimen#Container"; } } + public override string TypeName { get { return "Specimen.container"; } } /// /// Id for the container diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs index 1da7f6de2b..ad81b424ff 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition", IsResource=true)] + [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition")] public partial class StructureDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -151,14 +151,13 @@ public enum TypeDerivationRule /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Mapping", IsNestedType=true)] - [BackboneType("StructureDefinition.mapping")] + [FhirType("StructureDefinition.mapping", IsBackboneType=true)] public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Mapping"; } } + public override string TypeName { get { return "StructureDefinition.mapping"; } } /// /// Internal id when this mapping is used @@ -425,14 +424,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Snapshot", IsNestedType=true)] - [BackboneType("StructureDefinition.snapshot")] + [FhirType("StructureDefinition.snapshot", IsBackboneType=true)] public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Snapshot"; } } + public override string TypeName { get { return "StructureDefinition.snapshot"; } } /// /// Definition of elements in the resource (if no StructureDefinition) @@ -552,14 +550,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureDefinition#Differential", IsNestedType=true)] - [BackboneType("StructureDefinition.differential")] + [FhirType("StructureDefinition.differential", IsBackboneType=true)] public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureDefinition#Differential"; } } + public override string TypeName { get { return "StructureDefinition.differential"; } } /// /// Definition of elements in the resource (if no StructureDefinition) diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs index e6e7fab0eb..448ea855f2 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)] + [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")] public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -357,14 +357,13 @@ public enum StructureMapTransform /// [Serializable] [DataContract] - [FhirType("StructureMap#Structure", IsNestedType=true)] - [BackboneType("StructureMap.structure")] + [FhirType("StructureMap.structure", IsBackboneType=true)] public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Structure"; } } + public override string TypeName { get { return "StructureMap.structure"; } } /// /// Canonical URL for structure definition @@ -634,14 +633,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Group", IsNestedType=true)] - [BackboneType("StructureMap.group")] + [FhirType("StructureMap.group", IsBackboneType=true)] public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Group"; } } + public override string TypeName { get { return "StructureMap.group"; } } /// /// Human-readable label @@ -964,14 +962,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Input", IsNestedType=true)] - [BackboneType("StructureMap.group.input")] + [FhirType("StructureMap.group.input", IsBackboneType=true)] public partial class InputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Input"; } } + public override string TypeName { get { return "StructureMap.group.input"; } } /// /// Name for this instance of data @@ -1238,14 +1235,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Rule", IsNestedType=true)] - [BackboneType("StructureMap.group.rule")] + [FhirType("StructureMap.group.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Rule"; } } + public override string TypeName { get { return "StructureMap.group.rule"; } } /// /// Name of the rule for internal references @@ -1527,14 +1523,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Source", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.source")] + [FhirType("StructureMap.group.rule.source", IsBackboneType=true)] public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Source"; } } + public override string TypeName { get { return "StructureMap.group.rule.source"; } } /// /// Type or variable this rule applies to @@ -2042,14 +2037,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Target", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target")] + [FhirType("StructureMap.group.rule.target", IsBackboneType=true)] public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Target"; } } + public override string TypeName { get { return "StructureMap.group.rule.target"; } } /// /// Type or variable this rule applies to @@ -2474,14 +2468,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Parameter", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.target.parameter")] + [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Parameter"; } } + public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } } /// /// Parameter value - variable or literal @@ -2600,14 +2593,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("StructureMap#Dependent", IsNestedType=true)] - [BackboneType("StructureMap.group.rule.dependent")] + [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)] public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "StructureMap#Dependent"; } } + public override string TypeName { get { return "StructureMap.group.rule.dependent"; } } /// /// Name of a rule or group to apply diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs index c7e1eb5434..8f57fabaef 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)] + [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")] public partial class Subscription : Hl7.Fhir.Model.DomainResource { /// @@ -141,14 +141,13 @@ public enum SubscriptionChannelType /// [Serializable] [DataContract] - [FhirType("Subscription#Channel", IsNestedType=true)] - [BackboneType("Subscription.channel")] + [FhirType("Subscription.channel", IsBackboneType=true)] public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Subscription#Channel"; } } + public override string TypeName { get { return "Subscription.channel"; } } /// /// rest-hook | websocket | email | sms | message diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs index f7713e86a7..11ee00031e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)] + [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")] public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus /// [Serializable] [DataContract] - [FhirType("Substance#Instance", IsNestedType=true)] - [BackboneType("Substance.instance")] + [FhirType("Substance.instance", IsBackboneType=true)] public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Instance"; } } + public override string TypeName { get { return "Substance.instance"; } } /// /// Identifier of the package/container @@ -286,14 +285,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Substance#Ingredient", IsNestedType=true)] - [BackboneType("Substance.ingredient")] + [FhirType("Substance.ingredient", IsBackboneType=true)] public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Substance#Ingredient"; } } + public override string TypeName { get { return "Substance.ingredient"; } } /// /// Optional amount (concentration) diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs index 7c2b6296cb..1f28cc8785 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)] + [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")] public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -123,14 +123,13 @@ public enum SupplyItemType /// [Serializable] [DataContract] - [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)] - [BackboneType("SupplyDelivery.suppliedItem")] + [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)] public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } } + public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } } /// /// Amount dispensed diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs index e7be91a3fd..7e9a41489b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)] + [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")] public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -116,14 +116,13 @@ public enum SupplyRequestStatus /// [Serializable] [DataContract] - [FhirType("SupplyRequest#OrderedItem", IsNestedType=true)] - [BackboneType("SupplyRequest.orderedItem")] + [FhirType("SupplyRequest.orderedItem", IsBackboneType=true)] public partial class OrderedItemComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyRequest#OrderedItem"; } } + public override string TypeName { get { return "SupplyRequest.orderedItem"; } } /// /// The requested amount of the item indicated @@ -272,14 +271,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("SupplyRequest#Requester", IsNestedType=true)] - [BackboneType("SupplyRequest.requester")] + [FhirType("SupplyRequest.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "SupplyRequest#Requester"; } } + public override string TypeName { get { return "SupplyRequest.requester"; } } /// /// Individual making the request diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs index 32eb4c6ac1..46c34603ad 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs @@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)] + [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")] public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -146,14 +146,13 @@ public enum TaskStatus /// [Serializable] [DataContract] - [FhirType("Task#Requester", IsNestedType=true)] - [BackboneType("Task.requester")] + [FhirType("Task.requester", IsBackboneType=true)] public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Requester"; } } + public override string TypeName { get { return "Task.requester"; } } /// /// Individual asking for task @@ -302,14 +301,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Restriction", IsNestedType=true)] - [BackboneType("Task.restriction")] + [FhirType("Task.restriction", IsBackboneType=true)] public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Restriction"; } } + public override string TypeName { get { return "Task.restriction"; } } /// /// How many times to repeat @@ -499,14 +497,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Parameter", IsNestedType=true)] - [BackboneType("Task.input")] + [FhirType("Task.input", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Parameter"; } } + public override string TypeName { get { return "Task.input"; } } /// /// Label for the input @@ -655,14 +652,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("Task#Output", IsNestedType=true)] - [BackboneType("Task.output")] + [FhirType("Task.output", IsBackboneType=true)] public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "Task#Output"; } } + public override string TypeName { get { return "Task.output"; } } /// /// Label for output diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs index 59dd0ede90..aa629b8704 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)] + [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")] public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -200,14 +200,13 @@ public enum TestReportActionResult /// [Serializable] [DataContract] - [FhirType("TestReport#Participant", IsNestedType=true)] - [BackboneType("TestReport.participant")] + [FhirType("TestReport.participant", IsBackboneType=true)] public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Participant"; } } + public override string TypeName { get { return "TestReport.participant"; } } /// /// test-engine | client | server @@ -431,14 +430,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Setup", IsNestedType=true)] - [BackboneType("TestReport.setup")] + [FhirType("TestReport.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Setup"; } } + public override string TypeName { get { return "TestReport.setup"; } } /// /// A setup operation or assert that was executed @@ -559,14 +557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#SetupAction", IsNestedType=true)] - [BackboneType("TestReport.setup.action")] + [FhirType("TestReport.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#SetupAction"; } } + public override string TypeName { get { return "TestReport.setup.action"; } } /// /// The operation to perform @@ -710,14 +707,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Operation", IsNestedType=true)] - [BackboneType("TestReport.setup.action.operation")] + [FhirType("TestReport.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Operation"; } } + public override string TypeName { get { return "TestReport.setup.action.operation"; } } /// /// pass | skip | fail | warning | error @@ -943,14 +939,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Assert", IsNestedType=true)] - [BackboneType("TestReport.setup.action.assert")] + [FhirType("TestReport.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Assert"; } } + public override string TypeName { get { return "TestReport.setup.action.assert"; } } /// /// pass | skip | fail | warning | error @@ -1173,14 +1168,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Test", IsNestedType=true)] - [BackboneType("TestReport.test")] + [FhirType("TestReport.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Test"; } } + public override string TypeName { get { return "TestReport.test"; } } /// /// Tracking/logging name of this test @@ -1387,14 +1381,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TestAction", IsNestedType=true)] - [BackboneType("TestReport.test.action")] + [FhirType("TestReport.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TestAction"; } } + public override string TypeName { get { return "TestReport.test.action"; } } /// /// The operation performed @@ -1538,14 +1531,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#Teardown", IsNestedType=true)] - [BackboneType("TestReport.teardown")] + [FhirType("TestReport.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#Teardown"; } } + public override string TypeName { get { return "TestReport.teardown"; } } /// /// One or more teardown operations performed @@ -1666,14 +1658,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestReport#TeardownAction", IsNestedType=true)] - [BackboneType("TestReport.teardown.action")] + [FhirType("TestReport.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestReport#TeardownAction"; } } + public override string TypeName { get { return "TestReport.teardown.action"; } } /// /// The teardown operation performed diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs index 839d019789..ae3a855c25 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)] + [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")] public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable { /// @@ -328,14 +328,13 @@ public enum AssertionResponseTypes /// [Serializable] [DataContract] - [FhirType("TestScript#Origin", IsNestedType=true)] - [BackboneType("TestScript.origin")] + [FhirType("TestScript.origin", IsBackboneType=true)] public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Origin"; } } + public override string TypeName { get { return "TestScript.origin"; } } /// /// The index of the abstract origin server starting at 1 @@ -501,14 +500,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Destination", IsNestedType=true)] - [BackboneType("TestScript.destination")] + [FhirType("TestScript.destination", IsBackboneType=true)] public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Destination"; } } + public override string TypeName { get { return "TestScript.destination"; } } /// /// The index of the abstract destination server starting at 1 @@ -673,14 +671,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Metadata", IsNestedType=true)] - [BackboneType("TestScript.metadata")] + [FhirType("TestScript.metadata", IsBackboneType=true)] public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Metadata"; } } + public override string TypeName { get { return "TestScript.metadata"; } } /// /// Links to the FHIR specification @@ -826,14 +823,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Link", IsNestedType=true)] - [BackboneType("TestScript.metadata.link")] + [FhirType("TestScript.metadata.link", IsBackboneType=true)] public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Link"; } } + public override string TypeName { get { return "TestScript.metadata.link"; } } /// /// URL to the specification @@ -1015,14 +1011,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Capability", IsNestedType=true)] - [BackboneType("TestScript.metadata.capability")] + [FhirType("TestScript.metadata.capability", IsBackboneType=true)] public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Capability"; } } + public override string TypeName { get { return "TestScript.metadata.capability"; } } /// /// Are the capabilities required? @@ -1404,14 +1399,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Fixture", IsNestedType=true)] - [BackboneType("TestScript.fixture")] + [FhirType("TestScript.fixture", IsBackboneType=true)] public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Fixture"; } } + public override string TypeName { get { return "TestScript.fixture"; } } /// /// Whether or not to implicitly create the fixture during setup @@ -1619,14 +1613,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Variable", IsNestedType=true)] - [BackboneType("TestScript.variable")] + [FhirType("TestScript.variable", IsBackboneType=true)] public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Variable"; } } + public override string TypeName { get { return "TestScript.variable"; } } /// /// Descriptive name for this variable @@ -2066,14 +2059,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Rule", IsNestedType=true)] - [BackboneType("TestScript.rule")] + [FhirType("TestScript.rule", IsBackboneType=true)] public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Rule"; } } + public override string TypeName { get { return "TestScript.rule"; } } /// /// Assert rule resource reference @@ -2222,14 +2214,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RuleParam", IsNestedType=true)] - [BackboneType("TestScript.rule.param")] + [FhirType("TestScript.rule.param", IsBackboneType=true)] public partial class RuleParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RuleParam"; } } + public override string TypeName { get { return "TestScript.rule.param"; } } /// /// Parameter name matching external assert rule parameter @@ -2411,14 +2402,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Ruleset", IsNestedType=true)] - [BackboneType("TestScript.ruleset")] + [FhirType("TestScript.ruleset", IsBackboneType=true)] public partial class RulesetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Ruleset"; } } + public override string TypeName { get { return "TestScript.ruleset"; } } /// /// Assert ruleset resource reference @@ -2567,14 +2557,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RulesetRule", IsNestedType=true)] - [BackboneType("TestScript.ruleset.rule")] + [FhirType("TestScript.ruleset.rule", IsBackboneType=true)] public partial class RulesetRuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RulesetRule"; } } + public override string TypeName { get { return "TestScript.ruleset.rule"; } } /// /// Id of referenced rule within the ruleset @@ -2739,14 +2728,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RulesetRuleParam", IsNestedType=true)] - [BackboneType("TestScript.ruleset.rule.param")] + [FhirType("TestScript.ruleset.rule.param", IsBackboneType=true)] public partial class RulesetRuleParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RulesetRuleParam"; } } + public override string TypeName { get { return "TestScript.ruleset.rule.param"; } } /// /// Parameter name matching external assert ruleset rule parameter @@ -2924,14 +2912,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Setup", IsNestedType=true)] - [BackboneType("TestScript.setup")] + [FhirType("TestScript.setup", IsBackboneType=true)] public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Setup"; } } + public override string TypeName { get { return "TestScript.setup"; } } /// /// A setup operation or assert to perform @@ -3052,14 +3039,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#SetupAction", IsNestedType=true)] - [BackboneType("TestScript.setup.action")] + [FhirType("TestScript.setup.action", IsBackboneType=true)] public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#SetupAction"; } } + public override string TypeName { get { return "TestScript.setup.action"; } } /// /// The setup operation to perform @@ -3203,14 +3189,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Operation", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation")] + [FhirType("TestScript.setup.action.operation", IsBackboneType=true)] public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Operation"; } } + public override string TypeName { get { return "TestScript.setup.action.operation"; } } /// /// The operation code type that will be executed @@ -3965,14 +3950,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#RequestHeader", IsNestedType=true)] - [BackboneType("TestScript.setup.action.operation.requestHeader")] + [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)] public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#RequestHeader"; } } + public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } } /// /// HTTP header field name @@ -4155,14 +4139,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Assert", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert")] + [FhirType("TestScript.setup.action.assert", IsBackboneType=true)] public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Assert"; } } + public override string TypeName { get { return "TestScript.setup.action.assert"; } } /// /// Tracking/logging assertion label @@ -5265,14 +5248,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#ActionAssertRule", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.rule")] + [FhirType("TestScript.setup.action.assert.rule", IsBackboneType=true)] public partial class ActionAssertRuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#ActionAssertRule"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.rule"; } } /// /// Id of the TestScript.rule @@ -5437,14 +5419,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#ActionAssertRuleParam", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.rule.param")] + [FhirType("TestScript.setup.action.assert.rule.param", IsBackboneType=true)] public partial class ActionAssertRuleParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#ActionAssertRuleParam"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.rule.param"; } } /// /// Parameter name matching external assert rule parameter @@ -5627,14 +5608,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#ActionAssertRuleset", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.ruleset")] + [FhirType("TestScript.setup.action.assert.ruleset", IsBackboneType=true)] public partial class ActionAssertRulesetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#ActionAssertRuleset"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.ruleset"; } } /// /// Id of the TestScript.ruleset @@ -5799,14 +5779,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#ActionAssertRulesetRule", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.ruleset.rule")] + [FhirType("TestScript.setup.action.assert.ruleset.rule", IsBackboneType=true)] public partial class ActionAssertRulesetRuleComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#ActionAssertRulesetRule"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.ruleset.rule"; } } /// /// Id of referenced rule within the ruleset @@ -5971,14 +5950,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Param", IsNestedType=true)] - [BackboneType("TestScript.setup.action.assert.ruleset.rule.param")] + [FhirType("TestScript.setup.action.assert.ruleset.rule.param", IsBackboneType=true)] public partial class ParamComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Param"; } } + public override string TypeName { get { return "TestScript.setup.action.assert.ruleset.rule.param"; } } /// /// Parameter name matching external assert ruleset rule parameter @@ -6157,14 +6135,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Test", IsNestedType=true)] - [BackboneType("TestScript.test")] + [FhirType("TestScript.test", IsBackboneType=true)] public partial class TestComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Test"; } } + public override string TypeName { get { return "TestScript.test"; } } /// /// Tracking/logging name of this test @@ -6371,14 +6348,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TestAction", IsNestedType=true)] - [BackboneType("TestScript.test.action")] + [FhirType("TestScript.test.action", IsBackboneType=true)] public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TestAction"; } } + public override string TypeName { get { return "TestScript.test.action"; } } /// /// The setup operation to perform @@ -6522,14 +6498,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#Teardown", IsNestedType=true)] - [BackboneType("TestScript.teardown")] + [FhirType("TestScript.teardown", IsBackboneType=true)] public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#Teardown"; } } + public override string TypeName { get { return "TestScript.teardown"; } } /// /// One or more teardown operations to perform @@ -6650,14 +6625,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("TestScript#TeardownAction", IsNestedType=true)] - [BackboneType("TestScript.teardown.action")] + [FhirType("TestScript.teardown.action", IsBackboneType=true)] public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "TestScript#TeardownAction"; } } + public override string TypeName { get { return "TestScript.teardown.action"; } } /// /// The teardown operation to perform diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs index f863dd75f0..1477b47a04 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs @@ -248,14 +248,13 @@ public enum EventTiming /// [Serializable] [DataContract] - [FhirType("Timing#Repeat", IsNestedType=true)] - [BackboneType("Timing.repeat")] + [FhirType("Timing.repeat", IsBackboneType=true)] public partial class RepeatComponent : Hl7.Fhir.Model.Element { /// /// FHIR Type Name /// - public override string TypeName { get { return "Timing#Repeat"; } } + public override string TypeName { get { return "Timing.repeat"; } } /// /// Length/Range of lengths, or (Start and/or end) limits diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs index ea725d6494..f716e3b478 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet", IsResource=true)] + [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet")] public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -67,14 +67,13 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable [Serializable] [DataContract] - [FhirType("ValueSet#Compose", IsNestedType=true)] - [BackboneType("ValueSet.compose")] + [FhirType("ValueSet.compose", IsBackboneType=true)] public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Compose"; } } + public override string TypeName { get { return "ValueSet.compose"; } } /// /// Fixed date for version-less references (transitive) @@ -306,14 +305,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptSet", IsNestedType=true)] - [BackboneType("ValueSet.compose.include")] + [FhirType("ValueSet.compose.include", IsBackboneType=true)] public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptSet"; } } + public override string TypeName { get { return "ValueSet.compose.include"; } } /// /// The system the codes come from @@ -590,14 +588,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#ConceptReference", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.concept")] + [FhirType("ValueSet.compose.include.concept", IsBackboneType=true)] public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#ConceptReference"; } } + public override string TypeName { get { return "ValueSet.compose.include.concept"; } } /// /// Code or expression from system @@ -804,14 +801,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Designation", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.concept.designation")] + [FhirType("ValueSet.compose.include.concept.designation", IsBackboneType=true)] public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Designation"; } } + public override string TypeName { get { return "ValueSet.compose.include.concept.designation"; } } /// /// Human language of the designation @@ -1020,14 +1016,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Filter", IsNestedType=true)] - [BackboneType("ValueSet.compose.include.filter")] + [FhirType("ValueSet.compose.include.filter", IsBackboneType=true)] public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Filter"; } } + public override string TypeName { get { return "ValueSet.compose.include.filter"; } } /// /// A property defined by the code system @@ -1256,14 +1251,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Expansion", IsNestedType=true)] - [BackboneType("ValueSet.expansion")] + [FhirType("ValueSet.expansion", IsBackboneType=true)] public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Expansion"; } } + public override string TypeName { get { return "ValueSet.expansion"; } } /// /// Uniquely identifies this expansion @@ -1584,14 +1578,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Parameter", IsNestedType=true)] - [BackboneType("ValueSet.expansion.parameter")] + [FhirType("ValueSet.expansion.parameter", IsBackboneType=true)] public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Parameter"; } } + public override string TypeName { get { return "ValueSet.expansion.parameter"; } } /// /// Name as assigned by the server @@ -1756,14 +1749,13 @@ protected override IEnumerable> GetElementPairs() /// [Serializable] [DataContract] - [FhirType("ValueSet#Contains", IsNestedType=true)] - [BackboneType("ValueSet.expansion.contains")] + [FhirType("ValueSet.expansion.contains", IsBackboneType=true)] public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "ValueSet#Contains"; } } + public override string TypeName { get { return "ValueSet.expansion.contains"; } } /// /// System value for the code diff --git a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs index b49b8bf86e..46ca88afef 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs @@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model /// [Serializable] [DataContract] - [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)] + [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")] public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable> { /// @@ -123,14 +123,13 @@ public enum VisionBase /// [Serializable] [DataContract] - [FhirType("VisionPrescription#Dispense", IsNestedType=true)] - [BackboneType("VisionPrescription.dispense")] + [FhirType("VisionPrescription.dispense", IsBackboneType=true)] public partial class DispenseComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name /// - public override string TypeName { get { return "VisionPrescription#Dispense"; } } + public override string TypeName { get { return "VisionPrescription.dispense"; } } /// /// Product to be supplied diff --git a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs index d2f0489612..b9eb0ada05 100644 --- a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs +++ b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs @@ -189,4 +189,4 @@ private static ITypedElement mockResolver(string url) return null; } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs b/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs index 3bcd6cef6c..18c0c46608 100644 --- a/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs +++ b/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs @@ -13,179 +13,178 @@ using System; using System.Diagnostics; -namespace Hl7.Fhir.Tests.Introspection +namespace Hl7.Fhir.Tests.Introspection; + +[TestClass] +public class ModelInspectorMembersTest { - [TestClass] - public class ModelInspectorMembersTest + [TestMethod] + public void TestPrimitiveDataTypeMapping() { - [TestMethod] - public void TestPrimitiveDataTypeMapping() - { - Assert.IsTrue(ClassMapping.TryCreate(typeof(Base64Binary), out var mapping)); - Assert.AreEqual("base64Binary", mapping.Name); - Assert.IsTrue(mapping.HasPrimitiveValueMember); - Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value - var valueProp = mapping.PrimitiveValueProperty; - Assert.IsNotNull(valueProp); - Assert.AreEqual("value", valueProp.Name); - Assert.IsFalse(valueProp.IsCollection); // don't see byte[] as a collection of byte in FHIR - Assert.IsTrue(valueProp.RepresentsValueElement); - - Assert.IsTrue(ClassMapping.TryCreate(typeof(Code), out mapping)); - Assert.AreEqual("codeOfT", mapping.Name); - Assert.IsTrue(mapping.HasPrimitiveValueMember); - Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value - valueProp = mapping.PrimitiveValueProperty; - Assert.IsNotNull(valueProp); - Assert.IsFalse(valueProp.IsCollection); - Assert.IsTrue(valueProp.RepresentsValueElement); - Assert.AreEqual(typeof(SomeEnum), valueProp.ImplementingType); - - Assert.IsTrue(ClassMapping.TryCreate(typeof(FhirUri), out mapping)); - Assert.AreEqual("uri", mapping.Name); - Assert.IsTrue(mapping.HasPrimitiveValueMember); - Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value - valueProp = mapping.PrimitiveValueProperty; - Assert.IsNotNull(valueProp); - Assert.IsFalse(valueProp.IsCollection); - Assert.IsTrue(valueProp.RepresentsValueElement); - Assert.AreEqual(typeof(string), valueProp.ImplementingType); - } + Assert.IsTrue(ClassMapping.TryCreate(typeof(Base64Binary), out var mapping)); + Assert.AreEqual("base64Binary", mapping.Name); + Assert.IsTrue(mapping.HasPrimitiveValueMember); + Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value + var valueProp = mapping.PrimitiveValueProperty; + Assert.IsNotNull(valueProp); + Assert.AreEqual("value", valueProp.Name); + Assert.IsFalse(valueProp.IsCollection); // don't see byte[] as a collection of byte in FHIR + Assert.IsTrue(valueProp.RepresentsValueElement); + + Assert.IsTrue(ClassMapping.TryCreate(typeof(Code), out mapping)); + Assert.AreEqual("codeOfT", mapping.Name); + Assert.IsTrue(mapping.HasPrimitiveValueMember); + Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value + valueProp = mapping.PrimitiveValueProperty; + Assert.IsNotNull(valueProp); + Assert.IsFalse(valueProp.IsCollection); + Assert.IsTrue(valueProp.RepresentsValueElement); + Assert.AreEqual(typeof(SomeEnum), valueProp.ImplementingType); + + Assert.IsTrue(ClassMapping.TryCreate(typeof(FhirUri), out mapping)); + Assert.AreEqual("uri", mapping.Name); + Assert.IsTrue(mapping.HasPrimitiveValueMember); + Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value + valueProp = mapping.PrimitiveValueProperty; + Assert.IsNotNull(valueProp); + Assert.IsFalse(valueProp.IsCollection); + Assert.IsTrue(valueProp.RepresentsValueElement); + Assert.AreEqual(typeof(string), valueProp.ImplementingType); + } - [TestMethod] - public void TestVersionSpecificMapping() - { - Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out var mapping, Specification.FhirRelease.DSTU1)); - Assert.IsNull(mapping.FindMappedElementByName("source")); - var profile = mapping.FindMappedElementByName("profile"); - Assert.IsNotNull(profile); - Assert.AreEqual(typeof(FhirUri), profile.PropertyTypeMapping.NativeType); - - Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out mapping, Specification.FhirRelease.R4)); - Assert.IsNotNull(mapping.FindMappedElementByName("source")); - profile = mapping.FindMappedElementByName("profile"); - Assert.IsNotNull(profile); - Assert.AreEqual(typeof(Canonical), profile.PropertyTypeMapping.NativeType); - } + [TestMethod] + public void TestVersionSpecificMapping() + { + Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out var mapping, Specification.FhirRelease.DSTU1)); + Assert.IsNull(mapping.FindMappedElementByName("source")); + var profile = mapping.FindMappedElementByName("profile"); + Assert.IsNotNull(profile); + Assert.AreEqual(typeof(FhirUri), profile.PropertyTypeMapping.NativeType); + + Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out mapping, Specification.FhirRelease.R4)); + Assert.IsNotNull(mapping.FindMappedElementByName("source")); + profile = mapping.FindMappedElementByName("profile"); + Assert.IsNotNull(profile); + Assert.AreEqual(typeof(Canonical), profile.PropertyTypeMapping.NativeType); + } - [TestMethod] - public void TestGetByName() - { - ClassMapping.TryCreate(typeof(Extension), out var cm).Should().BeTrue(); - cm.FindMappedElementByName("url").Should().NotBeNull(); - cm.FindMappedElementByName("urlx").Should().BeNull(); - cm.FindMappedElementByName("ur").Should().BeNull(); - cm.FindMappedElementByName("value").Should().NotBeNull(); - - cm.FindMappedElementByChoiceName("value").Should().NotBeNull(); - cm.FindMappedElementByChoiceName("valu").Should().BeNull(); - cm.FindMappedElementByChoiceName("valueString").Should().NotBeNull(); - - var urlChild = cm.FindMappedElementByName("url"); - urlChild.DeclaringClass.Should().Be(cm); - } + [TestMethod] + public void TestGetByName() + { + ClassMapping.TryCreate(typeof(Extension), out var cm).Should().BeTrue(); + cm.FindMappedElementByName("url").Should().NotBeNull(); + cm.FindMappedElementByName("urlx").Should().BeNull(); + cm.FindMappedElementByName("ur").Should().BeNull(); + cm.FindMappedElementByName("value").Should().NotBeNull(); + + cm.FindMappedElementByChoiceName("value").Should().NotBeNull(); + cm.FindMappedElementByChoiceName("valu").Should().BeNull(); + cm.FindMappedElementByChoiceName("valueString").Should().NotBeNull(); + + var urlChild = cm.FindMappedElementByName("url"); + urlChild.DeclaringClass.Should().Be(cm); + } - [TestMethod] - public void TestPropsWithRedirect() - { - Assert.IsTrue(ClassMapping.TryCreate(typeof(TypeWithCodeOfT), out var mapping)); + [TestMethod] + public void TestPropsWithRedirect() + { + Assert.IsTrue(ClassMapping.TryCreate(typeof(TypeWithCodeOfT), out var mapping)); - var propMapping = mapping.FindMappedElementByName("type1"); - Assert.AreEqual(typeof(Code), propMapping.ImplementingType); - Assert.AreEqual(typeof(FhirString), propMapping.PropertyTypeMapping.NativeType); - } + var propMapping = mapping.FindMappedElementByName("type1"); + Assert.AreEqual(typeof(Code), propMapping.ImplementingType); + Assert.AreEqual(typeof(FhirString), propMapping.PropertyTypeMapping.NativeType); + } - [TestMethod] - public void GetClassMappingForProperty() - { - // Canonical.Value - a system primitive - ClassMapping.TryCreate(typeof(Canonical), out var canonicalMapping); - canonicalMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("System.String"); + [TestMethod] + public void GetClassMappingForProperty() + { + // Canonical.Value - a system primitive + ClassMapping.TryCreate(typeof(Canonical), out var canonicalMapping); + canonicalMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("System.String"); - // ConcactPoint.System - a Code -> Code - ClassMapping.TryCreate(typeof(ContactPoint), out var contactPointMapping); - contactPointMapping.FindMappedElementByName("system").PropertyTypeMapping.Name.Should().Be("code"); + // ConcactPoint.System - a Code -> Code + ClassMapping.TryCreate(typeof(ContactPoint), out var contactPointMapping); + contactPointMapping.FindMappedElementByName("system").PropertyTypeMapping.Name.Should().Be("code"); - // ContactPoint.Value - a FhirString - contactPointMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("string"); + // ContactPoint.Value - a FhirString + contactPointMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("string"); - // Extension.Url - a system primitive - ClassMapping.TryCreate(typeof(Extension), out var extensionMapping); - extensionMapping.FindMappedElementByName("url").PropertyTypeMapping.Name.Should().Be("System.String"); + // Extension.Url - a system primitive + ClassMapping.TryCreate(typeof(Extension), out var extensionMapping); + extensionMapping.FindMappedElementByName("url").PropertyTypeMapping.Name.Should().Be("System.String"); - // Extension.Value - an abstract DataType - extensionMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("DataType"); + // Extension.Value - an abstract DataType + extensionMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("DataType"); - // Parameters.Parameter - a backbone - ClassMapping.TryCreate(typeof(Parameters), out var parametersMapping); - var parameterComponentMapping = parametersMapping.FindMappedElementByName("parameter").PropertyTypeMapping; + // Parameters.Parameter - a backbone + ClassMapping.TryCreate(typeof(Parameters), out var parametersMapping); + var parameterComponentMapping = parametersMapping.FindMappedElementByName("parameter").PropertyTypeMapping; + parameterComponentMapping.Name.Should().Be("Parameters.parameter"); - parameterComponentMapping.Name.Should().Be("Parameters#Parameter"); - parameterComponentMapping.FindMappedElementByName("resource").PropertyTypeMapping.Name.Should().Be("Resource"); - } + parameterComponentMapping.FindMappedElementByName("resource").PropertyTypeMapping.Name.Should().Be("Resource"); + } - [FhirType("TypeWithCodeOfT")] - public class TypeWithCodeOfT - { - [FhirElement("type1")] - [DeclaredType(Type = typeof(FhirString))] - public Code Type1 { get; set; } - } + [FhirType("TypeWithCodeOfT")] + public class TypeWithCodeOfT + { + [FhirElement("type1")] + [DeclaredType(Type = typeof(FhirString))] + public Code Type1 { get; set; } + } - [FhirType("BindableClass")] - [Bindable(true)] - public class BindableClass - { - } + [FhirType("BindableClass")] + [Bindable(true)] + public class BindableClass + { + } - [FhirType("NonBindableClass")] - [Bindable(false)] - public class NonBindableClass - { - } + [FhirType("NonBindableClass")] + [Bindable(false)] + public class NonBindableClass + { + } - [TestMethod] - public void IsBindableTest() - { - ClassMapping.TryCreate(typeof(BindableClass), out var mapping); - mapping.Should().NotBeNull(); - mapping.IsBindable.Should().BeTrue(); + [TestMethod] + public void IsBindableTest() + { + ClassMapping.TryCreate(typeof(BindableClass), out var mapping); + mapping.Should().NotBeNull(); + mapping.IsBindable.Should().BeTrue(); - ClassMapping.TryCreate(typeof(NonBindableClass), out mapping); - mapping.Should().NotBeNull(); - mapping.IsBindable.Should().BeFalse(); - } + ClassMapping.TryCreate(typeof(NonBindableClass), out mapping); + mapping.Should().NotBeNull(); + mapping.IsBindable.Should().BeFalse(); + } - [TestMethod] - public void TestPerformanceOfMapping() + [TestMethod] + public void TestPerformanceOfMapping() + { + // just a random list of POCO types available in common + var typesToTest = new Type[] { typeof(BackboneElement), typeof(BackboneType), + typeof(Base64Binary), typeof(Canonical), typeof(Element), typeof(FhirString), + typeof(Extension), typeof(Resource), typeof(Meta), typeof(XHtml) }; + + + var sw = new Stopwatch(); + sw.Start(); + for (int i = 0; i < 1000; i++) + foreach (var testee in typesToTest) + createMapping(testee); + sw.Stop(); + Console.WriteLine($"No props: {sw.ElapsedMilliseconds}"); + + sw.Restart(); + for (int i = 0; i < 1000; i++) + foreach (var testee in typesToTest) + createMapping(testee, touchProps: true); + sw.Stop(); + Console.WriteLine($"With props: {sw.ElapsedMilliseconds}"); + + int createMapping(Type t, bool touchProps = false) { - // just a random list of POCO types available in common - var typesToTest = new Type[] { typeof(BackboneElement), typeof(BackboneType), - typeof(Base64Binary), typeof(Canonical), typeof(Element), typeof(FhirString), - typeof(Extension), typeof(Resource), typeof(Meta), typeof(XHtml) }; - - - var sw = new Stopwatch(); - sw.Start(); - for (int i = 0; i < 1000; i++) - foreach (var testee in typesToTest) - createMapping(testee); - sw.Stop(); - Console.WriteLine($"No props: {sw.ElapsedMilliseconds}"); - - sw.Restart(); - for (int i = 0; i < 1000; i++) - foreach (var testee in typesToTest) - createMapping(testee, touchProps: true); - sw.Stop(); - Console.WriteLine($"With props: {sw.ElapsedMilliseconds}"); - - int createMapping(Type t, bool touchProps = false) - { - ClassMapping.TryCreate(t, out var mapping); - return touchProps ? mapping.PropertyMappings.Count : -1; - } + ClassMapping.TryCreate(t, out var mapping); + return touchProps ? mapping.PropertyMappings.Count : -1; } } -} +} \ No newline at end of file