@smile-cdr/fhirts 2.0.0 → 2.0.2

package/src/FHIR-R4/classes/requestGroup.ts

@@ -15,7 +15,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -35,7 +35,7 @@ export class RequestGroup {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -111,7 +111,7 @@ export class RequestGroup {
     /**
      * Indicates when the request group was created.
      */
-    authoredOn?: Date;
+    authoredOn?: Date | string;
     /**
      * Provides a reference to the author of the request group.
      */

package/src/FHIR-R4/classes/requestGroupRelatedAction.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { Duration } from './duration';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Range } from './range';
 
 
@@ -35,7 +35,7 @@ export class RequestGroupRelatedAction {
     /**
      * The element id of the action this is related to.
      */
-    actionId?: Id;
+    actionId?: string;
     /**
      * The relationship of this action to the related action.
      */

package/src/FHIR-R4/classes/researchDefinition.ts

@@ -15,7 +15,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -38,7 +38,7 @@ export class ResearchDefinition {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -110,7 +110,7 @@ export class ResearchDefinition {
     /**
      * The date  (and optionally time) when the research definition was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the research definition changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the research definition.
      */

package/src/FHIR-R4/classes/researchElementDefinition.ts

@@ -15,7 +15,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -39,7 +39,7 @@ export class ResearchElementDefinition {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -111,7 +111,7 @@ export class ResearchElementDefinition {
     /**
      * The date  (and optionally time) when the research element definition was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the research element definition changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the research element definition.
      */

package/src/FHIR-R4/classes/researchStudy.ts

@@ -14,7 +14,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -38,7 +38,7 @@ export class ResearchStudy {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/researchSubject.ts

@@ -11,7 +11,7 @@
  */
 import { Code } from './code';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -31,7 +31,7 @@ export class ResearchSubject {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/resource.ts

@@ -129,5 +129,4 @@ import { ValueSet } from './valueSet';
 import { VerificationResult } from './verificationResult';
 import { VisionPrescription } from './visionPrescription';
 
-
-export type Resource = Account | ActivityDefinition | AdverseEvent | AllergyIntolerance | Appointment | AppointmentResponse | AuditEvent | Binary | BiologicallyDerivedProduct | BodyStructure | Bundle | CapabilityStatement | CarePlan | CareTeam | CatalogEntry | ChargeItem | ChargeItemDefinition | Claim | ClaimResponse | ClinicalImpression | CodeSystem | Communication | CommunicationRequest | CompartmentDefinition | Composition | ConceptMap | Condition | Consent | Contract | Coverage | CoverageEligibilityRequest | CoverageEligibilityResponse | DetectedIssue | Device | DeviceDefinition | DeviceMetric | DeviceRequest | DeviceUseStatement | DiagnosticReport | DocumentManifest | DocumentReference | Encounter | Endpoint | EnrollmentRequest | EnrollmentResponse | EpisodeOfCare | EventDefinition | Evidence | EvidenceVariable | ExampleScenario | ExplanationOfBenefit | FamilyMemberHistory | Flag | Goal | GraphDefinition | Group | GuidanceResponse | HealthcareService | ImagingStudy | Immunization | ImmunizationEvaluation | ImmunizationRecommendation | ImplementationGuide | InsurancePlan | Invoice | Library | Linkage | List | Location | Measure | MeasureReport | Media | Medication | MedicationAdministration | MedicationDispense | MedicationKnowledge | MedicationRequest | MedicationStatement | MessageDefinition | MessageHeader | MolecularSequence | NamingSystem | NutritionOrder | Observation | ObservationDefinition | OperationDefinition | OperationOutcome | Organization | OrganizationAffiliation | Patient | PaymentNotice | PaymentReconciliation | Person | PlanDefinition | Practitioner | PractitionerRole | Procedure | Provenance | Questionnaire | QuestionnaireResponse | RelatedPerson | RequestGroup | ResearchDefinition | ResearchElementDefinition | ResearchStudy | ResearchSubject | RiskAssessment | Schedule | SearchParameter | ServiceRequest | Slot | Specimen | SpecimenDefinition | StructureDefinition | StructureMap | Subscription | Substance | SupplyDelivery | SupplyRequest | Task | TerminologyCapabilities | TestReport | TestScript | ValueSet | VerificationResult | VisionPrescription;
+export type Resource = Account | ActivityDefinition | AdverseEvent | AllergyIntolerance | Appointment | AppointmentResponse | AuditEvent | Binary | BiologicallyDerivedProduct | BodyStructure | Bundle | CapabilityStatement | CarePlan | CareTeam | CatalogEntry | ChargeItem | ChargeItemDefinition | Claim | ClaimResponse | ClinicalImpression | CodeSystem | Communication | CommunicationRequest | CompartmentDefinition | Composition | ConceptMap | Condition | Consent | Contract | Coverage | CoverageEligibilityRequest | CoverageEligibilityResponse | DetectedIssue | Device | DeviceDefinition | DeviceMetric | DeviceRequest | DeviceUseStatement | DiagnosticReport | DocumentManifest | DocumentReference | Encounter | Endpoint | EnrollmentRequest | EnrollmentResponse | EpisodeOfCare | EventDefinition | Evidence | EvidenceVariable | ExampleScenario | ExplanationOfBenefit | FamilyMemberHistory | Flag | Goal | GraphDefinition | Group | GuidanceResponse | HealthcareService | ImagingStudy | Immunization | ImmunizationEvaluation | ImmunizationRecommendation | ImplementationGuide | InsurancePlan | Invoice | Library | Linkage | List | Location | Measure | MeasureReport | Media | Medication | MedicationAdministration | MedicationDispense | MedicationKnowledge | MedicationRequest | MedicationStatement | MessageDefinition | MessageHeader | MolecularSequence | NamingSystem | NutritionOrder | Observation | ObservationDefinition | OperationDefinition | OperationOutcome | Organization | OrganizationAffiliation | Patient | PaymentNotice | PaymentReconciliation | Person | PlanDefinition | Practitioner | PractitionerRole | Procedure | Provenance | Questionnaire | QuestionnaireResponse | RelatedPerson | RequestGroup | ResearchDefinition | ResearchElementDefinition | ResearchStudy | ResearchSubject | RiskAssessment | Schedule | SearchParameter | ServiceRequest | Slot | Specimen | SpecimenDefinition | StructureDefinition | StructureMap | Subscription | Substance | SupplyDelivery | SupplyRequest | Task | TerminologyCapabilities | TestReport | TestScript | ValueSet | VerificationResult | VisionPrescription;

package/src/FHIR-R4/classes/riskAssessment.ts

@@ -13,7 +13,7 @@ import { Annotation } from './annotation';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -34,7 +34,7 @@ export class RiskAssessment {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/riskEvidenceSynthesis.ts

@@ -15,7 +15,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -41,7 +41,7 @@ export class RiskEvidenceSynthesis {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -93,7 +93,7 @@ export class RiskEvidenceSynthesis {
     /**
      * The date  (and optionally time) when the risk evidence synthesis was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the risk evidence synthesis changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the risk evidence synthesis.
      */

package/src/FHIR-R4/classes/schedule.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -32,7 +32,7 @@ export class Schedule {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/searchParameter.ts

@@ -15,7 +15,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Markdown } from './markdown';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -36,7 +36,7 @@ export class SearchParameter {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -88,7 +88,7 @@ export class SearchParameter {
     /**
      * The date  (and optionally time) when the search parameter was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the search parameter changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the search parameter.
      */

package/src/FHIR-R4/classes/serviceRequest.ts

@@ -15,7 +15,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -39,7 +39,7 @@ export class ServiceRequest {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -159,7 +159,7 @@ export class ServiceRequest {
     /**
      * When the request transitioned to being actionable.
      */
-    authoredOn?: Date;
+    authoredOn?: Date | string;
     /**
      * The individual who initiated the request and has responsibility for its activation.
      */

package/src/FHIR-R4/classes/slot.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Instant } from './instant';
 import { Meta } from './meta';
@@ -32,7 +32,7 @@ export class Slot {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/specimen.ts

@@ -14,7 +14,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -36,7 +36,7 @@ export class Specimen {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -84,7 +84,7 @@ export class Specimen {
     /**
      * Time when specimen was received for processing or testing.
      */
-    receivedTime?: Date;
+    receivedTime?: Date | string;
     /**
      * Reference to the parent (source) specimen which is used when the specimen was either derived from or a component of another specimen.
      */

package/src/FHIR-R4/classes/specimenDefinition.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -31,7 +31,7 @@ export class SpecimenDefinition {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/structureDefinition.ts

@@ -16,7 +16,7 @@ import { Coding } from './coding';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -40,7 +40,7 @@ export class StructureDefinition {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -96,7 +96,7 @@ export class StructureDefinition {
     /**
      * The date  (and optionally time) when the structure definition was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the structure definition changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the structure definition.
      */

package/src/FHIR-R4/classes/structureDefinitionMapping.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Uri } from './uri';
 
 
@@ -33,7 +33,7 @@ export class StructureDefinitionMapping {
     /**
      * An Internal id that is used to identify this mapping set when specific mappings are made.
      */
-    identity?: Id;
+    identity?: string;
     /**
      * An absolute URI that identifies the specification that this mapping is expressed to.
      */

package/src/FHIR-R4/classes/structureMap.ts

@@ -15,7 +15,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Markdown } from './markdown';
 import { Meta } from './meta';
@@ -37,7 +37,7 @@ export class StructureMap {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */
@@ -93,7 +93,7 @@ export class StructureMap {
     /**
      * The date  (and optionally time) when the structure map was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the structure map changes.
      */
-    date?: Date;
+    date?: Date | string;
     /**
      * The name of the organization or individual that published the structure map.
      */

package/src/FHIR-R4/classes/structureMapDependent.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 
 
 /**
@@ -32,7 +32,7 @@ export class StructureMapDependent {
     /**
      * Name of a rule or group to apply.
      */
-    name?: Id;
+    name?: string;
     /**
      * Variable to pass to the rule or group.
      */

package/src/FHIR-R4/classes/structureMapGroup.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { StructureMapInput } from './structureMapInput';
 import { StructureMapRule } from './structureMapRule';
 
@@ -34,11 +34,11 @@ export class StructureMapGroup {
     /**
      * A unique name for the group for the convenience of human readers.
      */
-    name?: Id;
+    name?: string;
     /**
      * Another group that this group adds rules to.
      */
-    _extends?: Id;
+    _extends?: string;
     /**
      * If this is the default rule set to apply for the source type or this combination of types.
      */

package/src/FHIR-R4/classes/structureMapInput.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 
 
 /**
@@ -32,7 +32,7 @@ export class StructureMapInput {
     /**
      * Name for this instance of data.
      */
-    name?: Id;
+    name?: string;
     /**
      * Type for this instance of data.
      */

package/src/FHIR-R4/classes/structureMapRule.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { StructureMapDependent } from './structureMapDependent';
 import { StructureMapSource } from './structureMapSource';
 import { StructureMapTarget } from './structureMapTarget';
@@ -35,7 +35,7 @@ export class StructureMapRule {
     /**
      * Name of the rule for internal references.
      */
-    name?: Id;
+    name?: string;
     /**
      * Source inputs to the mapping.
      */

package/src/FHIR-R4/classes/structureMapSource.ts

@@ -26,7 +26,7 @@ import { Duration } from './duration';
 import { Expression } from './expression';
 import { Extension } from './extension';
 import { HumanName } from './humanName';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Money } from './money';
 import { ParameterDefinition } from './parameterDefinition';
@@ -62,7 +62,7 @@ export class StructureMapSource {
     /**
      * Type or variable this rule applies to.
      */
-    context?: Id;
+    context?: string;
     /**
      * Specified minimum cardinality for the element. This is optional; if present, it acts an implicit check on the input content.
      */
@@ -282,7 +282,7 @@ export class StructureMapSource {
     /**
      * Named context for field, if a field is specified.
      */
-    variable?: Id;
+    variable?: string;
     /**
      * FHIRPath expression  - must be true or the rule does not apply.
      */

package/src/FHIR-R4/classes/structureMapTarget.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { StructureMapParameter } from './structureMapParameter';
 
 
@@ -33,7 +33,7 @@ export class StructureMapTarget {
     /**
      * Type or variable this rule applies to.
      */
-    context?: Id;
+    context?: string;
     /**
      * How to interpret the context.
      */
@@ -45,7 +45,7 @@ export class StructureMapTarget {
     /**
      * Named context for field, if desired, and a field is specified.
      */
-    variable?: Id;
+    variable?: string;
     /**
      * If field is a list, how to manage the list.
      */
@@ -53,7 +53,7 @@ export class StructureMapTarget {
     /**
      * Internal rule reference for shared list items.
      */
-    listRuleId?: Id;
+    listRuleId?: string;
     /**
      * How the data is copied / created.
      */

package/src/FHIR-R4/classes/subscription.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { ContactPoint } from './contactPoint';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Instant } from './instant';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -31,7 +31,7 @@ export class Subscription {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/substance.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Identifier } from './identifier';
 import { Meta } from './meta';
 import { Narrative } from './narrative';
@@ -32,7 +32,7 @@ export class Substance {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/substanceInstance.ts

@@ -38,7 +38,7 @@ export class SubstanceInstance {
     /**
      * When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
      */
-    expiry?: Date;
+    expiry?: Date | string;
     /**
      * The amount of the substance.
      */

package/src/FHIR-R4/classes/substanceNucleicAcid.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Meta } from './meta';
 import { Narrative } from './narrative';
 import { SubstanceNucleicAcidSubunit } from './substanceNucleicAcidSubunit';
@@ -30,7 +30,7 @@ export class SubstanceNucleicAcid {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */

package/src/FHIR-R4/classes/substancePolymer.ts

@@ -12,7 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Extension } from './extension';
-import { Id } from './id';
+
 import { Meta } from './meta';
 import { Narrative } from './narrative';
 import { SubstancePolymerMonomerSet } from './substancePolymerMonomerSet';
@@ -31,7 +31,7 @@ export class SubstancePolymer {
     /**
      * The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
      */
-    id?: Id;
+    id?: string;
     /**
      * The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.
      */