diff --git a/.python-version b/.python-version new file mode 100644 index 00000000..d57c8d83 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +fhirclient diff --git a/README.md b/README.md index 109c618f..646b0d85 100644 --- a/README.md +++ b/README.md @@ -204,3 +204,14 @@ and install the needed packages as shown: [smart]: http://docs.smarthealthit.org [fhir-parser]: https://github.com/smart-on-fhir/fhir-parser [docs]: https://smart-on-fhir.github.io/client-py + +### Generating Fresh Models + +To generate fresh models after making changes to `fhir-parser` or to +`fhir-parser-resources`, do the following: + +``` +git submodule init --update --recursive +pip install -r fhir-parser/requirements.txt +./generate_models.sh +``` diff --git a/fhir-parser-resources/fhirprimitiveextension.py b/fhir-parser-resources/fhirprimitiveextension.py new file mode 100644 index 00000000..519c0247 --- /dev/null +++ b/fhir-parser-resources/fhirprimitiveextension.py @@ -0,0 +1,21 @@ +from . import backboneelement, extension + + +class FHIRPrimitiveExtension(backboneelement.BackboneElement): + """A special kind of FHIR extension which can be used to extend primitives. + """ + + def __init__(self, jsondict=None, strict=True): + self.extension = None + """ The extension value(s). + List of `Extension` items (represented as `list[dict]` in JSON). """ + + super(FHIRPrimitiveExtension, self).__init__(jsondict=jsondict, + strict=strict) + + def elementProperties(self): + js = super(FHIRPrimitiveExtension, self).elementProperties() + js.extend([ + ("extension", "extension", extension.Extension, True, None, False), + ]) + return js diff --git a/fhir-parser-resources/settings.py b/fhir-parser-resources/settings.py index 46b0e74e..08821799 100644 --- a/fhir-parser-resources/settings.py +++ b/fhir-parser-resources/settings.py @@ -38,6 +38,7 @@ ('../fhir-parser-resources/fhirdate.py', 'fhirdate', ['date']), ('../fhir-parser-resources/fhirdatetime.py', 'fhirdatetime', ['dateTime']), ('../fhir-parser-resources/fhirinstant.py', 'fhirinstant', ['instant']), + ('../fhir-parser-resources/fhirprimitiveextension.py', 'fhirprimitiveextension', ['FHIRPrimitiveExtension']), ('../fhir-parser-resources/fhirtime.py', 'fhirtime', ['time']), ('../fhir-parser-resources/fhirsearch.py', 'fhirsearch', ['FHIRSearch']), ] diff --git a/fhir-parser-resources/template-resource.py b/fhir-parser-resources/template-resource.py index 9fd991eb..084ce3e7 100644 --- a/fhir-parser-resources/template-resource.py +++ b/fhir-parser-resources/template-resource.py @@ -47,6 +47,11 @@ def __init__(self, jsondict=None, strict=True): {% if prop.is_array %}List of{% else %}Type{% endif %} `{{ prop.class_name }}`{% if prop.is_array %} items{% endif %} {%- if prop.reference_to_names|length > 0 %} referencing `{{ prop.reference_to_names|join(', ') }}`{% endif %} {%- if prop.json_class != prop.class_name %} (represented as `{{ prop.json_class }}` in JSON){% endif %}. """ + {#- HACK: _owner is a reserved property in fhirclient... #} + {%- if prop.name != "owner" %} + self._{{ prop.name }} = None + """ Primitive extension for {{ prop.name }}. {% if prop.is_array %}List of{% else %}Type{% endif %} `FHIRPrimitiveExtension` """ + {%- endif %} {%- endfor %} super({{ klass.name }}, self).__init__(jsondict=jsondict, strict=strict) @@ -69,6 +74,10 @@ def elementProperties(self): {{- prop.is_array }}, {%- if prop.one_of_many %} "{{ prop.one_of_many }}"{% else %} None{% endif %}, {# #} {{- prop.nonoptional }}), + {#- HACK: _owner is a reserved property in fhirclient... #} + {%- if prop.name != "owner" %} + ("_{{ prop.name }}", "_{{ prop.name }}", fhirprimitiveextension.FHIRPrimitiveExtension, {{ prop.is_array }}, None, False), + {%- endif %} {%- endfor %} ]) return js @@ -76,7 +85,7 @@ def elementProperties(self): {%- endif %} {%- endfor %} +from . import fhirprimitiveextension {% for imp in imports %}{% if imp.module not in imported %} from . import {{ imp.module }} {%- endif %}{% endfor %} - diff --git a/fhirclient/models/account.py b/fhirclient/models/account.py index 39c17a74..2733894e 100644 --- a/fhirclient/models/account.py +++ b/fhirclient/models/account.py @@ -26,22 +26,32 @@ def __init__(self, jsondict=None, strict=True): """ The party(s) that are responsible for covering the payment of this account, and what order should they be applied to the account. List of `AccountCoverage` items (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. List of `FHIRPrimitiveExtension` """ self.description = None """ Explanation of purpose/use. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.guarantor = None """ The parties ultimately responsible for balancing the Account. List of `AccountGuarantor` items (represented as `dict` in JSON). """ + self._guarantor = None + """ Primitive extension for guarantor. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Account number. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.name = None """ Human-readable label. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.owner = None """ Entity managing the Account. @@ -50,22 +60,32 @@ def __init__(self, jsondict=None, strict=True): self.partOf = None """ Reference to a parent Account. Type `FHIRReference` (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. Type `FHIRPrimitiveExtension` """ self.servicePeriod = None """ Transaction window. Type `Period` (represented as `dict` in JSON). """ + self._servicePeriod = None + """ Primitive extension for servicePeriod. Type `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error | on-hold | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ The entity that caused the expenses. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.type = None """ E.g. patient, expense, depreciation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Account, self).__init__(jsondict=jsondict, strict=strict) @@ -73,16 +93,26 @@ def elementProperties(self): js = super(Account, self).elementProperties() js.extend([ ("coverage", "coverage", AccountCoverage, True, None, False), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("guarantor", "guarantor", AccountGuarantor, True, None, False), + ("_guarantor", "_guarantor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("owner", "owner", fhirreference.FHIRReference, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, False, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicePeriod", "servicePeriod", period.Period, False, None, False), + ("_servicePeriod", "_servicePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -108,10 +138,14 @@ def __init__(self, jsondict=None, strict=True): """ The party(s), such as insurances, that may contribute to the payment of this account. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.priority = None """ The priority of the coverage in the context of this account. Type `int`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ super(AccountCoverage, self).__init__(jsondict=jsondict, strict=strict) @@ -119,7 +153,9 @@ def elementProperties(self): js = super(AccountCoverage, self).elementProperties() js.extend([ ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", int, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -144,14 +180,20 @@ def __init__(self, jsondict=None, strict=True): self.onHold = None """ Credit or other hold applied. Type `bool`. """ + self._onHold = None + """ Primitive extension for onHold. Type `FHIRPrimitiveExtension` """ self.party = None """ Responsible entity. Type `FHIRReference` (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. Type `FHIRPrimitiveExtension` """ self.period = None """ Guarantee account during. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ super(AccountGuarantor, self).__init__(jsondict=jsondict, strict=strict) @@ -159,13 +201,17 @@ def elementProperties(self): js = super(AccountGuarantor, self).elementProperties() js.extend([ ("onHold", "onHold", bool, False, None, False), + ("_onHold", "_onHold", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("party", "party", fhirreference.FHIRReference, False, None, True), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/activitydefinition.py b/fhirclient/models/activitydefinition.py index 64dc7d9b..0d861bd9 100644 --- a/fhirclient/models/activitydefinition.py +++ b/fhirclient/models/activitydefinition.py @@ -26,216 +26,322 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the activity definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ What part of body to perform on. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. List of `FHIRPrimitiveExtension` """ self.code = None """ Detail type of activity. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the activity definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.doNotPerform = None """ True if the activity should not be performed. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.dosage = None """ Detailed dosage instructions. List of `Dosage` items (represented as `dict` in JSON). """ + self._dosage = None + """ Primitive extension for dosage. List of `FHIRPrimitiveExtension` """ self.dynamicValue = None """ Dynamic aspects of the definition. List of `ActivityDefinitionDynamicValue` items (represented as `dict` in JSON). """ + self._dynamicValue = None + """ Primitive extension for dynamicValue. List of `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the activity definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the activity definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for activity definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.kind = None """ Kind of resource. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the activity definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.library = None """ Logic used by the activity definition. List of `str` items. """ + self._library = None + """ Primitive extension for library. List of `FHIRPrimitiveExtension` """ self.location = None """ Where it should happen. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this activity definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.observationRequirement = None """ What observations are required to perform this action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._observationRequirement = None + """ Primitive extension for observationRequirement. List of `FHIRPrimitiveExtension` """ self.observationResultRequirement = None """ What observations must be produced by this action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._observationResultRequirement = None + """ Primitive extension for observationResultRequirement. List of `FHIRPrimitiveExtension` """ self.participant = None """ Who should participate in the action. List of `ActivityDefinitionParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.productCodeableConcept = None """ What's administered/supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productCodeableConcept = None + """ Primitive extension for productCodeableConcept. Type `FHIRPrimitiveExtension` """ self.productReference = None """ What's administered/supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._productReference = None + """ Primitive extension for productReference. Type `FHIRPrimitiveExtension` """ self.profile = None """ What profile the resource needs to conform to. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this activity definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.quantity = None """ How much is administered/consumed/supplied. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.specimenRequirement = None """ What specimens are required to perform this action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._specimenRequirement = None + """ Primitive extension for specimenRequirement. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ Type of individual the activity definition is intended for. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ Type of individual the activity definition is intended for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the activity definition. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.timingAge = None """ When activity is to occur. Type `Age` (represented as `dict` in JSON). """ + self._timingAge = None + """ Primitive extension for timingAge. Type `FHIRPrimitiveExtension` """ self.timingDateTime = None """ When activity is to occur. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timingDateTime = None + """ Primitive extension for timingDateTime. Type `FHIRPrimitiveExtension` """ self.timingDuration = None """ When activity is to occur. Type `Duration` (represented as `dict` in JSON). """ + self._timingDuration = None + """ Primitive extension for timingDuration. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ When activity is to occur. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.timingRange = None """ When activity is to occur. Type `Range` (represented as `dict` in JSON). """ + self._timingRange = None + """ Primitive extension for timingRange. Type `FHIRPrimitiveExtension` """ self.timingTiming = None """ When activity is to occur. Type `Timing` (represented as `dict` in JSON). """ + self._timingTiming = None + """ Primitive extension for timingTiming. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this activity definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ E.g. Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.transform = None """ Transform to apply the template. Type `str`. """ + self._transform = None + """ Primitive extension for transform. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this activity definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the activity definition. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the activity definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ActivityDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -243,58 +349,111 @@ def elementProperties(self): js = super(ActivityDefinition, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, True, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dosage", "dosage", dosage.Dosage, True, None, False), + ("_dosage", "_dosage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dynamicValue", "dynamicValue", ActivityDefinitionDynamicValue, True, None, False), + ("_dynamicValue", "_dynamicValue", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, False), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, False), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("library", "library", str, True, None, False), + ("_library", "_library", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("observationRequirement", "observationRequirement", fhirreference.FHIRReference, True, None, False), + ("_observationRequirement", "_observationRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("observationResultRequirement", "observationResultRequirement", fhirreference.FHIRReference, True, None, False), + ("_observationResultRequirement", "_observationResultRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("participant", "participant", ActivityDefinitionParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productCodeableConcept", "productCodeableConcept", codeableconcept.CodeableConcept, False, "product", False), + ("_productCodeableConcept", "_productCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productReference", "productReference", fhirreference.FHIRReference, False, "product", False), + ("_productReference", "_productReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimenRequirement", "specimenRequirement", fhirreference.FHIRReference, True, None, False), + ("_specimenRequirement", "_specimenRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingAge", "timingAge", age.Age, False, "timing", False), + ("_timingAge", "_timingAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDateTime", "timingDateTime", fhirdatetime.FHIRDateTime, False, "timing", False), + ("_timingDateTime", "_timingDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDuration", "timingDuration", duration.Duration, False, "timing", False), + ("_timingDuration", "_timingDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingRange", "timingRange", range.Range, False, "timing", False), + ("_timingRange", "_timingRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingTiming", "timingTiming", timing.Timing, False, "timing", False), + ("_timingTiming", "_timingTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("transform", "transform", str, False, None, False), + ("_transform", "_transform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -324,10 +483,14 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ An expression that provides the dynamic value for the customization. Type `Expression` (represented as `dict` in JSON). """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.path = None """ The path to the element to be set dynamically. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ super(ActivityDefinitionDynamicValue, self).__init__(jsondict=jsondict, strict=strict) @@ -335,7 +498,9 @@ def elementProperties(self): js = super(ActivityDefinitionDynamicValue, self).elementProperties() js.extend([ ("expression", "expression", expression.Expression, False, None, True), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, True), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -359,10 +524,14 @@ def __init__(self, jsondict=None, strict=True): self.role = None """ E.g. Nurse, Surgeon, Parent, etc.. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.type = None """ patient | practitioner | related-person | device. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ActivityDefinitionParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -370,10 +539,13 @@ def elementProperties(self): js = super(ActivityDefinitionParticipant, self).elementProperties() js.extend([ ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import codeableconcept @@ -390,4 +562,4 @@ def elementProperties(self): from . import range from . import relatedartifact from . import timing -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/address.py b/fhirclient/models/address.py index 9b7aff8b..9b5ce297 100644 --- a/fhirclient/models/address.py +++ b/fhirclient/models/address.py @@ -28,42 +28,62 @@ def __init__(self, jsondict=None, strict=True): self.city = None """ Name of city, town etc.. Type `str`. """ + self._city = None + """ Primitive extension for city. Type `FHIRPrimitiveExtension` """ self.country = None """ Country (e.g. can be ISO 3166 2 or 3 letter code). Type `str`. """ + self._country = None + """ Primitive extension for country. Type `FHIRPrimitiveExtension` """ self.district = None """ District name (aka county). Type `str`. """ + self._district = None + """ Primitive extension for district. Type `FHIRPrimitiveExtension` """ self.line = None """ Street name, number, direction & P.O. Box etc.. List of `str` items. """ + self._line = None + """ Primitive extension for line. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period when address was/is in use. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.postalCode = None """ Postal code for area. Type `str`. """ + self._postalCode = None + """ Primitive extension for postalCode. Type `FHIRPrimitiveExtension` """ self.state = None """ Sub-unit of country (abbreviations ok). Type `str`. """ + self._state = None + """ Primitive extension for state. Type `FHIRPrimitiveExtension` """ self.text = None """ Text representation of the address. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ postal | physical | both. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ home | work | temp | old | billing - purpose of this address. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(Address, self).__init__(jsondict=jsondict, strict=strict) @@ -71,17 +91,28 @@ def elementProperties(self): js = super(Address, self).elementProperties() js.extend([ ("city", "city", str, False, None, False), + ("_city", "_city", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("country", "country", str, False, None, False), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("district", "district", str, False, None, False), + ("_district", "_district", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("line", "line", str, True, None, False), + ("_line", "_line", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("postalCode", "postalCode", str, False, None, False), + ("_postalCode", "_postalCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("state", "state", str, False, None, False), + ("_state", "_state", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/adverseevent.py b/fhirclient/models/adverseevent.py index 46044bf9..c227a38e 100644 --- a/fhirclient/models/adverseevent.py +++ b/fhirclient/models/adverseevent.py @@ -27,6 +27,8 @@ def __init__(self, jsondict=None, strict=True): self.actuality = None """ actual | potential. Type `str`. """ + self._actuality = None + """ Primitive extension for actuality. Type `FHIRPrimitiveExtension` """ self.category = None """ product-problem | product-quality | product-use-error | wrong-dose @@ -35,80 +37,118 @@ def __init__(self, jsondict=None, strict=True): | expired-drug | medical-device-use-error | problem-different- manufacturer | unsafe-physical-environment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.contributor = None """ Who was involved in the adverse event or the potential adverse event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._contributor = None + """ Primitive extension for contributor. List of `FHIRPrimitiveExtension` """ self.date = None """ When the event occurred. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.detected = None """ When the event was detected. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._detected = None + """ Primitive extension for detected. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.event = None """ Type of the event itself in relation to the subject. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._event = None + """ Primitive extension for event. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for the event. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.location = None """ Location where adverse event occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.outcome = None """ resolved | recovering | ongoing | resolvedWithSequelae | fatal | unknown. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.recordedDate = None """ When the event was recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._recordedDate = None + """ Primitive extension for recordedDate. Type `FHIRPrimitiveExtension` """ self.recorder = None """ Who recorded the adverse event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recorder = None + """ Primitive extension for recorder. Type `FHIRPrimitiveExtension` """ self.referenceDocument = None """ AdverseEvent.referenceDocument. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._referenceDocument = None + """ Primitive extension for referenceDocument. List of `FHIRPrimitiveExtension` """ self.resultingCondition = None """ Effect on the subject due to this event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._resultingCondition = None + """ Primitive extension for resultingCondition. List of `FHIRPrimitiveExtension` """ self.seriousness = None """ Seriousness of the event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._seriousness = None + """ Primitive extension for seriousness. Type `FHIRPrimitiveExtension` """ self.severity = None """ mild | moderate | severe. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ self.study = None """ AdverseEvent.study. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._study = None + """ Primitive extension for study. List of `FHIRPrimitiveExtension` """ self.subject = None """ Subject impacted by event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.subjectMedicalHistory = None """ AdverseEvent.subjectMedicalHistory. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subjectMedicalHistory = None + """ Primitive extension for subjectMedicalHistory. List of `FHIRPrimitiveExtension` """ self.suspectEntity = None """ The suspected agent causing the adverse event. List of `AdverseEventSuspectEntity` items (represented as `dict` in JSON). """ + self._suspectEntity = None + """ Primitive extension for suspectEntity. List of `FHIRPrimitiveExtension` """ super(AdverseEvent, self).__init__(jsondict=jsondict, strict=strict) @@ -116,25 +156,45 @@ def elementProperties(self): js = super(AdverseEvent, self).elementProperties() js.extend([ ("actuality", "actuality", str, False, None, True), + ("_actuality", "_actuality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contributor", "contributor", fhirreference.FHIRReference, True, None, False), + ("_contributor", "_contributor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detected", "detected", fhirdatetime.FHIRDateTime, False, None, False), + ("_detected", "_detected", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("event", "event", codeableconcept.CodeableConcept, False, None, False), + ("_event", "_event", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", codeableconcept.CodeableConcept, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recordedDate", "recordedDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_recordedDate", "_recordedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recorder", "recorder", fhirreference.FHIRReference, False, None, False), + ("_recorder", "_recorder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceDocument", "referenceDocument", fhirreference.FHIRReference, True, None, False), + ("_referenceDocument", "_referenceDocument", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resultingCondition", "resultingCondition", fhirreference.FHIRReference, True, None, False), + ("_resultingCondition", "_resultingCondition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("seriousness", "seriousness", codeableconcept.CodeableConcept, False, None, False), + ("_seriousness", "_seriousness", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("severity", "severity", codeableconcept.CodeableConcept, False, None, False), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("study", "study", fhirreference.FHIRReference, True, None, False), + ("_study", "_study", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectMedicalHistory", "subjectMedicalHistory", fhirreference.FHIRReference, True, None, False), + ("_subjectMedicalHistory", "_subjectMedicalHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("suspectEntity", "suspectEntity", AdverseEventSuspectEntity, True, None, False), + ("_suspectEntity", "_suspectEntity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -160,10 +220,14 @@ def __init__(self, jsondict=None, strict=True): self.causality = None """ Information on the possible cause of the event. List of `AdverseEventSuspectEntityCausality` items (represented as `dict` in JSON). """ + self._causality = None + """ Primitive extension for causality. List of `FHIRPrimitiveExtension` """ self.instance = None """ Refers to the specific entity that caused the adverse event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._instance = None + """ Primitive extension for instance. Type `FHIRPrimitiveExtension` """ super(AdverseEventSuspectEntity, self).__init__(jsondict=jsondict, strict=strict) @@ -171,7 +235,9 @@ def elementProperties(self): js = super(AdverseEventSuspectEntity, self).elementProperties() js.extend([ ("causality", "causality", AdverseEventSuspectEntityCausality, True, None, False), + ("_causality", "_causality", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instance", "instance", fhirreference.FHIRReference, False, None, True), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -193,18 +259,26 @@ def __init__(self, jsondict=None, strict=True): self.assessment = None """ Assessment of if the entity caused the event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._assessment = None + """ Primitive extension for assessment. Type `FHIRPrimitiveExtension` """ self.author = None """ AdverseEvent.suspectEntity.causalityAuthor. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.method = None """ ProbabilityScale | Bayesian | Checklist. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.productRelatedness = None """ AdverseEvent.suspectEntity.causalityProductRelatedness. Type `str`. """ + self._productRelatedness = None + """ Primitive extension for productRelatedness. Type `FHIRPrimitiveExtension` """ super(AdverseEventSuspectEntityCausality, self).__init__(jsondict=jsondict, strict=strict) @@ -212,14 +286,19 @@ def elementProperties(self): js = super(AdverseEventSuspectEntityCausality, self).elementProperties() js.extend([ ("assessment", "assessment", codeableconcept.CodeableConcept, False, None, False), + ("_assessment", "_assessment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productRelatedness", "productRelatedness", str, False, None, False), + ("_productRelatedness", "_productRelatedness", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/age.py b/fhirclient/models/age.py index 43a2fd9f..04212990 100644 --- a/fhirclient/models/age.py +++ b/fhirclient/models/age.py @@ -20,4 +20,4 @@ def __init__(self, jsondict=None, strict=True): super(Age, self).__init__(jsondict=jsondict, strict=strict) - +from . import fhirprimitiveextension diff --git a/fhirclient/models/allergyintolerance.py b/fhirclient/models/allergyintolerance.py index dd4541d2..efd21b08 100644 --- a/fhirclient/models/allergyintolerance.py +++ b/fhirclient/models/allergyintolerance.py @@ -24,82 +24,122 @@ def __init__(self, jsondict=None, strict=True): self.asserter = None """ Source of the information about the allergy. Type `FHIRReference` (represented as `dict` in JSON). """ + self._asserter = None + """ Primitive extension for asserter. Type `FHIRPrimitiveExtension` """ self.category = None """ food | medication | environment | biologic. List of `str` items. """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.clinicalStatus = None """ active | inactive | resolved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._clinicalStatus = None + """ Primitive extension for clinicalStatus. Type `FHIRPrimitiveExtension` """ self.code = None """ Code that identifies the allergy or intolerance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.criticality = None """ low | high | unable-to-assess. Type `str`. """ + self._criticality = None + """ Primitive extension for criticality. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter when the allergy or intolerance was asserted. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.lastOccurrence = None """ Date(/time) of last known occurrence of a reaction. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._lastOccurrence = None + """ Primitive extension for lastOccurrence. Type `FHIRPrimitiveExtension` """ self.note = None """ Additional text not captured in other fields. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.onsetAge = None """ When allergy or intolerance was identified. Type `Age` (represented as `dict` in JSON). """ + self._onsetAge = None + """ Primitive extension for onsetAge. Type `FHIRPrimitiveExtension` """ self.onsetDateTime = None """ When allergy or intolerance was identified. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._onsetDateTime = None + """ Primitive extension for onsetDateTime. Type `FHIRPrimitiveExtension` """ self.onsetPeriod = None """ When allergy or intolerance was identified. Type `Period` (represented as `dict` in JSON). """ + self._onsetPeriod = None + """ Primitive extension for onsetPeriod. Type `FHIRPrimitiveExtension` """ self.onsetRange = None """ When allergy or intolerance was identified. Type `Range` (represented as `dict` in JSON). """ + self._onsetRange = None + """ Primitive extension for onsetRange. Type `FHIRPrimitiveExtension` """ self.onsetString = None """ When allergy or intolerance was identified. Type `str`. """ + self._onsetString = None + """ Primitive extension for onsetString. Type `FHIRPrimitiveExtension` """ self.patient = None """ Who the sensitivity is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.reaction = None """ Adverse Reaction Events linked to exposure to substance. List of `AllergyIntoleranceReaction` items (represented as `dict` in JSON). """ + self._reaction = None + """ Primitive extension for reaction. List of `FHIRPrimitiveExtension` """ self.recordedDate = None """ Date first version of the resource instance was recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._recordedDate = None + """ Primitive extension for recordedDate. Type `FHIRPrimitiveExtension` """ self.recorder = None """ Who recorded the sensitivity. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recorder = None + """ Primitive extension for recorder. Type `FHIRPrimitiveExtension` """ self.type = None """ allergy | intolerance - Underlying mechanism (if known). Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.verificationStatus = None """ unconfirmed | confirmed | refuted | entered-in-error. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._verificationStatus = None + """ Primitive extension for verificationStatus. Type `FHIRPrimitiveExtension` """ super(AllergyIntolerance, self).__init__(jsondict=jsondict, strict=strict) @@ -107,25 +147,45 @@ def elementProperties(self): js = super(AllergyIntolerance, self).elementProperties() js.extend([ ("asserter", "asserter", fhirreference.FHIRReference, False, None, False), + ("_asserter", "_asserter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", str, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("clinicalStatus", "clinicalStatus", codeableconcept.CodeableConcept, False, None, False), + ("_clinicalStatus", "_clinicalStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("criticality", "criticality", str, False, None, False), + ("_criticality", "_criticality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastOccurrence", "lastOccurrence", fhirdatetime.FHIRDateTime, False, None, False), + ("_lastOccurrence", "_lastOccurrence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("onsetAge", "onsetAge", age.Age, False, "onset", False), + ("_onsetAge", "_onsetAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetDateTime", "onsetDateTime", fhirdatetime.FHIRDateTime, False, "onset", False), + ("_onsetDateTime", "_onsetDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetPeriod", "onsetPeriod", period.Period, False, "onset", False), + ("_onsetPeriod", "_onsetPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetRange", "onsetRange", range.Range, False, "onset", False), + ("_onsetRange", "_onsetRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetString", "onsetString", str, False, "onset", False), + ("_onsetString", "_onsetString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reaction", "reaction", AllergyIntoleranceReaction, True, None, False), + ("_reaction", "_reaction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recordedDate", "recordedDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_recordedDate", "_recordedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recorder", "recorder", fhirreference.FHIRReference, False, None, False), + ("_recorder", "_recorder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("verificationStatus", "verificationStatus", codeableconcept.CodeableConcept, False, None, False), + ("_verificationStatus", "_verificationStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -152,31 +212,45 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of the event as a whole. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.exposureRoute = None """ How the subject was exposed to the substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._exposureRoute = None + """ Primitive extension for exposureRoute. Type `FHIRPrimitiveExtension` """ self.manifestation = None """ Clinical symptoms/signs associated with the Event. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._manifestation = None + """ Primitive extension for manifestation. List of `FHIRPrimitiveExtension` """ self.note = None """ Text about event not captured in other fields. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.onset = None """ Date(/time) when manifestations showed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._onset = None + """ Primitive extension for onset. Type `FHIRPrimitiveExtension` """ self.severity = None """ mild | moderate | severe (of event as a whole). Type `str`. """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ self.substance = None """ Specific substance or pharmaceutical product considered to be responsible for event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substance = None + """ Primitive extension for substance. Type `FHIRPrimitiveExtension` """ super(AllergyIntoleranceReaction, self).__init__(jsondict=jsondict, strict=strict) @@ -184,15 +258,23 @@ def elementProperties(self): js = super(AllergyIntoleranceReaction, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposureRoute", "exposureRoute", codeableconcept.CodeableConcept, False, None, False), + ("_exposureRoute", "_exposureRoute", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manifestation", "manifestation", codeableconcept.CodeableConcept, True, None, True), + ("_manifestation", "_manifestation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("onset", "onset", fhirdatetime.FHIRDateTime, False, None, False), + ("_onset", "_onset", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("severity", "severity", str, False, None, False), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substance", "substance", codeableconcept.CodeableConcept, False, None, False), + ("_substance", "_substance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import annotation @@ -201,4 +283,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/annotation.py b/fhirclient/models/annotation.py index d88c4775..9b4b42a3 100644 --- a/fhirclient/models/annotation.py +++ b/fhirclient/models/annotation.py @@ -24,18 +24,26 @@ def __init__(self, jsondict=None, strict=True): self.authorReference = None """ Individual responsible for the annotation. Type `FHIRReference` (represented as `dict` in JSON). """ + self._authorReference = None + """ Primitive extension for authorReference. Type `FHIRPrimitiveExtension` """ self.authorString = None """ Individual responsible for the annotation. Type `str`. """ + self._authorString = None + """ Primitive extension for authorString. Type `FHIRPrimitiveExtension` """ self.text = None """ The annotation - text content (as markdown). Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.time = None """ When the annotation was made. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._time = None + """ Primitive extension for time. Type `FHIRPrimitiveExtension` """ super(Annotation, self).__init__(jsondict=jsondict, strict=strict) @@ -43,12 +51,17 @@ def elementProperties(self): js = super(Annotation, self).elementProperties() js.extend([ ("authorReference", "authorReference", fhirreference.FHIRReference, False, "author", False), + ("_authorReference", "_authorReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authorString", "authorString", str, False, "author", False), + ("_authorString", "_authorString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, True), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("time", "time", fhirdatetime.FHIRDateTime, False, None, False), + ("_time", "_time", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirdatetime -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/appointment.py b/fhirclient/models/appointment.py index 037e46fc..56c48c49 100644 --- a/fhirclient/models/appointment.py +++ b/fhirclient/models/appointment.py @@ -24,95 +24,139 @@ def __init__(self, jsondict=None, strict=True): """ The style of appointment or patient that has been booked in the slot (not service type). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._appointmentType = None + """ Primitive extension for appointmentType. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ The service request this appointment is allocated to assess. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.cancelationReason = None """ The coded reason for the appointment being cancelled. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._cancelationReason = None + """ Primitive extension for cancelationReason. Type `FHIRPrimitiveExtension` """ self.comment = None """ Additional comments. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.created = None """ The date that this appointment was initially created. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.description = None """ Shown on a subject line in a meeting request, or appointment list. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.end = None """ When appointment is to conclude. Type `FHIRInstant` (represented as `str` in JSON). """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.minutesDuration = None """ Can be less than start/end (e.g. estimate). Type `int`. """ + self._minutesDuration = None + """ Primitive extension for minutesDuration. Type `FHIRPrimitiveExtension` """ self.participant = None """ Participants involved in appointment. List of `AppointmentParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.patientInstruction = None """ Detailed information and instructions for the patient. Type `str`. """ + self._patientInstruction = None + """ Primitive extension for patientInstruction. Type `FHIRPrimitiveExtension` """ self.priority = None """ Used to make informed decisions if needing to re-prioritize. Type `int`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Coded reason this appointment is scheduled. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Reason the appointment is to take place (resource). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.requestedPeriod = None """ Potential date/time interval(s) requested to allocate the appointment within. List of `Period` items (represented as `dict` in JSON). """ + self._requestedPeriod = None + """ Primitive extension for requestedPeriod. List of `FHIRPrimitiveExtension` """ self.serviceCategory = None """ A broad categorization of the service that is to be performed during this appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceCategory = None + """ Primitive extension for serviceCategory. List of `FHIRPrimitiveExtension` """ self.serviceType = None """ The specific service that is to be performed during this appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceType = None + """ Primitive extension for serviceType. List of `FHIRPrimitiveExtension` """ self.slot = None """ The slots that this appointment is filling. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._slot = None + """ Primitive extension for slot. List of `FHIRPrimitiveExtension` """ self.specialty = None """ The specialty of a practitioner that would be required to perform the service requested in this appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ self.start = None """ When appointment is to take place. Type `FHIRInstant` (represented as `str` in JSON). """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.status = None """ proposed | pending | booked | arrived | fulfilled | cancelled | noshow | entered-in-error | checked-in | waitlist. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.supportingInformation = None """ Additional information to support the appointment. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. List of `FHIRPrimitiveExtension` """ super(Appointment, self).__init__(jsondict=jsondict, strict=strict) @@ -120,27 +164,49 @@ def elementProperties(self): js = super(Appointment, self).elementProperties() js.extend([ ("appointmentType", "appointmentType", codeableconcept.CodeableConcept, False, None, False), + ("_appointmentType", "_appointmentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("cancelationReason", "cancelationReason", codeableconcept.CodeableConcept, False, None, False), + ("_cancelationReason", "_cancelationReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("end", "end", fhirinstant.FHIRInstant, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("minutesDuration", "minutesDuration", int, False, None, False), + ("_minutesDuration", "_minutesDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participant", "participant", AppointmentParticipant, True, None, True), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patientInstruction", "patientInstruction", str, False, None, False), + ("_patientInstruction", "_patientInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", int, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requestedPeriod", "requestedPeriod", period.Period, True, None, False), + ("_requestedPeriod", "_requestedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceCategory", "serviceCategory", codeableconcept.CodeableConcept, True, None, False), + ("_serviceCategory", "_serviceCategory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceType", "serviceType", codeableconcept.CodeableConcept, True, None, False), + ("_serviceType", "_serviceType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("slot", "slot", fhirreference.FHIRReference, True, None, False), + ("_slot", "_slot", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("start", "start", fhirinstant.FHIRInstant, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInformation", "supportingInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -166,22 +232,32 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Person, Location/HealthcareService or Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.period = None """ Participation period of the actor. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.required = None """ required | optional | information-only. Type `str`. """ + self._required = None + """ Primitive extension for required. Type `FHIRPrimitiveExtension` """ self.status = None """ accepted | declined | tentative | needs-action. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.type = None """ Role of participant in the appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(AppointmentParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -189,17 +265,23 @@ def elementProperties(self): js = super(AppointmentParticipant, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, False), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("required", "required", str, False, None, False), + ("_required", "_required", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirinstant from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/appointmentresponse.py b/fhirclient/models/appointmentresponse.py index de1ea84b..01ad278e 100644 --- a/fhirclient/models/appointmentresponse.py +++ b/fhirclient/models/appointmentresponse.py @@ -22,34 +22,50 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Person, Location, HealthcareService, or Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.appointment = None """ Appointment this response relates to. Type `FHIRReference` (represented as `dict` in JSON). """ + self._appointment = None + """ Primitive extension for appointment. Type `FHIRPrimitiveExtension` """ self.comment = None """ Additional comments. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.end = None """ Time from appointment, or requested new end time. Type `FHIRInstant` (represented as `str` in JSON). """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.participantStatus = None """ accepted | declined | tentative | needs-action. Type `str`. """ + self._participantStatus = None + """ Primitive extension for participantStatus. Type `FHIRPrimitiveExtension` """ self.participantType = None """ Role of participant in the appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._participantType = None + """ Primitive extension for participantType. List of `FHIRPrimitiveExtension` """ self.start = None """ Time from appointment, or requested new start time. Type `FHIRInstant` (represented as `str` in JSON). """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ super(AppointmentResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -57,18 +73,27 @@ def elementProperties(self): js = super(AppointmentResponse, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, False), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("appointment", "appointment", fhirreference.FHIRReference, False, None, True), + ("_appointment", "_appointment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("end", "end", fhirinstant.FHIRInstant, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("participantStatus", "participantStatus", str, False, None, True), + ("_participantStatus", "_participantStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantType", "participantType", codeableconcept.CodeableConcept, True, None, False), + ("_participantType", "_participantType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("start", "start", fhirinstant.FHIRInstant, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirinstant from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/attachment.py b/fhirclient/models/attachment.py index 680e3932..e875579c 100644 --- a/fhirclient/models/attachment.py +++ b/fhirclient/models/attachment.py @@ -23,34 +23,50 @@ def __init__(self, jsondict=None, strict=True): self.contentType = None """ Mime type of the content, with charset etc.. Type `str`. """ + self._contentType = None + """ Primitive extension for contentType. Type `FHIRPrimitiveExtension` """ self.creation = None """ Date attachment was first created. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._creation = None + """ Primitive extension for creation. Type `FHIRPrimitiveExtension` """ self.data = None """ Data inline, base64ed. Type `str`. """ + self._data = None + """ Primitive extension for data. Type `FHIRPrimitiveExtension` """ self.hash = None """ Hash of the data (sha-1, base64ed). Type `str`. """ + self._hash = None + """ Primitive extension for hash. Type `FHIRPrimitiveExtension` """ self.language = None """ Human language of the content (BCP-47). Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.size = None """ Number of bytes of content (if url provided). Type `int`. """ + self._size = None + """ Primitive extension for size. Type `FHIRPrimitiveExtension` """ self.title = None """ Label to display in place of the data. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Uri where the data can be found. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(Attachment, self).__init__(jsondict=jsondict, strict=strict) @@ -58,15 +74,24 @@ def elementProperties(self): js = super(Attachment, self).elementProperties() js.extend([ ("contentType", "contentType", str, False, None, False), + ("_contentType", "_contentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("creation", "creation", fhirdatetime.FHIRDateTime, False, None, False), + ("_creation", "_creation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("data", "data", str, False, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("hash", "hash", str, False, None, False), + ("_hash", "_hash", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("size", "size", int, False, None, False), + ("_size", "_size", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import fhirdatetime +from . import fhirdatetime \ No newline at end of file diff --git a/fhirclient/models/auditevent.py b/fhirclient/models/auditevent.py index 9ea366fd..2e792f2d 100644 --- a/fhirclient/models/auditevent.py +++ b/fhirclient/models/auditevent.py @@ -25,46 +25,68 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Type of action performed during the event. Type `str`. """ + self._action = None + """ Primitive extension for action. Type `FHIRPrimitiveExtension` """ self.agent = None """ Actor involved in the event. List of `AuditEventAgent` items (represented as `dict` in JSON). """ + self._agent = None + """ Primitive extension for agent. List of `FHIRPrimitiveExtension` """ self.entity = None """ Data or objects used. List of `AuditEventEntity` items (represented as `dict` in JSON). """ + self._entity = None + """ Primitive extension for entity. List of `FHIRPrimitiveExtension` """ self.outcome = None """ Whether the event succeeded or failed. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.outcomeDesc = None """ Description of the event outcome. Type `str`. """ + self._outcomeDesc = None + """ Primitive extension for outcomeDesc. Type `FHIRPrimitiveExtension` """ self.period = None """ When the activity occurred. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.purposeOfEvent = None """ The purposeOfUse of the event. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._purposeOfEvent = None + """ Primitive extension for purposeOfEvent. List of `FHIRPrimitiveExtension` """ self.recorded = None """ Time when the event was recorded. Type `FHIRInstant` (represented as `str` in JSON). """ + self._recorded = None + """ Primitive extension for recorded. Type `FHIRPrimitiveExtension` """ self.source = None """ Audit Event Reporter. Type `AuditEventSource` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.subtype = None """ More specific type/id for the event. List of `Coding` items (represented as `dict` in JSON). """ + self._subtype = None + """ Primitive extension for subtype. List of `FHIRPrimitiveExtension` """ self.type = None """ Type/identifier of event. Type `Coding` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(AuditEvent, self).__init__(jsondict=jsondict, strict=strict) @@ -72,16 +94,27 @@ def elementProperties(self): js = super(AuditEvent, self).elementProperties() js.extend([ ("action", "action", str, False, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("agent", "agent", AuditEventAgent, True, None, True), + ("_agent", "_agent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("entity", "entity", AuditEventEntity, True, None, False), + ("_entity", "_entity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", str, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcomeDesc", "outcomeDesc", str, False, None, False), + ("_outcomeDesc", "_outcomeDesc", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purposeOfEvent", "purposeOfEvent", codeableconcept.CodeableConcept, True, None, False), + ("_purposeOfEvent", "_purposeOfEvent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recorded", "recorded", fhirinstant.FHIRInstant, False, None, True), + ("_recorded", "_recorded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", AuditEventSource, False, None, True), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtype", "subtype", coding.Coding, True, None, False), + ("_subtype", "_subtype", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", coding.Coding, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -107,46 +140,68 @@ def __init__(self, jsondict=None, strict=True): self.altId = None """ Alternative User identity. Type `str`. """ + self._altId = None + """ Primitive extension for altId. Type `FHIRPrimitiveExtension` """ self.location = None """ Where. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.media = None """ Type of media. Type `Coding` (represented as `dict` in JSON). """ + self._media = None + """ Primitive extension for media. Type `FHIRPrimitiveExtension` """ self.name = None """ Human friendly name for the agent. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.network = None """ Logical network location for application activity. Type `AuditEventAgentNetwork` (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. Type `FHIRPrimitiveExtension` """ self.policy = None """ Policy that authorized event. List of `str` items. """ + self._policy = None + """ Primitive extension for policy. List of `FHIRPrimitiveExtension` """ self.purposeOfUse = None """ Reason given for this user. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._purposeOfUse = None + """ Primitive extension for purposeOfUse. List of `FHIRPrimitiveExtension` """ self.requestor = None """ Whether user is initiator. Type `bool`. """ + self._requestor = None + """ Primitive extension for requestor. Type `FHIRPrimitiveExtension` """ self.role = None """ Agent role in the event. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. List of `FHIRPrimitiveExtension` """ self.type = None """ How agent participated. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.who = None """ Identifier of who. Type `FHIRReference` (represented as `dict` in JSON). """ + self._who = None + """ Primitive extension for who. Type `FHIRPrimitiveExtension` """ super(AuditEventAgent, self).__init__(jsondict=jsondict, strict=strict) @@ -154,16 +209,27 @@ def elementProperties(self): js = super(AuditEventAgent, self).elementProperties() js.extend([ ("altId", "altId", str, False, None, False), + ("_altId", "_altId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("media", "media", coding.Coding, False, None, False), + ("_media", "_media", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("network", "network", AuditEventAgentNetwork, False, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("policy", "policy", str, True, None, False), + ("_policy", "_policy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("purposeOfUse", "purposeOfUse", codeableconcept.CodeableConcept, True, None, False), + ("_purposeOfUse", "_purposeOfUse", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requestor", "requestor", bool, False, None, True), + ("_requestor", "_requestor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, True, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("who", "who", fhirreference.FHIRReference, False, None, False), + ("_who", "_who", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -188,10 +254,14 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Identifier for the network access point of the user device. Type `str`. """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of network access point. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(AuditEventAgentNetwork, self).__init__(jsondict=jsondict, strict=strict) @@ -199,7 +269,9 @@ def elementProperties(self): js = super(AuditEventAgentNetwork, self).elementProperties() js.extend([ ("address", "address", str, False, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -223,38 +295,56 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Descriptive text. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.detail = None """ Additional Information about the entity. List of `AuditEventEntityDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.lifecycle = None """ Life-cycle stage for the entity. Type `Coding` (represented as `dict` in JSON). """ + self._lifecycle = None + """ Primitive extension for lifecycle. Type `FHIRPrimitiveExtension` """ self.name = None """ Descriptor for entity. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.query = None """ Query parameters. Type `str`. """ + self._query = None + """ Primitive extension for query. Type `FHIRPrimitiveExtension` """ self.role = None """ What role the entity played. Type `Coding` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.securityLabel = None """ Security labels on the entity. List of `Coding` items (represented as `dict` in JSON). """ + self._securityLabel = None + """ Primitive extension for securityLabel. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of entity involved. Type `Coding` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.what = None """ Specific instance of resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._what = None + """ Primitive extension for what. Type `FHIRPrimitiveExtension` """ super(AuditEventEntity, self).__init__(jsondict=jsondict, strict=strict) @@ -262,14 +352,23 @@ def elementProperties(self): js = super(AuditEventEntity, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", AuditEventEntityDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lifecycle", "lifecycle", coding.Coding, False, None, False), + ("_lifecycle", "_lifecycle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("query", "query", str, False, None, False), + ("_query", "_query", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", coding.Coding, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("securityLabel", "securityLabel", coding.Coding, True, None, False), + ("_securityLabel", "_securityLabel", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", coding.Coding, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("what", "what", fhirreference.FHIRReference, False, None, False), + ("_what", "_what", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -293,14 +392,20 @@ def __init__(self, jsondict=None, strict=True): self.type = None """ Name of the property. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Property value. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Property value. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(AuditEventEntityDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -308,8 +413,11 @@ def elementProperties(self): js = super(AuditEventEntityDetail, self).elementProperties() js.extend([ ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", True), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -333,14 +441,20 @@ def __init__(self, jsondict=None, strict=True): self.observer = None """ The identity of source detecting the event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._observer = None + """ Primitive extension for observer. Type `FHIRPrimitiveExtension` """ self.site = None """ Logical source location within the enterprise. Type `str`. """ + self._site = None + """ Primitive extension for site. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of source where event originated. List of `Coding` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(AuditEventSource, self).__init__(jsondict=jsondict, strict=strict) @@ -348,14 +462,18 @@ def elementProperties(self): js = super(AuditEventSource, self).elementProperties() js.extend([ ("observer", "observer", fhirreference.FHIRReference, False, None, True), + ("_observer", "_observer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("site", "site", str, False, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", coding.Coding, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import fhirinstant from . import fhirreference -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/backboneelement.py b/fhirclient/models/backboneelement.py index 6fb3a7c9..9f6ebd1b 100644 --- a/fhirclient/models/backboneelement.py +++ b/fhirclient/models/backboneelement.py @@ -24,6 +24,8 @@ def __init__(self, jsondict=None, strict=True): self.modifierExtension = None """ Extensions that cannot be ignored even if unrecognized. List of `Extension` items (represented as `dict` in JSON). """ + self._modifierExtension = None + """ Primitive extension for modifierExtension. List of `FHIRPrimitiveExtension` """ super(BackboneElement, self).__init__(jsondict=jsondict, strict=strict) @@ -31,8 +33,10 @@ def elementProperties(self): js = super(BackboneElement, self).elementProperties() js.extend([ ("modifierExtension", "modifierExtension", extension.Extension, True, None, False), + ("_modifierExtension", "_modifierExtension", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension -from . import extension +from . import extension \ No newline at end of file diff --git a/fhirclient/models/basic.py b/fhirclient/models/basic.py index 049b1173..b630e74a 100644 --- a/fhirclient/models/basic.py +++ b/fhirclient/models/basic.py @@ -25,22 +25,32 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ Who created. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.code = None """ Kind of Resource. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.created = None """ When created. Type `FHIRDate` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.subject = None """ Identifies the focus of this resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(Basic, self).__init__(jsondict=jsondict, strict=strict) @@ -48,15 +58,21 @@ def elementProperties(self): js = super(Basic, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("created", "created", fhirdate.FHIRDate, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/binary.py b/fhirclient/models/binary.py index 23a4523e..c0a34b4a 100644 --- a/fhirclient/models/binary.py +++ b/fhirclient/models/binary.py @@ -25,15 +25,21 @@ def __init__(self, jsondict=None, strict=True): self.contentType = None """ MimeType of the binary content. Type `str`. """ + self._contentType = None + """ Primitive extension for contentType. Type `FHIRPrimitiveExtension` """ self.data = None """ The actual content. Type `str`. """ + self._data = None + """ Primitive extension for data. Type `FHIRPrimitiveExtension` """ self.securityContext = None """ Identifies another resource to use as proxy when enforcing access control. Type `FHIRReference` (represented as `dict` in JSON). """ + self._securityContext = None + """ Primitive extension for securityContext. Type `FHIRPrimitiveExtension` """ super(Binary, self).__init__(jsondict=jsondict, strict=strict) @@ -41,10 +47,14 @@ def elementProperties(self): js = super(Binary, self).elementProperties() js.extend([ ("contentType", "contentType", str, False, None, True), + ("_contentType", "_contentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("data", "data", str, False, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("securityContext", "securityContext", fhirreference.FHIRReference, False, None, False), + ("_securityContext", "_securityContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/biologicallyderivedproduct.py b/fhirclient/models/biologicallyderivedproduct.py index a1b22c20..487d60fd 100644 --- a/fhirclient/models/biologicallyderivedproduct.py +++ b/fhirclient/models/biologicallyderivedproduct.py @@ -25,46 +25,68 @@ def __init__(self, jsondict=None, strict=True): self.collection = None """ How this product was collected. Type `BiologicallyDerivedProductCollection` (represented as `dict` in JSON). """ + self._collection = None + """ Primitive extension for collection. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.manipulation = None """ Any manipulation of product post-collection. Type `BiologicallyDerivedProductManipulation` (represented as `dict` in JSON). """ + self._manipulation = None + """ Primitive extension for manipulation. Type `FHIRPrimitiveExtension` """ self.parent = None """ BiologicallyDerivedProduct parent. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._parent = None + """ Primitive extension for parent. List of `FHIRPrimitiveExtension` """ self.processing = None """ Any processing of the product during collection. List of `BiologicallyDerivedProductProcessing` items (represented as `dict` in JSON). """ + self._processing = None + """ Primitive extension for processing. List of `FHIRPrimitiveExtension` """ self.productCategory = None """ organ | tissue | fluid | cells | biologicalAgent. Type `str`. """ + self._productCategory = None + """ Primitive extension for productCategory. Type `FHIRPrimitiveExtension` """ self.productCode = None """ What this biologically derived product is. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productCode = None + """ Primitive extension for productCode. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The amount of this biologically derived product. Type `int`. """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.request = None """ Procedure request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. List of `FHIRPrimitiveExtension` """ self.status = None """ available | unavailable. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.storage = None """ Product storage. List of `BiologicallyDerivedProductStorage` items (represented as `dict` in JSON). """ + self._storage = None + """ Primitive extension for storage. List of `FHIRPrimitiveExtension` """ super(BiologicallyDerivedProduct, self).__init__(jsondict=jsondict, strict=strict) @@ -72,16 +94,27 @@ def elementProperties(self): js = super(BiologicallyDerivedProduct, self).elementProperties() js.extend([ ("collection", "collection", BiologicallyDerivedProductCollection, False, None, False), + ("_collection", "_collection", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manipulation", "manipulation", BiologicallyDerivedProductManipulation, False, None, False), + ("_manipulation", "_manipulation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parent", "parent", fhirreference.FHIRReference, True, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("processing", "processing", BiologicallyDerivedProductProcessing, True, None, False), + ("_processing", "_processing", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productCategory", "productCategory", str, False, None, False), + ("_productCategory", "_productCategory", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productCode", "productCode", codeableconcept.CodeableConcept, False, None, False), + ("_productCode", "_productCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", int, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", fhirreference.FHIRReference, True, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("storage", "storage", BiologicallyDerivedProductStorage, True, None, False), + ("_storage", "_storage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -105,18 +138,26 @@ def __init__(self, jsondict=None, strict=True): self.collectedDateTime = None """ Time of product collection. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._collectedDateTime = None + """ Primitive extension for collectedDateTime. Type `FHIRPrimitiveExtension` """ self.collectedPeriod = None """ Time of product collection. Type `Period` (represented as `dict` in JSON). """ + self._collectedPeriod = None + """ Primitive extension for collectedPeriod. Type `FHIRPrimitiveExtension` """ self.collector = None """ Individual performing collection. Type `FHIRReference` (represented as `dict` in JSON). """ + self._collector = None + """ Primitive extension for collector. Type `FHIRPrimitiveExtension` """ self.source = None """ Who is product from. Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ super(BiologicallyDerivedProductCollection, self).__init__(jsondict=jsondict, strict=strict) @@ -124,9 +165,13 @@ def elementProperties(self): js = super(BiologicallyDerivedProductCollection, self).elementProperties() js.extend([ ("collectedDateTime", "collectedDateTime", fhirdatetime.FHIRDateTime, False, "collected", False), + ("_collectedDateTime", "_collectedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collectedPeriod", "collectedPeriod", period.Period, False, "collected", False), + ("_collectedPeriod", "_collectedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collector", "collector", fhirreference.FHIRReference, False, None, False), + ("_collector", "_collector", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -152,14 +197,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of manipulation. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.timeDateTime = None """ Time of manipulation. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timeDateTime = None + """ Primitive extension for timeDateTime. Type `FHIRPrimitiveExtension` """ self.timePeriod = None """ Time of manipulation. Type `Period` (represented as `dict` in JSON). """ + self._timePeriod = None + """ Primitive extension for timePeriod. Type `FHIRPrimitiveExtension` """ super(BiologicallyDerivedProductManipulation, self).__init__(jsondict=jsondict, strict=strict) @@ -167,8 +218,11 @@ def elementProperties(self): js = super(BiologicallyDerivedProductManipulation, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timeDateTime", "timeDateTime", fhirdatetime.FHIRDateTime, False, "time", False), + ("_timeDateTime", "_timeDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timePeriod", "timePeriod", period.Period, False, "time", False), + ("_timePeriod", "_timePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -194,22 +248,32 @@ def __init__(self, jsondict=None, strict=True): self.additive = None """ Substance added during processing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._additive = None + """ Primitive extension for additive. Type `FHIRPrimitiveExtension` """ self.description = None """ Description of of processing. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.procedure = None """ Procesing code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._procedure = None + """ Primitive extension for procedure. Type `FHIRPrimitiveExtension` """ self.timeDateTime = None """ Time of processing. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timeDateTime = None + """ Primitive extension for timeDateTime. Type `FHIRPrimitiveExtension` """ self.timePeriod = None """ Time of processing. Type `Period` (represented as `dict` in JSON). """ + self._timePeriod = None + """ Primitive extension for timePeriod. Type `FHIRPrimitiveExtension` """ super(BiologicallyDerivedProductProcessing, self).__init__(jsondict=jsondict, strict=strict) @@ -217,10 +281,15 @@ def elementProperties(self): js = super(BiologicallyDerivedProductProcessing, self).elementProperties() js.extend([ ("additive", "additive", fhirreference.FHIRReference, False, None, False), + ("_additive", "_additive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedure", "procedure", codeableconcept.CodeableConcept, False, None, False), + ("_procedure", "_procedure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timeDateTime", "timeDateTime", fhirdatetime.FHIRDateTime, False, "time", False), + ("_timeDateTime", "_timeDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timePeriod", "timePeriod", period.Period, False, "time", False), + ("_timePeriod", "_timePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -242,18 +311,26 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of storage. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.duration = None """ Storage timeperiod. Type `Period` (represented as `dict` in JSON). """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.scale = None """ farenheit | celsius | kelvin. Type `str`. """ + self._scale = None + """ Primitive extension for scale. Type `FHIRPrimitiveExtension` """ self.temperature = None """ Storage temperature. Type `float`. """ + self._temperature = None + """ Primitive extension for temperature. Type `FHIRPrimitiveExtension` """ super(BiologicallyDerivedProductStorage, self).__init__(jsondict=jsondict, strict=strict) @@ -261,15 +338,20 @@ def elementProperties(self): js = super(BiologicallyDerivedProductStorage, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("duration", "duration", period.Period, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scale", "scale", str, False, None, False), + ("_scale", "_scale", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("temperature", "temperature", float, False, None, False), + ("_temperature", "_temperature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/bodystructure.py b/fhirclient/models/bodystructure.py index d5206083..8bede5f9 100644 --- a/fhirclient/models/bodystructure.py +++ b/fhirclient/models/bodystructure.py @@ -25,34 +25,50 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.description = None """ Text description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Bodystructure identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.image = None """ Attached images. List of `Attachment` items (represented as `dict` in JSON). """ + self._image = None + """ Primitive extension for image. List of `FHIRPrimitiveExtension` """ self.location = None """ Body site. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.locationQualifier = None """ Body site modifier. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._locationQualifier = None + """ Primitive extension for locationQualifier. List of `FHIRPrimitiveExtension` """ self.morphology = None """ Kind of Structure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._morphology = None + """ Primitive extension for morphology. Type `FHIRPrimitiveExtension` """ self.patient = None """ Who this is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ super(BodyStructure, self).__init__(jsondict=jsondict, strict=strict) @@ -60,18 +76,27 @@ def elementProperties(self): js = super(BodyStructure, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("image", "image", attachment.Attachment, True, None, False), + ("_image", "_image", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", codeableconcept.CodeableConcept, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationQualifier", "locationQualifier", codeableconcept.CodeableConcept, True, None, False), + ("_locationQualifier", "_locationQualifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("morphology", "morphology", codeableconcept.CodeableConcept, False, None, False), + ("_morphology", "_morphology", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/bundle.py b/fhirclient/models/bundle.py index 637aca37..8d227954 100644 --- a/fhirclient/models/bundle.py +++ b/fhirclient/models/bundle.py @@ -23,31 +23,45 @@ def __init__(self, jsondict=None, strict=True): self.entry = None """ Entry in the bundle - will have a resource or information. List of `BundleEntry` items (represented as `dict` in JSON). """ + self._entry = None + """ Primitive extension for entry. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Persistent identifier for the bundle. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.link = None """ Links related to this Bundle. List of `BundleLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.signature = None """ Digital Signature. Type `Signature` (represented as `dict` in JSON). """ + self._signature = None + """ Primitive extension for signature. Type `FHIRPrimitiveExtension` """ self.timestamp = None """ When the bundle was assembled. Type `FHIRInstant` (represented as `str` in JSON). """ + self._timestamp = None + """ Primitive extension for timestamp. Type `FHIRPrimitiveExtension` """ self.total = None """ If search, the total number of matches. Type `int`. """ + self._total = None + """ Primitive extension for total. Type `FHIRPrimitiveExtension` """ self.type = None """ document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Bundle, self).__init__(jsondict=jsondict, strict=strict) @@ -55,12 +69,19 @@ def elementProperties(self): js = super(Bundle, self).elementProperties() js.extend([ ("entry", "entry", BundleEntry, True, None, False), + ("_entry", "_entry", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("link", "link", BundleLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("signature", "signature", signature.Signature, False, None, False), + ("_signature", "_signature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timestamp", "timestamp", fhirinstant.FHIRInstant, False, None, False), + ("_timestamp", "_timestamp", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("total", "total", int, False, None, False), + ("_total", "_total", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -87,26 +108,38 @@ def __init__(self, jsondict=None, strict=True): self.fullUrl = None """ URI for resource (Absolute URL server address or URI for UUID/OID). Type `str`. """ + self._fullUrl = None + """ Primitive extension for fullUrl. Type `FHIRPrimitiveExtension` """ self.link = None """ Links related to this entry. List of `BundleLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.request = None """ Additional execution information (transaction/batch/history). Type `BundleEntryRequest` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.resource = None """ A resource in the bundle. Type `Resource` (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.response = None """ Results of execution (transaction/batch/history). Type `BundleEntryResponse` (represented as `dict` in JSON). """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.search = None """ Search related information. Type `BundleEntrySearch` (represented as `dict` in JSON). """ + self._search = None + """ Primitive extension for search. Type `FHIRPrimitiveExtension` """ super(BundleEntry, self).__init__(jsondict=jsondict, strict=strict) @@ -114,11 +147,17 @@ def elementProperties(self): js = super(BundleEntry, self).elementProperties() js.extend([ ("fullUrl", "fullUrl", str, False, None, False), + ("_fullUrl", "_fullUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("link", "link", BundleLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("request", "request", BundleEntryRequest, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", resource.Resource, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", BundleEntryResponse, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("search", "search", BundleEntrySearch, False, None, False), + ("_search", "_search", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -144,26 +183,38 @@ def __init__(self, jsondict=None, strict=True): self.ifMatch = None """ For managing update contention. Type `str`. """ + self._ifMatch = None + """ Primitive extension for ifMatch. Type `FHIRPrimitiveExtension` """ self.ifModifiedSince = None """ For managing cache currency. Type `FHIRInstant` (represented as `str` in JSON). """ + self._ifModifiedSince = None + """ Primitive extension for ifModifiedSince. Type `FHIRPrimitiveExtension` """ self.ifNoneExist = None """ For conditional creates. Type `str`. """ + self._ifNoneExist = None + """ Primitive extension for ifNoneExist. Type `FHIRPrimitiveExtension` """ self.ifNoneMatch = None """ For managing cache currency. Type `str`. """ + self._ifNoneMatch = None + """ Primitive extension for ifNoneMatch. Type `FHIRPrimitiveExtension` """ self.method = None """ GET | HEAD | POST | PUT | DELETE | PATCH. Type `str`. """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.url = None """ URL for HTTP equivalent of this entry. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(BundleEntryRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -171,11 +222,17 @@ def elementProperties(self): js = super(BundleEntryRequest, self).elementProperties() js.extend([ ("ifMatch", "ifMatch", str, False, None, False), + ("_ifMatch", "_ifMatch", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ifModifiedSince", "ifModifiedSince", fhirinstant.FHIRInstant, False, None, False), + ("_ifModifiedSince", "_ifModifiedSince", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ifNoneExist", "ifNoneExist", str, False, None, False), + ("_ifNoneExist", "_ifNoneExist", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ifNoneMatch", "ifNoneMatch", str, False, None, False), + ("_ifNoneMatch", "_ifNoneMatch", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", str, False, None, True), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -201,22 +258,32 @@ def __init__(self, jsondict=None, strict=True): self.etag = None """ The Etag for the resource (if relevant). Type `str`. """ + self._etag = None + """ Primitive extension for etag. Type `FHIRPrimitiveExtension` """ self.lastModified = None """ Server's date time modified. Type `FHIRInstant` (represented as `str` in JSON). """ + self._lastModified = None + """ Primitive extension for lastModified. Type `FHIRPrimitiveExtension` """ self.location = None """ The location (if the operation returns a location). Type `str`. """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.outcome = None """ OperationOutcome with hints and warnings (for batch/transaction). Type `Resource` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.status = None """ Status response code (text optional). Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(BundleEntryResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -224,10 +291,15 @@ def elementProperties(self): js = super(BundleEntryResponse, self).elementProperties() js.extend([ ("etag", "etag", str, False, None, False), + ("_etag", "_etag", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lastModified", "lastModified", fhirinstant.FHIRInstant, False, None, False), + ("_lastModified", "_lastModified", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", str, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", resource.Resource, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -252,10 +324,14 @@ def __init__(self, jsondict=None, strict=True): self.mode = None """ match | include | outcome - why this is in the result set. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.score = None """ Search ranking (between 0 and 1). Type `float`. """ + self._score = None + """ Primitive extension for score. Type `FHIRPrimitiveExtension` """ super(BundleEntrySearch, self).__init__(jsondict=jsondict, strict=strict) @@ -263,7 +339,9 @@ def elementProperties(self): js = super(BundleEntrySearch, self).elementProperties() js.extend([ ("mode", "mode", str, False, None, False), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("score", "score", float, False, None, False), + ("_score", "_score", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -288,10 +366,14 @@ def __init__(self, jsondict=None, strict=True): """ See http://www.iana.org/assignments/link-relations/link- relations.xhtml#link-relations-1. Type `str`. """ + self._relation = None + """ Primitive extension for relation. Type `FHIRPrimitiveExtension` """ self.url = None """ Reference details for the link. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(BundleLink, self).__init__(jsondict=jsondict, strict=strict) @@ -299,11 +381,14 @@ def elementProperties(self): js = super(BundleLink, self).elementProperties() js.extend([ ("relation", "relation", str, False, None, True), + ("_relation", "_relation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirinstant from . import identifier -from . import signature +from . import signature \ No newline at end of file diff --git a/fhirclient/models/capabilitystatement.py b/fhirclient/models/capabilitystatement.py index abe1de81..bb8a03ae 100644 --- a/fhirclient/models/capabilitystatement.py +++ b/fhirclient/models/capabilitystatement.py @@ -26,107 +26,159 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the capability statement. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.document = None """ Document definition. List of `CapabilityStatementDocument` items (represented as `dict` in JSON). """ + self._document = None + """ Primitive extension for document. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.fhirVersion = None """ FHIR Version the system supports. Type `str`. """ + self._fhirVersion = None + """ Primitive extension for fhirVersion. Type `FHIRPrimitiveExtension` """ self.format = None """ formats supported (xml | json | ttl | mime type). List of `str` items. """ + self._format = None + """ Primitive extension for format. List of `FHIRPrimitiveExtension` """ self.implementation = None """ If this describes a specific instance. Type `CapabilityStatementImplementation` (represented as `dict` in JSON). """ + self._implementation = None + """ Primitive extension for implementation. Type `FHIRPrimitiveExtension` """ self.implementationGuide = None """ Implementation guides supported. List of `str` items. """ + self._implementationGuide = None + """ Primitive extension for implementationGuide. List of `FHIRPrimitiveExtension` """ self.imports = None """ Canonical URL of another capability statement this adds to. List of `str` items. """ + self._imports = None + """ Primitive extension for imports. List of `FHIRPrimitiveExtension` """ self.instantiates = None """ Canonical URL of another capability statement this implements. List of `str` items. """ + self._instantiates = None + """ Primitive extension for instantiates. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for capability statement (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.kind = None """ instance | capability | requirements. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.messaging = None """ If messaging is supported. List of `CapabilityStatementMessaging` items (represented as `dict` in JSON). """ + self._messaging = None + """ Primitive extension for messaging. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this capability statement (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.patchFormat = None """ Patch formats supported. List of `str` items. """ + self._patchFormat = None + """ Primitive extension for patchFormat. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this capability statement is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.rest = None """ If the endpoint is a RESTful one. List of `CapabilityStatementRest` items (represented as `dict` in JSON). """ + self._rest = None + """ Primitive extension for rest. List of `FHIRPrimitiveExtension` """ self.software = None """ Software that is covered by this capability statement. Type `CapabilityStatementSoftware` (represented as `dict` in JSON). """ + self._software = None + """ Primitive extension for software. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this capability statement (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this capability statement, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the capability statement. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(CapabilityStatement, self).__init__(jsondict=jsondict, strict=strict) @@ -134,31 +186,57 @@ def elementProperties(self): js = super(CapabilityStatement, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("document", "document", CapabilityStatementDocument, True, None, False), + ("_document", "_document", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fhirVersion", "fhirVersion", str, False, None, True), + ("_fhirVersion", "_fhirVersion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("format", "format", str, True, None, True), + ("_format", "_format", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("implementation", "implementation", CapabilityStatementImplementation, False, None, False), + ("_implementation", "_implementation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("implementationGuide", "implementationGuide", str, True, None, False), + ("_implementationGuide", "_implementationGuide", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("imports", "imports", str, True, None, False), + ("_imports", "_imports", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiates", "instantiates", str, True, None, False), + ("_instantiates", "_instantiates", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("messaging", "messaging", CapabilityStatementMessaging, True, None, False), + ("_messaging", "_messaging", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patchFormat", "patchFormat", str, True, None, False), + ("_patchFormat", "_patchFormat", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rest", "rest", CapabilityStatementRest, True, None, False), + ("_rest", "_rest", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("software", "software", CapabilityStatementSoftware, False, None, False), + ("_software", "_software", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -184,14 +262,20 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ Description of document support. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.mode = None """ producer | consumer. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.profile = None """ Constraint on the resources used in the document. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementDocument, self).__init__(jsondict=jsondict, strict=strict) @@ -199,8 +283,11 @@ def elementProperties(self): js = super(CapabilityStatementDocument, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, True), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -226,14 +313,20 @@ def __init__(self, jsondict=None, strict=True): self.custodian = None """ Organization that manages the data. Type `FHIRReference` (represented as `dict` in JSON). """ + self._custodian = None + """ Primitive extension for custodian. Type `FHIRPrimitiveExtension` """ self.description = None """ Describes this specific instance. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.url = None """ Base URL for the installation. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementImplementation, self).__init__(jsondict=jsondict, strict=strict) @@ -241,8 +334,11 @@ def elementProperties(self): js = super(CapabilityStatementImplementation, self).elementProperties() js.extend([ ("custodian", "custodian", fhirreference.FHIRReference, False, None, False), + ("_custodian", "_custodian", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -266,18 +362,26 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ Messaging interface behavior details. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.endpoint = None """ Where messages should be sent. List of `CapabilityStatementMessagingEndpoint` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.reliableCache = None """ Reliable Message Cache Length (min). Type `int`. """ + self._reliableCache = None + """ Primitive extension for reliableCache. Type `FHIRPrimitiveExtension` """ self.supportedMessage = None """ Messages supported by this system. List of `CapabilityStatementMessagingSupportedMessage` items (represented as `dict` in JSON). """ + self._supportedMessage = None + """ Primitive extension for supportedMessage. List of `FHIRPrimitiveExtension` """ super(CapabilityStatementMessaging, self).__init__(jsondict=jsondict, strict=strict) @@ -285,9 +389,13 @@ def elementProperties(self): js = super(CapabilityStatementMessaging, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endpoint", "endpoint", CapabilityStatementMessagingEndpoint, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reliableCache", "reliableCache", int, False, None, False), + ("_reliableCache", "_reliableCache", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportedMessage", "supportedMessage", CapabilityStatementMessagingSupportedMessage, True, None, False), + ("_supportedMessage", "_supportedMessage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -312,10 +420,14 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Network address or identifier of the end-point. Type `str`. """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.protocol = None """ http | ftp | mllp +. Type `Coding` (represented as `dict` in JSON). """ + self._protocol = None + """ Primitive extension for protocol. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementMessagingEndpoint, self).__init__(jsondict=jsondict, strict=strict) @@ -323,7 +435,9 @@ def elementProperties(self): js = super(CapabilityStatementMessagingEndpoint, self).elementProperties() js.extend([ ("address", "address", str, False, None, True), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("protocol", "protocol", coding.Coding, False, None, True), + ("_protocol", "_protocol", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -348,10 +462,14 @@ def __init__(self, jsondict=None, strict=True): self.definition = None """ Message supported by this system. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.mode = None """ sender | receiver. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementMessagingSupportedMessage, self).__init__(jsondict=jsondict, strict=strict) @@ -359,7 +477,9 @@ def elementProperties(self): js = super(CapabilityStatementMessagingSupportedMessage, self).elementProperties() js.extend([ ("definition", "definition", str, False, None, True), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -383,34 +503,50 @@ def __init__(self, jsondict=None, strict=True): self.compartment = None """ Compartments served/used by system. List of `str` items. """ + self._compartment = None + """ Primitive extension for compartment. List of `FHIRPrimitiveExtension` """ self.documentation = None """ General description of implementation. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.interaction = None """ What operations are supported?. List of `CapabilityStatementRestInteraction` items (represented as `dict` in JSON). """ + self._interaction = None + """ Primitive extension for interaction. List of `FHIRPrimitiveExtension` """ self.mode = None """ client | server. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.operation = None """ Definition of a system level operation. List of `CapabilityStatementRestResourceOperation` items (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. List of `FHIRPrimitiveExtension` """ self.resource = None """ Resource served on the REST interface. List of `CapabilityStatementRestResource` items (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. List of `FHIRPrimitiveExtension` """ self.searchParam = None """ Search parameters for searching all resources. List of `CapabilityStatementRestResourceSearchParam` items (represented as `dict` in JSON). """ + self._searchParam = None + """ Primitive extension for searchParam. List of `FHIRPrimitiveExtension` """ self.security = None """ Information about security of implementation. Type `CapabilityStatementRestSecurity` (represented as `dict` in JSON). """ + self._security = None + """ Primitive extension for security. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRest, self).__init__(jsondict=jsondict, strict=strict) @@ -418,13 +554,21 @@ def elementProperties(self): js = super(CapabilityStatementRest, self).elementProperties() js.extend([ ("compartment", "compartment", str, True, None, False), + ("_compartment", "_compartment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("interaction", "interaction", CapabilityStatementRestInteraction, True, None, False), + ("_interaction", "_interaction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operation", "operation", CapabilityStatementRestResourceOperation, True, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resource", "resource", CapabilityStatementRestResource, True, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("searchParam", "searchParam", CapabilityStatementRestResourceSearchParam, True, None, False), + ("_searchParam", "_searchParam", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("security", "security", CapabilityStatementRestSecurity, False, None, False), + ("_security", "_security", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -448,10 +592,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ transaction | batch | search-system | history-system. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Anything special about operation behavior. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRestInteraction, self).__init__(jsondict=jsondict, strict=strict) @@ -459,7 +607,9 @@ def elementProperties(self): js = super(CapabilityStatementRestInteraction, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -484,71 +634,105 @@ def __init__(self, jsondict=None, strict=True): self.conditionalCreate = None """ If allows/uses conditional create. Type `bool`. """ + self._conditionalCreate = None + """ Primitive extension for conditionalCreate. Type `FHIRPrimitiveExtension` """ self.conditionalDelete = None """ not-supported | single | multiple - how conditional delete is supported. Type `str`. """ + self._conditionalDelete = None + """ Primitive extension for conditionalDelete. Type `FHIRPrimitiveExtension` """ self.conditionalRead = None """ not-supported | modified-since | not-match | full-support. Type `str`. """ + self._conditionalRead = None + """ Primitive extension for conditionalRead. Type `FHIRPrimitiveExtension` """ self.conditionalUpdate = None """ If allows/uses conditional update. Type `bool`. """ + self._conditionalUpdate = None + """ Primitive extension for conditionalUpdate. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Additional information about the use of the resource type. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.interaction = None """ What operations are supported?. List of `CapabilityStatementRestResourceInteraction` items (represented as `dict` in JSON). """ + self._interaction = None + """ Primitive extension for interaction. List of `FHIRPrimitiveExtension` """ self.operation = None """ Definition of a resource operation. List of `CapabilityStatementRestResourceOperation` items (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. List of `FHIRPrimitiveExtension` """ self.profile = None """ Base System profile for all uses of resource. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.readHistory = None """ Whether vRead can return past versions. Type `bool`. """ + self._readHistory = None + """ Primitive extension for readHistory. Type `FHIRPrimitiveExtension` """ self.referencePolicy = None """ literal | logical | resolves | enforced | local. List of `str` items. """ + self._referencePolicy = None + """ Primitive extension for referencePolicy. List of `FHIRPrimitiveExtension` """ self.searchInclude = None """ _include values supported by the server. List of `str` items. """ + self._searchInclude = None + """ Primitive extension for searchInclude. List of `FHIRPrimitiveExtension` """ self.searchParam = None """ Search parameters supported by implementation. List of `CapabilityStatementRestResourceSearchParam` items (represented as `dict` in JSON). """ + self._searchParam = None + """ Primitive extension for searchParam. List of `FHIRPrimitiveExtension` """ self.searchRevInclude = None """ _revinclude values supported by the server. List of `str` items. """ + self._searchRevInclude = None + """ Primitive extension for searchRevInclude. List of `FHIRPrimitiveExtension` """ self.supportedProfile = None """ Profiles for use cases supported. List of `str` items. """ + self._supportedProfile = None + """ Primitive extension for supportedProfile. List of `FHIRPrimitiveExtension` """ self.type = None """ A resource type that is supported. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.updateCreate = None """ If update can commit to a new identity. Type `bool`. """ + self._updateCreate = None + """ Primitive extension for updateCreate. Type `FHIRPrimitiveExtension` """ self.versioning = None """ no-version | versioned | versioned-update. Type `str`. """ + self._versioning = None + """ Primitive extension for versioning. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRestResource, self).__init__(jsondict=jsondict, strict=strict) @@ -556,22 +740,39 @@ def elementProperties(self): js = super(CapabilityStatementRestResource, self).elementProperties() js.extend([ ("conditionalCreate", "conditionalCreate", bool, False, None, False), + ("_conditionalCreate", "_conditionalCreate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("conditionalDelete", "conditionalDelete", str, False, None, False), + ("_conditionalDelete", "_conditionalDelete", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("conditionalRead", "conditionalRead", str, False, None, False), + ("_conditionalRead", "_conditionalRead", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("conditionalUpdate", "conditionalUpdate", bool, False, None, False), + ("_conditionalUpdate", "_conditionalUpdate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("interaction", "interaction", CapabilityStatementRestResourceInteraction, True, None, False), + ("_interaction", "_interaction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("operation", "operation", CapabilityStatementRestResourceOperation, True, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("readHistory", "readHistory", bool, False, None, False), + ("_readHistory", "_readHistory", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referencePolicy", "referencePolicy", str, True, None, False), + ("_referencePolicy", "_referencePolicy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("searchInclude", "searchInclude", str, True, None, False), + ("_searchInclude", "_searchInclude", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("searchParam", "searchParam", CapabilityStatementRestResourceSearchParam, True, None, False), + ("_searchParam", "_searchParam", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("searchRevInclude", "searchRevInclude", str, True, None, False), + ("_searchRevInclude", "_searchRevInclude", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("supportedProfile", "supportedProfile", str, True, None, False), + ("_supportedProfile", "_supportedProfile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("updateCreate", "updateCreate", bool, False, None, False), + ("_updateCreate", "_updateCreate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("versioning", "versioning", str, False, None, False), + ("_versioning", "_versioning", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -596,10 +797,14 @@ def __init__(self, jsondict=None, strict=True): """ read | vread | update | patch | delete | history-instance | history-type | create | search-type. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Anything special about operation behavior. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRestResourceInteraction, self).__init__(jsondict=jsondict, strict=strict) @@ -607,7 +812,9 @@ def elementProperties(self): js = super(CapabilityStatementRestResourceInteraction, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -633,14 +840,20 @@ def __init__(self, jsondict=None, strict=True): self.definition = None """ The defined operation/query. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Specific details about operation behavior. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.name = None """ Name by which the operation/query is invoked. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRestResourceOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -648,8 +861,11 @@ def elementProperties(self): js = super(CapabilityStatementRestResourceOperation, self).elementProperties() js.extend([ ("definition", "definition", str, False, None, True), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -675,19 +891,27 @@ def __init__(self, jsondict=None, strict=True): self.definition = None """ Source of definition for parameter. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Server-specific usage. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.name = None """ Name of search parameter. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ number | date | string | token | reference | composite | quantity | uri | special. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementRestResourceSearchParam, self).__init__(jsondict=jsondict, strict=strict) @@ -695,9 +919,13 @@ def elementProperties(self): js = super(CapabilityStatementRestResourceSearchParam, self).elementProperties() js.extend([ ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -722,14 +950,20 @@ def __init__(self, jsondict=None, strict=True): self.cors = None """ Adds CORS Headers (http://enable-cors.org/). Type `bool`. """ + self._cors = None + """ Primitive extension for cors. Type `FHIRPrimitiveExtension` """ self.description = None """ General description of how security works. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.service = None """ OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._service = None + """ Primitive extension for service. List of `FHIRPrimitiveExtension` """ super(CapabilityStatementRestSecurity, self).__init__(jsondict=jsondict, strict=strict) @@ -737,8 +971,11 @@ def elementProperties(self): js = super(CapabilityStatementRestSecurity, self).elementProperties() js.extend([ ("cors", "cors", bool, False, None, False), + ("_cors", "_cors", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("service", "service", codeableconcept.CodeableConcept, True, None, False), + ("_service", "_service", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -764,14 +1001,20 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ A name the software is known by. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.releaseDate = None """ Date this version was released. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._releaseDate = None + """ Primitive extension for releaseDate. Type `FHIRPrimitiveExtension` """ self.version = None """ Version covered by this statement. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(CapabilityStatementSoftware, self).__init__(jsondict=jsondict, strict=strict) @@ -779,15 +1022,19 @@ def elementProperties(self): js = super(CapabilityStatementSoftware, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("releaseDate", "releaseDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_releaseDate", "_releaseDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import contactdetail from . import fhirdatetime from . import fhirreference -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/careplan.py b/fhirclient/models/careplan.py index 386089f1..7f66cfb5 100644 --- a/fhirclient/models/careplan.py +++ b/fhirclient/models/careplan.py @@ -25,95 +25,141 @@ def __init__(self, jsondict=None, strict=True): self.activity = None """ Action to occur as part of plan. List of `CarePlanActivity` items (represented as `dict` in JSON). """ + self._activity = None + """ Primitive extension for activity. List of `FHIRPrimitiveExtension` """ self.addresses = None """ Health issues this plan addresses. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._addresses = None + """ Primitive extension for addresses. List of `FHIRPrimitiveExtension` """ self.author = None """ Who is the designated responsible party. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ Fulfills CarePlan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.careTeam = None """ Who's involved in plan?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._careTeam = None + """ Primitive extension for careTeam. List of `FHIRPrimitiveExtension` """ self.category = None """ Type of plan. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.contributor = None """ Who provided the content of the care plan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._contributor = None + """ Primitive extension for contributor. List of `FHIRPrimitiveExtension` """ self.created = None """ Date record was first recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.description = None """ Summary of nature of plan. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.goal = None """ Desired outcome of plan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._goal = None + """ Primitive extension for goal. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this plan. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments about the plan. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced CarePlan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period plan covers. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.replaces = None """ CarePlan replaced by this CarePlan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who the care plan is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Information considered as part of plan. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ self.title = None """ Human-friendly name for the care plan. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(CarePlan, self).__init__(jsondict=jsondict, strict=strict) @@ -121,28 +167,51 @@ def elementProperties(self): js = super(CarePlan, self).elementProperties() js.extend([ ("activity", "activity", CarePlanActivity, True, None, False), + ("_activity", "_activity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("addresses", "addresses", fhirreference.FHIRReference, True, None, False), + ("_addresses", "_addresses", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("careTeam", "careTeam", fhirreference.FHIRReference, True, None, False), + ("_careTeam", "_careTeam", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contributor", "contributor", fhirreference.FHIRReference, True, None, False), + ("_contributor", "_contributor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("goal", "goal", fhirreference.FHIRReference, True, None, False), + ("_goal", "_goal", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("replaces", "replaces", fhirreference.FHIRReference, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", fhirreference.FHIRReference, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -170,22 +239,32 @@ def __init__(self, jsondict=None, strict=True): self.detail = None """ In-line definition of activity. Type `CarePlanActivityDetail` (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. Type `FHIRPrimitiveExtension` """ self.outcomeCodeableConcept = None """ Results of the activity. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._outcomeCodeableConcept = None + """ Primitive extension for outcomeCodeableConcept. List of `FHIRPrimitiveExtension` """ self.outcomeReference = None """ Appointment, Encounter, Procedure, etc.. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._outcomeReference = None + """ Primitive extension for outcomeReference. List of `FHIRPrimitiveExtension` """ self.progress = None """ Comments about the activity status/progress. List of `Annotation` items (represented as `dict` in JSON). """ + self._progress = None + """ Primitive extension for progress. List of `FHIRPrimitiveExtension` """ self.reference = None """ Activity details defined in specific resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ super(CarePlanActivity, self).__init__(jsondict=jsondict, strict=strict) @@ -193,10 +272,15 @@ def elementProperties(self): js = super(CarePlanActivity, self).elementProperties() js.extend([ ("detail", "detail", CarePlanActivityDetail, False, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcomeCodeableConcept", "outcomeCodeableConcept", codeableconcept.CodeableConcept, True, None, False), + ("_outcomeCodeableConcept", "_outcomeCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcomeReference", "outcomeReference", fhirreference.FHIRReference, True, None, False), + ("_outcomeReference", "_outcomeReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("progress", "progress", annotation.Annotation, True, None, False), + ("_progress", "_progress", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reference", "reference", fhirreference.FHIRReference, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -222,85 +306,125 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Detail type of activity. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.dailyAmount = None """ How to consume/day?. Type `Quantity` (represented as `dict` in JSON). """ + self._dailyAmount = None + """ Primitive extension for dailyAmount. Type `FHIRPrimitiveExtension` """ self.description = None """ Extra info describing activity to perform. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.doNotPerform = None """ If true, activity is prohibiting action. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.goal = None """ Goals this activity relates to. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._goal = None + """ Primitive extension for goal. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.kind = None """ Appointment | CommunicationRequest | DeviceRequest | MedicationRequest | NutritionOrder | Task | ServiceRequest | VisionPrescription. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.location = None """ Where it should happen. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who will be responsible?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.productCodeableConcept = None """ What is to be administered/supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productCodeableConcept = None + """ Primitive extension for productCodeableConcept. Type `FHIRPrimitiveExtension` """ self.productReference = None """ What is to be administered/supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._productReference = None + """ Primitive extension for productReference. Type `FHIRPrimitiveExtension` """ self.quantity = None """ How much to administer/supply/consume. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why activity should be done or why activity was prohibited. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why activity is needed. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.scheduledPeriod = None """ When activity is to occur. Type `Period` (represented as `dict` in JSON). """ + self._scheduledPeriod = None + """ Primitive extension for scheduledPeriod. Type `FHIRPrimitiveExtension` """ self.scheduledString = None """ When activity is to occur. Type `str`. """ + self._scheduledString = None + """ Primitive extension for scheduledString. Type `FHIRPrimitiveExtension` """ self.scheduledTiming = None """ When activity is to occur. Type `Timing` (represented as `dict` in JSON). """ + self._scheduledTiming = None + """ Primitive extension for scheduledTiming. Type `FHIRPrimitiveExtension` """ self.status = None """ not-started | scheduled | in-progress | on-hold | completed | cancelled | stopped | unknown | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ super(CarePlanActivityDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -308,28 +432,49 @@ def elementProperties(self): js = super(CarePlanActivityDetail, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dailyAmount", "dailyAmount", quantity.Quantity, False, None, False), + ("_dailyAmount", "_dailyAmount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("goal", "goal", fhirreference.FHIRReference, True, None, False), + ("_goal", "_goal", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, False), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productCodeableConcept", "productCodeableConcept", codeableconcept.CodeableConcept, False, "product", False), + ("_productCodeableConcept", "_productCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productReference", "productReference", fhirreference.FHIRReference, False, "product", False), + ("_productReference", "_productReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("scheduledPeriod", "scheduledPeriod", period.Period, False, "scheduled", False), + ("_scheduledPeriod", "_scheduledPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scheduledString", "scheduledString", str, False, "scheduled", False), + ("_scheduledString", "_scheduledString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scheduledTiming", "scheduledTiming", timing.Timing, False, "scheduled", False), + ("_scheduledTiming", "_scheduledTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -338,4 +483,4 @@ def elementProperties(self): from . import identifier from . import period from . import quantity -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/careteam.py b/fhirclient/models/careteam.py index 6371304a..0ece0497 100644 --- a/fhirclient/models/careteam.py +++ b/fhirclient/models/careteam.py @@ -25,54 +25,80 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Type of team. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this team. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ Organization responsible for the care team. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. List of `FHIRPrimitiveExtension` """ self.name = None """ Name of the team, such as crisis assessment team. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the CareTeam. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.participant = None """ Members of the team. List of `CareTeamParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period team covers. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why the care team exists. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why the care team exists. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.status = None """ proposed | active | suspended | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who care team is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the care team (that applies to all members). List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(CareTeam, self).__init__(jsondict=jsondict, strict=strict) @@ -80,18 +106,31 @@ def elementProperties(self): js = super(CareTeam, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, True, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("participant", "participant", CareTeamParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -118,18 +157,26 @@ def __init__(self, jsondict=None, strict=True): self.member = None """ Who is involved. Type `FHIRReference` (represented as `dict` in JSON). """ + self._member = None + """ Primitive extension for member. Type `FHIRPrimitiveExtension` """ self.onBehalfOf = None """ Organization of the practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._onBehalfOf = None + """ Primitive extension for onBehalfOf. Type `FHIRPrimitiveExtension` """ self.period = None """ Time period of participant. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.role = None """ Type of involvement. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. List of `FHIRPrimitiveExtension` """ super(CareTeamParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -137,16 +184,21 @@ def elementProperties(self): js = super(CareTeamParticipant, self).elementProperties() js.extend([ ("member", "member", fhirreference.FHIRReference, False, None, False), + ("_member", "_member", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onBehalfOf", "onBehalfOf", fhirreference.FHIRReference, False, None, False), + ("_onBehalfOf", "_onBehalfOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, True, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import contactpoint from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/catalogentry.py b/fhirclient/models/catalogentry.py index 542121c8..d1967c6b 100644 --- a/fhirclient/models/catalogentry.py +++ b/fhirclient/models/catalogentry.py @@ -24,56 +24,82 @@ def __init__(self, jsondict=None, strict=True): self.additionalCharacteristic = None """ Additional characteristics of the catalog entry. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._additionalCharacteristic = None + """ Primitive extension for additionalCharacteristic. List of `FHIRPrimitiveExtension` """ self.additionalClassification = None """ Additional classification of the catalog entry. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._additionalClassification = None + """ Primitive extension for additionalClassification. List of `FHIRPrimitiveExtension` """ self.additionalIdentifier = None """ Any additional identifier(s) for the catalog item, in the same granularity or concept. List of `Identifier` items (represented as `dict` in JSON). """ + self._additionalIdentifier = None + """ Primitive extension for additionalIdentifier. List of `FHIRPrimitiveExtension` """ self.classification = None """ Classification (category or class) of the item entry. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier of the catalog item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.lastUpdated = None """ When was this catalog last updated. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._lastUpdated = None + """ Primitive extension for lastUpdated. Type `FHIRPrimitiveExtension` """ self.orderable = None """ Whether the entry represents an orderable item. Type `bool`. """ + self._orderable = None + """ Primitive extension for orderable. Type `FHIRPrimitiveExtension` """ self.referencedItem = None """ The item that is being defined. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referencedItem = None + """ Primitive extension for referencedItem. Type `FHIRPrimitiveExtension` """ self.relatedEntry = None """ An item that this catalog entry is related to. List of `CatalogEntryRelatedEntry` items (represented as `dict` in JSON). """ + self._relatedEntry = None + """ Primitive extension for relatedEntry. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of item - medication, device, service, protocol or other. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.validTo = None """ The date until which this catalog entry is expected to be active. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._validTo = None + """ Primitive extension for validTo. Type `FHIRPrimitiveExtension` """ self.validityPeriod = None """ The time period in which this catalog entry is expected to be active. Type `Period` (represented as `dict` in JSON). """ + self._validityPeriod = None + """ Primitive extension for validityPeriod. Type `FHIRPrimitiveExtension` """ super(CatalogEntry, self).__init__(jsondict=jsondict, strict=strict) @@ -81,18 +107,31 @@ def elementProperties(self): js = super(CatalogEntry, self).elementProperties() js.extend([ ("additionalCharacteristic", "additionalCharacteristic", codeableconcept.CodeableConcept, True, None, False), + ("_additionalCharacteristic", "_additionalCharacteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("additionalClassification", "additionalClassification", codeableconcept.CodeableConcept, True, None, False), + ("_additionalClassification", "_additionalClassification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("additionalIdentifier", "additionalIdentifier", identifier.Identifier, True, None, False), + ("_additionalIdentifier", "_additionalIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("classification", "classification", codeableconcept.CodeableConcept, True, None, False), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastUpdated", "lastUpdated", fhirdatetime.FHIRDateTime, False, None, False), + ("_lastUpdated", "_lastUpdated", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orderable", "orderable", bool, False, None, True), + ("_orderable", "_orderable", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referencedItem", "referencedItem", fhirreference.FHIRReference, False, None, True), + ("_referencedItem", "_referencedItem", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedEntry", "relatedEntry", CatalogEntryRelatedEntry, True, None, False), + ("_relatedEntry", "_relatedEntry", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validTo", "validTo", fhirdatetime.FHIRDateTime, False, None, False), + ("_validTo", "_validTo", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validityPeriod", "validityPeriod", period.Period, False, None, False), + ("_validityPeriod", "_validityPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -119,10 +158,14 @@ def __init__(self, jsondict=None, strict=True): self.item = None """ The reference to the related item. Type `FHIRReference` (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. Type `FHIRPrimitiveExtension` """ self.relationtype = None """ triggers | is-replaced-by. Type `str`. """ + self._relationtype = None + """ Primitive extension for relationtype. Type `FHIRPrimitiveExtension` """ super(CatalogEntryRelatedEntry, self).__init__(jsondict=jsondict, strict=strict) @@ -130,13 +173,16 @@ def elementProperties(self): js = super(CatalogEntryRelatedEntry, self).elementProperties() js.extend([ ("item", "item", fhirreference.FHIRReference, False, None, True), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationtype", "relationtype", str, False, None, True), + ("_relationtype", "_relationtype", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/chargeitem.py b/fhirclient/models/chargeitem.py index 4672c36f..b4957bb4 100644 --- a/fhirclient/models/chargeitem.py +++ b/fhirclient/models/chargeitem.py @@ -29,119 +29,177 @@ def __init__(self, jsondict=None, strict=True): self.account = None """ Account to place this charge. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._account = None + """ Primitive extension for account. List of `FHIRPrimitiveExtension` """ self.bodysite = None """ Anatomical location, if relevant. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._bodysite = None + """ Primitive extension for bodysite. List of `FHIRPrimitiveExtension` """ self.code = None """ A code that identifies the charge, like a billing code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.context = None """ Encounter / Episode associated with event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.costCenter = None """ Organization that has ownership of the (potential, future) revenue. Type `FHIRReference` (represented as `dict` in JSON). """ + self._costCenter = None + """ Primitive extension for costCenter. Type `FHIRPrimitiveExtension` """ self.definitionCanonical = None """ Resource defining the code of this ChargeItem. List of `str` items. """ + self._definitionCanonical = None + """ Primitive extension for definitionCanonical. List of `FHIRPrimitiveExtension` """ self.definitionUri = None """ Defining information about the code of this charge item. List of `str` items. """ + self._definitionUri = None + """ Primitive extension for definitionUri. List of `FHIRPrimitiveExtension` """ self.enteredDate = None """ Date the charge item was entered. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._enteredDate = None + """ Primitive extension for enteredDate. Type `FHIRPrimitiveExtension` """ self.enterer = None """ Individual who was entering. Type `FHIRReference` (represented as `dict` in JSON). """ + self._enterer = None + """ Primitive extension for enterer. Type `FHIRPrimitiveExtension` """ self.factorOverride = None """ Factor overriding the associated rules. Type `float`. """ + self._factorOverride = None + """ Primitive extension for factorOverride. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the ChargeItem. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When the charged service was applied. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When the charged service was applied. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ When the charged service was applied. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.overrideReason = None """ Reason for overriding the list price/factor. Type `str`. """ + self._overrideReason = None + """ Primitive extension for overrideReason. Type `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced ChargeItem. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performer = None """ Who performed charged service. List of `ChargeItemPerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.performingOrganization = None """ Organization providing the charged service. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performingOrganization = None + """ Primitive extension for performingOrganization. Type `FHIRPrimitiveExtension` """ self.priceOverride = None """ Price overriding the associated rules. Type `Money` (represented as `dict` in JSON). """ + self._priceOverride = None + """ Primitive extension for priceOverride. Type `FHIRPrimitiveExtension` """ self.productCodeableConcept = None """ Product charged. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productCodeableConcept = None + """ Primitive extension for productCodeableConcept. Type `FHIRPrimitiveExtension` """ self.productReference = None """ Product charged. Type `FHIRReference` (represented as `dict` in JSON). """ + self._productReference = None + """ Primitive extension for productReference. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Quantity of which the charge item has been serviced. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.reason = None """ Why was the charged service rendered?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. List of `FHIRPrimitiveExtension` """ self.requestingOrganization = None """ Organization requesting the charged service. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requestingOrganization = None + """ Primitive extension for requestingOrganization. Type `FHIRPrimitiveExtension` """ self.service = None """ Which rendered service is being charged?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._service = None + """ Primitive extension for service. List of `FHIRPrimitiveExtension` """ self.status = None """ planned | billable | not-billable | aborted | billed | entered-in- error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Individual service was done for/to. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.supportingInformation = None """ Further information supporting this charge. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. List of `FHIRPrimitiveExtension` """ super(ChargeItem, self).__init__(jsondict=jsondict, strict=strict) @@ -149,34 +207,63 @@ def elementProperties(self): js = super(ChargeItem, self).elementProperties() js.extend([ ("account", "account", fhirreference.FHIRReference, True, None, False), + ("_account", "_account", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodysite", "bodysite", codeableconcept.CodeableConcept, True, None, False), + ("_bodysite", "_bodysite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", fhirreference.FHIRReference, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("costCenter", "costCenter", fhirreference.FHIRReference, False, None, False), + ("_costCenter", "_costCenter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionCanonical", "definitionCanonical", str, True, None, False), + ("_definitionCanonical", "_definitionCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definitionUri", "definitionUri", str, True, None, False), + ("_definitionUri", "_definitionUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("enteredDate", "enteredDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_enteredDate", "_enteredDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enterer", "enterer", fhirreference.FHIRReference, False, None, False), + ("_enterer", "_enterer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factorOverride", "factorOverride", float, False, None, False), + ("_factorOverride", "_factorOverride", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("overrideReason", "overrideReason", str, False, None, False), + ("_overrideReason", "_overrideReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", ChargeItemPerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performingOrganization", "performingOrganization", fhirreference.FHIRReference, False, None, False), + ("_performingOrganization", "_performingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priceOverride", "priceOverride", money.Money, False, None, False), + ("_priceOverride", "_priceOverride", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productCodeableConcept", "productCodeableConcept", codeableconcept.CodeableConcept, False, "product", False), + ("_productCodeableConcept", "_productCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productReference", "productReference", fhirreference.FHIRReference, False, "product", False), + ("_productReference", "_productReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, True, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requestingOrganization", "requestingOrganization", fhirreference.FHIRReference, False, None, False), + ("_requestingOrganization", "_requestingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("service", "service", fhirreference.FHIRReference, True, None, False), + ("_service", "_service", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInformation", "supportingInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -202,10 +289,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Individual who was performing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ What type of performance was done. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ super(ChargeItemPerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -213,10 +304,13 @@ def elementProperties(self): js = super(ChargeItemPerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -226,4 +320,4 @@ def elementProperties(self): from . import money from . import period from . import quantity -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/chargeitemdefinition.py b/fhirclient/models/chargeitemdefinition.py index c9f2164d..965a103d 100644 --- a/fhirclient/models/chargeitemdefinition.py +++ b/fhirclient/models/chargeitemdefinition.py @@ -28,97 +28,143 @@ def __init__(self, jsondict=None, strict=True): self.applicability = None """ Whether or not the billing code is applicable. List of `ChargeItemDefinitionApplicability` items (represented as `dict` in JSON). """ + self._applicability = None + """ Primitive extension for applicability. List of `FHIRPrimitiveExtension` """ self.approvalDate = None """ When the charge item definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.code = None """ Billing codes or product types this definition applies to. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.derivedFromUri = None """ Underlying externally-defined charge item definition. List of `str` items. """ + self._derivedFromUri = None + """ Primitive extension for derivedFromUri. List of `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the charge item definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the charge item definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the charge item definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instance = None """ Instances this definition applies to. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._instance = None + """ Primitive extension for instance. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for charge item definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the charge item definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.partOf = None """ A larger definition of which this particular definition is a component or step. List of `str` items. """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.propertyGroup = None """ Group of properties which are applicable under the same conditions. List of `ChargeItemDefinitionPropertyGroup` items (represented as `dict` in JSON). """ + self._propertyGroup = None + """ Primitive extension for propertyGroup. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.replaces = None """ Completed or terminated request(s) whose function is taken by this new request. List of `str` items. """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this charge item definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this charge item definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the charge item definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ChargeItemDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -126,28 +172,51 @@ def elementProperties(self): js = super(ChargeItemDefinition, self).elementProperties() js.extend([ ("applicability", "applicability", ChargeItemDefinitionApplicability, True, None, False), + ("_applicability", "_applicability", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFromUri", "derivedFromUri", str, True, None, False), + ("_derivedFromUri", "_derivedFromUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instance", "instance", fhirreference.FHIRReference, True, None, False), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", str, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("propertyGroup", "propertyGroup", ChargeItemDefinitionPropertyGroup, True, None, False), + ("_propertyGroup", "_propertyGroup", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("replaces", "replaces", str, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -173,14 +242,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Natural language description of the condition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expression = None """ Boolean-valued expression. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.language = None """ Language of the expression. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ super(ChargeItemDefinitionApplicability, self).__init__(jsondict=jsondict, strict=strict) @@ -188,8 +263,11 @@ def elementProperties(self): js = super(ChargeItemDefinitionApplicability, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -215,10 +293,14 @@ def __init__(self, jsondict=None, strict=True): self.applicability = None """ Conditions under which the priceComponent is applicable. List of `ChargeItemDefinitionApplicability` items (represented as `dict` in JSON). """ + self._applicability = None + """ Primitive extension for applicability. List of `FHIRPrimitiveExtension` """ self.priceComponent = None """ Components of total line item price. List of `ChargeItemDefinitionPropertyGroupPriceComponent` items (represented as `dict` in JSON). """ + self._priceComponent = None + """ Primitive extension for priceComponent. List of `FHIRPrimitiveExtension` """ super(ChargeItemDefinitionPropertyGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -226,7 +308,9 @@ def elementProperties(self): js = super(ChargeItemDefinitionPropertyGroup, self).elementProperties() js.extend([ ("applicability", "applicability", ChargeItemDefinitionApplicability, True, None, False), + ("_applicability", "_applicability", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priceComponent", "priceComponent", ChargeItemDefinitionPropertyGroupPriceComponent, True, None, False), + ("_priceComponent", "_priceComponent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -255,18 +339,26 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Monetary amount associated with this component. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.code = None """ Code identifying the specific component. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.factor = None """ Factor used for calculating this component. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.type = None """ base | surcharge | deduction | discount | tax | informational. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ChargeItemDefinitionPropertyGroupPriceComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -274,12 +366,17 @@ def elementProperties(self): js = super(ChargeItemDefinitionPropertyGroupPriceComponent, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail @@ -289,4 +386,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/claim.py b/fhirclient/models/claim.py index fa7dd403..0cd6ed53 100644 --- a/fhirclient/models/claim.py +++ b/fhirclient/models/claim.py @@ -25,110 +25,164 @@ def __init__(self, jsondict=None, strict=True): self.accident = None """ Details of the event. Type `ClaimAccident` (represented as `dict` in JSON). """ + self._accident = None + """ Primitive extension for accident. Type `FHIRPrimitiveExtension` """ self.billablePeriod = None """ Relevant time frame for the claim. Type `Period` (represented as `dict` in JSON). """ + self._billablePeriod = None + """ Primitive extension for billablePeriod. Type `FHIRPrimitiveExtension` """ self.careTeam = None """ Members of the care team. List of `ClaimCareTeam` items (represented as `dict` in JSON). """ + self._careTeam = None + """ Primitive extension for careTeam. List of `FHIRPrimitiveExtension` """ self.created = None """ Resource creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.diagnosis = None """ Pertinent diagnosis information. List of `ClaimDiagnosis` items (represented as `dict` in JSON). """ + self._diagnosis = None + """ Primitive extension for diagnosis. List of `FHIRPrimitiveExtension` """ self.enterer = None """ Author of the claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._enterer = None + """ Primitive extension for enterer. Type `FHIRPrimitiveExtension` """ self.facility = None """ Servicing facility. Type `FHIRReference` (represented as `dict` in JSON). """ + self._facility = None + """ Primitive extension for facility. Type `FHIRPrimitiveExtension` """ self.fundsReserve = None """ For whom to reserve funds. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fundsReserve = None + """ Primitive extension for fundsReserve. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for claim. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Patient insurance information. List of `ClaimInsurance` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Target. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.item = None """ Product or service provided. List of `ClaimItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.originalPrescription = None """ Original prescription if superseded by fulfiller. Type `FHIRReference` (represented as `dict` in JSON). """ + self._originalPrescription = None + """ Primitive extension for originalPrescription. Type `FHIRPrimitiveExtension` """ self.patient = None """ The recipient of the products and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.payee = None """ Recipient of benefits payable. Type `ClaimPayee` (represented as `dict` in JSON). """ + self._payee = None + """ Primitive extension for payee. Type `FHIRPrimitiveExtension` """ self.prescription = None """ Prescription authorizing services and products. Type `FHIRReference` (represented as `dict` in JSON). """ + self._prescription = None + """ Primitive extension for prescription. Type `FHIRPrimitiveExtension` """ self.priority = None """ Desired processing ugency. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.procedure = None """ Clinical procedures performed. List of `ClaimProcedure` items (represented as `dict` in JSON). """ + self._procedure = None + """ Primitive extension for procedure. List of `FHIRPrimitiveExtension` """ self.provider = None """ Party responsible for the claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.referral = None """ Treatment referral. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referral = None + """ Primitive extension for referral. Type `FHIRPrimitiveExtension` """ self.related = None """ Prior or corollary claims. List of `ClaimRelated` items (represented as `dict` in JSON). """ + self._related = None + """ Primitive extension for related. List of `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subType = None """ More granular claim type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Supporting information. List of `ClaimSupportingInfo` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ self.total = None """ Total claim cost. Type `Money` (represented as `dict` in JSON). """ + self._total = None + """ Primitive extension for total. Type `FHIRPrimitiveExtension` """ self.type = None """ Category or discipline. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ claim | preauthorization | predetermination. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(Claim, self).__init__(jsondict=jsondict, strict=strict) @@ -136,32 +190,59 @@ def elementProperties(self): js = super(Claim, self).elementProperties() js.extend([ ("accident", "accident", ClaimAccident, False, None, False), + ("_accident", "_accident", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("billablePeriod", "billablePeriod", period.Period, False, None, False), + ("_billablePeriod", "_billablePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("careTeam", "careTeam", ClaimCareTeam, True, None, False), + ("_careTeam", "_careTeam", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosis", "diagnosis", ClaimDiagnosis, True, None, False), + ("_diagnosis", "_diagnosis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("enterer", "enterer", fhirreference.FHIRReference, False, None, False), + ("_enterer", "_enterer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("facility", "facility", fhirreference.FHIRReference, False, None, False), + ("_facility", "_facility", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fundsReserve", "fundsReserve", codeableconcept.CodeableConcept, False, None, False), + ("_fundsReserve", "_fundsReserve", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", ClaimInsurance, True, None, True), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, False), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", ClaimItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("originalPrescription", "originalPrescription", fhirreference.FHIRReference, False, None, False), + ("_originalPrescription", "_originalPrescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payee", "payee", ClaimPayee, False, None, False), + ("_payee", "_payee", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prescription", "prescription", fhirreference.FHIRReference, False, None, False), + ("_prescription", "_prescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, True), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedure", "procedure", ClaimProcedure, True, None, False), + ("_procedure", "_procedure", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, True), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referral", "referral", fhirreference.FHIRReference, False, None, False), + ("_referral", "_referral", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("related", "related", ClaimRelated, True, None, False), + ("_related", "_related", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subType", "subType", codeableconcept.CodeableConcept, False, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", ClaimSupportingInfo, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("total", "total", money.Money, False, None, False), + ("_total", "_total", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -188,18 +269,26 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When the incident occurred. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.locationAddress = None """ Where the event occurred. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Where the event occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.type = None """ The nature of the accident. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ClaimAccident, self).__init__(jsondict=jsondict, strict=strict) @@ -207,9 +296,13 @@ def elementProperties(self): js = super(ClaimAccident, self).elementProperties() js.extend([ ("date", "date", fhirdate.FHIRDate, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -233,22 +326,32 @@ def __init__(self, jsondict=None, strict=True): self.provider = None """ Practitioner or organization. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.qualification = None """ Practitioner credential or specialization. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._qualification = None + """ Primitive extension for qualification. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Indicator of the lead practitioner. Type `bool`. """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.role = None """ Function within the team. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Order of care team. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(ClaimCareTeam, self).__init__(jsondict=jsondict, strict=strict) @@ -256,10 +359,15 @@ def elementProperties(self): js = super(ClaimCareTeam, self).elementProperties() js.extend([ ("provider", "provider", fhirreference.FHIRReference, False, None, True), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("qualification", "qualification", codeableconcept.CodeableConcept, False, None, False), + ("_qualification", "_qualification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", bool, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -283,26 +391,38 @@ def __init__(self, jsondict=None, strict=True): self.diagnosisCodeableConcept = None """ Nature of illness or problem. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diagnosisCodeableConcept = None + """ Primitive extension for diagnosisCodeableConcept. Type `FHIRPrimitiveExtension` """ self.diagnosisReference = None """ Nature of illness or problem. Type `FHIRReference` (represented as `dict` in JSON). """ + self._diagnosisReference = None + """ Primitive extension for diagnosisReference. Type `FHIRPrimitiveExtension` """ self.onAdmission = None """ Present on admission. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._onAdmission = None + """ Primitive extension for onAdmission. Type `FHIRPrimitiveExtension` """ self.packageCode = None """ Package billing code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._packageCode = None + """ Primitive extension for packageCode. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Diagnosis instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.type = None """ Timing or nature of the diagnosis. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(ClaimDiagnosis, self).__init__(jsondict=jsondict, strict=strict) @@ -310,11 +430,17 @@ def elementProperties(self): js = super(ClaimDiagnosis, self).elementProperties() js.extend([ ("diagnosisCodeableConcept", "diagnosisCodeableConcept", codeableconcept.CodeableConcept, False, "diagnosis", True), + ("_diagnosisCodeableConcept", "_diagnosisCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosisReference", "diagnosisReference", fhirreference.FHIRReference, False, "diagnosis", True), + ("_diagnosisReference", "_diagnosisReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onAdmission", "onAdmission", codeableconcept.CodeableConcept, False, None, False), + ("_onAdmission", "_onAdmission", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("packageCode", "packageCode", codeableconcept.CodeableConcept, False, None, False), + ("_packageCode", "_packageCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -339,30 +465,44 @@ def __init__(self, jsondict=None, strict=True): self.businessArrangement = None """ Additional provider contract number. Type `str`. """ + self._businessArrangement = None + """ Primitive extension for businessArrangement. Type `FHIRPrimitiveExtension` """ self.claimResponse = None """ Adjudication results. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claimResponse = None + """ Primitive extension for claimResponse. Type `FHIRPrimitiveExtension` """ self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.focal = None """ Coverage to be used for adjudication. Type `bool`. """ + self._focal = None + """ Primitive extension for focal. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Pre-assigned Claim number. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.preAuthRef = None """ Prior authorization reference number. List of `str` items. """ + self._preAuthRef = None + """ Primitive extension for preAuthRef. List of `FHIRPrimitiveExtension` """ self.sequence = None """ Insurance instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(ClaimInsurance, self).__init__(jsondict=jsondict, strict=strict) @@ -370,12 +510,19 @@ def elementProperties(self): js = super(ClaimInsurance, self).elementProperties() js.extend([ ("businessArrangement", "businessArrangement", str, False, None, False), + ("_businessArrangement", "_businessArrangement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("claimResponse", "claimResponse", fhirreference.FHIRReference, False, None, False), + ("_claimResponse", "_claimResponse", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focal", "focal", bool, False, None, True), + ("_focal", "_focal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthRef", "preAuthRef", str, True, None, False), + ("_preAuthRef", "_preAuthRef", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -400,98 +547,146 @@ def __init__(self, jsondict=None, strict=True): self.bodySite = None """ Anatomical location. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.careTeamSequence = None """ Applicable careTeam members. List of `int` items. """ + self._careTeamSequence = None + """ Primitive extension for careTeamSequence. List of `FHIRPrimitiveExtension` """ self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.detail = None """ Product or service provided. List of `ClaimItemDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.diagnosisSequence = None """ Applicable diagnoses. List of `int` items. """ + self._diagnosisSequence = None + """ Primitive extension for diagnosisSequence. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounters related to this billed item. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.informationSequence = None """ Applicable exception and supporting information. List of `int` items. """ + self._informationSequence = None + """ Primitive extension for informationSequence. List of `FHIRPrimitiveExtension` """ self.locationAddress = None """ Place of service or where product was supplied. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationCodeableConcept = None """ Place of service or where product was supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._locationCodeableConcept = None + """ Primitive extension for locationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Place of service or where product was supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Product or service billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.procedureSequence = None """ Applicable procedures. List of `int` items. """ + self._procedureSequence = None + """ Primitive extension for procedureSequence. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Item instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.servicedDate = None """ Date or dates of service or product delivery. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Date or dates of service or product delivery. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.subSite = None """ Anatomical sub-location. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subSite = None + """ Primitive extension for subSite. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimItem, self).__init__(jsondict=jsondict, strict=strict) @@ -499,29 +694,53 @@ def elementProperties(self): js = super(ClaimItem, self).elementProperties() js.extend([ ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("careTeamSequence", "careTeamSequence", int, True, None, False), + ("_careTeamSequence", "_careTeamSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", ClaimItemDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("diagnosisSequence", "diagnosisSequence", int, True, None, False), + ("_diagnosisSequence", "_diagnosisSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, True, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("informationSequence", "informationSequence", int, True, None, False), + ("_informationSequence", "_informationSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationCodeableConcept", "locationCodeableConcept", codeableconcept.CodeableConcept, False, "location", False), + ("_locationCodeableConcept", "_locationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureSequence", "procedureSequence", int, True, None, False), + ("_procedureSequence", "_procedureSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subSite", "subSite", codeableconcept.CodeableConcept, True, None, False), + ("_subSite", "_subSite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -546,50 +765,74 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Item instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.subDetail = None """ Product or service provided. List of `ClaimItemDetailSubDetail` items (represented as `dict` in JSON). """ + self._subDetail = None + """ Primitive extension for subDetail. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimItemDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -597,17 +840,29 @@ def elementProperties(self): js = super(ClaimItemDetail, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetail", "subDetail", ClaimItemDetailSubDetail, True, None, False), + ("_subDetail", "_subDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -632,46 +887,68 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Item instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimItemDetailSubDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -679,16 +956,27 @@ def elementProperties(self): js = super(ClaimItemDetailSubDetail, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -713,10 +1001,14 @@ def __init__(self, jsondict=None, strict=True): self.party = None """ Recipient reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of recipient. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ClaimPayee, self).__init__(jsondict=jsondict, strict=strict) @@ -724,7 +1016,9 @@ def elementProperties(self): js = super(ClaimPayee, self).elementProperties() js.extend([ ("party", "party", fhirreference.FHIRReference, False, None, False), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -749,26 +1043,38 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When the procedure was performed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.procedureCodeableConcept = None """ Specific clinical procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._procedureCodeableConcept = None + """ Primitive extension for procedureCodeableConcept. Type `FHIRPrimitiveExtension` """ self.procedureReference = None """ Specific clinical procedure. Type `FHIRReference` (represented as `dict` in JSON). """ + self._procedureReference = None + """ Primitive extension for procedureReference. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Procedure instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of Procedure. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ super(ClaimProcedure, self).__init__(jsondict=jsondict, strict=strict) @@ -776,11 +1082,17 @@ def elementProperties(self): js = super(ClaimProcedure, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureCodeableConcept", "procedureCodeableConcept", codeableconcept.CodeableConcept, False, "procedure", True), + ("_procedureCodeableConcept", "_procedureCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureReference", "procedureReference", fhirreference.FHIRReference, False, "procedure", True), + ("_procedureReference", "_procedureReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -805,14 +1117,20 @@ def __init__(self, jsondict=None, strict=True): self.claim = None """ Reference to the related claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claim = None + """ Primitive extension for claim. Type `FHIRPrimitiveExtension` """ self.reference = None """ File or case reference. Type `Identifier` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.relationship = None """ How the reference claim is related. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ super(ClaimRelated, self).__init__(jsondict=jsondict, strict=strict) @@ -820,8 +1138,11 @@ def elementProperties(self): js = super(ClaimRelated, self).elementProperties() js.extend([ ("claim", "claim", fhirreference.FHIRReference, False, None, False), + ("_claim", "_claim", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", identifier.Identifier, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, False, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -846,46 +1167,68 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Classification of the supplied information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.code = None """ Type of information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.reason = None """ Explanation for the information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Information instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.timingDate = None """ When it occurred. Type `FHIRDate` (represented as `str` in JSON). """ + self._timingDate = None + """ Primitive extension for timingDate. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ When it occurred. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Data to be provided. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Data to be provided. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Data to be provided. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Data to be provided. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Data to be provided. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(ClaimSupportingInfo, self).__init__(jsondict=jsondict, strict=strict) @@ -893,19 +1236,31 @@ def elementProperties(self): js = super(ClaimSupportingInfo, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDate", "timingDate", fhirdate.FHIRDate, False, "timing", False), + ("_timingDate", "_timingDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", False), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", False), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -916,4 +1271,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/claimresponse.py b/fhirclient/models/claimresponse.py index 8a57dad8..716ed7ae 100644 --- a/fhirclient/models/claimresponse.py +++ b/fhirclient/models/claimresponse.py @@ -24,110 +24,164 @@ def __init__(self, jsondict=None, strict=True): self.addItem = None """ Insurer added line items. List of `ClaimResponseAddItem` items (represented as `dict` in JSON). """ + self._addItem = None + """ Primitive extension for addItem. List of `FHIRPrimitiveExtension` """ self.adjudication = None """ Header-level adjudication. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.communicationRequest = None """ Request for additional information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._communicationRequest = None + """ Primitive extension for communicationRequest. List of `FHIRPrimitiveExtension` """ self.created = None """ Response creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.disposition = None """ Disposition Message. Type `str`. """ + self._disposition = None + """ Primitive extension for disposition. Type `FHIRPrimitiveExtension` """ self.error = None """ Processing errors. List of `ClaimResponseError` items (represented as `dict` in JSON). """ + self._error = None + """ Primitive extension for error. List of `FHIRPrimitiveExtension` """ self.form = None """ Printed reference or actual form. Type `Attachment` (represented as `dict` in JSON). """ + self._form = None + """ Primitive extension for form. Type `FHIRPrimitiveExtension` """ self.formCode = None """ Printed form identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._formCode = None + """ Primitive extension for formCode. Type `FHIRPrimitiveExtension` """ self.fundsReserve = None """ Funds reserved status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fundsReserve = None + """ Primitive extension for fundsReserve. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for a claim response. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Patient insurance information. List of `ClaimResponseInsurance` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Party responsible for reimbursement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.item = None """ Adjudication for claim line items. List of `ClaimResponseItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.outcome = None """ queued | complete | error | partial. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.patient = None """ The recipient of the products and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.payeeType = None """ Party to be paid any benefits payable. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._payeeType = None + """ Primitive extension for payeeType. Type `FHIRPrimitiveExtension` """ self.payment = None """ Payment Details. Type `ClaimResponsePayment` (represented as `dict` in JSON). """ + self._payment = None + """ Primitive extension for payment. Type `FHIRPrimitiveExtension` """ self.preAuthPeriod = None """ Preauthorization reference effective period. Type `Period` (represented as `dict` in JSON). """ + self._preAuthPeriod = None + """ Primitive extension for preAuthPeriod. Type `FHIRPrimitiveExtension` """ self.preAuthRef = None """ Preauthorization reference. Type `str`. """ + self._preAuthRef = None + """ Primitive extension for preAuthRef. Type `FHIRPrimitiveExtension` """ self.processNote = None """ Note concerning adjudication. List of `ClaimResponseProcessNote` items (represented as `dict` in JSON). """ + self._processNote = None + """ Primitive extension for processNote. List of `FHIRPrimitiveExtension` """ self.request = None """ Id of resource triggering adjudication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.requestor = None """ Party responsible for the claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requestor = None + """ Primitive extension for requestor. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subType = None """ More granular claim type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. Type `FHIRPrimitiveExtension` """ self.total = None """ Adjudication totals. List of `ClaimResponseTotal` items (represented as `dict` in JSON). """ + self._total = None + """ Primitive extension for total. List of `FHIRPrimitiveExtension` """ self.type = None """ More granular claim type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ claim | preauthorization | predetermination. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(ClaimResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -135,32 +189,59 @@ def elementProperties(self): js = super(ClaimResponse, self).elementProperties() js.extend([ ("addItem", "addItem", ClaimResponseAddItem, True, None, False), + ("_addItem", "_addItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("communicationRequest", "communicationRequest", fhirreference.FHIRReference, True, None, False), + ("_communicationRequest", "_communicationRequest", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("disposition", "disposition", str, False, None, False), + ("_disposition", "_disposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("error", "error", ClaimResponseError, True, None, False), + ("_error", "_error", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("form", "form", attachment.Attachment, False, None, False), + ("_form", "_form", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("formCode", "formCode", codeableconcept.CodeableConcept, False, None, False), + ("_formCode", "_formCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fundsReserve", "fundsReserve", codeableconcept.CodeableConcept, False, None, False), + ("_fundsReserve", "_fundsReserve", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", ClaimResponseInsurance, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, True), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", ClaimResponseItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", str, False, None, True), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payeeType", "payeeType", codeableconcept.CodeableConcept, False, None, False), + ("_payeeType", "_payeeType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payment", "payment", ClaimResponsePayment, False, None, False), + ("_payment", "_payment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthPeriod", "preAuthPeriod", period.Period, False, None, False), + ("_preAuthPeriod", "_preAuthPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthRef", "preAuthRef", str, False, None, False), + ("_preAuthRef", "_preAuthRef", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("processNote", "processNote", ClaimResponseProcessNote, True, None, False), + ("_processNote", "_processNote", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestor", "requestor", fhirreference.FHIRReference, False, None, False), + ("_requestor", "_requestor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subType", "subType", codeableconcept.CodeableConcept, False, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("total", "total", ClaimResponseTotal, True, None, False), + ("_total", "_total", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -187,86 +268,128 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items adjudication. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Anatomical location. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.detail = None """ Insurer added line details. List of `ClaimResponseAddItemDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.detailSequence = None """ Detail sequence number. List of `int` items. """ + self._detailSequence = None + """ Primitive extension for detailSequence. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.itemSequence = None """ Item sequence number. List of `int` items. """ + self._itemSequence = None + """ Primitive extension for itemSequence. List of `FHIRPrimitiveExtension` """ self.locationAddress = None """ Place of service or where product was supplied. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationCodeableConcept = None """ Place of service or where product was supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._locationCodeableConcept = None + """ Primitive extension for locationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Place of service or where product was supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.provider = None """ Authorized providers. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.servicedDate = None """ Date or dates of service or product delivery. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Date or dates of service or product delivery. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.subSite = None """ Anatomical sub-location. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subSite = None + """ Primitive extension for subSite. List of `FHIRPrimitiveExtension` """ self.subdetailSequence = None """ Subdetail sequence number. List of `int` items. """ + self._subdetailSequence = None + """ Primitive extension for subdetailSequence. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimResponseAddItem, self).__init__(jsondict=jsondict, strict=strict) @@ -274,26 +397,47 @@ def elementProperties(self): js = super(ClaimResponseAddItem, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, True), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", ClaimResponseAddItemDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detailSequence", "detailSequence", int, True, None, False), + ("_detailSequence", "_detailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemSequence", "itemSequence", int, True, None, False), + ("_itemSequence", "_itemSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationCodeableConcept", "locationCodeableConcept", codeableconcept.CodeableConcept, False, "location", False), + ("_locationCodeableConcept", "_locationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("provider", "provider", fhirreference.FHIRReference, True, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subSite", "subSite", codeableconcept.CodeableConcept, True, None, False), + ("_subSite", "_subSite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subdetailSequence", "subdetailSequence", int, True, None, False), + ("_subdetailSequence", "_subdetailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -317,38 +461,56 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items detail adjudication. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.subDetail = None """ Insurer added line items. List of `ClaimResponseAddItemDetailSubDetail` items (represented as `dict` in JSON). """ + self._subDetail = None + """ Primitive extension for subDetail. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimResponseAddItemDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -356,14 +518,23 @@ def elementProperties(self): js = super(ClaimResponseAddItemDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, True), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetail", "subDetail", ClaimResponseAddItemDetailSubDetail, True, None, False), + ("_subDetail", "_subDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -387,34 +558,50 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items detail adjudication. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ClaimResponseAddItemDetailSubDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -422,13 +609,21 @@ def elementProperties(self): js = super(ClaimResponseAddItemDetailSubDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, True), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -452,18 +647,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Error code detailing processing issues. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.detailSequence = None """ Detail sequence number. Type `int`. """ + self._detailSequence = None + """ Primitive extension for detailSequence. Type `FHIRPrimitiveExtension` """ self.itemSequence = None """ Item sequence number. Type `int`. """ + self._itemSequence = None + """ Primitive extension for itemSequence. Type `FHIRPrimitiveExtension` """ self.subDetailSequence = None """ Subdetail sequence number. Type `int`. """ + self._subDetailSequence = None + """ Primitive extension for subDetailSequence. Type `FHIRPrimitiveExtension` """ super(ClaimResponseError, self).__init__(jsondict=jsondict, strict=strict) @@ -471,9 +674,13 @@ def elementProperties(self): js = super(ClaimResponseError, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailSequence", "detailSequence", int, False, None, False), + ("_detailSequence", "_detailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemSequence", "itemSequence", int, False, None, False), + ("_itemSequence", "_itemSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetailSequence", "subDetailSequence", int, False, None, False), + ("_subDetailSequence", "_subDetailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -498,22 +705,32 @@ def __init__(self, jsondict=None, strict=True): self.businessArrangement = None """ Additional provider contract number. Type `str`. """ + self._businessArrangement = None + """ Primitive extension for businessArrangement. Type `FHIRPrimitiveExtension` """ self.claimResponse = None """ Adjudication results. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claimResponse = None + """ Primitive extension for claimResponse. Type `FHIRPrimitiveExtension` """ self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.focal = None """ Coverage to be used for adjudication. Type `bool`. """ + self._focal = None + """ Primitive extension for focal. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Insurance instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(ClaimResponseInsurance, self).__init__(jsondict=jsondict, strict=strict) @@ -521,10 +738,15 @@ def elementProperties(self): js = super(ClaimResponseInsurance, self).elementProperties() js.extend([ ("businessArrangement", "businessArrangement", str, False, None, False), + ("_businessArrangement", "_businessArrangement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("claimResponse", "claimResponse", fhirreference.FHIRReference, False, None, False), + ("_claimResponse", "_claimResponse", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focal", "focal", bool, False, None, True), + ("_focal", "_focal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -549,18 +771,26 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Adjudication details. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.detail = None """ Adjudication for claim details. List of `ClaimResponseItemDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.itemSequence = None """ Claim item instance identifier. Type `int`. """ + self._itemSequence = None + """ Primitive extension for itemSequence. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ super(ClaimResponseItem, self).__init__(jsondict=jsondict, strict=strict) @@ -568,9 +798,13 @@ def elementProperties(self): js = super(ClaimResponseItem, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, True), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detail", "detail", ClaimResponseItemDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("itemSequence", "itemSequence", int, False, None, True), + ("_itemSequence", "_itemSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -596,18 +830,26 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Monetary amount. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.category = None """ Type of adjudication information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.reason = None """ Explanation of adjudication outcome. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.value = None """ Non-monetary value. Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ClaimResponseItemAdjudication, self).__init__(jsondict=jsondict, strict=strict) @@ -615,9 +857,13 @@ def elementProperties(self): js = super(ClaimResponseItemAdjudication, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -642,18 +888,26 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Detail level adjudication details. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.detailSequence = None """ Claim detail instance identifier. Type `int`. """ + self._detailSequence = None + """ Primitive extension for detailSequence. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.subDetail = None """ Adjudication for claim sub-details. List of `ClaimResponseItemDetailSubDetail` items (represented as `dict` in JSON). """ + self._subDetail = None + """ Primitive extension for subDetail. List of `FHIRPrimitiveExtension` """ super(ClaimResponseItemDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -661,9 +915,13 @@ def elementProperties(self): js = super(ClaimResponseItemDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, True), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detailSequence", "detailSequence", int, False, None, True), + ("_detailSequence", "_detailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subDetail", "subDetail", ClaimResponseItemDetailSubDetail, True, None, False), + ("_subDetail", "_subDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -687,14 +945,20 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Subdetail level adjudication details. List of `ClaimResponseItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.subDetailSequence = None """ Claim sub-detail instance identifier. Type `int`. """ + self._subDetailSequence = None + """ Primitive extension for subDetailSequence. Type `FHIRPrimitiveExtension` """ super(ClaimResponseItemDetailSubDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -702,8 +966,11 @@ def elementProperties(self): js = super(ClaimResponseItemDetailSubDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ClaimResponseItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subDetailSequence", "subDetailSequence", int, False, None, True), + ("_subDetailSequence", "_subDetailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -727,26 +994,38 @@ def __init__(self, jsondict=None, strict=True): self.adjustment = None """ Payment adjustment for non-claim issues. Type `Money` (represented as `dict` in JSON). """ + self._adjustment = None + """ Primitive extension for adjustment. Type `FHIRPrimitiveExtension` """ self.adjustmentReason = None """ Explanation for the adjustment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._adjustmentReason = None + """ Primitive extension for adjustmentReason. Type `FHIRPrimitiveExtension` """ self.amount = None """ Payable amount after adjustment. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.date = None """ Expected date of payment. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for the payment. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.type = None """ Partial or complete payment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ClaimResponsePayment, self).__init__(jsondict=jsondict, strict=strict) @@ -754,11 +1033,17 @@ def elementProperties(self): js = super(ClaimResponsePayment, self).elementProperties() js.extend([ ("adjustment", "adjustment", money.Money, False, None, False), + ("_adjustment", "_adjustment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("adjustmentReason", "adjustmentReason", codeableconcept.CodeableConcept, False, None, False), + ("_adjustmentReason", "_adjustmentReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amount", "amount", money.Money, False, None, True), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdate.FHIRDate, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -783,18 +1068,26 @@ def __init__(self, jsondict=None, strict=True): self.language = None """ Language of the text. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.number = None """ Note instance identifier. Type `int`. """ + self._number = None + """ Primitive extension for number. Type `FHIRPrimitiveExtension` """ self.text = None """ Note explanatory text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ display | print | printoper. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ClaimResponseProcessNote, self).__init__(jsondict=jsondict, strict=strict) @@ -802,9 +1095,13 @@ def elementProperties(self): js = super(ClaimResponseProcessNote, self).elementProperties() js.extend([ ("language", "language", codeableconcept.CodeableConcept, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("number", "number", int, False, None, False), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, True), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -828,10 +1125,14 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Financial total for the category. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.category = None """ Type of adjudication information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ super(ClaimResponseTotal, self).__init__(jsondict=jsondict, strict=strict) @@ -839,10 +1140,13 @@ def elementProperties(self): js = super(ClaimResponseTotal, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, True), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -853,4 +1157,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/clinicalimpression.py b/fhirclient/models/clinicalimpression.py index 2fd808fd..9123b165 100644 --- a/fhirclient/models/clinicalimpression.py +++ b/fhirclient/models/clinicalimpression.py @@ -30,86 +30,128 @@ def __init__(self, jsondict=None, strict=True): self.assessor = None """ The clinician performing the assessment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._assessor = None + """ Primitive extension for assessor. Type `FHIRPrimitiveExtension` """ self.code = None """ Kind of assessment performed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.date = None """ When the assessment was documented. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Why/how the assessment was performed. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.effectiveDateTime = None """ Time of assessment. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDateTime = None + """ Primitive extension for effectiveDateTime. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ Time of assessment. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.finding = None """ Possible or likely findings and diagnoses. List of `ClinicalImpressionFinding` items (represented as `dict` in JSON). """ + self._finding = None + """ Primitive extension for finding. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.investigation = None """ One or more sets of investigations (signs, symptoms, etc.). List of `ClinicalImpressionInvestigation` items (represented as `dict` in JSON). """ + self._investigation = None + """ Primitive extension for investigation. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the ClinicalImpression. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.previous = None """ Reference to last assessment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._previous = None + """ Primitive extension for previous. Type `FHIRPrimitiveExtension` """ self.problem = None """ Relevant impressions of patient state. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._problem = None + """ Primitive extension for problem. List of `FHIRPrimitiveExtension` """ self.prognosisCodeableConcept = None """ Estimate of likely outcome. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._prognosisCodeableConcept = None + """ Primitive extension for prognosisCodeableConcept. List of `FHIRPrimitiveExtension` """ self.prognosisReference = None """ RiskAssessment expressing likely outcome. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._prognosisReference = None + """ Primitive extension for prognosisReference. List of `FHIRPrimitiveExtension` """ self.protocol = None """ Clinical Protocol followed. List of `str` items. """ + self._protocol = None + """ Primitive extension for protocol. List of `FHIRPrimitiveExtension` """ self.status = None """ in-progress | completed | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Patient or group assessed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.summary = None """ Summary of the assessment. Type `str`. """ + self._summary = None + """ Primitive extension for summary. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Information supporting the clinical impression. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ super(ClinicalImpression, self).__init__(jsondict=jsondict, strict=strict) @@ -117,26 +159,47 @@ def elementProperties(self): js = super(ClinicalImpression, self).elementProperties() js.extend([ ("assessor", "assessor", fhirreference.FHIRReference, False, None, False), + ("_assessor", "_assessor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveDateTime", "effectiveDateTime", fhirdatetime.FHIRDateTime, False, "effective", False), + ("_effectiveDateTime", "_effectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, "effective", False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("finding", "finding", ClinicalImpressionFinding, True, None, False), + ("_finding", "_finding", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("investigation", "investigation", ClinicalImpressionInvestigation, True, None, False), + ("_investigation", "_investigation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("previous", "previous", fhirreference.FHIRReference, False, None, False), + ("_previous", "_previous", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("problem", "problem", fhirreference.FHIRReference, True, None, False), + ("_problem", "_problem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("prognosisCodeableConcept", "prognosisCodeableConcept", codeableconcept.CodeableConcept, True, None, False), + ("_prognosisCodeableConcept", "_prognosisCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("prognosisReference", "prognosisReference", fhirreference.FHIRReference, True, None, False), + ("_prognosisReference", "_prognosisReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("protocol", "protocol", str, True, None, False), + ("_protocol", "_protocol", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("summary", "summary", str, False, None, False), + ("_summary", "_summary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", fhirreference.FHIRReference, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -163,14 +226,20 @@ def __init__(self, jsondict=None, strict=True): self.basis = None """ Which investigations support finding. Type `str`. """ + self._basis = None + """ Primitive extension for basis. Type `FHIRPrimitiveExtension` """ self.itemCodeableConcept = None """ What was found. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ What was found. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ super(ClinicalImpressionFinding, self).__init__(jsondict=jsondict, strict=strict) @@ -178,8 +247,11 @@ def elementProperties(self): js = super(ClinicalImpressionFinding, self).elementProperties() js.extend([ ("basis", "basis", str, False, None, False), + ("_basis", "_basis", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, None, False), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, None, False), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -207,10 +279,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ A name/code for the set. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.item = None """ Record of a specific investigation. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ super(ClinicalImpressionInvestigation, self).__init__(jsondict=jsondict, strict=strict) @@ -218,14 +294,17 @@ def elementProperties(self): js = super(ClinicalImpressionInvestigation, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", fhirreference.FHIRReference, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/codeableconcept.py b/fhirclient/models/codeableconcept.py index f13da996..c3d55fc6 100644 --- a/fhirclient/models/codeableconcept.py +++ b/fhirclient/models/codeableconcept.py @@ -24,10 +24,14 @@ def __init__(self, jsondict=None, strict=True): self.coding = None """ Code defined by a terminology system. List of `Coding` items (represented as `dict` in JSON). """ + self._coding = None + """ Primitive extension for coding. List of `FHIRPrimitiveExtension` """ self.text = None """ Plain text representation of the concept. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ super(CodeableConcept, self).__init__(jsondict=jsondict, strict=strict) @@ -35,9 +39,12 @@ def elementProperties(self): js = super(CodeableConcept, self).elementProperties() js.extend([ ("coding", "coding", coding.Coding, True, None, False), + ("_coding", "_coding", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import coding +from . import coding \ No newline at end of file diff --git a/fhirclient/models/codesystem.py b/fhirclient/models/codesystem.py index 72616c8f..0e4d2e8c 100644 --- a/fhirclient/models/codesystem.py +++ b/fhirclient/models/codesystem.py @@ -26,108 +26,160 @@ def __init__(self, jsondict=None, strict=True): self.caseSensitive = None """ If code comparison is case sensitive. Type `bool`. """ + self._caseSensitive = None + """ Primitive extension for caseSensitive. Type `FHIRPrimitiveExtension` """ self.compositional = None """ If code system defines a compositional grammar. Type `bool`. """ + self._compositional = None + """ Primitive extension for compositional. Type `FHIRPrimitiveExtension` """ self.concept = None """ Concepts in the code system. List of `CodeSystemConcept` items (represented as `dict` in JSON). """ + self._concept = None + """ Primitive extension for concept. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.content = None """ not-present | example | fragment | complete | supplement. Type `str`. """ + self._content = None + """ Primitive extension for content. Type `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.count = None """ Total concepts in the code system. Type `int`. """ + self._count = None + """ Primitive extension for count. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the code system. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.filter = None """ Filter that can be used in a value set. List of `CodeSystemFilter` items (represented as `dict` in JSON). """ + self._filter = None + """ Primitive extension for filter. List of `FHIRPrimitiveExtension` """ self.hierarchyMeaning = None """ grouped-by | is-a | part-of | classified-with. Type `str`. """ + self._hierarchyMeaning = None + """ Primitive extension for hierarchyMeaning. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the code system (business identifier). List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for code system (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this code system (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.property = None """ Additional information supplied about each concept. List of `CodeSystemProperty` items (represented as `dict` in JSON). """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this code system is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.supplements = None """ Canonical URL of Code System this adds designations and properties to. Type `str`. """ + self._supplements = None + """ Primitive extension for supplements. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this code system (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this code system, represented as a URI (globally unique) (Coding.system). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.valueSet = None """ Canonical reference to the value set with entire code system. Type `str`. """ + self._valueSet = None + """ Primitive extension for valueSet. Type `FHIRPrimitiveExtension` """ self.version = None """ Business version of the code system (Coding.version). Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ self.versionNeeded = None """ If definitions are not stable. Type `bool`. """ + self._versionNeeded = None + """ Primitive extension for versionNeeded. Type `FHIRPrimitiveExtension` """ super(CodeSystem, self).__init__(jsondict=jsondict, strict=strict) @@ -135,31 +187,57 @@ def elementProperties(self): js = super(CodeSystem, self).elementProperties() js.extend([ ("caseSensitive", "caseSensitive", bool, False, None, False), + ("_caseSensitive", "_caseSensitive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("compositional", "compositional", bool, False, None, False), + ("_compositional", "_compositional", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("concept", "concept", CodeSystemConcept, True, None, False), + ("_concept", "_concept", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("content", "content", str, False, None, True), + ("_content", "_content", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("count", "count", int, False, None, False), + ("_count", "_count", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("filter", "filter", CodeSystemFilter, True, None, False), + ("_filter", "_filter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("hierarchyMeaning", "hierarchyMeaning", str, False, None, False), + ("_hierarchyMeaning", "_hierarchyMeaning", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", CodeSystemProperty, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supplements", "supplements", str, False, None, False), + ("_supplements", "_supplements", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valueSet", "valueSet", str, False, None, False), + ("_valueSet", "_valueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("versionNeeded", "versionNeeded", bool, False, None, False), + ("_versionNeeded", "_versionNeeded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -187,26 +265,38 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code that identifies concept. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.concept = None """ Child Concepts (is-a/contains/categorizes). List of `CodeSystemConcept` items (represented as `dict` in JSON). """ + self._concept = None + """ Primitive extension for concept. List of `FHIRPrimitiveExtension` """ self.definition = None """ Formal definition. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.designation = None """ Additional representations for the concept. List of `CodeSystemConceptDesignation` items (represented as `dict` in JSON). """ + self._designation = None + """ Primitive extension for designation. List of `FHIRPrimitiveExtension` """ self.display = None """ Text to display to the user. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.property = None """ Property value for the concept. List of `CodeSystemConceptProperty` items (represented as `dict` in JSON). """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ super(CodeSystemConcept, self).__init__(jsondict=jsondict, strict=strict) @@ -214,11 +304,17 @@ def elementProperties(self): js = super(CodeSystemConcept, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("concept", "concept", CodeSystemConcept, True, None, False), + ("_concept", "_concept", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("designation", "designation", CodeSystemConceptDesignation, True, None, False), + ("_designation", "_designation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", CodeSystemConceptProperty, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -243,14 +339,20 @@ def __init__(self, jsondict=None, strict=True): self.language = None """ Human language of the designation. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.use = None """ Details how this designation would be used. Type `Coding` (represented as `dict` in JSON). """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ self.value = None """ The text value for this designation. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(CodeSystemConceptDesignation, self).__init__(jsondict=jsondict, strict=strict) @@ -258,8 +360,11 @@ def elementProperties(self): js = super(CodeSystemConceptDesignation, self).elementProperties() js.extend([ ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", coding.Coding, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -283,34 +388,50 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Reference to CodeSystem.property.code. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of the property for this concept. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Value of the property for this concept. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Value of the property for this concept. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Value of the property for this concept. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Value of the property for this concept. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Value of the property for this concept. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Value of the property for this concept. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(CodeSystemConceptProperty, self).__init__(jsondict=jsondict, strict=strict) @@ -318,13 +439,21 @@ def elementProperties(self): js = super(CodeSystemConceptProperty, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", True), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -349,19 +478,27 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code that identifies the filter. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ How or why the filter is used. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.operator = None """ = | is-a | descendent-of | is-not-a | regex | in | not-in | generalizes | exists. List of `str` items. """ + self._operator = None + """ Primitive extension for operator. List of `FHIRPrimitiveExtension` """ self.value = None """ What to use for the value. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(CodeSystemFilter, self).__init__(jsondict=jsondict, strict=strict) @@ -369,9 +506,13 @@ def elementProperties(self): js = super(CodeSystemFilter, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operator", "operator", str, True, None, True), + ("_operator", "_operator", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -397,18 +538,26 @@ def __init__(self, jsondict=None, strict=True): """ Identifies the property on the concepts, and when referred to in operations. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ Why the property is defined, and/or what it conveys. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.type = None """ code | Coding | string | integer | boolean | dateTime | decimal. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.uri = None """ Formal identifier for the property. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ super(CodeSystemProperty, self).__init__(jsondict=jsondict, strict=strict) @@ -416,16 +565,21 @@ def elementProperties(self): js = super(CodeSystemProperty, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, False), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import contactdetail from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/coding.py b/fhirclient/models/coding.py index b3216e71..7ba87497 100644 --- a/fhirclient/models/coding.py +++ b/fhirclient/models/coding.py @@ -21,22 +21,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Symbol in syntax defined by the system. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.display = None """ Representation defined by the system. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.system = None """ Identity of the terminology system. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.userSelected = None """ If this coding was chosen directly by the user. Type `bool`. """ + self._userSelected = None + """ Primitive extension for userSelected. Type `FHIRPrimitiveExtension` """ self.version = None """ Version of the system - if relevant. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Coding, self).__init__(jsondict=jsondict, strict=strict) @@ -44,11 +54,16 @@ def elementProperties(self): js = super(Coding, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("userSelected", "userSelected", bool, False, None, False), + ("_userSelected", "_userSelected", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/communication.py b/fhirclient/models/communication.py index 47869d26..8aaead22 100644 --- a/fhirclient/models/communication.py +++ b/fhirclient/models/communication.py @@ -25,95 +25,141 @@ def __init__(self, jsondict=None, strict=True): self.about = None """ Resources that pertain to this communication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._about = None + """ Primitive extension for about. List of `FHIRPrimitiveExtension` """ self.basedOn = None """ Request fulfilled by this communication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.category = None """ Message category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.inResponseTo = None """ Reply to. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._inResponseTo = None + """ Primitive extension for inResponseTo. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.medium = None """ A channel of communication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._medium = None + """ Primitive extension for medium. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the communication. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of this action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.payload = None """ Message payload. List of `CommunicationPayload` items (represented as `dict` in JSON). """ + self._payload = None + """ Primitive extension for payload. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Indication for message. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why was communication done?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.received = None """ When received. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._received = None + """ Primitive extension for received. Type `FHIRPrimitiveExtension` """ self.recipient = None """ Message recipient. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. List of `FHIRPrimitiveExtension` """ self.sender = None """ Message sender. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sender = None + """ Primitive extension for sender. Type `FHIRPrimitiveExtension` """ self.sent = None """ When sent. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._sent = None + """ Primitive extension for sent. Type `FHIRPrimitiveExtension` """ self.status = None """ preparation | in-progress | not-done | on-hold | stopped | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Focus of message. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.topic = None """ Description of the purpose/content. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. Type `FHIRPrimitiveExtension` """ super(Communication, self).__init__(jsondict=jsondict, strict=strict) @@ -121,28 +167,51 @@ def elementProperties(self): js = super(Communication, self).elementProperties() js.extend([ ("about", "about", fhirreference.FHIRReference, True, None, False), + ("_about", "_about", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("inResponseTo", "inResponseTo", fhirreference.FHIRReference, True, None, False), + ("_inResponseTo", "_inResponseTo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("medium", "medium", codeableconcept.CodeableConcept, True, None, False), + ("_medium", "_medium", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("payload", "payload", CommunicationPayload, True, None, False), + ("_payload", "_payload", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("received", "received", fhirdatetime.FHIRDateTime, False, None, False), + ("_received", "_received", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, True, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sender", "sender", fhirreference.FHIRReference, False, None, False), + ("_sender", "_sender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sent", "sent", fhirdatetime.FHIRDateTime, False, None, False), + ("_sent", "_sent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, False, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -168,14 +237,20 @@ def __init__(self, jsondict=None, strict=True): self.contentAttachment = None """ Message part content. Type `Attachment` (represented as `dict` in JSON). """ + self._contentAttachment = None + """ Primitive extension for contentAttachment. Type `FHIRPrimitiveExtension` """ self.contentReference = None """ Message part content. Type `FHIRReference` (represented as `dict` in JSON). """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ self.contentString = None """ Message part content. Type `str`. """ + self._contentString = None + """ Primitive extension for contentString. Type `FHIRPrimitiveExtension` """ super(CommunicationPayload, self).__init__(jsondict=jsondict, strict=strict) @@ -183,15 +258,19 @@ def elementProperties(self): js = super(CommunicationPayload, self).elementProperties() js.extend([ ("contentAttachment", "contentAttachment", attachment.Attachment, False, "content", True), + ("_contentAttachment", "_contentAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentReference", "contentReference", fhirreference.FHIRReference, False, "content", True), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentString", "contentString", str, False, "content", True), + ("_contentString", "_contentString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import attachment from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/communicationrequest.py b/fhirclient/models/communicationrequest.py index 81a11117..f7e36234 100644 --- a/fhirclient/models/communicationrequest.py +++ b/fhirclient/models/communicationrequest.py @@ -25,95 +25,141 @@ def __init__(self, jsondict=None, strict=True): self.about = None """ Resources that pertain to this communication request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._about = None + """ Primitive extension for about. List of `FHIRPrimitiveExtension` """ self.authoredOn = None """ When request transitioned to being actionable. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ Fulfills plan or proposal. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.category = None """ Message category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.doNotPerform = None """ True if request is prohibiting action. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.groupIdentifier = None """ Composite request this is part of. Type `Identifier` (represented as `dict` in JSON). """ + self._groupIdentifier = None + """ Primitive extension for groupIdentifier. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.medium = None """ A channel of communication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._medium = None + """ Primitive extension for medium. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about communication request. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When scheduled. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When scheduled. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.payload = None """ Message payload. List of `CommunicationRequestPayload` items (represented as `dict` in JSON). """ + self._payload = None + """ Primitive extension for payload. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why is communication needed?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why is communication needed?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.recipient = None """ Message recipient. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. List of `FHIRPrimitiveExtension` """ self.replaces = None """ Request(s) replaced by this request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.requester = None """ Who/what is requesting service. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.sender = None """ Message sender. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sender = None + """ Primitive extension for sender. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Focus of message. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(CommunicationRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -121,28 +167,51 @@ def elementProperties(self): js = super(CommunicationRequest, self).elementProperties() js.extend([ ("about", "about", fhirreference.FHIRReference, True, None, False), + ("_about", "_about", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupIdentifier", "groupIdentifier", identifier.Identifier, False, None, False), + ("_groupIdentifier", "_groupIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("medium", "medium", codeableconcept.CodeableConcept, True, None, False), + ("_medium", "_medium", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payload", "payload", CommunicationRequestPayload, True, None, False), + ("_payload", "_payload", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recipient", "recipient", fhirreference.FHIRReference, True, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("replaces", "replaces", fhirreference.FHIRReference, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sender", "sender", fhirreference.FHIRReference, False, None, False), + ("_sender", "_sender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -168,14 +237,20 @@ def __init__(self, jsondict=None, strict=True): self.contentAttachment = None """ Message part content. Type `Attachment` (represented as `dict` in JSON). """ + self._contentAttachment = None + """ Primitive extension for contentAttachment. Type `FHIRPrimitiveExtension` """ self.contentReference = None """ Message part content. Type `FHIRReference` (represented as `dict` in JSON). """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ self.contentString = None """ Message part content. Type `str`. """ + self._contentString = None + """ Primitive extension for contentString. Type `FHIRPrimitiveExtension` """ super(CommunicationRequestPayload, self).__init__(jsondict=jsondict, strict=strict) @@ -183,11 +258,15 @@ def elementProperties(self): js = super(CommunicationRequestPayload, self).elementProperties() js.extend([ ("contentAttachment", "contentAttachment", attachment.Attachment, False, "content", True), + ("_contentAttachment", "_contentAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentReference", "contentReference", fhirreference.FHIRReference, False, "content", True), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentString", "contentString", str, False, "content", True), + ("_contentString", "_contentString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import attachment @@ -195,4 +274,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/compartmentdefinition.py b/fhirclient/models/compartmentdefinition.py index d4b2fe9c..89f2fcfe 100644 --- a/fhirclient/models/compartmentdefinition.py +++ b/fhirclient/models/compartmentdefinition.py @@ -24,59 +24,87 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Patient | Encounter | RelatedPerson | Practitioner | Device. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the compartment definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this compartment definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this compartment definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.resource = None """ How a resource is related to the compartment. List of `CompartmentDefinitionResource` items (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. List of `FHIRPrimitiveExtension` """ self.search = None """ Whether the search syntax is supported. Type `bool`. """ + self._search = None + """ Primitive extension for search. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this compartment definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the compartment definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(CompartmentDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -84,19 +112,33 @@ def elementProperties(self): js = super(CompartmentDefinition, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", CompartmentDefinitionResource, True, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("search", "search", bool, False, None, True), + ("_search", "_search", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -122,14 +164,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Name of resource type. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Additional documentation about the resource and compartment. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.param = None """ Search Parameter Name, or chained parameters. List of `str` items. """ + self._param = None + """ Primitive extension for param. List of `FHIRPrimitiveExtension` """ super(CompartmentDefinitionResource, self).__init__(jsondict=jsondict, strict=strict) @@ -137,12 +185,16 @@ def elementProperties(self): js = super(CompartmentDefinitionResource, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("param", "param", str, True, None, False), + ("_param", "_param", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/composition.py b/fhirclient/models/composition.py index dc85bb09..c34eaf32 100644 --- a/fhirclient/models/composition.py +++ b/fhirclient/models/composition.py @@ -32,62 +32,92 @@ def __init__(self, jsondict=None, strict=True): self.attester = None """ Attests to accuracy of composition. List of `CompositionAttester` items (represented as `dict` in JSON). """ + self._attester = None + """ Primitive extension for attester. List of `FHIRPrimitiveExtension` """ self.author = None """ Who and/or what authored the composition. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.category = None """ Categorization of Composition. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.confidentiality = None """ As defined by affinity domain. Type `str`. """ + self._confidentiality = None + """ Primitive extension for confidentiality. Type `FHIRPrimitiveExtension` """ self.custodian = None """ Organization which maintains the composition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._custodian = None + """ Primitive extension for custodian. Type `FHIRPrimitiveExtension` """ self.date = None """ Composition editing time. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Context of the Composition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.event = None """ The clinical service(s) being documented. List of `CompositionEvent` items (represented as `dict` in JSON). """ + self._event = None + """ Primitive extension for event. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Version-independent identifier for the Composition. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.relatesTo = None """ Relationships to other compositions/documents. List of `CompositionRelatesTo` items (represented as `dict` in JSON). """ + self._relatesTo = None + """ Primitive extension for relatesTo. List of `FHIRPrimitiveExtension` """ self.section = None """ Composition is broken into sections. List of `CompositionSection` items (represented as `dict` in JSON). """ + self._section = None + """ Primitive extension for section. List of `FHIRPrimitiveExtension` """ self.status = None """ preliminary | final | amended | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who and/or what the composition is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.title = None """ Human Readable name/title. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of composition (LOINC if possible). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Composition, self).__init__(jsondict=jsondict, strict=strict) @@ -95,20 +125,35 @@ def elementProperties(self): js = super(Composition, self).elementProperties() js.extend([ ("attester", "attester", CompositionAttester, True, None, False), + ("_attester", "_attester", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("author", "author", fhirreference.FHIRReference, True, None, True), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("confidentiality", "confidentiality", str, False, None, False), + ("_confidentiality", "_confidentiality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("custodian", "custodian", fhirreference.FHIRReference, False, None, False), + ("_custodian", "_custodian", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("event", "event", CompositionEvent, True, None, False), + ("_event", "_event", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatesTo", "relatesTo", CompositionRelatesTo, True, None, False), + ("_relatesTo", "_relatesTo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("section", "section", CompositionSection, True, None, False), + ("_section", "_section", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, True), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -134,14 +179,20 @@ def __init__(self, jsondict=None, strict=True): self.mode = None """ personal | professional | legal | official. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.party = None """ Who attested the composition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. Type `FHIRPrimitiveExtension` """ self.time = None """ When the composition was attested. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._time = None + """ Primitive extension for time. Type `FHIRPrimitiveExtension` """ super(CompositionAttester, self).__init__(jsondict=jsondict, strict=strict) @@ -149,8 +200,11 @@ def elementProperties(self): js = super(CompositionAttester, self).elementProperties() js.extend([ ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("party", "party", fhirreference.FHIRReference, False, None, False), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("time", "time", fhirdatetime.FHIRDateTime, False, None, False), + ("_time", "_time", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -175,14 +229,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code(s) that apply to the event being documented. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.detail = None """ The event(s) being documented. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.period = None """ The period covered by the documentation. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ super(CompositionEvent, self).__init__(jsondict=jsondict, strict=strict) @@ -190,8 +250,11 @@ def elementProperties(self): js = super(CompositionEvent, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detail", "detail", fhirreference.FHIRReference, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -216,14 +279,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ replaces | transforms | signs | appends. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.targetIdentifier = None """ Target of the relationship. Type `Identifier` (represented as `dict` in JSON). """ + self._targetIdentifier = None + """ Primitive extension for targetIdentifier. Type `FHIRPrimitiveExtension` """ self.targetReference = None """ Target of the relationship. Type `FHIRReference` (represented as `dict` in JSON). """ + self._targetReference = None + """ Primitive extension for targetReference. Type `FHIRPrimitiveExtension` """ super(CompositionRelatesTo, self).__init__(jsondict=jsondict, strict=strict) @@ -231,8 +300,11 @@ def elementProperties(self): js = super(CompositionRelatesTo, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetIdentifier", "targetIdentifier", identifier.Identifier, False, "target", True), + ("_targetIdentifier", "_targetIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetReference", "targetReference", fhirreference.FHIRReference, False, "target", True), + ("_targetReference", "_targetReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -256,43 +328,63 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ Who and/or what authored the section. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.code = None """ Classification of section (recommended). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.emptyReason = None """ Why the section is empty. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._emptyReason = None + """ Primitive extension for emptyReason. Type `FHIRPrimitiveExtension` """ self.entry = None """ A reference to data that supports this section. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._entry = None + """ Primitive extension for entry. List of `FHIRPrimitiveExtension` """ self.focus = None """ Who/what the section is about, when it is not about the subject of composition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. Type `FHIRPrimitiveExtension` """ self.mode = None """ working | snapshot | changes. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.orderedBy = None """ Order of section entries. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._orderedBy = None + """ Primitive extension for orderedBy. Type `FHIRPrimitiveExtension` """ self.section = None """ Nested Section. List of `CompositionSection` items (represented as `dict` in JSON). """ + self._section = None + """ Primitive extension for section. List of `FHIRPrimitiveExtension` """ self.text = None """ Text summary of the section, for human interpretation. Type `Narrative` (represented as `dict` in JSON). """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.title = None """ Label for section (e.g. for ToC). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(CompositionSection, self).__init__(jsondict=jsondict, strict=strict) @@ -300,22 +392,33 @@ def elementProperties(self): js = super(CompositionSection, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("emptyReason", "emptyReason", codeableconcept.CodeableConcept, False, None, False), + ("_emptyReason", "_emptyReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("entry", "entry", fhirreference.FHIRReference, True, None, False), + ("_entry", "_entry", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("focus", "focus", fhirreference.FHIRReference, False, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, False), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orderedBy", "orderedBy", codeableconcept.CodeableConcept, False, None, False), + ("_orderedBy", "_orderedBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("section", "section", CompositionSection, True, None, False), + ("_section", "_section", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", narrative.Narrative, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier from . import narrative -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/conceptmap.py b/fhirclient/models/conceptmap.py index 26eb8992..a33376e2 100644 --- a/fhirclient/models/conceptmap.py +++ b/fhirclient/models/conceptmap.py @@ -25,85 +25,125 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the concept map. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.group = None """ Same source and target systems. List of `ConceptMapGroup` items (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the concept map. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for concept map (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this concept map (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this concept map is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.sourceCanonical = None """ The source value set that contains the concepts that are being mapped. Type `str`. """ + self._sourceCanonical = None + """ Primitive extension for sourceCanonical. Type `FHIRPrimitiveExtension` """ self.sourceUri = None """ The source value set that contains the concepts that are being mapped. Type `str`. """ + self._sourceUri = None + """ Primitive extension for sourceUri. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.targetCanonical = None """ The target value set which provides context for the mappings. Type `str`. """ + self._targetCanonical = None + """ Primitive extension for targetCanonical. Type `FHIRPrimitiveExtension` """ self.targetUri = None """ The target value set which provides context for the mappings. Type `str`. """ + self._targetUri = None + """ Primitive extension for targetUri. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this concept map (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this concept map, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the concept map. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ConceptMap, self).__init__(jsondict=jsondict, strict=strict) @@ -111,25 +151,45 @@ def elementProperties(self): js = super(ConceptMap, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("group", "group", ConceptMapGroup, True, None, False), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceCanonical", "sourceCanonical", str, False, "source", False), + ("_sourceCanonical", "_sourceCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceUri", "sourceUri", str, False, "source", False), + ("_sourceUri", "_sourceUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetCanonical", "targetCanonical", str, False, "target", False), + ("_targetCanonical", "_targetCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetUri", "targetUri", str, False, "target", False), + ("_targetUri", "_targetUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -155,26 +215,38 @@ def __init__(self, jsondict=None, strict=True): self.element = None """ Mappings for a concept from the source set. List of `ConceptMapGroupElement` items (represented as `dict` in JSON). """ + self._element = None + """ Primitive extension for element. List of `FHIRPrimitiveExtension` """ self.source = None """ Source system where concepts to be mapped are defined. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.sourceVersion = None """ Specific version of the code system. Type `str`. """ + self._sourceVersion = None + """ Primitive extension for sourceVersion. Type `FHIRPrimitiveExtension` """ self.target = None """ Target system that the concepts are to be mapped to. Type `str`. """ + self._target = None + """ Primitive extension for target. Type `FHIRPrimitiveExtension` """ self.targetVersion = None """ Specific version of the code system. Type `str`. """ + self._targetVersion = None + """ Primitive extension for targetVersion. Type `FHIRPrimitiveExtension` """ self.unmapped = None """ What to do when there is no mapping for the source concept. Type `ConceptMapGroupUnmapped` (represented as `dict` in JSON). """ + self._unmapped = None + """ Primitive extension for unmapped. Type `FHIRPrimitiveExtension` """ super(ConceptMapGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -182,11 +254,17 @@ def elementProperties(self): js = super(ConceptMapGroup, self).elementProperties() js.extend([ ("element", "element", ConceptMapGroupElement, True, None, True), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", str, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceVersion", "sourceVersion", str, False, None, False), + ("_sourceVersion", "_sourceVersion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", str, False, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetVersion", "targetVersion", str, False, None, False), + ("_targetVersion", "_targetVersion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unmapped", "unmapped", ConceptMapGroupUnmapped, False, None, False), + ("_unmapped", "_unmapped", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -211,14 +289,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Identifies element being mapped. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.display = None """ Display for the code. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.target = None """ Concept in target system for element. List of `ConceptMapGroupElementTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(ConceptMapGroupElement, self).__init__(jsondict=jsondict, strict=strict) @@ -226,8 +310,11 @@ def elementProperties(self): js = super(ConceptMapGroupElement, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", ConceptMapGroupElementTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -251,27 +338,39 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code that identifies the target element. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comment = None """ Description of status/issues in mapping. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.dependsOn = None """ Other elements required for this mapping (from context). List of `ConceptMapGroupElementTargetDependsOn` items (represented as `dict` in JSON). """ + self._dependsOn = None + """ Primitive extension for dependsOn. List of `FHIRPrimitiveExtension` """ self.display = None """ Display for the code. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.equivalence = None """ relatedto | equivalent | equal | wider | subsumes | narrower | specializes | inexact | unmatched | disjoint. Type `str`. """ + self._equivalence = None + """ Primitive extension for equivalence. Type `FHIRPrimitiveExtension` """ self.product = None """ Other concepts that this mapping also produces. List of `ConceptMapGroupElementTargetDependsOn` items (represented as `dict` in JSON). """ + self._product = None + """ Primitive extension for product. List of `FHIRPrimitiveExtension` """ super(ConceptMapGroupElementTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -279,11 +378,17 @@ def elementProperties(self): js = super(ConceptMapGroupElementTarget, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dependsOn", "dependsOn", ConceptMapGroupElementTargetDependsOn, True, None, False), + ("_dependsOn", "_dependsOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("equivalence", "equivalence", str, False, None, True), + ("_equivalence", "_equivalence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("product", "product", ConceptMapGroupElementTargetDependsOn, True, None, False), + ("_product", "_product", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -309,18 +414,26 @@ def __init__(self, jsondict=None, strict=True): self.display = None """ Display for the code (if value is a code). Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.property = None """ Reference to property mapping depends on. Type `str`. """ + self._property = None + """ Primitive extension for property. Type `FHIRPrimitiveExtension` """ self.system = None """ Code System (if necessary). Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.value = None """ Value of the referenced element. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ConceptMapGroupElementTargetDependsOn, self).__init__(jsondict=jsondict, strict=strict) @@ -328,9 +441,13 @@ def elementProperties(self): js = super(ConceptMapGroupElementTargetDependsOn, self).elementProperties() js.extend([ ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", str, False, None, True), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -356,19 +473,27 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Fixed code when mode = fixed. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.display = None """ Display for the code. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.mode = None """ provided | fixed | other-map. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.url = None """ canonical reference to an additional ConceptMap to use for mapping if the source concept is unmapped. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(ConceptMapGroupUnmapped, self).__init__(jsondict=jsondict, strict=strict) @@ -376,15 +501,20 @@ def elementProperties(self): js = super(ConceptMapGroupUnmapped, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/condition.py b/fhirclient/models/condition.py index 9da378a7..d718a2bc 100644 --- a/fhirclient/models/condition.py +++ b/fhirclient/models/condition.py @@ -24,103 +24,153 @@ def __init__(self, jsondict=None, strict=True): self.abatementAge = None """ When in resolution/remission. Type `Age` (represented as `dict` in JSON). """ + self._abatementAge = None + """ Primitive extension for abatementAge. Type `FHIRPrimitiveExtension` """ self.abatementDateTime = None """ When in resolution/remission. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._abatementDateTime = None + """ Primitive extension for abatementDateTime. Type `FHIRPrimitiveExtension` """ self.abatementPeriod = None """ When in resolution/remission. Type `Period` (represented as `dict` in JSON). """ + self._abatementPeriod = None + """ Primitive extension for abatementPeriod. Type `FHIRPrimitiveExtension` """ self.abatementRange = None """ When in resolution/remission. Type `Range` (represented as `dict` in JSON). """ + self._abatementRange = None + """ Primitive extension for abatementRange. Type `FHIRPrimitiveExtension` """ self.abatementString = None """ When in resolution/remission. Type `str`. """ + self._abatementString = None + """ Primitive extension for abatementString. Type `FHIRPrimitiveExtension` """ self.asserter = None """ Person who asserts this condition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._asserter = None + """ Primitive extension for asserter. Type `FHIRPrimitiveExtension` """ self.bodySite = None """ Anatomical location, if relevant. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. List of `FHIRPrimitiveExtension` """ self.category = None """ problem-list-item | encounter-diagnosis. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.clinicalStatus = None """ active | recurrence | relapse | inactive | remission | resolved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._clinicalStatus = None + """ Primitive extension for clinicalStatus. Type `FHIRPrimitiveExtension` """ self.code = None """ Identification of the condition, problem or diagnosis. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.evidence = None """ Supporting evidence. List of `ConditionEvidence` items (represented as `dict` in JSON). """ + self._evidence = None + """ Primitive extension for evidence. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this condition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.note = None """ Additional information about the Condition. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.onsetAge = None """ Estimated or actual date, date-time, or age. Type `Age` (represented as `dict` in JSON). """ + self._onsetAge = None + """ Primitive extension for onsetAge. Type `FHIRPrimitiveExtension` """ self.onsetDateTime = None """ Estimated or actual date, date-time, or age. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._onsetDateTime = None + """ Primitive extension for onsetDateTime. Type `FHIRPrimitiveExtension` """ self.onsetPeriod = None """ Estimated or actual date, date-time, or age. Type `Period` (represented as `dict` in JSON). """ + self._onsetPeriod = None + """ Primitive extension for onsetPeriod. Type `FHIRPrimitiveExtension` """ self.onsetRange = None """ Estimated or actual date, date-time, or age. Type `Range` (represented as `dict` in JSON). """ + self._onsetRange = None + """ Primitive extension for onsetRange. Type `FHIRPrimitiveExtension` """ self.onsetString = None """ Estimated or actual date, date-time, or age. Type `str`. """ + self._onsetString = None + """ Primitive extension for onsetString. Type `FHIRPrimitiveExtension` """ self.recordedDate = None """ Date record was first recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._recordedDate = None + """ Primitive extension for recordedDate. Type `FHIRPrimitiveExtension` """ self.recorder = None """ Who recorded the condition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recorder = None + """ Primitive extension for recorder. Type `FHIRPrimitiveExtension` """ self.severity = None """ Subjective severity of condition. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ self.stage = None """ Stage/grade, usually assessed formally. List of `ConditionStage` items (represented as `dict` in JSON). """ + self._stage = None + """ Primitive extension for stage. List of `FHIRPrimitiveExtension` """ self.subject = None """ Who has the condition?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.verificationStatus = None """ unconfirmed | provisional | differential | confirmed | refuted | entered-in-error. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._verificationStatus = None + """ Primitive extension for verificationStatus. Type `FHIRPrimitiveExtension` """ super(Condition, self).__init__(jsondict=jsondict, strict=strict) @@ -128,30 +178,55 @@ def elementProperties(self): js = super(Condition, self).elementProperties() js.extend([ ("abatementAge", "abatementAge", age.Age, False, "abatement", False), + ("_abatementAge", "_abatementAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("abatementDateTime", "abatementDateTime", fhirdatetime.FHIRDateTime, False, "abatement", False), + ("_abatementDateTime", "_abatementDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("abatementPeriod", "abatementPeriod", period.Period, False, "abatement", False), + ("_abatementPeriod", "_abatementPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("abatementRange", "abatementRange", range.Range, False, "abatement", False), + ("_abatementRange", "_abatementRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("abatementString", "abatementString", str, False, "abatement", False), + ("_abatementString", "_abatementString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("asserter", "asserter", fhirreference.FHIRReference, False, None, False), + ("_asserter", "_asserter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, True, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("clinicalStatus", "clinicalStatus", codeableconcept.CodeableConcept, False, None, False), + ("_clinicalStatus", "_clinicalStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("evidence", "evidence", ConditionEvidence, True, None, False), + ("_evidence", "_evidence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("onsetAge", "onsetAge", age.Age, False, "onset", False), + ("_onsetAge", "_onsetAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetDateTime", "onsetDateTime", fhirdatetime.FHIRDateTime, False, "onset", False), + ("_onsetDateTime", "_onsetDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetPeriod", "onsetPeriod", period.Period, False, "onset", False), + ("_onsetPeriod", "_onsetPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetRange", "onsetRange", range.Range, False, "onset", False), + ("_onsetRange", "_onsetRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetString", "onsetString", str, False, "onset", False), + ("_onsetString", "_onsetString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recordedDate", "recordedDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_recordedDate", "_recordedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recorder", "recorder", fhirreference.FHIRReference, False, None, False), + ("_recorder", "_recorder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("severity", "severity", codeableconcept.CodeableConcept, False, None, False), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("stage", "stage", ConditionStage, True, None, False), + ("_stage", "_stage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("verificationStatus", "verificationStatus", codeableconcept.CodeableConcept, False, None, False), + ("_verificationStatus", "_verificationStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -179,10 +254,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Manifestation/symptom. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.detail = None """ Supporting information found elsewhere. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ super(ConditionEvidence, self).__init__(jsondict=jsondict, strict=strict) @@ -190,7 +269,9 @@ def elementProperties(self): js = super(ConditionEvidence, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detail", "detail", fhirreference.FHIRReference, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -215,14 +296,20 @@ def __init__(self, jsondict=None, strict=True): self.assessment = None """ Formal record of assessment. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._assessment = None + """ Primitive extension for assessment. List of `FHIRPrimitiveExtension` """ self.summary = None """ Simple summary (disease specific). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._summary = None + """ Primitive extension for summary. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of staging. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ConditionStage, self).__init__(jsondict=jsondict, strict=strict) @@ -230,11 +317,15 @@ def elementProperties(self): js = super(ConditionStage, self).elementProperties() js.extend([ ("assessment", "assessment", fhirreference.FHIRReference, True, None, False), + ("_assessment", "_assessment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("summary", "summary", codeableconcept.CodeableConcept, False, None, False), + ("_summary", "_summary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import annotation @@ -243,4 +334,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/consent.py b/fhirclient/models/consent.py index e70ab33c..21af7a6d 100644 --- a/fhirclient/models/consent.py +++ b/fhirclient/models/consent.py @@ -26,58 +26,86 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Classification of the consent statement - for indexing/retrieval. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.dateTime = None """ When this Consent was created or indexed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateTime = None + """ Primitive extension for dateTime. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier for this record (external references). List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.organization = None """ Custodian of the consent. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. List of `FHIRPrimitiveExtension` """ self.patient = None """ Who the consent applies to. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who is agreeing to the policy and rules. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.policy = None """ Policies covered by this consent. List of `ConsentPolicy` items (represented as `dict` in JSON). """ + self._policy = None + """ Primitive extension for policy. List of `FHIRPrimitiveExtension` """ self.policyRule = None """ Regulation that this consents to. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._policyRule = None + """ Primitive extension for policyRule. Type `FHIRPrimitiveExtension` """ self.provision = None """ Constraints to the base Consent.policyRule. Type `ConsentProvision` (represented as `dict` in JSON). """ + self._provision = None + """ Primitive extension for provision. Type `FHIRPrimitiveExtension` """ self.scope = None """ Which of the four areas this resource covers (extensible). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._scope = None + """ Primitive extension for scope. Type `FHIRPrimitiveExtension` """ self.sourceAttachment = None """ Source from which this consent is taken. Type `Attachment` (represented as `dict` in JSON). """ + self._sourceAttachment = None + """ Primitive extension for sourceAttachment. Type `FHIRPrimitiveExtension` """ self.sourceReference = None """ Source from which this consent is taken. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sourceReference = None + """ Primitive extension for sourceReference. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | proposed | active | rejected | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.verification = None """ Consent Verified by patient or family. List of `ConsentVerification` items (represented as `dict` in JSON). """ + self._verification = None + """ Primitive extension for verification. List of `FHIRPrimitiveExtension` """ super(Consent, self).__init__(jsondict=jsondict, strict=strict) @@ -85,19 +113,33 @@ def elementProperties(self): js = super(Consent, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, True, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dateTime", "dateTime", fhirdatetime.FHIRDateTime, False, None, False), + ("_dateTime", "_dateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("organization", "organization", fhirreference.FHIRReference, True, None, False), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, False), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("policy", "policy", ConsentPolicy, True, None, False), + ("_policy", "_policy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("policyRule", "policyRule", codeableconcept.CodeableConcept, False, None, False), + ("_policyRule", "_policyRule", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provision", "provision", ConsentProvision, False, None, False), + ("_provision", "_provision", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scope", "scope", codeableconcept.CodeableConcept, False, None, True), + ("_scope", "_scope", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceAttachment", "sourceAttachment", attachment.Attachment, False, "source", False), + ("_sourceAttachment", "_sourceAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceReference", "sourceReference", fhirreference.FHIRReference, False, "source", False), + ("_sourceReference", "_sourceReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("verification", "verification", ConsentVerification, True, None, False), + ("_verification", "_verification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -125,10 +167,14 @@ def __init__(self, jsondict=None, strict=True): self.authority = None """ Enforcement source for policy. Type `str`. """ + self._authority = None + """ Primitive extension for authority. Type `FHIRPrimitiveExtension` """ self.uri = None """ Specific policy covered by this consent. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ super(ConsentPolicy, self).__init__(jsondict=jsondict, strict=strict) @@ -136,7 +182,9 @@ def elementProperties(self): js = super(ConsentPolicy, self).elementProperties() js.extend([ ("authority", "authority", str, False, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, False), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -161,46 +209,68 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Actions controlled by this rule. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.actor = None """ Who|what controlled by this rule (or group, by role). List of `ConsentProvisionActor` items (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. List of `FHIRPrimitiveExtension` """ self.class_fhir = None """ e.g. Resource Type, Profile, CDA, etc.. List of `Coding` items (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. List of `FHIRPrimitiveExtension` """ self.code = None """ e.g. LOINC or SNOMED CT code, etc. in the content. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.data = None """ Data controlled by this rule. List of `ConsentProvisionData` items (represented as `dict` in JSON). """ + self._data = None + """ Primitive extension for data. List of `FHIRPrimitiveExtension` """ self.dataPeriod = None """ Timeframe for data controlled by this rule. Type `Period` (represented as `dict` in JSON). """ + self._dataPeriod = None + """ Primitive extension for dataPeriod. Type `FHIRPrimitiveExtension` """ self.period = None """ Timeframe for this rule. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.provision = None """ Nested Exception Rules. List of `ConsentProvision` items (represented as `dict` in JSON). """ + self._provision = None + """ Primitive extension for provision. List of `FHIRPrimitiveExtension` """ self.purpose = None """ Context of activities covered by this rule. List of `Coding` items (represented as `dict` in JSON). """ + self._purpose = None + """ Primitive extension for purpose. List of `FHIRPrimitiveExtension` """ self.securityLabel = None """ Security Labels that define affected resources. List of `Coding` items (represented as `dict` in JSON). """ + self._securityLabel = None + """ Primitive extension for securityLabel. List of `FHIRPrimitiveExtension` """ self.type = None """ deny | permit. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ConsentProvision, self).__init__(jsondict=jsondict, strict=strict) @@ -208,16 +278,27 @@ def elementProperties(self): js = super(ConsentProvision, self).elementProperties() js.extend([ ("action", "action", codeableconcept.CodeableConcept, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("actor", "actor", ConsentProvisionActor, True, None, False), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("class_fhir", "class", coding.Coding, True, None, False), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("data", "data", ConsentProvisionData, True, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dataPeriod", "dataPeriod", period.Period, False, None, False), + ("_dataPeriod", "_dataPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provision", "provision", ConsentProvision, True, None, False), + ("_provision", "_provision", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("purpose", "purpose", coding.Coding, True, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("securityLabel", "securityLabel", coding.Coding, True, None, False), + ("_securityLabel", "_securityLabel", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -242,10 +323,14 @@ def __init__(self, jsondict=None, strict=True): self.reference = None """ Resource for the actor (or group, by role). Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.role = None """ How the actor is involved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ super(ConsentProvisionActor, self).__init__(jsondict=jsondict, strict=strict) @@ -253,7 +338,9 @@ def elementProperties(self): js = super(ConsentProvisionActor, self).elementProperties() js.extend([ ("reference", "reference", fhirreference.FHIRReference, False, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, True), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -277,10 +364,14 @@ def __init__(self, jsondict=None, strict=True): self.meaning = None """ instance | related | dependents | authoredby. Type `str`. """ + self._meaning = None + """ Primitive extension for meaning. Type `FHIRPrimitiveExtension` """ self.reference = None """ The actual data reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ super(ConsentProvisionData, self).__init__(jsondict=jsondict, strict=strict) @@ -288,7 +379,9 @@ def elementProperties(self): js = super(ConsentProvisionData, self).elementProperties() js.extend([ ("meaning", "meaning", str, False, None, True), + ("_meaning", "_meaning", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", fhirreference.FHIRReference, False, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -313,14 +406,20 @@ def __init__(self, jsondict=None, strict=True): self.verificationDate = None """ When consent verified. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._verificationDate = None + """ Primitive extension for verificationDate. Type `FHIRPrimitiveExtension` """ self.verified = None """ Has been verified. Type `bool`. """ + self._verified = None + """ Primitive extension for verified. Type `FHIRPrimitiveExtension` """ self.verifiedWith = None """ Person who verified. Type `FHIRReference` (represented as `dict` in JSON). """ + self._verifiedWith = None + """ Primitive extension for verifiedWith. Type `FHIRPrimitiveExtension` """ super(ConsentVerification, self).__init__(jsondict=jsondict, strict=strict) @@ -328,11 +427,15 @@ def elementProperties(self): js = super(ConsentVerification, self).elementProperties() js.extend([ ("verificationDate", "verificationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_verificationDate", "_verificationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("verified", "verified", bool, False, None, True), + ("_verified", "_verified", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("verifiedWith", "verifiedWith", fhirreference.FHIRReference, False, None, False), + ("_verifiedWith", "_verifiedWith", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -340,4 +443,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/contactdetail.py b/fhirclient/models/contactdetail.py index a3678995..f6eb2023 100644 --- a/fhirclient/models/contactdetail.py +++ b/fhirclient/models/contactdetail.py @@ -23,10 +23,14 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Name of an individual to contact. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details for individual or organization. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(ContactDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -34,9 +38,12 @@ def elementProperties(self): js = super(ContactDetail, self).elementProperties() js.extend([ ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension -from . import contactpoint +from . import contactpoint \ No newline at end of file diff --git a/fhirclient/models/contactpoint.py b/fhirclient/models/contactpoint.py index 2475c4ba..79023b9f 100644 --- a/fhirclient/models/contactpoint.py +++ b/fhirclient/models/contactpoint.py @@ -24,22 +24,32 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ Time period when the contact point was/is in use. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.rank = None """ Specify preferred order of use (1 = highest). Type `int`. """ + self._rank = None + """ Primitive extension for rank. Type `FHIRPrimitiveExtension` """ self.system = None """ phone | fax | email | pager | url | sms | other. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.use = None """ home | work | temp | old | mobile - purpose of this contact point. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ self.value = None """ The actual contact point details. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ContactPoint, self).__init__(jsondict=jsondict, strict=strict) @@ -47,12 +57,18 @@ def elementProperties(self): js = super(ContactPoint, self).elementProperties() js.extend([ ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rank", "rank", int, False, None, False), + ("_rank", "_rank", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/contract.py b/fhirclient/models/contract.py index ddea5cb6..621c304e 100644 --- a/fhirclient/models/contract.py +++ b/fhirclient/models/contract.py @@ -24,145 +24,215 @@ def __init__(self, jsondict=None, strict=True): self.alias = None """ Acronym or short name. List of `str` items. """ + self._alias = None + """ Primitive extension for alias. List of `FHIRPrimitiveExtension` """ self.applies = None """ Effective time. Type `Period` (represented as `dict` in JSON). """ + self._applies = None + """ Primitive extension for applies. Type `FHIRPrimitiveExtension` """ self.author = None """ Source of Contract. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.authority = None """ Authority under which this Contract has standing. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._authority = None + """ Primitive extension for authority. List of `FHIRPrimitiveExtension` """ self.contentDefinition = None """ Contract precursor content. Type `ContractContentDefinition` (represented as `dict` in JSON). """ + self._contentDefinition = None + """ Primitive extension for contentDefinition. Type `FHIRPrimitiveExtension` """ self.contentDerivative = None """ Content derived from the basal information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._contentDerivative = None + """ Primitive extension for contentDerivative. Type `FHIRPrimitiveExtension` """ self.domain = None """ A sphere of control governed by an authoritative jurisdiction, organization, or person. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._domain = None + """ Primitive extension for domain. List of `FHIRPrimitiveExtension` """ self.expirationType = None """ Contract cessation cause. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._expirationType = None + """ Primitive extension for expirationType. Type `FHIRPrimitiveExtension` """ self.friendly = None """ Contract Friendly Language. List of `ContractFriendly` items (represented as `dict` in JSON). """ + self._friendly = None + """ Primitive extension for friendly. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Contract number. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Source Contract Definition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. Type `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ External Contract Definition. Type `str`. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. Type `FHIRPrimitiveExtension` """ self.issued = None """ When this Contract was issued. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.legal = None """ Contract Legal Language. List of `ContractLegal` items (represented as `dict` in JSON). """ + self._legal = None + """ Primitive extension for legal. List of `FHIRPrimitiveExtension` """ self.legalState = None """ Negotiation status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._legalState = None + """ Primitive extension for legalState. Type `FHIRPrimitiveExtension` """ self.legallyBindingAttachment = None """ Binding Contract. Type `Attachment` (represented as `dict` in JSON). """ + self._legallyBindingAttachment = None + """ Primitive extension for legallyBindingAttachment. Type `FHIRPrimitiveExtension` """ self.legallyBindingReference = None """ Binding Contract. Type `FHIRReference` (represented as `dict` in JSON). """ + self._legallyBindingReference = None + """ Primitive extension for legallyBindingReference. Type `FHIRPrimitiveExtension` """ self.name = None """ Computer friendly designation. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.relevantHistory = None """ Key event in Contract History. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._relevantHistory = None + """ Primitive extension for relevantHistory. List of `FHIRPrimitiveExtension` """ self.rule = None """ Computable Contract Language. List of `ContractRule` items (represented as `dict` in JSON). """ + self._rule = None + """ Primitive extension for rule. List of `FHIRPrimitiveExtension` """ self.scope = None """ Range of Legal Concerns. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._scope = None + """ Primitive extension for scope. Type `FHIRPrimitiveExtension` """ self.signer = None """ Contract Signatory. List of `ContractSigner` items (represented as `dict` in JSON). """ + self._signer = None + """ Primitive extension for signer. List of `FHIRPrimitiveExtension` """ self.site = None """ Specific Location. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._site = None + """ Primitive extension for site. List of `FHIRPrimitiveExtension` """ self.status = None """ amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subType = None """ Subtype within the context of type. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. List of `FHIRPrimitiveExtension` """ self.subject = None """ Contract Target Entity. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate Friendly name. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Extra Information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ self.term = None """ Contract Term List. List of `ContractTerm` items (represented as `dict` in JSON). """ + self._term = None + """ Primitive extension for term. List of `FHIRPrimitiveExtension` """ self.title = None """ Human Friendly name. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topicCodeableConcept = None """ Focus of contract interest. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._topicCodeableConcept = None + """ Primitive extension for topicCodeableConcept. Type `FHIRPrimitiveExtension` """ self.topicReference = None """ Focus of contract interest. Type `FHIRReference` (represented as `dict` in JSON). """ + self._topicReference = None + """ Primitive extension for topicReference. Type `FHIRPrimitiveExtension` """ self.type = None """ Legal instrument category. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Basal definition. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.version = None """ Business edition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Contract, self).__init__(jsondict=jsondict, strict=strict) @@ -170,40 +240,75 @@ def elementProperties(self): js = super(Contract, self).elementProperties() js.extend([ ("alias", "alias", str, True, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("applies", "applies", period.Period, False, None, False), + ("_applies", "_applies", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authority", "authority", fhirreference.FHIRReference, True, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contentDefinition", "contentDefinition", ContractContentDefinition, False, None, False), + ("_contentDefinition", "_contentDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentDerivative", "contentDerivative", codeableconcept.CodeableConcept, False, None, False), + ("_contentDerivative", "_contentDerivative", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("domain", "domain", fhirreference.FHIRReference, True, None, False), + ("_domain", "_domain", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("expirationType", "expirationType", codeableconcept.CodeableConcept, False, None, False), + ("_expirationType", "_expirationType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("friendly", "friendly", ContractFriendly, True, None, False), + ("_friendly", "_friendly", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", fhirreference.FHIRReference, False, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("instantiatesUri", "instantiatesUri", str, False, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("issued", "issued", fhirdatetime.FHIRDateTime, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("legal", "legal", ContractLegal, True, None, False), + ("_legal", "_legal", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("legalState", "legalState", codeableconcept.CodeableConcept, False, None, False), + ("_legalState", "_legalState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("legallyBindingAttachment", "legallyBindingAttachment", attachment.Attachment, False, "legallyBinding", False), + ("_legallyBindingAttachment", "_legallyBindingAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("legallyBindingReference", "legallyBindingReference", fhirreference.FHIRReference, False, "legallyBinding", False), + ("_legallyBindingReference", "_legallyBindingReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relevantHistory", "relevantHistory", fhirreference.FHIRReference, True, None, False), + ("_relevantHistory", "_relevantHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rule", "rule", ContractRule, True, None, False), + ("_rule", "_rule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("scope", "scope", codeableconcept.CodeableConcept, False, None, False), + ("_scope", "_scope", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("signer", "signer", ContractSigner, True, None, False), + ("_signer", "_signer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("site", "site", fhirreference.FHIRReference, True, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subType", "subType", codeableconcept.CodeableConcept, True, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", fhirreference.FHIRReference, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("term", "term", ContractTerm, True, None, False), + ("_term", "_term", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topicCodeableConcept", "topicCodeableConcept", codeableconcept.CodeableConcept, False, "topic", False), + ("_topicCodeableConcept", "_topicCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topicReference", "topicReference", fhirreference.FHIRReference, False, "topic", False), + ("_topicReference", "_topicReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -231,28 +336,40 @@ def __init__(self, jsondict=None, strict=True): self.copyright = None """ Publication Ownership. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.publicationDate = None """ When published. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._publicationDate = None + """ Primitive extension for publicationDate. Type `FHIRPrimitiveExtension` """ self.publicationStatus = None """ amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated. Type `str`. """ + self._publicationStatus = None + """ Primitive extension for publicationStatus. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Publisher Entity. Type `FHIRReference` (represented as `dict` in JSON). """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.subType = None """ Detailed Content Type Definition. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. Type `FHIRPrimitiveExtension` """ self.type = None """ Content structure and use. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ContractContentDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -260,11 +377,17 @@ def elementProperties(self): js = super(ContractContentDefinition, self).elementProperties() js.extend([ ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publicationDate", "publicationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_publicationDate", "_publicationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publicationStatus", "publicationStatus", str, False, None, True), + ("_publicationStatus", "_publicationStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", fhirreference.FHIRReference, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subType", "subType", codeableconcept.CodeableConcept, False, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -294,10 +417,14 @@ def __init__(self, jsondict=None, strict=True): self.contentAttachment = None """ Easily comprehended representation of this Contract. Type `Attachment` (represented as `dict` in JSON). """ + self._contentAttachment = None + """ Primitive extension for contentAttachment. Type `FHIRPrimitiveExtension` """ self.contentReference = None """ Easily comprehended representation of this Contract. Type `FHIRReference` (represented as `dict` in JSON). """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ super(ContractFriendly, self).__init__(jsondict=jsondict, strict=strict) @@ -305,7 +432,9 @@ def elementProperties(self): js = super(ContractFriendly, self).elementProperties() js.extend([ ("contentAttachment", "contentAttachment", attachment.Attachment, False, "content", True), + ("_contentAttachment", "_contentAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentReference", "contentReference", fhirreference.FHIRReference, False, "content", True), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -329,10 +458,14 @@ def __init__(self, jsondict=None, strict=True): self.contentAttachment = None """ Contract Legal Text. Type `Attachment` (represented as `dict` in JSON). """ + self._contentAttachment = None + """ Primitive extension for contentAttachment. Type `FHIRPrimitiveExtension` """ self.contentReference = None """ Contract Legal Text. Type `FHIRReference` (represented as `dict` in JSON). """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ super(ContractLegal, self).__init__(jsondict=jsondict, strict=strict) @@ -340,7 +473,9 @@ def elementProperties(self): js = super(ContractLegal, self).elementProperties() js.extend([ ("contentAttachment", "contentAttachment", attachment.Attachment, False, "content", True), + ("_contentAttachment", "_contentAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentReference", "contentReference", fhirreference.FHIRReference, False, "content", True), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -364,10 +499,14 @@ def __init__(self, jsondict=None, strict=True): self.contentAttachment = None """ Computable Contract Rules. Type `Attachment` (represented as `dict` in JSON). """ + self._contentAttachment = None + """ Primitive extension for contentAttachment. Type `FHIRPrimitiveExtension` """ self.contentReference = None """ Computable Contract Rules. Type `FHIRReference` (represented as `dict` in JSON). """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ super(ContractRule, self).__init__(jsondict=jsondict, strict=strict) @@ -375,7 +514,9 @@ def elementProperties(self): js = super(ContractRule, self).elementProperties() js.extend([ ("contentAttachment", "contentAttachment", attachment.Attachment, False, "content", True), + ("_contentAttachment", "_contentAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentReference", "contentReference", fhirreference.FHIRReference, False, "content", True), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -402,14 +543,20 @@ def __init__(self, jsondict=None, strict=True): self.party = None """ Contract Signatory Party. Type `FHIRReference` (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. Type `FHIRPrimitiveExtension` """ self.signature = None """ Contract Documentation Signature. List of `Signature` items (represented as `dict` in JSON). """ + self._signature = None + """ Primitive extension for signature. List of `FHIRPrimitiveExtension` """ self.type = None """ Contract Signatory Role. Type `Coding` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ContractSigner, self).__init__(jsondict=jsondict, strict=strict) @@ -417,8 +564,11 @@ def elementProperties(self): js = super(ContractSigner, self).elementProperties() js.extend([ ("party", "party", fhirreference.FHIRReference, False, None, True), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("signature", "signature", signature.Signature, True, None, True), + ("_signature", "_signature", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", coding.Coding, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -443,54 +593,80 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Entity being ascribed responsibility. List of `ContractTermAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.applies = None """ Contract Term Effective Time. Type `Period` (represented as `dict` in JSON). """ + self._applies = None + """ Primitive extension for applies. Type `FHIRPrimitiveExtension` """ self.asset = None """ Contract Term Asset List. List of `ContractTermAsset` items (represented as `dict` in JSON). """ + self._asset = None + """ Primitive extension for asset. List of `FHIRPrimitiveExtension` """ self.group = None """ Nested Contract Term Group. List of `ContractTerm` items (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Contract Term Number. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.issued = None """ Contract Term Issue Date Time. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.offer = None """ Context of the Contract term. Type `ContractTermOffer` (represented as `dict` in JSON). """ + self._offer = None + """ Primitive extension for offer. Type `FHIRPrimitiveExtension` """ self.securityLabel = None """ Protection for the Term. List of `ContractTermSecurityLabel` items (represented as `dict` in JSON). """ + self._securityLabel = None + """ Primitive extension for securityLabel. List of `FHIRPrimitiveExtension` """ self.subType = None """ Contract Term Type specific classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. Type `FHIRPrimitiveExtension` """ self.text = None """ Term Statement. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.topicCodeableConcept = None """ Term Concern. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._topicCodeableConcept = None + """ Primitive extension for topicCodeableConcept. Type `FHIRPrimitiveExtension` """ self.topicReference = None """ Term Concern. Type `FHIRReference` (represented as `dict` in JSON). """ + self._topicReference = None + """ Primitive extension for topicReference. Type `FHIRPrimitiveExtension` """ self.type = None """ Contract Term Type or Form. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ContractTerm, self).__init__(jsondict=jsondict, strict=strict) @@ -498,18 +674,31 @@ def elementProperties(self): js = super(ContractTerm, self).elementProperties() js.extend([ ("action", "action", ContractTermAction, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("applies", "applies", period.Period, False, None, False), + ("_applies", "_applies", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("asset", "asset", ContractTermAsset, True, None, False), + ("_asset", "_asset", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("group", "group", ContractTerm, True, None, False), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("issued", "issued", fhirdatetime.FHIRDateTime, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offer", "offer", ContractTermOffer, False, None, True), + ("_offer", "_offer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("securityLabel", "securityLabel", ContractTermSecurityLabel, True, None, False), + ("_securityLabel", "_securityLabel", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subType", "subType", codeableconcept.CodeableConcept, False, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topicCodeableConcept", "topicCodeableConcept", codeableconcept.CodeableConcept, False, "topic", False), + ("_topicCodeableConcept", "_topicCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topicReference", "topicReference", fhirreference.FHIRReference, False, "topic", False), + ("_topicReference", "_topicReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -534,94 +723,140 @@ def __init__(self, jsondict=None, strict=True): self.context = None """ Episode associated with action. Type `FHIRReference` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.contextLinkId = None """ Pointer to specific item. List of `str` items. """ + self._contextLinkId = None + """ Primitive extension for contextLinkId. List of `FHIRPrimitiveExtension` """ self.doNotPerform = None """ True if the term prohibits the action. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.intent = None """ Purpose for the Contract Term Action. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.linkId = None """ Pointer to specific item. List of `str` items. """ + self._linkId = None + """ Primitive extension for linkId. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments about the action. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When action happens. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When action happens. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ When action happens. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.performer = None """ Actor that wil execute (or not) the action. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.performerLinkId = None """ Pointer to specific item. List of `str` items. """ + self._performerLinkId = None + """ Primitive extension for performerLinkId. List of `FHIRPrimitiveExtension` """ self.performerRole = None """ Competency of the performer. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._performerRole = None + """ Primitive extension for performerRole. Type `FHIRPrimitiveExtension` """ self.performerType = None """ Kind of service performer. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._performerType = None + """ Primitive extension for performerType. List of `FHIRPrimitiveExtension` """ self.reason = None """ Why action is to be performed. List of `str` items. """ + self._reason = None + """ Primitive extension for reason. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why is action (not) needed?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonLinkId = None """ Pointer to specific item. List of `str` items. """ + self._reasonLinkId = None + """ Primitive extension for reasonLinkId. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why is action (not) needed?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.requester = None """ Who asked for action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. List of `FHIRPrimitiveExtension` """ self.requesterLinkId = None """ Pointer to specific item. List of `str` items. """ + self._requesterLinkId = None + """ Primitive extension for requesterLinkId. List of `FHIRPrimitiveExtension` """ self.securityLabelNumber = None """ Action restriction numbers. List of `int` items. """ + self._securityLabelNumber = None + """ Primitive extension for securityLabelNumber. List of `FHIRPrimitiveExtension` """ self.status = None """ State of the action. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Entity of the action. List of `ContractTermActionSubject` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.type = None """ Type or form of the action. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ContractTermAction, self).__init__(jsondict=jsondict, strict=strict) @@ -629,28 +864,51 @@ def elementProperties(self): js = super(ContractTermAction, self).elementProperties() js.extend([ ("context", "context", fhirreference.FHIRReference, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contextLinkId", "contextLinkId", str, True, None, False), + ("_contextLinkId", "_contextLinkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("intent", "intent", codeableconcept.CodeableConcept, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("linkId", "linkId", str, True, None, False), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performerLinkId", "performerLinkId", str, True, None, False), + ("_performerLinkId", "_performerLinkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performerRole", "performerRole", codeableconcept.CodeableConcept, False, None, False), + ("_performerRole", "_performerRole", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performerType", "performerType", codeableconcept.CodeableConcept, True, None, False), + ("_performerType", "_performerType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reason", "reason", str, True, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonLinkId", "reasonLinkId", str, True, None, False), + ("_reasonLinkId", "_reasonLinkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, True, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requesterLinkId", "requesterLinkId", str, True, None, False), + ("_requesterLinkId", "_requesterLinkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("securityLabelNumber", "securityLabelNumber", int, True, None, False), + ("_securityLabelNumber", "_securityLabelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", ContractTermActionSubject, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -672,10 +930,14 @@ def __init__(self, jsondict=None, strict=True): self.reference = None """ Entity of the action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. List of `FHIRPrimitiveExtension` """ self.role = None """ Role type of the agent. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ super(ContractTermActionSubject, self).__init__(jsondict=jsondict, strict=strict) @@ -683,7 +945,9 @@ def elementProperties(self): js = super(ContractTermActionSubject, self).elementProperties() js.extend([ ("reference", "reference", fhirreference.FHIRReference, True, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -705,62 +969,92 @@ def __init__(self, jsondict=None, strict=True): self.answer = None """ Response to assets. List of `ContractTermOfferAnswer` items (represented as `dict` in JSON). """ + self._answer = None + """ Primitive extension for answer. List of `FHIRPrimitiveExtension` """ self.condition = None """ Quality desctiption of asset. Type `str`. """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.context = None """ Circumstance of the asset. List of `ContractTermAssetContext` items (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. List of `FHIRPrimitiveExtension` """ self.linkId = None """ Pointer to asset text. List of `str` items. """ + self._linkId = None + """ Primitive extension for linkId. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period of the asset. List of `Period` items (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. List of `FHIRPrimitiveExtension` """ self.periodType = None """ Asset availability types. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._periodType = None + """ Primitive extension for periodType. List of `FHIRPrimitiveExtension` """ self.relationship = None """ Kinship of the asset. Type `Coding` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ self.scope = None """ Range of asset. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._scope = None + """ Primitive extension for scope. Type `FHIRPrimitiveExtension` """ self.securityLabelNumber = None """ Asset restriction numbers. List of `int` items. """ + self._securityLabelNumber = None + """ Primitive extension for securityLabelNumber. List of `FHIRPrimitiveExtension` """ self.subtype = None """ Asset sub-category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subtype = None + """ Primitive extension for subtype. List of `FHIRPrimitiveExtension` """ self.text = None """ Asset clause or question text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ Asset category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.typeReference = None """ Associated entities. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._typeReference = None + """ Primitive extension for typeReference. List of `FHIRPrimitiveExtension` """ self.usePeriod = None """ Time period. List of `Period` items (represented as `dict` in JSON). """ + self._usePeriod = None + """ Primitive extension for usePeriod. List of `FHIRPrimitiveExtension` """ self.valuedItem = None """ Contract Valued Item List. List of `ContractTermAssetValuedItem` items (represented as `dict` in JSON). """ + self._valuedItem = None + """ Primitive extension for valuedItem. List of `FHIRPrimitiveExtension` """ super(ContractTermAsset, self).__init__(jsondict=jsondict, strict=strict) @@ -768,20 +1062,35 @@ def elementProperties(self): js = super(ContractTermAsset, self).elementProperties() js.extend([ ("answer", "answer", ContractTermOfferAnswer, True, None, False), + ("_answer", "_answer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("condition", "condition", str, False, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", ContractTermAssetContext, True, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("linkId", "linkId", str, True, None, False), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, True, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("periodType", "periodType", codeableconcept.CodeableConcept, True, None, False), + ("_periodType", "_periodType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relationship", "relationship", coding.Coding, False, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scope", "scope", codeableconcept.CodeableConcept, False, None, False), + ("_scope", "_scope", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("securityLabelNumber", "securityLabelNumber", int, True, None, False), + ("_securityLabelNumber", "_securityLabelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subtype", "subtype", codeableconcept.CodeableConcept, True, None, False), + ("_subtype", "_subtype", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("typeReference", "typeReference", fhirreference.FHIRReference, True, None, False), + ("_typeReference", "_typeReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("usePeriod", "usePeriod", period.Period, True, None, False), + ("_usePeriod", "_usePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valuedItem", "valuedItem", ContractTermAssetValuedItem, True, None, False), + ("_valuedItem", "_valuedItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -803,14 +1112,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Codeable asset context. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.reference = None """ Creator,custodian or owner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.text = None """ Context description. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ super(ContractTermAssetContext, self).__init__(jsondict=jsondict, strict=strict) @@ -818,8 +1133,11 @@ def elementProperties(self): js = super(ContractTermAssetContext, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reference", "reference", fhirreference.FHIRReference, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -841,62 +1159,92 @@ def __init__(self, jsondict=None, strict=True): self.effectiveTime = None """ Contract Valued Item Effective Tiem. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveTime = None + """ Primitive extension for effectiveTime. Type `FHIRPrimitiveExtension` """ self.entityCodeableConcept = None """ Contract Valued Item Type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._entityCodeableConcept = None + """ Primitive extension for entityCodeableConcept. Type `FHIRPrimitiveExtension` """ self.entityReference = None """ Contract Valued Item Type. Type `FHIRReference` (represented as `dict` in JSON). """ + self._entityReference = None + """ Primitive extension for entityReference. Type `FHIRPrimitiveExtension` """ self.factor = None """ Contract Valued Item Price Scaling Factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Contract Valued Item Number. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.linkId = None """ Pointer to specific item. List of `str` items. """ + self._linkId = None + """ Primitive extension for linkId. List of `FHIRPrimitiveExtension` """ self.net = None """ Total Contract Valued Item Value. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.payment = None """ Terms of valuation. Type `str`. """ + self._payment = None + """ Primitive extension for payment. Type `FHIRPrimitiveExtension` """ self.paymentDate = None """ When payment is due. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._paymentDate = None + """ Primitive extension for paymentDate. Type `FHIRPrimitiveExtension` """ self.points = None """ Contract Valued Item Difficulty Scaling Factor. Type `float`. """ + self._points = None + """ Primitive extension for points. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of Contract Valued Items. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.recipient = None """ Who will receive payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Who will make payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.securityLabelNumber = None """ Security Labels that define affected terms. List of `int` items. """ + self._securityLabelNumber = None + """ Primitive extension for securityLabelNumber. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Contract Valued Item fee, charge, or cost. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ContractTermAssetValuedItem, self).__init__(jsondict=jsondict, strict=strict) @@ -904,20 +1252,35 @@ def elementProperties(self): js = super(ContractTermAssetValuedItem, self).elementProperties() js.extend([ ("effectiveTime", "effectiveTime", fhirdatetime.FHIRDateTime, False, None, False), + ("_effectiveTime", "_effectiveTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("entityCodeableConcept", "entityCodeableConcept", codeableconcept.CodeableConcept, False, "entity", False), + ("_entityCodeableConcept", "_entityCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("entityReference", "entityReference", fhirreference.FHIRReference, False, "entity", False), + ("_entityReference", "_entityReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("linkId", "linkId", str, True, None, False), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payment", "payment", str, False, None, False), + ("_payment", "_payment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentDate", "paymentDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_paymentDate", "_paymentDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("points", "points", float, False, None, False), + ("_points", "_points", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, False, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", fhirreference.FHIRReference, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("securityLabelNumber", "securityLabelNumber", int, True, None, False), + ("_securityLabelNumber", "_securityLabelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -941,42 +1304,62 @@ def __init__(self, jsondict=None, strict=True): self.answer = None """ Response to offer text. List of `ContractTermOfferAnswer` items (represented as `dict` in JSON). """ + self._answer = None + """ Primitive extension for answer. List of `FHIRPrimitiveExtension` """ self.decision = None """ Accepting party choice. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._decision = None + """ Primitive extension for decision. Type `FHIRPrimitiveExtension` """ self.decisionMode = None """ How decision is conveyed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._decisionMode = None + """ Primitive extension for decisionMode. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Offer business ID. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.linkId = None """ Pointer to text. List of `str` items. """ + self._linkId = None + """ Primitive extension for linkId. List of `FHIRPrimitiveExtension` """ self.party = None """ Offer Recipient. List of `ContractTermOfferParty` items (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. List of `FHIRPrimitiveExtension` """ self.securityLabelNumber = None """ Offer restriction numbers. List of `int` items. """ + self._securityLabelNumber = None + """ Primitive extension for securityLabelNumber. List of `FHIRPrimitiveExtension` """ self.text = None """ Human readable offer text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.topic = None """ Negotiable offer asset. Type `FHIRReference` (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. Type `FHIRPrimitiveExtension` """ self.type = None """ Contract Offer Type or Form. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ContractTermOffer, self).__init__(jsondict=jsondict, strict=strict) @@ -984,15 +1367,25 @@ def elementProperties(self): js = super(ContractTermOffer, self).elementProperties() js.extend([ ("answer", "answer", ContractTermOfferAnswer, True, None, False), + ("_answer", "_answer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("decision", "decision", codeableconcept.CodeableConcept, False, None, False), + ("_decision", "_decision", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("decisionMode", "decisionMode", codeableconcept.CodeableConcept, True, None, False), + ("_decisionMode", "_decisionMode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("linkId", "linkId", str, True, None, False), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("party", "party", ContractTermOfferParty, True, None, False), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("securityLabelNumber", "securityLabelNumber", int, True, None, False), + ("_securityLabelNumber", "_securityLabelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", fhirreference.FHIRReference, False, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1014,50 +1407,74 @@ def __init__(self, jsondict=None, strict=True): self.valueAttachment = None """ The actual answer response. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ The actual answer response. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ The actual answer response. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ The actual answer response. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ The actual answer response. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ The actual answer response. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ The actual answer response. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ The actual answer response. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ The actual answer response. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ The actual answer response. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ The actual answer response. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ The actual answer response. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ super(ContractTermOfferAnswer, self).__init__(jsondict=jsondict, strict=strict) @@ -1065,17 +1482,29 @@ def elementProperties(self): js = super(ContractTermOfferAnswer, self).elementProperties() js.extend([ ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", True), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", True), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1097,10 +1526,14 @@ def __init__(self, jsondict=None, strict=True): self.reference = None """ Referenced entity. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. List of `FHIRPrimitiveExtension` """ self.role = None """ Participant engagement type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ super(ContractTermOfferParty, self).__init__(jsondict=jsondict, strict=strict) @@ -1108,7 +1541,9 @@ def elementProperties(self): js = super(ContractTermOfferParty, self).elementProperties() js.extend([ ("reference", "reference", fhirreference.FHIRReference, True, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, True), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1133,18 +1568,26 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Applicable Policy. List of `Coding` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.classification = None """ Confidentiality Protection. Type `Coding` (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. Type `FHIRPrimitiveExtension` """ self.control = None """ Handling Instructions. List of `Coding` items (represented as `dict` in JSON). """ + self._control = None + """ Primitive extension for control. List of `FHIRPrimitiveExtension` """ self.number = None """ Link to Security Labels. List of `int` items. """ + self._number = None + """ Primitive extension for number. List of `FHIRPrimitiveExtension` """ super(ContractTermSecurityLabel, self).__init__(jsondict=jsondict, strict=strict) @@ -1152,12 +1595,17 @@ def elementProperties(self): js = super(ContractTermSecurityLabel, self).elementProperties() js.extend([ ("category", "category", coding.Coding, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("classification", "classification", coding.Coding, False, None, True), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("control", "control", coding.Coding, True, None, False), + ("_control", "_control", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("number", "number", int, True, None, False), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import attachment @@ -1172,4 +1620,4 @@ def elementProperties(self): from . import period from . import quantity from . import signature -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/contributor.py b/fhirclient/models/contributor.py index 651079b1..de913d28 100644 --- a/fhirclient/models/contributor.py +++ b/fhirclient/models/contributor.py @@ -24,14 +24,20 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details of the contributor. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.name = None """ Who contributed the content. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ author | editor | reviewer | endorser. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Contributor, self).__init__(jsondict=jsondict, strict=strict) @@ -39,10 +45,14 @@ def elementProperties(self): js = super(Contributor, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import contactdetail +from . import contactdetail \ No newline at end of file diff --git a/fhirclient/models/count.py b/fhirclient/models/count.py index bccc80bf..c096d7a2 100644 --- a/fhirclient/models/count.py +++ b/fhirclient/models/count.py @@ -24,4 +24,4 @@ def __init__(self, jsondict=None, strict=True): super(Count, self).__init__(jsondict=jsondict, strict=strict) - +from . import fhirprimitiveextension diff --git a/fhirclient/models/coverage.py b/fhirclient/models/coverage.py index e4d5d75e..cbda09c8 100644 --- a/fhirclient/models/coverage.py +++ b/fhirclient/models/coverage.py @@ -24,70 +24,104 @@ def __init__(self, jsondict=None, strict=True): self.beneficiary = None """ Plan beneficiary. Type `FHIRReference` (represented as `dict` in JSON). """ + self._beneficiary = None + """ Primitive extension for beneficiary. Type `FHIRPrimitiveExtension` """ self.class_fhir = None """ Additional coverage classifications. List of `CoverageClass` items (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. List of `FHIRPrimitiveExtension` """ self.contract = None """ Contract details. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._contract = None + """ Primitive extension for contract. List of `FHIRPrimitiveExtension` """ self.costToBeneficiary = None """ Patient payments for services/products. List of `CoverageCostToBeneficiary` items (represented as `dict` in JSON). """ + self._costToBeneficiary = None + """ Primitive extension for costToBeneficiary. List of `FHIRPrimitiveExtension` """ self.dependent = None """ Dependent number. Type `str`. """ + self._dependent = None + """ Primitive extension for dependent. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for the coverage. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.network = None """ Insurer network. Type `str`. """ + self._network = None + """ Primitive extension for network. Type `FHIRPrimitiveExtension` """ self.order = None """ Relative order of the coverage. Type `int`. """ + self._order = None + """ Primitive extension for order. Type `FHIRPrimitiveExtension` """ self.payor = None """ Issuer of the policy. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._payor = None + """ Primitive extension for payor. List of `FHIRPrimitiveExtension` """ self.period = None """ Coverage start and end dates. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.policyHolder = None """ Owner of the policy. Type `FHIRReference` (represented as `dict` in JSON). """ + self._policyHolder = None + """ Primitive extension for policyHolder. Type `FHIRPrimitiveExtension` """ self.relationship = None """ Beneficiary relationship to the subscriber. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subrogation = None """ Reimbursement to insurer. Type `bool`. """ + self._subrogation = None + """ Primitive extension for subrogation. Type `FHIRPrimitiveExtension` """ self.subscriber = None """ Subscriber to the policy. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subscriber = None + """ Primitive extension for subscriber. Type `FHIRPrimitiveExtension` """ self.subscriberId = None """ ID assigned to the subscriber. Type `str`. """ + self._subscriberId = None + """ Primitive extension for subscriberId. Type `FHIRPrimitiveExtension` """ self.type = None """ Coverage category such as medical or accident. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Coverage, self).__init__(jsondict=jsondict, strict=strict) @@ -95,22 +129,39 @@ def elementProperties(self): js = super(Coverage, self).elementProperties() js.extend([ ("beneficiary", "beneficiary", fhirreference.FHIRReference, False, None, True), + ("_beneficiary", "_beneficiary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("class_fhir", "class", CoverageClass, True, None, False), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contract", "contract", fhirreference.FHIRReference, True, None, False), + ("_contract", "_contract", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("costToBeneficiary", "costToBeneficiary", CoverageCostToBeneficiary, True, None, False), + ("_costToBeneficiary", "_costToBeneficiary", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dependent", "dependent", str, False, None, False), + ("_dependent", "_dependent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("network", "network", str, False, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("order", "order", int, False, None, False), + ("_order", "_order", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payor", "payor", fhirreference.FHIRReference, True, None, True), + ("_payor", "_payor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("policyHolder", "policyHolder", fhirreference.FHIRReference, False, None, False), + ("_policyHolder", "_policyHolder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, False, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subrogation", "subrogation", bool, False, None, False), + ("_subrogation", "_subrogation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subscriber", "subscriber", fhirreference.FHIRReference, False, None, False), + ("_subscriber", "_subscriber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subscriberId", "subscriberId", str, False, None, False), + ("_subscriberId", "_subscriberId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -136,14 +187,20 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Human readable description of the type and value. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of class such as 'group' or 'plan'. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.value = None """ Value associated with the type. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(CoverageClass, self).__init__(jsondict=jsondict, strict=strict) @@ -151,8 +208,11 @@ def elementProperties(self): js = super(CoverageClass, self).elementProperties() js.extend([ ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -178,18 +238,26 @@ def __init__(self, jsondict=None, strict=True): self.exception = None """ Exceptions for patient payments. List of `CoverageCostToBeneficiaryException` items (represented as `dict` in JSON). """ + self._exception = None + """ Primitive extension for exception. List of `FHIRPrimitiveExtension` """ self.type = None """ Cost category. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ The amount or percentage due from the beneficiary. Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ The amount or percentage due from the beneficiary. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ super(CoverageCostToBeneficiary, self).__init__(jsondict=jsondict, strict=strict) @@ -197,9 +265,13 @@ def elementProperties(self): js = super(CoverageCostToBeneficiary, self).elementProperties() js.extend([ ("exception", "exception", CoverageCostToBeneficiaryException, True, None, False), + ("_exception", "_exception", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", True), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -224,10 +296,14 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ The effective period of the exception. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.type = None """ Exception category. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(CoverageCostToBeneficiaryException, self).__init__(jsondict=jsondict, strict=strict) @@ -235,14 +311,17 @@ def elementProperties(self): js = super(CoverageCostToBeneficiaryException, self).elementProperties() js.extend([ ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/coverageeligibilityrequest.py b/fhirclient/models/coverageeligibilityrequest.py index 71d69592..722a8a96 100644 --- a/fhirclient/models/coverageeligibilityrequest.py +++ b/fhirclient/models/coverageeligibilityrequest.py @@ -27,62 +27,92 @@ def __init__(self, jsondict=None, strict=True): self.created = None """ Creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.enterer = None """ Author. Type `FHIRReference` (represented as `dict` in JSON). """ + self._enterer = None + """ Primitive extension for enterer. Type `FHIRPrimitiveExtension` """ self.facility = None """ Servicing facility. Type `FHIRReference` (represented as `dict` in JSON). """ + self._facility = None + """ Primitive extension for facility. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for coverage eligiblity request. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Patient insurance information. List of `CoverageEligibilityRequestInsurance` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Coverage issuer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.item = None """ Item to be evaluated for eligibiity. List of `CoverageEligibilityRequestItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.patient = None """ Intended recipient of products and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.priority = None """ Desired processing priority. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.provider = None """ Party responsible for the request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.purpose = None """ auth-requirements | benefits | discovery | validation. List of `str` items. """ + self._purpose = None + """ Primitive extension for purpose. List of `FHIRPrimitiveExtension` """ self.servicedDate = None """ Estimated date or dates of service. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Estimated date or dates of service. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Supporting information. List of `CoverageEligibilityRequestSupportingInfo` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ super(CoverageEligibilityRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -90,20 +120,35 @@ def elementProperties(self): js = super(CoverageEligibilityRequest, self).elementProperties() js.extend([ ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enterer", "enterer", fhirreference.FHIRReference, False, None, False), + ("_enterer", "_enterer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("facility", "facility", fhirreference.FHIRReference, False, None, False), + ("_facility", "_facility", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", CoverageEligibilityRequestInsurance, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, True), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", CoverageEligibilityRequestItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, True, None, True), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", CoverageEligibilityRequestSupportingInfo, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -130,14 +175,20 @@ def __init__(self, jsondict=None, strict=True): self.businessArrangement = None """ Additional provider contract number. Type `str`. """ + self._businessArrangement = None + """ Primitive extension for businessArrangement. Type `FHIRPrimitiveExtension` """ self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.focal = None """ Applicable coverage. Type `bool`. """ + self._focal = None + """ Primitive extension for focal. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityRequestInsurance, self).__init__(jsondict=jsondict, strict=strict) @@ -145,8 +196,11 @@ def elementProperties(self): js = super(CoverageEligibilityRequestInsurance, self).elementProperties() js.extend([ ("businessArrangement", "businessArrangement", str, False, None, False), + ("_businessArrangement", "_businessArrangement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focal", "focal", bool, False, None, False), + ("_focal", "_focal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -171,42 +225,62 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.detail = None """ Product or service details. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.diagnosis = None """ Applicable diagnosis. List of `CoverageEligibilityRequestItemDiagnosis` items (represented as `dict` in JSON). """ + self._diagnosis = None + """ Primitive extension for diagnosis. List of `FHIRPrimitiveExtension` """ self.facility = None """ Servicing facility. Type `FHIRReference` (represented as `dict` in JSON). """ + self._facility = None + """ Primitive extension for facility. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Product or service billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.provider = None """ Perfoming practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.supportingInfoSequence = None """ Applicable exception or supporting information. List of `int` items. """ + self._supportingInfoSequence = None + """ Primitive extension for supportingInfoSequence. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityRequestItem, self).__init__(jsondict=jsondict, strict=strict) @@ -214,15 +288,25 @@ def elementProperties(self): js = super(CoverageEligibilityRequestItem, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", fhirreference.FHIRReference, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("diagnosis", "diagnosis", CoverageEligibilityRequestItemDiagnosis, True, None, False), + ("_diagnosis", "_diagnosis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("facility", "facility", fhirreference.FHIRReference, False, None, False), + ("_facility", "_facility", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, False), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfoSequence", "supportingInfoSequence", int, True, None, False), + ("_supportingInfoSequence", "_supportingInfoSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -246,10 +330,14 @@ def __init__(self, jsondict=None, strict=True): self.diagnosisCodeableConcept = None """ Nature of illness or problem. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diagnosisCodeableConcept = None + """ Primitive extension for diagnosisCodeableConcept. Type `FHIRPrimitiveExtension` """ self.diagnosisReference = None """ Nature of illness or problem. Type `FHIRReference` (represented as `dict` in JSON). """ + self._diagnosisReference = None + """ Primitive extension for diagnosisReference. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityRequestItemDiagnosis, self).__init__(jsondict=jsondict, strict=strict) @@ -257,7 +345,9 @@ def elementProperties(self): js = super(CoverageEligibilityRequestItemDiagnosis, self).elementProperties() js.extend([ ("diagnosisCodeableConcept", "diagnosisCodeableConcept", codeableconcept.CodeableConcept, False, "diagnosis", False), + ("_diagnosisCodeableConcept", "_diagnosisCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosisReference", "diagnosisReference", fhirreference.FHIRReference, False, "diagnosis", False), + ("_diagnosisReference", "_diagnosisReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -282,14 +372,20 @@ def __init__(self, jsondict=None, strict=True): self.appliesToAll = None """ Applies to all items. Type `bool`. """ + self._appliesToAll = None + """ Primitive extension for appliesToAll. Type `FHIRPrimitiveExtension` """ self.information = None """ Data to be provided. Type `FHIRReference` (represented as `dict` in JSON). """ + self._information = None + """ Primitive extension for information. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Information instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityRequestSupportingInfo, self).__init__(jsondict=jsondict, strict=strict) @@ -297,11 +393,15 @@ def elementProperties(self): js = super(CoverageEligibilityRequestSupportingInfo, self).elementProperties() js.extend([ ("appliesToAll", "appliesToAll", bool, False, None, False), + ("_appliesToAll", "_appliesToAll", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("information", "information", fhirreference.FHIRReference, False, None, True), + ("_information", "_information", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate @@ -310,4 +410,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/coverageeligibilityresponse.py b/fhirclient/models/coverageeligibilityresponse.py index faad7bf8..52e43fa6 100644 --- a/fhirclient/models/coverageeligibilityresponse.py +++ b/fhirclient/models/coverageeligibilityresponse.py @@ -24,66 +24,98 @@ def __init__(self, jsondict=None, strict=True): self.created = None """ Response creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.disposition = None """ Disposition Message. Type `str`. """ + self._disposition = None + """ Primitive extension for disposition. Type `FHIRPrimitiveExtension` """ self.error = None """ Processing errors. List of `CoverageEligibilityResponseError` items (represented as `dict` in JSON). """ + self._error = None + """ Primitive extension for error. List of `FHIRPrimitiveExtension` """ self.form = None """ Printed form identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._form = None + """ Primitive extension for form. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for coverage eligiblity request. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Patient insurance information. List of `CoverageEligibilityResponseInsurance` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Coverage issuer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.outcome = None """ queued | complete | error | partial. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.patient = None """ Intended recipient of products and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.preAuthRef = None """ Preauthorization reference. Type `str`. """ + self._preAuthRef = None + """ Primitive extension for preAuthRef. Type `FHIRPrimitiveExtension` """ self.purpose = None """ auth-requirements | benefits | discovery | validation. List of `str` items. """ + self._purpose = None + """ Primitive extension for purpose. List of `FHIRPrimitiveExtension` """ self.request = None """ Eligibility request reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.requestor = None """ Party responsible for the request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requestor = None + """ Primitive extension for requestor. Type `FHIRPrimitiveExtension` """ self.servicedDate = None """ Estimated date or dates of service. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Estimated date or dates of service. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -91,21 +123,37 @@ def elementProperties(self): js = super(CoverageEligibilityResponse, self).elementProperties() js.extend([ ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("disposition", "disposition", str, False, None, False), + ("_disposition", "_disposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("error", "error", CoverageEligibilityResponseError, True, None, False), + ("_error", "_error", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("form", "form", codeableconcept.CodeableConcept, False, None, False), + ("_form", "_form", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", CoverageEligibilityResponseInsurance, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, True), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", str, False, None, True), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthRef", "preAuthRef", str, False, None, False), + ("_preAuthRef", "_preAuthRef", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, True, None, True), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("request", "request", fhirreference.FHIRReference, False, None, True), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestor", "requestor", fhirreference.FHIRReference, False, None, False), + ("_requestor", "_requestor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -131,6 +179,8 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Error code detailing processing issues. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityResponseError, self).__init__(jsondict=jsondict, strict=strict) @@ -138,6 +188,7 @@ def elementProperties(self): js = super(CoverageEligibilityResponseError, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -162,18 +213,26 @@ def __init__(self, jsondict=None, strict=True): self.benefitPeriod = None """ When the benefits are applicable. Type `Period` (represented as `dict` in JSON). """ + self._benefitPeriod = None + """ Primitive extension for benefitPeriod. Type `FHIRPrimitiveExtension` """ self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.inforce = None """ Coverage inforce indicator. Type `bool`. """ + self._inforce = None + """ Primitive extension for inforce. Type `FHIRPrimitiveExtension` """ self.item = None """ Benefits and authorization details. List of `CoverageEligibilityResponseInsuranceItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ super(CoverageEligibilityResponseInsurance, self).__init__(jsondict=jsondict, strict=strict) @@ -181,9 +240,13 @@ def elementProperties(self): js = super(CoverageEligibilityResponseInsurance, self).elementProperties() js.extend([ ("benefitPeriod", "benefitPeriod", period.Period, False, None, False), + ("_benefitPeriod", "_benefitPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("inforce", "inforce", bool, False, None, False), + ("_inforce", "_inforce", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", CoverageEligibilityResponseInsuranceItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -208,58 +271,86 @@ def __init__(self, jsondict=None, strict=True): self.authorizationRequired = None """ Authorization required flag. Type `bool`. """ + self._authorizationRequired = None + """ Primitive extension for authorizationRequired. Type `FHIRPrimitiveExtension` """ self.authorizationSupporting = None """ Type of required supporting materials. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._authorizationSupporting = None + """ Primitive extension for authorizationSupporting. List of `FHIRPrimitiveExtension` """ self.authorizationUrl = None """ Preauthorization requirements endpoint. Type `str`. """ + self._authorizationUrl = None + """ Primitive extension for authorizationUrl. Type `FHIRPrimitiveExtension` """ self.benefit = None """ Benefit Summary. List of `CoverageEligibilityResponseInsuranceItemBenefit` items (represented as `dict` in JSON). """ + self._benefit = None + """ Primitive extension for benefit. List of `FHIRPrimitiveExtension` """ self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.description = None """ Description of the benefit or services covered. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.excluded = None """ Excluded from the plan. Type `bool`. """ + self._excluded = None + """ Primitive extension for excluded. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Product or service billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.name = None """ Short name for the benefit. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.network = None """ In or out of network. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. Type `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.provider = None """ Performing practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.term = None """ Annual or lifetime. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._term = None + """ Primitive extension for term. Type `FHIRPrimitiveExtension` """ self.unit = None """ Individual or family. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unit = None + """ Primitive extension for unit. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityResponseInsuranceItem, self).__init__(jsondict=jsondict, strict=strict) @@ -267,19 +358,33 @@ def elementProperties(self): js = super(CoverageEligibilityResponseInsuranceItem, self).elementProperties() js.extend([ ("authorizationRequired", "authorizationRequired", bool, False, None, False), + ("_authorizationRequired", "_authorizationRequired", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authorizationSupporting", "authorizationSupporting", codeableconcept.CodeableConcept, True, None, False), + ("_authorizationSupporting", "_authorizationSupporting", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("authorizationUrl", "authorizationUrl", str, False, None, False), + ("_authorizationUrl", "_authorizationUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("benefit", "benefit", CoverageEligibilityResponseInsuranceItemBenefit, True, None, False), + ("_benefit", "_benefit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("excluded", "excluded", bool, False, None, False), + ("_excluded", "_excluded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("network", "network", codeableconcept.CodeableConcept, False, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, False), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("term", "term", codeableconcept.CodeableConcept, False, None, False), + ("_term", "_term", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unit", "unit", codeableconcept.CodeableConcept, False, None, False), + ("_unit", "_unit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -303,30 +408,44 @@ def __init__(self, jsondict=None, strict=True): self.allowedMoney = None """ Benefits allowed. Type `Money` (represented as `dict` in JSON). """ + self._allowedMoney = None + """ Primitive extension for allowedMoney. Type `FHIRPrimitiveExtension` """ self.allowedString = None """ Benefits allowed. Type `str`. """ + self._allowedString = None + """ Primitive extension for allowedString. Type `FHIRPrimitiveExtension` """ self.allowedUnsignedInt = None """ Benefits allowed. Type `int`. """ + self._allowedUnsignedInt = None + """ Primitive extension for allowedUnsignedInt. Type `FHIRPrimitiveExtension` """ self.type = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.usedMoney = None """ Benefits used. Type `Money` (represented as `dict` in JSON). """ + self._usedMoney = None + """ Primitive extension for usedMoney. Type `FHIRPrimitiveExtension` """ self.usedString = None """ Benefits used. Type `str`. """ + self._usedString = None + """ Primitive extension for usedString. Type `FHIRPrimitiveExtension` """ self.usedUnsignedInt = None """ Benefits used. Type `int`. """ + self._usedUnsignedInt = None + """ Primitive extension for usedUnsignedInt. Type `FHIRPrimitiveExtension` """ super(CoverageEligibilityResponseInsuranceItemBenefit, self).__init__(jsondict=jsondict, strict=strict) @@ -334,15 +453,23 @@ def elementProperties(self): js = super(CoverageEligibilityResponseInsuranceItemBenefit, self).elementProperties() js.extend([ ("allowedMoney", "allowedMoney", money.Money, False, "allowed", False), + ("_allowedMoney", "_allowedMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("allowedString", "allowedString", str, False, "allowed", False), + ("_allowedString", "_allowedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("allowedUnsignedInt", "allowedUnsignedInt", int, False, "allowed", False), + ("_allowedUnsignedInt", "_allowedUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedMoney", "usedMoney", money.Money, False, "used", False), + ("_usedMoney", "_usedMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedString", "usedString", str, False, "used", False), + ("_usedString", "_usedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedUnsignedInt", "usedUnsignedInt", int, False, "used", False), + ("_usedUnsignedInt", "_usedUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate @@ -350,4 +477,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import money -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/datarequirement.py b/fhirclient/models/datarequirement.py index 2cf91a40..c10c03b0 100644 --- a/fhirclient/models/datarequirement.py +++ b/fhirclient/models/datarequirement.py @@ -24,41 +24,59 @@ def __init__(self, jsondict=None, strict=True): self.codeFilter = None """ What codes are expected. List of `DataRequirementCodeFilter` items (represented as `dict` in JSON). """ + self._codeFilter = None + """ Primitive extension for codeFilter. List of `FHIRPrimitiveExtension` """ self.dateFilter = None """ What dates/date ranges are expected. List of `DataRequirementDateFilter` items (represented as `dict` in JSON). """ + self._dateFilter = None + """ Primitive extension for dateFilter. List of `FHIRPrimitiveExtension` """ self.limit = None """ Number of results. Type `int`. """ + self._limit = None + """ Primitive extension for limit. Type `FHIRPrimitiveExtension` """ self.mustSupport = None """ Indicates specific structure elements that are referenced by the knowledge module. List of `str` items. """ + self._mustSupport = None + """ Primitive extension for mustSupport. List of `FHIRPrimitiveExtension` """ self.profile = None """ The profile of the required data. List of `str` items. """ + self._profile = None + """ Primitive extension for profile. List of `FHIRPrimitiveExtension` """ self.sort = None """ Order of the results. List of `DataRequirementSort` items (represented as `dict` in JSON). """ + self._sort = None + """ Primitive extension for sort. List of `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of the required data. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DataRequirement, self).__init__(jsondict=jsondict, strict=strict) @@ -66,14 +84,23 @@ def elementProperties(self): js = super(DataRequirement, self).elementProperties() js.extend([ ("codeFilter", "codeFilter", DataRequirementCodeFilter, True, None, False), + ("_codeFilter", "_codeFilter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dateFilter", "dateFilter", DataRequirementDateFilter, True, None, False), + ("_dateFilter", "_dateFilter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("limit", "limit", int, False, None, False), + ("_limit", "_limit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mustSupport", "mustSupport", str, True, None, False), + ("_mustSupport", "_mustSupport", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("profile", "profile", str, True, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sort", "sort", DataRequirementSort, True, None, False), + ("_sort", "_sort", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -100,18 +127,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ What code is expected. List of `Coding` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.path = None """ A code-valued attribute to filter on. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.searchParam = None """ A coded (token) parameter to search on. Type `str`. """ + self._searchParam = None + """ Primitive extension for searchParam. Type `FHIRPrimitiveExtension` """ self.valueSet = None """ Valueset for the filter. Type `str`. """ + self._valueSet = None + """ Primitive extension for valueSet. Type `FHIRPrimitiveExtension` """ super(DataRequirementCodeFilter, self).__init__(jsondict=jsondict, strict=strict) @@ -119,9 +154,13 @@ def elementProperties(self): js = super(DataRequirementCodeFilter, self).elementProperties() js.extend([ ("code", "code", coding.Coding, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("searchParam", "searchParam", str, False, None, False), + ("_searchParam", "_searchParam", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSet", "valueSet", str, False, None, False), + ("_valueSet", "_valueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -147,22 +186,32 @@ def __init__(self, jsondict=None, strict=True): self.path = None """ A date-valued attribute to filter on. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.searchParam = None """ A date valued parameter to search on. Type `str`. """ + self._searchParam = None + """ Primitive extension for searchParam. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ The value of the filter, as a Period, DateTime, or Duration value. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ The value of the filter, as a Period, DateTime, or Duration value. Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ The value of the filter, as a Period, DateTime, or Duration value. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ super(DataRequirementDateFilter, self).__init__(jsondict=jsondict, strict=strict) @@ -170,10 +219,15 @@ def elementProperties(self): js = super(DataRequirementDateFilter, self).elementProperties() js.extend([ ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("searchParam", "searchParam", str, False, None, False), + ("_searchParam", "_searchParam", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", False), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", False), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -197,10 +251,14 @@ def __init__(self, jsondict=None, strict=True): self.direction = None """ ascending | descending. Type `str`. """ + self._direction = None + """ Primitive extension for direction. Type `FHIRPrimitiveExtension` """ self.path = None """ The name of the attribute to perform the sort. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ super(DataRequirementSort, self).__init__(jsondict=jsondict, strict=strict) @@ -208,14 +266,17 @@ def elementProperties(self): js = super(DataRequirementSort, self).elementProperties() js.extend([ ("direction", "direction", str, False, None, True), + ("_direction", "_direction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, True), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import duration from . import fhirdatetime from . import fhirreference -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/detectedissue.py b/fhirclient/models/detectedissue.py index f14b9e01..b8fc95fe 100644 --- a/fhirclient/models/detectedissue.py +++ b/fhirclient/models/detectedissue.py @@ -26,54 +26,80 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ The provider or device that identified the issue. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.code = None """ Issue Category, e.g. drug-drug, duplicate therapy, etc.. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.detail = None """ Description and context. Type `str`. """ + self._detail = None + """ Primitive extension for detail. Type `FHIRPrimitiveExtension` """ self.evidence = None """ Supporting evidence. List of `DetectedIssueEvidence` items (represented as `dict` in JSON). """ + self._evidence = None + """ Primitive extension for evidence. List of `FHIRPrimitiveExtension` """ self.identifiedDateTime = None """ When identified. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._identifiedDateTime = None + """ Primitive extension for identifiedDateTime. Type `FHIRPrimitiveExtension` """ self.identifiedPeriod = None """ When identified. Type `Period` (represented as `dict` in JSON). """ + self._identifiedPeriod = None + """ Primitive extension for identifiedPeriod. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique id for the detected issue. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.implicated = None """ Problem resource. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._implicated = None + """ Primitive extension for implicated. List of `FHIRPrimitiveExtension` """ self.mitigation = None """ Step taken to address. List of `DetectedIssueMitigation` items (represented as `dict` in JSON). """ + self._mitigation = None + """ Primitive extension for mitigation. List of `FHIRPrimitiveExtension` """ self.patient = None """ Associated patient. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.reference = None """ Authority for issue. Type `str`. """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.severity = None """ high | moderate | low. Type `str`. """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ self.status = None """ registered | preliminary | final | amended +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(DetectedIssue, self).__init__(jsondict=jsondict, strict=strict) @@ -81,18 +107,31 @@ def elementProperties(self): js = super(DetectedIssue, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", str, False, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("evidence", "evidence", DetectedIssueEvidence, True, None, False), + ("_evidence", "_evidence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifiedDateTime", "identifiedDateTime", fhirdatetime.FHIRDateTime, False, "identified", False), + ("_identifiedDateTime", "_identifiedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifiedPeriod", "identifiedPeriod", period.Period, False, "identified", False), + ("_identifiedPeriod", "_identifiedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("implicated", "implicated", fhirreference.FHIRReference, True, None, False), + ("_implicated", "_implicated", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("mitigation", "mitigation", DetectedIssueMitigation, True, None, False), + ("_mitigation", "_mitigation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, False), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", str, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("severity", "severity", str, False, None, False), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -119,10 +158,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Manifestation. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.detail = None """ Supporting information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ super(DetectedIssueEvidence, self).__init__(jsondict=jsondict, strict=strict) @@ -130,7 +173,9 @@ def elementProperties(self): js = super(DetectedIssueEvidence, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detail", "detail", fhirreference.FHIRReference, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -157,14 +202,20 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ What mitigation?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. Type `FHIRPrimitiveExtension` """ self.author = None """ Who is committing?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.date = None """ Date committed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ super(DetectedIssueMitigation, self).__init__(jsondict=jsondict, strict=strict) @@ -172,14 +223,18 @@ def elementProperties(self): js = super(DetectedIssueMitigation, self).elementProperties() js.extend([ ("action", "action", codeableconcept.CodeableConcept, False, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/device.py b/fhirclient/models/device.py index 5ce2d44f..23a541b6 100644 --- a/fhirclient/models/device.py +++ b/fhirclient/models/device.py @@ -25,50 +25,74 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Details for human/organization for support. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.definition = None """ The reference to the definition for the device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.deviceName = None """ The name of the device as given by the manufacturer. List of `DeviceDeviceName` items (represented as `dict` in JSON). """ + self._deviceName = None + """ Primitive extension for deviceName. List of `FHIRPrimitiveExtension` """ self.distinctIdentifier = None """ The distinct identification string. Type `str`. """ + self._distinctIdentifier = None + """ Primitive extension for distinctIdentifier. Type `FHIRPrimitiveExtension` """ self.expirationDate = None """ Date and time of expiry of this device (if applicable). Type `FHIRDateTime` (represented as `str` in JSON). """ + self._expirationDate = None + """ Primitive extension for expirationDate. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Instance identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.location = None """ Where the device is found. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.lotNumber = None """ Lot number of manufacture. Type `str`. """ + self._lotNumber = None + """ Primitive extension for lotNumber. Type `FHIRPrimitiveExtension` """ self.manufactureDate = None """ Date when the device was made. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._manufactureDate = None + """ Primitive extension for manufactureDate. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ Name of device manufacturer. Type `str`. """ + self._manufacturer = None + """ Primitive extension for manufacturer. Type `FHIRPrimitiveExtension` """ self.modelNumber = None """ The model number for the device. Type `str`. """ + self._modelNumber = None + """ Primitive extension for modelNumber. Type `FHIRPrimitiveExtension` """ self.note = None """ Device notes and comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.owner = None """ Organization responsible for device. @@ -77,59 +101,85 @@ def __init__(self, jsondict=None, strict=True): self.parent = None """ The parent device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._parent = None + """ Primitive extension for parent. Type `FHIRPrimitiveExtension` """ self.partNumber = None """ The part number of the device. Type `str`. """ + self._partNumber = None + """ Primitive extension for partNumber. Type `FHIRPrimitiveExtension` """ self.patient = None """ Patient to whom Device is affixed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.property = None """ The actual configuration settings of a device as it actually operates, e.g., regulation status, time properties. List of `DeviceProperty` items (represented as `dict` in JSON). """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ self.safety = None """ Safety Characteristics of Device. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._safety = None + """ Primitive extension for safety. List of `FHIRPrimitiveExtension` """ self.serialNumber = None """ Serial number assigned by the manufacturer. Type `str`. """ + self._serialNumber = None + """ Primitive extension for serialNumber. Type `FHIRPrimitiveExtension` """ self.specialization = None """ The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication. List of `DeviceSpecialization` items (represented as `dict` in JSON). """ + self._specialization = None + """ Primitive extension for specialization. List of `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ online | paused | standby | offline | not-ready | transduc-discon | hw-discon | off. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. List of `FHIRPrimitiveExtension` """ self.type = None """ The kind or type of device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.udiCarrier = None """ Unique Device Identifier (UDI) Barcode string. List of `DeviceUdiCarrier` items (represented as `dict` in JSON). """ + self._udiCarrier = None + """ Primitive extension for udiCarrier. List of `FHIRPrimitiveExtension` """ self.url = None """ Network address to contact device. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.version = None """ The actual design of the device or software version running on the device. List of `DeviceVersion` items (represented as `dict` in JSON). """ + self._version = None + """ Primitive extension for version. List of `FHIRPrimitiveExtension` """ super(Device, self).__init__(jsondict=jsondict, strict=strict) @@ -137,31 +187,56 @@ def elementProperties(self): js = super(Device, self).elementProperties() js.extend([ ("contact", "contact", contactpoint.ContactPoint, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definition", "definition", fhirreference.FHIRReference, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deviceName", "deviceName", DeviceDeviceName, True, None, False), + ("_deviceName", "_deviceName", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("distinctIdentifier", "distinctIdentifier", str, False, None, False), + ("_distinctIdentifier", "_distinctIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expirationDate", "expirationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_expirationDate", "_expirationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lotNumber", "lotNumber", str, False, None, False), + ("_lotNumber", "_lotNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufactureDate", "manufactureDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_manufactureDate", "_manufactureDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", str, False, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modelNumber", "modelNumber", str, False, None, False), + ("_modelNumber", "_modelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("owner", "owner", fhirreference.FHIRReference, False, None, False), ("parent", "parent", fhirreference.FHIRReference, False, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partNumber", "partNumber", str, False, None, False), + ("_partNumber", "_partNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, False), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", DeviceProperty, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("safety", "safety", codeableconcept.CodeableConcept, True, None, False), + ("_safety", "_safety", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serialNumber", "serialNumber", str, False, None, False), + ("_serialNumber", "_serialNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specialization", "specialization", DeviceSpecialization, True, None, False), + ("_specialization", "_specialization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, True, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("udiCarrier", "udiCarrier", DeviceUdiCarrier, True, None, False), + ("_udiCarrier", "_udiCarrier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", DeviceVersion, True, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -190,11 +265,15 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ The name of the device. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ udi-label-name | user-friendly-name | patient-reported-name | manufacturer-name | model-name | other. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DeviceDeviceName, self).__init__(jsondict=jsondict, strict=strict) @@ -202,7 +281,9 @@ def elementProperties(self): js = super(DeviceDeviceName, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -226,14 +307,20 @@ def __init__(self, jsondict=None, strict=True): """ Code that specifies the property DeviceDefinitionPropetyCode (Extensible). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Property value as a code, e.g., NTP4 (synced to NTP). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._valueCode = None + """ Primitive extension for valueCode. List of `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Property value as a quantity. List of `Quantity` items (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. List of `FHIRPrimitiveExtension` """ super(DeviceProperty, self).__init__(jsondict=jsondict, strict=strict) @@ -241,8 +328,11 @@ def elementProperties(self): js = super(DeviceProperty, self).elementProperties() js.extend([ ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", codeableconcept.CodeableConcept, True, None, False), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, True, None, False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -265,10 +355,14 @@ def __init__(self, jsondict=None, strict=True): self.systemType = None """ The standard that is used to operate and communicate. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._systemType = None + """ Primitive extension for systemType. Type `FHIRPrimitiveExtension` """ self.version = None """ The version of the standard that is used to operate and communicate. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(DeviceSpecialization, self).__init__(jsondict=jsondict, strict=strict) @@ -276,7 +370,9 @@ def elementProperties(self): js = super(DeviceSpecialization, self).elementProperties() js.extend([ ("systemType", "systemType", codeableconcept.CodeableConcept, False, None, True), + ("_systemType", "_systemType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -303,26 +399,38 @@ def __init__(self, jsondict=None, strict=True): self.carrierAIDC = None """ UDI Machine Readable Barcode String. Type `str`. """ + self._carrierAIDC = None + """ Primitive extension for carrierAIDC. Type `FHIRPrimitiveExtension` """ self.carrierHRF = None """ UDI Human Readable Barcode String. Type `str`. """ + self._carrierHRF = None + """ Primitive extension for carrierHRF. Type `FHIRPrimitiveExtension` """ self.deviceIdentifier = None """ Mandatory fixed portion of UDI. Type `str`. """ + self._deviceIdentifier = None + """ Primitive extension for deviceIdentifier. Type `FHIRPrimitiveExtension` """ self.entryType = None """ barcode | rfid | manual +. Type `str`. """ + self._entryType = None + """ Primitive extension for entryType. Type `FHIRPrimitiveExtension` """ self.issuer = None """ UDI Issuing Organization. Type `str`. """ + self._issuer = None + """ Primitive extension for issuer. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Regional UDI authority. Type `str`. """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. Type `FHIRPrimitiveExtension` """ super(DeviceUdiCarrier, self).__init__(jsondict=jsondict, strict=strict) @@ -330,11 +438,17 @@ def elementProperties(self): js = super(DeviceUdiCarrier, self).elementProperties() js.extend([ ("carrierAIDC", "carrierAIDC", str, False, None, False), + ("_carrierAIDC", "_carrierAIDC", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("carrierHRF", "carrierHRF", str, False, None, False), + ("_carrierHRF", "_carrierHRF", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deviceIdentifier", "deviceIdentifier", str, False, None, False), + ("_deviceIdentifier", "_deviceIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("entryType", "entryType", str, False, None, False), + ("_entryType", "_entryType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("issuer", "issuer", str, False, None, False), + ("_issuer", "_issuer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", str, False, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -356,14 +470,20 @@ def __init__(self, jsondict=None, strict=True): self.component = None """ A single component of the device version. Type `Identifier` (represented as `dict` in JSON). """ + self._component = None + """ Primitive extension for component. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of the device version. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.value = None """ The version text. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(DeviceVersion, self).__init__(jsondict=jsondict, strict=strict) @@ -371,11 +491,15 @@ def elementProperties(self): js = super(DeviceVersion, self).elementProperties() js.extend([ ("component", "component", identifier.Identifier, False, None, False), + ("_component", "_component", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -383,4 +507,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/devicedefinition.py b/fhirclient/models/devicedefinition.py index e3b88463..a6434b68 100644 --- a/fhirclient/models/devicedefinition.py +++ b/fhirclient/models/devicedefinition.py @@ -24,48 +24,70 @@ def __init__(self, jsondict=None, strict=True): self.capability = None """ Device capabilities. List of `DeviceDefinitionCapability` items (represented as `dict` in JSON). """ + self._capability = None + """ Primitive extension for capability. List of `FHIRPrimitiveExtension` """ self.contact = None """ Details for human/organization for support. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.deviceName = None """ A name given to the device to identify it. List of `DeviceDefinitionDeviceName` items (represented as `dict` in JSON). """ + self._deviceName = None + """ Primitive extension for deviceName. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Instance identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.languageCode = None """ Language code for the human-readable text strings produced by the device (all supported). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._languageCode = None + """ Primitive extension for languageCode. List of `FHIRPrimitiveExtension` """ self.manufacturerReference = None """ Name of device manufacturer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._manufacturerReference = None + """ Primitive extension for manufacturerReference. Type `FHIRPrimitiveExtension` """ self.manufacturerString = None """ Name of device manufacturer. Type `str`. """ + self._manufacturerString = None + """ Primitive extension for manufacturerString. Type `FHIRPrimitiveExtension` """ self.material = None """ A substance used to create the material(s) of which the device is made. List of `DeviceDefinitionMaterial` items (represented as `dict` in JSON). """ + self._material = None + """ Primitive extension for material. List of `FHIRPrimitiveExtension` """ self.modelNumber = None """ The model number for the device. Type `str`. """ + self._modelNumber = None + """ Primitive extension for modelNumber. Type `FHIRPrimitiveExtension` """ self.note = None """ Device notes and comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.onlineInformation = None """ Access to on-line information. Type `str`. """ + self._onlineInformation = None + """ Primitive extension for onlineInformation. Type `FHIRPrimitiveExtension` """ self.owner = None """ Organization responsible for device. @@ -74,51 +96,73 @@ def __init__(self, jsondict=None, strict=True): self.parentDevice = None """ The parent device it can be part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._parentDevice = None + """ Primitive extension for parentDevice. Type `FHIRPrimitiveExtension` """ self.physicalCharacteristics = None """ Dimensions, color etc.. Type `ProdCharacteristic` (represented as `dict` in JSON). """ + self._physicalCharacteristics = None + """ Primitive extension for physicalCharacteristics. Type `FHIRPrimitiveExtension` """ self.property = None """ The actual configuration settings of a device as it actually operates, e.g., regulation status, time properties. List of `DeviceDefinitionProperty` items (represented as `dict` in JSON). """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ self.quantity = None """ The quantity of the device present in the packaging (e.g. the number of devices present in a pack, or the number of devices in the same package of the medicinal product). Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.safety = None """ Safety characteristics of the device. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._safety = None + """ Primitive extension for safety. List of `FHIRPrimitiveExtension` """ self.shelfLifeStorage = None """ Shelf Life and storage information. List of `ProductShelfLife` items (represented as `dict` in JSON). """ + self._shelfLifeStorage = None + """ Primitive extension for shelfLifeStorage. List of `FHIRPrimitiveExtension` """ self.specialization = None """ The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication. List of `DeviceDefinitionSpecialization` items (represented as `dict` in JSON). """ + self._specialization = None + """ Primitive extension for specialization. List of `FHIRPrimitiveExtension` """ self.type = None """ What kind of device or device system this is. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.udiDeviceIdentifier = None """ Unique Device Identifier (UDI) Barcode string. List of `DeviceDefinitionUdiDeviceIdentifier` items (represented as `dict` in JSON). """ + self._udiDeviceIdentifier = None + """ Primitive extension for udiDeviceIdentifier. List of `FHIRPrimitiveExtension` """ self.url = None """ Network address to contact device. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.version = None """ Available versions. List of `str` items. """ + self._version = None + """ Primitive extension for version. List of `FHIRPrimitiveExtension` """ super(DeviceDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -126,28 +170,50 @@ def elementProperties(self): js = super(DeviceDefinition, self).elementProperties() js.extend([ ("capability", "capability", DeviceDefinitionCapability, True, None, False), + ("_capability", "_capability", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactpoint.ContactPoint, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("deviceName", "deviceName", DeviceDefinitionDeviceName, True, None, False), + ("_deviceName", "_deviceName", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("languageCode", "languageCode", codeableconcept.CodeableConcept, True, None, False), + ("_languageCode", "_languageCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturerReference", "manufacturerReference", fhirreference.FHIRReference, False, "manufacturer", False), + ("_manufacturerReference", "_manufacturerReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturerString", "manufacturerString", str, False, "manufacturer", False), + ("_manufacturerString", "_manufacturerString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("material", "material", DeviceDefinitionMaterial, True, None, False), + ("_material", "_material", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("modelNumber", "modelNumber", str, False, None, False), + ("_modelNumber", "_modelNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("onlineInformation", "onlineInformation", str, False, None, False), + ("_onlineInformation", "_onlineInformation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("owner", "owner", fhirreference.FHIRReference, False, None, False), ("parentDevice", "parentDevice", fhirreference.FHIRReference, False, None, False), + ("_parentDevice", "_parentDevice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("physicalCharacteristics", "physicalCharacteristics", prodcharacteristic.ProdCharacteristic, False, None, False), + ("_physicalCharacteristics", "_physicalCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", DeviceDefinitionProperty, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("safety", "safety", codeableconcept.CodeableConcept, True, None, False), + ("_safety", "_safety", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("shelfLifeStorage", "shelfLifeStorage", productshelflife.ProductShelfLife, True, None, False), + ("_shelfLifeStorage", "_shelfLifeStorage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialization", "specialization", DeviceDefinitionSpecialization, True, None, False), + ("_specialization", "_specialization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("udiDeviceIdentifier", "udiDeviceIdentifier", DeviceDefinitionUdiDeviceIdentifier, True, None, False), + ("_udiDeviceIdentifier", "_udiDeviceIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, True, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -171,10 +237,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of capability. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._description = None + """ Primitive extension for description. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of capability. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DeviceDefinitionCapability, self).__init__(jsondict=jsondict, strict=strict) @@ -182,7 +252,9 @@ def elementProperties(self): js = super(DeviceDefinitionCapability, self).elementProperties() js.extend([ ("description", "description", codeableconcept.CodeableConcept, True, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -204,11 +276,15 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ The name of the device. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ udi-label-name | user-friendly-name | patient-reported-name | manufacturer-name | model-name | other. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DeviceDefinitionDeviceName, self).__init__(jsondict=jsondict, strict=strict) @@ -216,7 +292,9 @@ def elementProperties(self): js = super(DeviceDefinitionDeviceName, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -238,14 +316,20 @@ def __init__(self, jsondict=None, strict=True): self.allergenicIndicator = None """ Whether the substance is a known or suspected allergen. Type `bool`. """ + self._allergenicIndicator = None + """ Primitive extension for allergenicIndicator. Type `FHIRPrimitiveExtension` """ self.alternate = None """ Indicates an alternative material of the device. Type `bool`. """ + self._alternate = None + """ Primitive extension for alternate. Type `FHIRPrimitiveExtension` """ self.substance = None """ The substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substance = None + """ Primitive extension for substance. Type `FHIRPrimitiveExtension` """ super(DeviceDefinitionMaterial, self).__init__(jsondict=jsondict, strict=strict) @@ -253,8 +337,11 @@ def elementProperties(self): js = super(DeviceDefinitionMaterial, self).elementProperties() js.extend([ ("allergenicIndicator", "allergenicIndicator", bool, False, None, False), + ("_allergenicIndicator", "_allergenicIndicator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("alternate", "alternate", bool, False, None, False), + ("_alternate", "_alternate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substance", "substance", codeableconcept.CodeableConcept, False, None, True), + ("_substance", "_substance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -278,14 +365,20 @@ def __init__(self, jsondict=None, strict=True): """ Code that specifies the property DeviceDefinitionPropetyCode (Extensible). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Property value as a code, e.g., NTP4 (synced to NTP). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._valueCode = None + """ Primitive extension for valueCode. List of `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Property value as a quantity. List of `Quantity` items (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. List of `FHIRPrimitiveExtension` """ super(DeviceDefinitionProperty, self).__init__(jsondict=jsondict, strict=strict) @@ -293,8 +386,11 @@ def elementProperties(self): js = super(DeviceDefinitionProperty, self).elementProperties() js.extend([ ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", codeableconcept.CodeableConcept, True, None, False), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, True, None, False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -317,10 +413,14 @@ def __init__(self, jsondict=None, strict=True): self.systemType = None """ The standard that is used to operate and communicate. Type `str`. """ + self._systemType = None + """ Primitive extension for systemType. Type `FHIRPrimitiveExtension` """ self.version = None """ The version of the standard that is used to operate and communicate. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(DeviceDefinitionSpecialization, self).__init__(jsondict=jsondict, strict=strict) @@ -328,7 +428,9 @@ def elementProperties(self): js = super(DeviceDefinitionSpecialization, self).elementProperties() js.extend([ ("systemType", "systemType", str, False, None, True), + ("_systemType", "_systemType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -357,14 +459,20 @@ def __init__(self, jsondict=None, strict=True): references this DeviceDefintiion for the issuer and jurisdication porvided in the DeviceDefinition.udiDeviceIdentifier. Type `str`. """ + self._deviceIdentifier = None + """ Primitive extension for deviceIdentifier. Type `FHIRPrimitiveExtension` """ self.issuer = None """ The organization that assigns the identifier algorithm. Type `str`. """ + self._issuer = None + """ Primitive extension for issuer. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ The jurisdiction to which the deviceIdentifier applies. Type `str`. """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. Type `FHIRPrimitiveExtension` """ super(DeviceDefinitionUdiDeviceIdentifier, self).__init__(jsondict=jsondict, strict=strict) @@ -372,11 +480,15 @@ def elementProperties(self): js = super(DeviceDefinitionUdiDeviceIdentifier, self).elementProperties() js.extend([ ("deviceIdentifier", "deviceIdentifier", str, False, None, True), + ("_deviceIdentifier", "_deviceIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("issuer", "issuer", str, False, None, True), + ("_issuer", "_issuer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", str, False, None, True), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -385,4 +497,4 @@ def elementProperties(self): from . import identifier from . import prodcharacteristic from . import productshelflife -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/devicemetric.py b/fhirclient/models/devicemetric.py index 5d5c7f84..f10b4195 100644 --- a/fhirclient/models/devicemetric.py +++ b/fhirclient/models/devicemetric.py @@ -25,42 +25,62 @@ def __init__(self, jsondict=None, strict=True): """ Describes the calibrations that have been performed or that are required to be performed. List of `DeviceMetricCalibration` items (represented as `dict` in JSON). """ + self._calibration = None + """ Primitive extension for calibration. List of `FHIRPrimitiveExtension` """ self.category = None """ measurement | setting | calculation | unspecified. Type `str`. """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.color = None """ black | red | green | yellow | blue | magenta | cyan | white. Type `str`. """ + self._color = None + """ Primitive extension for color. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Instance identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.measurementPeriod = None """ Describes the measurement repetition time. Type `Timing` (represented as `dict` in JSON). """ + self._measurementPeriod = None + """ Primitive extension for measurementPeriod. Type `FHIRPrimitiveExtension` """ self.operationalStatus = None """ on | off | standby | entered-in-error. Type `str`. """ + self._operationalStatus = None + """ Primitive extension for operationalStatus. Type `FHIRPrimitiveExtension` """ self.parent = None """ Describes the link to the parent Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._parent = None + """ Primitive extension for parent. Type `FHIRPrimitiveExtension` """ self.source = None """ Describes the link to the source Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.type = None """ Identity of metric, for example Heart Rate or PEEP Setting. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.unit = None """ Unit of Measure for the Metric. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unit = None + """ Primitive extension for unit. Type `FHIRPrimitiveExtension` """ super(DeviceMetric, self).__init__(jsondict=jsondict, strict=strict) @@ -68,15 +88,25 @@ def elementProperties(self): js = super(DeviceMetric, self).elementProperties() js.extend([ ("calibration", "calibration", DeviceMetricCalibration, True, None, False), + ("_calibration", "_calibration", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", str, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("color", "color", str, False, None, False), + ("_color", "_color", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("measurementPeriod", "measurementPeriod", timing.Timing, False, None, False), + ("_measurementPeriod", "_measurementPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operationalStatus", "operationalStatus", str, False, None, False), + ("_operationalStatus", "_operationalStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parent", "parent", fhirreference.FHIRReference, False, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unit", "unit", codeableconcept.CodeableConcept, False, None, False), + ("_unit", "_unit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -101,14 +131,20 @@ def __init__(self, jsondict=None, strict=True): self.state = None """ not-calibrated | calibration-required | calibrated | unspecified. Type `str`. """ + self._state = None + """ Primitive extension for state. Type `FHIRPrimitiveExtension` """ self.time = None """ Describes the time last calibration has been performed. Type `FHIRInstant` (represented as `str` in JSON). """ + self._time = None + """ Primitive extension for time. Type `FHIRPrimitiveExtension` """ self.type = None """ unspecified | offset | gain | two-point. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DeviceMetricCalibration, self).__init__(jsondict=jsondict, strict=strict) @@ -116,14 +152,18 @@ def elementProperties(self): js = super(DeviceMetricCalibration, self).elementProperties() js.extend([ ("state", "state", str, False, None, False), + ("_state", "_state", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("time", "time", fhirinstant.FHIRInstant, False, None, False), + ("_time", "_time", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirinstant from . import fhirreference from . import identifier -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/devicerequest.py b/fhirclient/models/devicerequest.py index 78fd2f1a..979ca105 100644 --- a/fhirclient/models/devicerequest.py +++ b/fhirclient/models/devicerequest.py @@ -25,112 +25,166 @@ def __init__(self, jsondict=None, strict=True): self.authoredOn = None """ When recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ What request fulfills. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.codeCodeableConcept = None """ Device requested. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._codeCodeableConcept = None + """ Primitive extension for codeCodeableConcept. Type `FHIRPrimitiveExtension` """ self.codeReference = None """ Device requested. Type `FHIRReference` (represented as `dict` in JSON). """ + self._codeReference = None + """ Primitive extension for codeReference. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter motivating request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.groupIdentifier = None """ Identifier of composite request. Type `Identifier` (represented as `dict` in JSON). """ + self._groupIdentifier = None + """ Primitive extension for groupIdentifier. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Request identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Associated insurance coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.note = None """ Notes or comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ Desired time or schedule for use. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ Desired time or schedule for use. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ Desired time or schedule for use. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Device details. List of `DeviceRequestParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.performer = None """ Requested Filler. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.performerType = None """ Filler role. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._performerType = None + """ Primitive extension for performerType. Type `FHIRPrimitiveExtension` """ self.priorRequest = None """ What request replaces. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._priorRequest = None + """ Primitive extension for priorRequest. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Coded Reason for request. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Linked Reason for request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.relevantHistory = None """ Request provenance. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._relevantHistory = None + """ Primitive extension for relevantHistory. List of `FHIRPrimitiveExtension` """ self.requester = None """ Who/what is requesting diagnostics. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Focus of request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Additional clinical information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ super(DeviceRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -138,32 +192,59 @@ def elementProperties(self): js = super(DeviceRequest, self).elementProperties() js.extend([ ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("codeCodeableConcept", "codeCodeableConcept", codeableconcept.CodeableConcept, False, "code", True), + ("_codeCodeableConcept", "_codeCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("codeReference", "codeReference", fhirreference.FHIRReference, False, "code", True), + ("_codeReference", "_codeReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupIdentifier", "groupIdentifier", identifier.Identifier, False, None, False), + ("_groupIdentifier", "_groupIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", fhirreference.FHIRReference, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", DeviceRequestParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performerType", "performerType", codeableconcept.CodeableConcept, False, None, False), + ("_performerType", "_performerType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priorRequest", "priorRequest", fhirreference.FHIRReference, True, None, False), + ("_priorRequest", "_priorRequest", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relevantHistory", "relevantHistory", fhirreference.FHIRReference, True, None, False), + ("_relevantHistory", "_relevantHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", fhirreference.FHIRReference, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -190,22 +271,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Device detail. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of detail. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value of detail. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value of detail. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value of detail. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ super(DeviceRequestParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -213,13 +304,19 @@ def elementProperties(self): js = super(DeviceRequestParameter, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -229,4 +326,4 @@ def elementProperties(self): from . import period from . import quantity from . import range -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/deviceusestatement.py b/fhirclient/models/deviceusestatement.py index babe2e9a..3936dcd3 100644 --- a/fhirclient/models/deviceusestatement.py +++ b/fhirclient/models/deviceusestatement.py @@ -24,62 +24,92 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Fulfills plan, proposal or order. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Target body site. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.derivedFrom = None """ Supporting information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._derivedFrom = None + """ Primitive extension for derivedFrom. List of `FHIRPrimitiveExtension` """ self.device = None """ Reference to device used. Type `FHIRReference` (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External identifier for this record. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.note = None """ Addition details (comments, instructions). List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why device was used. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why was DeviceUseStatement performed?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.recordedOn = None """ When statement was recorded. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._recordedOn = None + """ Primitive extension for recordedOn. Type `FHIRPrimitiveExtension` """ self.source = None """ Who made the statement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.status = None """ active | completed | entered-in-error +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Patient using device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.timingDateTime = None """ How often the device was used. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timingDateTime = None + """ Primitive extension for timingDateTime. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ How often the device was used. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.timingTiming = None """ How often the device was used. Type `Timing` (represented as `dict` in JSON). """ + self._timingTiming = None + """ Primitive extension for timingTiming. Type `FHIRPrimitiveExtension` """ super(DeviceUseStatement, self).__init__(jsondict=jsondict, strict=strict) @@ -87,23 +117,39 @@ def elementProperties(self): js = super(DeviceUseStatement, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFrom", "derivedFrom", fhirreference.FHIRReference, True, None, False), + ("_derivedFrom", "_derivedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("device", "device", fhirreference.FHIRReference, False, None, True), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recordedOn", "recordedOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_recordedOn", "_recordedOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDateTime", "timingDateTime", fhirdatetime.FHIRDateTime, False, "timing", False), + ("_timingDateTime", "_timingDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingTiming", "timingTiming", timing.Timing, False, "timing", False), + ("_timingTiming", "_timingTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -111,4 +157,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/diagnosticreport.py b/fhirclient/models/diagnosticreport.py index e6d60785..b89c9369 100644 --- a/fhirclient/models/diagnosticreport.py +++ b/fhirclient/models/diagnosticreport.py @@ -28,79 +28,117 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ What was requested. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.category = None """ Service category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ Name/Code for this diagnostic report. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.conclusion = None """ Clinical conclusion (interpretation) of test results. Type `str`. """ + self._conclusion = None + """ Primitive extension for conclusion. Type `FHIRPrimitiveExtension` """ self.conclusionCode = None """ Codes for the clinical conclusion of test results. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._conclusionCode = None + """ Primitive extension for conclusionCode. List of `FHIRPrimitiveExtension` """ self.effectiveDateTime = None """ Clinically relevant time/time-period for report. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDateTime = None + """ Primitive extension for effectiveDateTime. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ Clinically relevant time/time-period for report. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Health care event when test ordered. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for report. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.imagingStudy = None """ Reference to full details of imaging associated with the diagnostic report. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._imagingStudy = None + """ Primitive extension for imagingStudy. List of `FHIRPrimitiveExtension` """ self.issued = None """ DateTime this version was made. Type `FHIRInstant` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.media = None """ Key images associated with this report. List of `DiagnosticReportMedia` items (represented as `dict` in JSON). """ + self._media = None + """ Primitive extension for media. List of `FHIRPrimitiveExtension` """ self.performer = None """ Responsible Diagnostic Service. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.presentedForm = None """ Entire report as issued. List of `Attachment` items (represented as `dict` in JSON). """ + self._presentedForm = None + """ Primitive extension for presentedForm. List of `FHIRPrimitiveExtension` """ self.result = None """ Observations. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._result = None + """ Primitive extension for result. List of `FHIRPrimitiveExtension` """ self.resultsInterpreter = None """ Primary result interpreter. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._resultsInterpreter = None + """ Primitive extension for resultsInterpreter. List of `FHIRPrimitiveExtension` """ self.specimen = None """ Specimens this report is based on. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._specimen = None + """ Primitive extension for specimen. List of `FHIRPrimitiveExtension` """ self.status = None """ registered | partial | preliminary | final +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ The subject of the report - usually, but not always, the patient. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(DiagnosticReport, self).__init__(jsondict=jsondict, strict=strict) @@ -108,24 +146,43 @@ def elementProperties(self): js = super(DiagnosticReport, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("conclusion", "conclusion", str, False, None, False), + ("_conclusion", "_conclusion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("conclusionCode", "conclusionCode", codeableconcept.CodeableConcept, True, None, False), + ("_conclusionCode", "_conclusionCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectiveDateTime", "effectiveDateTime", fhirdatetime.FHIRDateTime, False, "effective", False), + ("_effectiveDateTime", "_effectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, "effective", False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("imagingStudy", "imagingStudy", fhirreference.FHIRReference, True, None, False), + ("_imagingStudy", "_imagingStudy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("issued", "issued", fhirinstant.FHIRInstant, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("media", "media", DiagnosticReportMedia, True, None, False), + ("_media", "_media", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", fhirreference.FHIRReference, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("presentedForm", "presentedForm", attachment.Attachment, True, None, False), + ("_presentedForm", "_presentedForm", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("result", "result", fhirreference.FHIRReference, True, None, False), + ("_result", "_result", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resultsInterpreter", "resultsInterpreter", fhirreference.FHIRReference, True, None, False), + ("_resultsInterpreter", "_resultsInterpreter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimen", "specimen", fhirreference.FHIRReference, True, None, False), + ("_specimen", "_specimen", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -153,10 +210,14 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Comment about the image (e.g. explanation). Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.link = None """ Reference to the image source. Type `FHIRReference` (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. Type `FHIRPrimitiveExtension` """ super(DiagnosticReportMedia, self).__init__(jsondict=jsondict, strict=strict) @@ -164,10 +225,13 @@ def elementProperties(self): js = super(DiagnosticReportMedia, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("link", "link", fhirreference.FHIRReference, False, None, True), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -175,4 +239,4 @@ def elementProperties(self): from . import fhirinstant from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/distance.py b/fhirclient/models/distance.py index b2717217..29480209 100644 --- a/fhirclient/models/distance.py +++ b/fhirclient/models/distance.py @@ -20,4 +20,4 @@ def __init__(self, jsondict=None, strict=True): super(Distance, self).__init__(jsondict=jsondict, strict=strict) - +from . import fhirprimitiveextension diff --git a/fhirclient/models/documentmanifest.py b/fhirclient/models/documentmanifest.py index 22a3fd31..682a1c3e 100644 --- a/fhirclient/models/documentmanifest.py +++ b/fhirclient/models/documentmanifest.py @@ -24,50 +24,74 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ Who and/or what authored the DocumentManifest. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.content = None """ Items in manifest. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._content = None + """ Primitive extension for content. List of `FHIRPrimitiveExtension` """ self.created = None """ When this document manifest created. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.description = None """ Human-readable description (title). Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Other identifiers for the manifest. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.masterIdentifier = None """ Unique Identifier for the set of documents. Type `Identifier` (represented as `dict` in JSON). """ + self._masterIdentifier = None + """ Primitive extension for masterIdentifier. Type `FHIRPrimitiveExtension` """ self.recipient = None """ Intended to get notified about this set of documents. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. List of `FHIRPrimitiveExtension` """ self.related = None """ Related things. List of `DocumentManifestRelated` items (represented as `dict` in JSON). """ + self._related = None + """ Primitive extension for related. List of `FHIRPrimitiveExtension` """ self.source = None """ The source system/application/software. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.status = None """ current | superseded | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ The subject of the set of documents. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of document set. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DocumentManifest, self).__init__(jsondict=jsondict, strict=strict) @@ -75,17 +99,29 @@ def elementProperties(self): js = super(DocumentManifest, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("content", "content", fhirreference.FHIRReference, True, None, True), + ("_content", "_content", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("masterIdentifier", "masterIdentifier", identifier.Identifier, False, None, False), + ("_masterIdentifier", "_masterIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, True, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("related", "related", DocumentManifestRelated, True, None, False), + ("_related", "_related", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", str, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -111,10 +147,14 @@ def __init__(self, jsondict=None, strict=True): self.identifier = None """ Identifiers of things that are related. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.ref = None """ Related Resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._ref = None + """ Primitive extension for ref. Type `FHIRPrimitiveExtension` """ super(DocumentManifestRelated, self).__init__(jsondict=jsondict, strict=strict) @@ -122,12 +162,15 @@ def elementProperties(self): js = super(DocumentManifestRelated, self).elementProperties() js.extend([ ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ref", "ref", fhirreference.FHIRReference, False, None, False), + ("_ref", "_ref", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/documentreference.py b/fhirclient/models/documentreference.py index 35f4b8ef..a4e8dc4c 100644 --- a/fhirclient/models/documentreference.py +++ b/fhirclient/models/documentreference.py @@ -27,66 +27,98 @@ def __init__(self, jsondict=None, strict=True): self.authenticator = None """ Who/what authenticated the document. Type `FHIRReference` (represented as `dict` in JSON). """ + self._authenticator = None + """ Primitive extension for authenticator. Type `FHIRPrimitiveExtension` """ self.author = None """ Who and/or what authored the document. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.category = None """ Categorization of document. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.content = None """ Document referenced. List of `DocumentReferenceContent` items (represented as `dict` in JSON). """ + self._content = None + """ Primitive extension for content. List of `FHIRPrimitiveExtension` """ self.context = None """ Clinical context of document. Type `DocumentReferenceContext` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.custodian = None """ Organization which maintains the document. Type `FHIRReference` (represented as `dict` in JSON). """ + self._custodian = None + """ Primitive extension for custodian. Type `FHIRPrimitiveExtension` """ self.date = None """ When this document reference was created. Type `FHIRInstant` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Human-readable description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.docStatus = None """ preliminary | final | amended | entered-in-error. Type `str`. """ + self._docStatus = None + """ Primitive extension for docStatus. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Other identifiers for the document. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.masterIdentifier = None """ Master Version Specific Identifier. Type `Identifier` (represented as `dict` in JSON). """ + self._masterIdentifier = None + """ Primitive extension for masterIdentifier. Type `FHIRPrimitiveExtension` """ self.relatesTo = None """ Relationships to other documents. List of `DocumentReferenceRelatesTo` items (represented as `dict` in JSON). """ + self._relatesTo = None + """ Primitive extension for relatesTo. List of `FHIRPrimitiveExtension` """ self.securityLabel = None """ Document security-tags. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._securityLabel = None + """ Primitive extension for securityLabel. List of `FHIRPrimitiveExtension` """ self.status = None """ current | superseded | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who/what is the subject of the document. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of document (LOINC if possible). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DocumentReference, self).__init__(jsondict=jsondict, strict=strict) @@ -94,21 +126,37 @@ def elementProperties(self): js = super(DocumentReference, self).elementProperties() js.extend([ ("authenticator", "authenticator", fhirreference.FHIRReference, False, None, False), + ("_authenticator", "_authenticator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", fhirreference.FHIRReference, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("content", "content", DocumentReferenceContent, True, None, True), + ("_content", "_content", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("context", "context", DocumentReferenceContext, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("custodian", "custodian", fhirreference.FHIRReference, False, None, False), + ("_custodian", "_custodian", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirinstant.FHIRInstant, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("docStatus", "docStatus", str, False, None, False), + ("_docStatus", "_docStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("masterIdentifier", "masterIdentifier", identifier.Identifier, False, None, False), + ("_masterIdentifier", "_masterIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatesTo", "relatesTo", DocumentReferenceRelatesTo, True, None, False), + ("_relatesTo", "_relatesTo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("securityLabel", "securityLabel", codeableconcept.CodeableConcept, True, None, False), + ("_securityLabel", "_securityLabel", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -135,10 +183,14 @@ def __init__(self, jsondict=None, strict=True): self.attachment = None """ Where to access the document. Type `Attachment` (represented as `dict` in JSON). """ + self._attachment = None + """ Primitive extension for attachment. Type `FHIRPrimitiveExtension` """ self.format = None """ Format/content rules for the document. Type `Coding` (represented as `dict` in JSON). """ + self._format = None + """ Primitive extension for format. Type `FHIRPrimitiveExtension` """ super(DocumentReferenceContent, self).__init__(jsondict=jsondict, strict=strict) @@ -146,7 +198,9 @@ def elementProperties(self): js = super(DocumentReferenceContent, self).elementProperties() js.extend([ ("attachment", "attachment", attachment.Attachment, False, None, True), + ("_attachment", "_attachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("format", "format", coding.Coding, False, None, False), + ("_format", "_format", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -170,31 +224,45 @@ def __init__(self, jsondict=None, strict=True): self.encounter = None """ Context of the document content. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. List of `FHIRPrimitiveExtension` """ self.event = None """ Main clinical acts documented. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._event = None + """ Primitive extension for event. List of `FHIRPrimitiveExtension` """ self.facilityType = None """ Kind of facility where patient was seen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._facilityType = None + """ Primitive extension for facilityType. Type `FHIRPrimitiveExtension` """ self.period = None """ Time of service that is being documented. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.practiceSetting = None """ Additional details about where the content was created (e.g. clinical specialty). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._practiceSetting = None + """ Primitive extension for practiceSetting. Type `FHIRPrimitiveExtension` """ self.related = None """ Related identifiers or resources. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._related = None + """ Primitive extension for related. List of `FHIRPrimitiveExtension` """ self.sourcePatientInfo = None """ Patient demographics from source. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sourcePatientInfo = None + """ Primitive extension for sourcePatientInfo. Type `FHIRPrimitiveExtension` """ super(DocumentReferenceContext, self).__init__(jsondict=jsondict, strict=strict) @@ -202,12 +270,19 @@ def elementProperties(self): js = super(DocumentReferenceContext, self).elementProperties() js.extend([ ("encounter", "encounter", fhirreference.FHIRReference, True, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("event", "event", codeableconcept.CodeableConcept, True, None, False), + ("_event", "_event", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("facilityType", "facilityType", codeableconcept.CodeableConcept, False, None, False), + ("_facilityType", "_facilityType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("practiceSetting", "practiceSetting", codeableconcept.CodeableConcept, False, None, False), + ("_practiceSetting", "_practiceSetting", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("related", "related", fhirreference.FHIRReference, True, None, False), + ("_related", "_related", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sourcePatientInfo", "sourcePatientInfo", fhirreference.FHIRReference, False, None, False), + ("_sourcePatientInfo", "_sourcePatientInfo", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -232,10 +307,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ replaces | transforms | signs | appends. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.target = None """ Target of the relationship. Type `FHIRReference` (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. Type `FHIRPrimitiveExtension` """ super(DocumentReferenceRelatesTo, self).__init__(jsondict=jsondict, strict=strict) @@ -243,10 +322,13 @@ def elementProperties(self): js = super(DocumentReferenceRelatesTo, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", fhirreference.FHIRReference, False, None, True), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -254,4 +336,4 @@ def elementProperties(self): from . import fhirinstant from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/domainresource.py b/fhirclient/models/domainresource.py index dff256d8..56024221 100644 --- a/fhirclient/models/domainresource.py +++ b/fhirclient/models/domainresource.py @@ -23,18 +23,26 @@ def __init__(self, jsondict=None, strict=True): self.contained = None """ Contained, inline Resources. List of `Resource` items (represented as `dict` in JSON). """ + self._contained = None + """ Primitive extension for contained. List of `FHIRPrimitiveExtension` """ self.extension = None """ Additional content defined by implementations. List of `Extension` items (represented as `dict` in JSON). """ + self._extension = None + """ Primitive extension for extension. List of `FHIRPrimitiveExtension` """ self.modifierExtension = None """ Extensions that cannot be ignored. List of `Extension` items (represented as `dict` in JSON). """ + self._modifierExtension = None + """ Primitive extension for modifierExtension. List of `FHIRPrimitiveExtension` """ self.text = None """ Text summary of the resource, for human interpretation. Type `Narrative` (represented as `dict` in JSON). """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ super(DomainResource, self).__init__(jsondict=jsondict, strict=strict) @@ -42,12 +50,17 @@ def elementProperties(self): js = super(DomainResource, self).elementProperties() js.extend([ ("contained", "contained", resource.Resource, True, None, False), + ("_contained", "_contained", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("extension", "extension", extension.Extension, True, None, False), + ("_extension", "_extension", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("modifierExtension", "modifierExtension", extension.Extension, True, None, False), + ("_modifierExtension", "_modifierExtension", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", narrative.Narrative, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import extension -from . import narrative +from . import narrative \ No newline at end of file diff --git a/fhirclient/models/dosage.py b/fhirclient/models/dosage.py index c7b3381c..8b43b4cf 100644 --- a/fhirclient/models/dosage.py +++ b/fhirclient/models/dosage.py @@ -25,58 +25,86 @@ def __init__(self, jsondict=None, strict=True): """ Supplemental instruction or warnings to the patient - e.g. "with meals", "may cause drowsiness". List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._additionalInstruction = None + """ Primitive extension for additionalInstruction. List of `FHIRPrimitiveExtension` """ self.asNeededBoolean = None """ Take "as needed" (for x). Type `bool`. """ + self._asNeededBoolean = None + """ Primitive extension for asNeededBoolean. Type `FHIRPrimitiveExtension` """ self.asNeededCodeableConcept = None """ Take "as needed" (for x). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._asNeededCodeableConcept = None + """ Primitive extension for asNeededCodeableConcept. Type `FHIRPrimitiveExtension` """ self.doseAndRate = None """ Amount of medication administered. List of `DosageDoseAndRate` items (represented as `dict` in JSON). """ + self._doseAndRate = None + """ Primitive extension for doseAndRate. List of `FHIRPrimitiveExtension` """ self.maxDosePerAdministration = None """ Upper limit on medication per administration. Type `Quantity` (represented as `dict` in JSON). """ + self._maxDosePerAdministration = None + """ Primitive extension for maxDosePerAdministration. Type `FHIRPrimitiveExtension` """ self.maxDosePerLifetime = None """ Upper limit on medication per lifetime of the patient. Type `Quantity` (represented as `dict` in JSON). """ + self._maxDosePerLifetime = None + """ Primitive extension for maxDosePerLifetime. Type `FHIRPrimitiveExtension` """ self.maxDosePerPeriod = None """ Upper limit on medication per unit of time. Type `Ratio` (represented as `dict` in JSON). """ + self._maxDosePerPeriod = None + """ Primitive extension for maxDosePerPeriod. Type `FHIRPrimitiveExtension` """ self.method = None """ Technique for administering medication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.patientInstruction = None """ Patient or consumer oriented instructions. Type `str`. """ + self._patientInstruction = None + """ Primitive extension for patientInstruction. Type `FHIRPrimitiveExtension` """ self.route = None """ How drug should enter body. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._route = None + """ Primitive extension for route. Type `FHIRPrimitiveExtension` """ self.sequence = None """ The order of the dosage instructions. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.site = None """ Body site to administer to. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._site = None + """ Primitive extension for site. Type `FHIRPrimitiveExtension` """ self.text = None """ Free text dosage instructions e.g. SIG. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.timing = None """ When medication should be administered. Type `Timing` (represented as `dict` in JSON). """ + self._timing = None + """ Primitive extension for timing. Type `FHIRPrimitiveExtension` """ super(Dosage, self).__init__(jsondict=jsondict, strict=strict) @@ -84,19 +112,33 @@ def elementProperties(self): js = super(Dosage, self).elementProperties() js.extend([ ("additionalInstruction", "additionalInstruction", codeableconcept.CodeableConcept, True, None, False), + ("_additionalInstruction", "_additionalInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("asNeededBoolean", "asNeededBoolean", bool, False, "asNeeded", False), + ("_asNeededBoolean", "_asNeededBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("asNeededCodeableConcept", "asNeededCodeableConcept", codeableconcept.CodeableConcept, False, "asNeeded", False), + ("_asNeededCodeableConcept", "_asNeededCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseAndRate", "doseAndRate", DosageDoseAndRate, True, None, False), + ("_doseAndRate", "_doseAndRate", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("maxDosePerAdministration", "maxDosePerAdministration", quantity.Quantity, False, None, False), + ("_maxDosePerAdministration", "_maxDosePerAdministration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxDosePerLifetime", "maxDosePerLifetime", quantity.Quantity, False, None, False), + ("_maxDosePerLifetime", "_maxDosePerLifetime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxDosePerPeriod", "maxDosePerPeriod", ratio.Ratio, False, None, False), + ("_maxDosePerPeriod", "_maxDosePerPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patientInstruction", "patientInstruction", str, False, None, False), + ("_patientInstruction", "_patientInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("route", "route", codeableconcept.CodeableConcept, False, None, False), + ("_route", "_route", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, False), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("site", "site", codeableconcept.CodeableConcept, False, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timing", "timing", timing.Timing, False, None, False), + ("_timing", "_timing", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -122,26 +164,38 @@ def __init__(self, jsondict=None, strict=True): self.doseQuantity = None """ Amount of medication per dose. Type `Quantity` (represented as `dict` in JSON). """ + self._doseQuantity = None + """ Primitive extension for doseQuantity. Type `FHIRPrimitiveExtension` """ self.doseRange = None """ Amount of medication per dose. Type `Range` (represented as `dict` in JSON). """ + self._doseRange = None + """ Primitive extension for doseRange. Type `FHIRPrimitiveExtension` """ self.rateQuantity = None """ Amount of medication per unit of time. Type `Quantity` (represented as `dict` in JSON). """ + self._rateQuantity = None + """ Primitive extension for rateQuantity. Type `FHIRPrimitiveExtension` """ self.rateRange = None """ Amount of medication per unit of time. Type `Range` (represented as `dict` in JSON). """ + self._rateRange = None + """ Primitive extension for rateRange. Type `FHIRPrimitiveExtension` """ self.rateRatio = None """ Amount of medication per unit of time. Type `Ratio` (represented as `dict` in JSON). """ + self._rateRatio = None + """ Primitive extension for rateRatio. Type `FHIRPrimitiveExtension` """ self.type = None """ The kind of dose or rate specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(DosageDoseAndRate, self).__init__(jsondict=jsondict, strict=strict) @@ -149,17 +203,24 @@ def elementProperties(self): js = super(DosageDoseAndRate, self).elementProperties() js.extend([ ("doseQuantity", "doseQuantity", quantity.Quantity, False, "dose", False), + ("_doseQuantity", "_doseQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseRange", "doseRange", range.Range, False, "dose", False), + ("_doseRange", "_doseRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateQuantity", "rateQuantity", quantity.Quantity, False, "rate", False), + ("_rateQuantity", "_rateQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateRange", "rateRange", range.Range, False, "rate", False), + ("_rateRange", "_rateRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateRatio", "rateRatio", ratio.Ratio, False, "rate", False), + ("_rateRatio", "_rateRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import quantity from . import range from . import ratio -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/duration.py b/fhirclient/models/duration.py index 7b06de19..3c5aa42f 100644 --- a/fhirclient/models/duration.py +++ b/fhirclient/models/duration.py @@ -20,4 +20,4 @@ def __init__(self, jsondict=None, strict=True): super(Duration, self).__init__(jsondict=jsondict, strict=strict) - +from . import fhirprimitiveextension diff --git a/fhirclient/models/effectevidencesynthesis.py b/fhirclient/models/effectevidencesynthesis.py index ada6f7c6..b673a847 100644 --- a/fhirclient/models/effectevidencesynthesis.py +++ b/fhirclient/models/effectevidencesynthesis.py @@ -25,136 +25,202 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the effect evidence synthesis was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.certainty = None """ How certain is the effect. List of `EffectEvidenceSynthesisCertainty` items (represented as `dict` in JSON). """ + self._certainty = None + """ Primitive extension for certainty. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the effect evidence synthesis. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectEstimate = None """ What was the estimated effect. List of `EffectEvidenceSynthesisEffectEstimate` items (represented as `dict` in JSON). """ + self._effectEstimate = None + """ Primitive extension for effectEstimate. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the effect evidence synthesis is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.exposure = None """ What exposure?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposure = None + """ Primitive extension for exposure. Type `FHIRPrimitiveExtension` """ self.exposureAlternative = None """ What comparison exposure?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposureAlternative = None + """ Primitive extension for exposureAlternative. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the effect evidence synthesis. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for effect evidence synthesis (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the effect evidence synthesis was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this effect evidence synthesis (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.outcome = None """ What outcome?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.population = None """ What population?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.resultsByExposure = None """ What was the result per exposure?. List of `EffectEvidenceSynthesisResultsByExposure` items (represented as `dict` in JSON). """ + self._resultsByExposure = None + """ Primitive extension for resultsByExposure. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.sampleSize = None """ What sample size was involved?. Type `EffectEvidenceSynthesisSampleSize` (represented as `dict` in JSON). """ + self._sampleSize = None + """ Primitive extension for sampleSize. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.studyType = None """ Type of study. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._studyType = None + """ Primitive extension for studyType. Type `FHIRPrimitiveExtension` """ self.synthesisType = None """ Type of synthesis. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._synthesisType = None + """ Primitive extension for synthesisType. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this effect evidence synthesis (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the EffectEvidenceSynthesis, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this effect evidence synthesis, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the effect evidence synthesis. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesis, self).__init__(jsondict=jsondict, strict=strict) @@ -162,38 +228,71 @@ def elementProperties(self): js = super(EffectEvidenceSynthesis, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("certainty", "certainty", EffectEvidenceSynthesisCertainty, True, None, False), + ("_certainty", "_certainty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectEstimate", "effectEstimate", EffectEvidenceSynthesisEffectEstimate, True, None, False), + ("_effectEstimate", "_effectEstimate", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("exposure", "exposure", fhirreference.FHIRReference, False, None, True), + ("_exposure", "_exposure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposureAlternative", "exposureAlternative", fhirreference.FHIRReference, False, None, True), + ("_exposureAlternative", "_exposureAlternative", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", fhirreference.FHIRReference, False, None, True), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", fhirreference.FHIRReference, False, None, True), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resultsByExposure", "resultsByExposure", EffectEvidenceSynthesisResultsByExposure, True, None, False), + ("_resultsByExposure", "_resultsByExposure", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sampleSize", "sampleSize", EffectEvidenceSynthesisSampleSize, False, None, False), + ("_sampleSize", "_sampleSize", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyType", "studyType", codeableconcept.CodeableConcept, False, None, False), + ("_studyType", "_studyType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("synthesisType", "synthesisType", codeableconcept.CodeableConcept, False, None, False), + ("_synthesisType", "_synthesisType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -219,14 +318,20 @@ def __init__(self, jsondict=None, strict=True): self.certaintySubcomponent = None """ A component that contributes to the overall certainty. List of `EffectEvidenceSynthesisCertaintyCertaintySubcomponent` items (represented as `dict` in JSON). """ + self._certaintySubcomponent = None + """ Primitive extension for certaintySubcomponent. List of `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.rating = None """ Certainty rating. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._rating = None + """ Primitive extension for rating. List of `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisCertainty, self).__init__(jsondict=jsondict, strict=strict) @@ -234,8 +339,11 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisCertainty, self).elementProperties() js.extend([ ("certaintySubcomponent", "certaintySubcomponent", EffectEvidenceSynthesisCertaintyCertaintySubcomponent, True, None, False), + ("_certaintySubcomponent", "_certaintySubcomponent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rating", "rating", codeableconcept.CodeableConcept, True, None, False), + ("_rating", "_rating", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -259,14 +367,20 @@ def __init__(self, jsondict=None, strict=True): self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.rating = None """ Subcomponent certainty rating. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._rating = None + """ Primitive extension for rating. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of subcomponent of certainty rating. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisCertaintyCertaintySubcomponent, self).__init__(jsondict=jsondict, strict=strict) @@ -274,8 +388,11 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisCertaintyCertaintySubcomponent, self).elementProperties() js.extend([ ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rating", "rating", codeableconcept.CodeableConcept, True, None, False), + ("_rating", "_rating", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -299,26 +416,38 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of effect estimate. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.precisionEstimate = None """ How precise the estimate is. List of `EffectEvidenceSynthesisEffectEstimatePrecisionEstimate` items (represented as `dict` in JSON). """ + self._precisionEstimate = None + """ Primitive extension for precisionEstimate. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of efffect estimate. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.unitOfMeasure = None """ What unit is the outcome described in?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unitOfMeasure = None + """ Primitive extension for unitOfMeasure. Type `FHIRPrimitiveExtension` """ self.value = None """ Point estimate. Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ self.variantState = None """ Variant exposure states. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._variantState = None + """ Primitive extension for variantState. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisEffectEstimate, self).__init__(jsondict=jsondict, strict=strict) @@ -326,11 +455,17 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisEffectEstimate, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("precisionEstimate", "precisionEstimate", EffectEvidenceSynthesisEffectEstimatePrecisionEstimate, True, None, False), + ("_precisionEstimate", "_precisionEstimate", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitOfMeasure", "unitOfMeasure", codeableconcept.CodeableConcept, False, None, False), + ("_unitOfMeasure", "_unitOfMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variantState", "variantState", codeableconcept.CodeableConcept, False, None, False), + ("_variantState", "_variantState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -354,18 +489,26 @@ def __init__(self, jsondict=None, strict=True): self.from_fhir = None """ Lower bound. Type `float`. """ + self._from_fhir = None + """ Primitive extension for from_fhir. Type `FHIRPrimitiveExtension` """ self.level = None """ Level of confidence interval. Type `float`. """ + self._level = None + """ Primitive extension for level. Type `FHIRPrimitiveExtension` """ self.to = None """ Upper bound. Type `float`. """ + self._to = None + """ Primitive extension for to. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of precision estimate. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisEffectEstimatePrecisionEstimate, self).__init__(jsondict=jsondict, strict=strict) @@ -373,9 +516,13 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisEffectEstimatePrecisionEstimate, self).elementProperties() js.extend([ ("from_fhir", "from", float, False, None, False), + ("_from_fhir", "_from_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("level", "level", float, False, None, False), + ("_level", "_level", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("to", "to", float, False, None, False), + ("_to", "_to", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -400,18 +547,26 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of results by exposure. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.exposureState = None """ exposure | exposure-alternative. Type `str`. """ + self._exposureState = None + """ Primitive extension for exposureState. Type `FHIRPrimitiveExtension` """ self.riskEvidenceSynthesis = None """ Risk evidence synthesis. Type `FHIRReference` (represented as `dict` in JSON). """ + self._riskEvidenceSynthesis = None + """ Primitive extension for riskEvidenceSynthesis. Type `FHIRPrimitiveExtension` """ self.variantState = None """ Variant exposure states. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._variantState = None + """ Primitive extension for variantState. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisResultsByExposure, self).__init__(jsondict=jsondict, strict=strict) @@ -419,9 +574,13 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisResultsByExposure, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposureState", "exposureState", str, False, None, False), + ("_exposureState", "_exposureState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("riskEvidenceSynthesis", "riskEvidenceSynthesis", fhirreference.FHIRReference, False, None, True), + ("_riskEvidenceSynthesis", "_riskEvidenceSynthesis", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variantState", "variantState", codeableconcept.CodeableConcept, False, None, False), + ("_variantState", "_variantState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -445,14 +604,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of sample size. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.numberOfParticipants = None """ How many participants?. Type `int`. """ + self._numberOfParticipants = None + """ Primitive extension for numberOfParticipants. Type `FHIRPrimitiveExtension` """ self.numberOfStudies = None """ How many studies?. Type `int`. """ + self._numberOfStudies = None + """ Primitive extension for numberOfStudies. Type `FHIRPrimitiveExtension` """ super(EffectEvidenceSynthesisSampleSize, self).__init__(jsondict=jsondict, strict=strict) @@ -460,11 +625,15 @@ def elementProperties(self): js = super(EffectEvidenceSynthesisSampleSize, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfParticipants", "numberOfParticipants", int, False, None, False), + ("_numberOfParticipants", "_numberOfParticipants", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfStudies", "numberOfStudies", int, False, None, False), + ("_numberOfStudies", "_numberOfStudies", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -475,4 +644,4 @@ def elementProperties(self): from . import identifier from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/element.py b/fhirclient/models/element.py index aa081da8..f00ead56 100644 --- a/fhirclient/models/element.py +++ b/fhirclient/models/element.py @@ -23,10 +23,14 @@ def __init__(self, jsondict=None, strict=True): self.extension = None """ Additional content defined by implementations. List of `Extension` items (represented as `dict` in JSON). """ + self._extension = None + """ Primitive extension for extension. List of `FHIRPrimitiveExtension` """ self.id = None """ Unique id for inter-element referencing. Type `str`. """ + self._id = None + """ Primitive extension for id. Type `FHIRPrimitiveExtension` """ super(Element, self).__init__(jsondict=jsondict, strict=strict) @@ -35,8 +39,10 @@ def elementProperties(self): from . import extension js.extend([ ("extension", "extension", extension.Extension, True, None, False), + ("_extension", "_extension", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("id", "id", str, False, None, False), + ("_id", "_id", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/elementdefinition.py b/fhirclient/models/elementdefinition.py index 389add21..0f7553e4 100644 --- a/fhirclient/models/elementdefinition.py +++ b/fhirclient/models/elementdefinition.py @@ -24,791 +24,1185 @@ def __init__(self, jsondict=None, strict=True): self.alias = None """ Other names. List of `str` items. """ + self._alias = None + """ Primitive extension for alias. List of `FHIRPrimitiveExtension` """ self.base = None """ Base definition information for tools. Type `ElementDefinitionBase` (represented as `dict` in JSON). """ + self._base = None + """ Primitive extension for base. Type `FHIRPrimitiveExtension` """ self.binding = None """ ValueSet details if this is coded. Type `ElementDefinitionBinding` (represented as `dict` in JSON). """ + self._binding = None + """ Primitive extension for binding. Type `FHIRPrimitiveExtension` """ self.code = None """ Corresponding codes in terminologies. List of `Coding` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.comment = None """ Comments about the use of this element. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.condition = None """ Reference to invariant about presence. List of `str` items. """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.constraint = None """ Condition that must evaluate to true. List of `ElementDefinitionConstraint` items (represented as `dict` in JSON). """ + self._constraint = None + """ Primitive extension for constraint. List of `FHIRPrimitiveExtension` """ self.contentReference = None """ Reference to definition of content for the element. Type `str`. """ + self._contentReference = None + """ Primitive extension for contentReference. Type `FHIRPrimitiveExtension` """ self.defaultValueAddress = None """ Specified value if missing from instance. Type `Address` (represented as `dict` in JSON). """ + self._defaultValueAddress = None + """ Primitive extension for defaultValueAddress. Type `FHIRPrimitiveExtension` """ self.defaultValueAge = None """ Specified value if missing from instance. Type `Age` (represented as `dict` in JSON). """ + self._defaultValueAge = None + """ Primitive extension for defaultValueAge. Type `FHIRPrimitiveExtension` """ self.defaultValueAnnotation = None """ Specified value if missing from instance. Type `Annotation` (represented as `dict` in JSON). """ + self._defaultValueAnnotation = None + """ Primitive extension for defaultValueAnnotation. Type `FHIRPrimitiveExtension` """ self.defaultValueAttachment = None """ Specified value if missing from instance. Type `Attachment` (represented as `dict` in JSON). """ + self._defaultValueAttachment = None + """ Primitive extension for defaultValueAttachment. Type `FHIRPrimitiveExtension` """ self.defaultValueBase64Binary = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueBase64Binary = None + """ Primitive extension for defaultValueBase64Binary. Type `FHIRPrimitiveExtension` """ self.defaultValueBoolean = None """ Specified value if missing from instance. Type `bool`. """ + self._defaultValueBoolean = None + """ Primitive extension for defaultValueBoolean. Type `FHIRPrimitiveExtension` """ self.defaultValueCanonical = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueCanonical = None + """ Primitive extension for defaultValueCanonical. Type `FHIRPrimitiveExtension` """ self.defaultValueCode = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueCode = None + """ Primitive extension for defaultValueCode. Type `FHIRPrimitiveExtension` """ self.defaultValueCodeableConcept = None """ Specified value if missing from instance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._defaultValueCodeableConcept = None + """ Primitive extension for defaultValueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.defaultValueCoding = None """ Specified value if missing from instance. Type `Coding` (represented as `dict` in JSON). """ + self._defaultValueCoding = None + """ Primitive extension for defaultValueCoding. Type `FHIRPrimitiveExtension` """ self.defaultValueContactDetail = None """ Specified value if missing from instance. Type `ContactDetail` (represented as `dict` in JSON). """ + self._defaultValueContactDetail = None + """ Primitive extension for defaultValueContactDetail. Type `FHIRPrimitiveExtension` """ self.defaultValueContactPoint = None """ Specified value if missing from instance. Type `ContactPoint` (represented as `dict` in JSON). """ + self._defaultValueContactPoint = None + """ Primitive extension for defaultValueContactPoint. Type `FHIRPrimitiveExtension` """ self.defaultValueContributor = None """ Specified value if missing from instance. Type `Contributor` (represented as `dict` in JSON). """ + self._defaultValueContributor = None + """ Primitive extension for defaultValueContributor. Type `FHIRPrimitiveExtension` """ self.defaultValueCount = None """ Specified value if missing from instance. Type `Count` (represented as `dict` in JSON). """ + self._defaultValueCount = None + """ Primitive extension for defaultValueCount. Type `FHIRPrimitiveExtension` """ self.defaultValueDataRequirement = None """ Specified value if missing from instance. Type `DataRequirement` (represented as `dict` in JSON). """ + self._defaultValueDataRequirement = None + """ Primitive extension for defaultValueDataRequirement. Type `FHIRPrimitiveExtension` """ self.defaultValueDate = None """ Specified value if missing from instance. Type `FHIRDate` (represented as `str` in JSON). """ + self._defaultValueDate = None + """ Primitive extension for defaultValueDate. Type `FHIRPrimitiveExtension` """ self.defaultValueDateTime = None """ Specified value if missing from instance. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._defaultValueDateTime = None + """ Primitive extension for defaultValueDateTime. Type `FHIRPrimitiveExtension` """ self.defaultValueDecimal = None """ Specified value if missing from instance. Type `float`. """ + self._defaultValueDecimal = None + """ Primitive extension for defaultValueDecimal. Type `FHIRPrimitiveExtension` """ self.defaultValueDistance = None """ Specified value if missing from instance. Type `Distance` (represented as `dict` in JSON). """ + self._defaultValueDistance = None + """ Primitive extension for defaultValueDistance. Type `FHIRPrimitiveExtension` """ self.defaultValueDosage = None """ Specified value if missing from instance. Type `Dosage` (represented as `dict` in JSON). """ + self._defaultValueDosage = None + """ Primitive extension for defaultValueDosage. Type `FHIRPrimitiveExtension` """ self.defaultValueDuration = None """ Specified value if missing from instance. Type `Duration` (represented as `dict` in JSON). """ + self._defaultValueDuration = None + """ Primitive extension for defaultValueDuration. Type `FHIRPrimitiveExtension` """ self.defaultValueExpression = None """ Specified value if missing from instance. Type `Expression` (represented as `dict` in JSON). """ + self._defaultValueExpression = None + """ Primitive extension for defaultValueExpression. Type `FHIRPrimitiveExtension` """ self.defaultValueHumanName = None """ Specified value if missing from instance. Type `HumanName` (represented as `dict` in JSON). """ + self._defaultValueHumanName = None + """ Primitive extension for defaultValueHumanName. Type `FHIRPrimitiveExtension` """ self.defaultValueId = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueId = None + """ Primitive extension for defaultValueId. Type `FHIRPrimitiveExtension` """ self.defaultValueIdentifier = None """ Specified value if missing from instance. Type `Identifier` (represented as `dict` in JSON). """ + self._defaultValueIdentifier = None + """ Primitive extension for defaultValueIdentifier. Type `FHIRPrimitiveExtension` """ self.defaultValueInstant = None """ Specified value if missing from instance. Type `FHIRInstant` (represented as `str` in JSON). """ + self._defaultValueInstant = None + """ Primitive extension for defaultValueInstant. Type `FHIRPrimitiveExtension` """ self.defaultValueInteger = None """ Specified value if missing from instance. Type `int`. """ + self._defaultValueInteger = None + """ Primitive extension for defaultValueInteger. Type `FHIRPrimitiveExtension` """ self.defaultValueMarkdown = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueMarkdown = None + """ Primitive extension for defaultValueMarkdown. Type `FHIRPrimitiveExtension` """ self.defaultValueMeta = None """ Specified value if missing from instance. Type `Meta` (represented as `dict` in JSON). """ + self._defaultValueMeta = None + """ Primitive extension for defaultValueMeta. Type `FHIRPrimitiveExtension` """ self.defaultValueMoney = None """ Specified value if missing from instance. Type `Money` (represented as `dict` in JSON). """ + self._defaultValueMoney = None + """ Primitive extension for defaultValueMoney. Type `FHIRPrimitiveExtension` """ self.defaultValueOid = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueOid = None + """ Primitive extension for defaultValueOid. Type `FHIRPrimitiveExtension` """ self.defaultValueParameterDefinition = None """ Specified value if missing from instance. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._defaultValueParameterDefinition = None + """ Primitive extension for defaultValueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.defaultValuePeriod = None """ Specified value if missing from instance. Type `Period` (represented as `dict` in JSON). """ + self._defaultValuePeriod = None + """ Primitive extension for defaultValuePeriod. Type `FHIRPrimitiveExtension` """ self.defaultValuePositiveInt = None """ Specified value if missing from instance. Type `int`. """ + self._defaultValuePositiveInt = None + """ Primitive extension for defaultValuePositiveInt. Type `FHIRPrimitiveExtension` """ self.defaultValueQuantity = None """ Specified value if missing from instance. Type `Quantity` (represented as `dict` in JSON). """ + self._defaultValueQuantity = None + """ Primitive extension for defaultValueQuantity. Type `FHIRPrimitiveExtension` """ self.defaultValueRange = None """ Specified value if missing from instance. Type `Range` (represented as `dict` in JSON). """ + self._defaultValueRange = None + """ Primitive extension for defaultValueRange. Type `FHIRPrimitiveExtension` """ self.defaultValueRatio = None """ Specified value if missing from instance. Type `Ratio` (represented as `dict` in JSON). """ + self._defaultValueRatio = None + """ Primitive extension for defaultValueRatio. Type `FHIRPrimitiveExtension` """ self.defaultValueReference = None """ Specified value if missing from instance. Type `FHIRReference` (represented as `dict` in JSON). """ + self._defaultValueReference = None + """ Primitive extension for defaultValueReference. Type `FHIRPrimitiveExtension` """ self.defaultValueRelatedArtifact = None """ Specified value if missing from instance. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._defaultValueRelatedArtifact = None + """ Primitive extension for defaultValueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.defaultValueSampledData = None """ Specified value if missing from instance. Type `SampledData` (represented as `dict` in JSON). """ + self._defaultValueSampledData = None + """ Primitive extension for defaultValueSampledData. Type `FHIRPrimitiveExtension` """ self.defaultValueSignature = None """ Specified value if missing from instance. Type `Signature` (represented as `dict` in JSON). """ + self._defaultValueSignature = None + """ Primitive extension for defaultValueSignature. Type `FHIRPrimitiveExtension` """ self.defaultValueString = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueString = None + """ Primitive extension for defaultValueString. Type `FHIRPrimitiveExtension` """ self.defaultValueTime = None """ Specified value if missing from instance. Type `FHIRTime` (represented as `str` in JSON). """ + self._defaultValueTime = None + """ Primitive extension for defaultValueTime. Type `FHIRPrimitiveExtension` """ self.defaultValueTiming = None """ Specified value if missing from instance. Type `Timing` (represented as `dict` in JSON). """ + self._defaultValueTiming = None + """ Primitive extension for defaultValueTiming. Type `FHIRPrimitiveExtension` """ self.defaultValueTriggerDefinition = None """ Specified value if missing from instance. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._defaultValueTriggerDefinition = None + """ Primitive extension for defaultValueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.defaultValueUnsignedInt = None """ Specified value if missing from instance. Type `int`. """ + self._defaultValueUnsignedInt = None + """ Primitive extension for defaultValueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.defaultValueUri = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueUri = None + """ Primitive extension for defaultValueUri. Type `FHIRPrimitiveExtension` """ self.defaultValueUrl = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueUrl = None + """ Primitive extension for defaultValueUrl. Type `FHIRPrimitiveExtension` """ self.defaultValueUsageContext = None """ Specified value if missing from instance. Type `UsageContext` (represented as `dict` in JSON). """ + self._defaultValueUsageContext = None + """ Primitive extension for defaultValueUsageContext. Type `FHIRPrimitiveExtension` """ self.defaultValueUuid = None """ Specified value if missing from instance. Type `str`. """ + self._defaultValueUuid = None + """ Primitive extension for defaultValueUuid. Type `FHIRPrimitiveExtension` """ self.definition = None """ Full formal definition as narrative text. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.example = None """ Example value (as defined for type). List of `ElementDefinitionExample` items (represented as `dict` in JSON). """ + self._example = None + """ Primitive extension for example. List of `FHIRPrimitiveExtension` """ self.fixedAddress = None """ Value must be exactly this. Type `Address` (represented as `dict` in JSON). """ + self._fixedAddress = None + """ Primitive extension for fixedAddress. Type `FHIRPrimitiveExtension` """ self.fixedAge = None """ Value must be exactly this. Type `Age` (represented as `dict` in JSON). """ + self._fixedAge = None + """ Primitive extension for fixedAge. Type `FHIRPrimitiveExtension` """ self.fixedAnnotation = None """ Value must be exactly this. Type `Annotation` (represented as `dict` in JSON). """ + self._fixedAnnotation = None + """ Primitive extension for fixedAnnotation. Type `FHIRPrimitiveExtension` """ self.fixedAttachment = None """ Value must be exactly this. Type `Attachment` (represented as `dict` in JSON). """ + self._fixedAttachment = None + """ Primitive extension for fixedAttachment. Type `FHIRPrimitiveExtension` """ self.fixedBase64Binary = None """ Value must be exactly this. Type `str`. """ + self._fixedBase64Binary = None + """ Primitive extension for fixedBase64Binary. Type `FHIRPrimitiveExtension` """ self.fixedBoolean = None """ Value must be exactly this. Type `bool`. """ + self._fixedBoolean = None + """ Primitive extension for fixedBoolean. Type `FHIRPrimitiveExtension` """ self.fixedCanonical = None """ Value must be exactly this. Type `str`. """ + self._fixedCanonical = None + """ Primitive extension for fixedCanonical. Type `FHIRPrimitiveExtension` """ self.fixedCode = None """ Value must be exactly this. Type `str`. """ + self._fixedCode = None + """ Primitive extension for fixedCode. Type `FHIRPrimitiveExtension` """ self.fixedCodeableConcept = None """ Value must be exactly this. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fixedCodeableConcept = None + """ Primitive extension for fixedCodeableConcept. Type `FHIRPrimitiveExtension` """ self.fixedCoding = None """ Value must be exactly this. Type `Coding` (represented as `dict` in JSON). """ + self._fixedCoding = None + """ Primitive extension for fixedCoding. Type `FHIRPrimitiveExtension` """ self.fixedContactDetail = None """ Value must be exactly this. Type `ContactDetail` (represented as `dict` in JSON). """ + self._fixedContactDetail = None + """ Primitive extension for fixedContactDetail. Type `FHIRPrimitiveExtension` """ self.fixedContactPoint = None """ Value must be exactly this. Type `ContactPoint` (represented as `dict` in JSON). """ + self._fixedContactPoint = None + """ Primitive extension for fixedContactPoint. Type `FHIRPrimitiveExtension` """ self.fixedContributor = None """ Value must be exactly this. Type `Contributor` (represented as `dict` in JSON). """ + self._fixedContributor = None + """ Primitive extension for fixedContributor. Type `FHIRPrimitiveExtension` """ self.fixedCount = None """ Value must be exactly this. Type `Count` (represented as `dict` in JSON). """ + self._fixedCount = None + """ Primitive extension for fixedCount. Type `FHIRPrimitiveExtension` """ self.fixedDataRequirement = None """ Value must be exactly this. Type `DataRequirement` (represented as `dict` in JSON). """ + self._fixedDataRequirement = None + """ Primitive extension for fixedDataRequirement. Type `FHIRPrimitiveExtension` """ self.fixedDate = None """ Value must be exactly this. Type `FHIRDate` (represented as `str` in JSON). """ + self._fixedDate = None + """ Primitive extension for fixedDate. Type `FHIRPrimitiveExtension` """ self.fixedDateTime = None """ Value must be exactly this. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._fixedDateTime = None + """ Primitive extension for fixedDateTime. Type `FHIRPrimitiveExtension` """ self.fixedDecimal = None """ Value must be exactly this. Type `float`. """ + self._fixedDecimal = None + """ Primitive extension for fixedDecimal. Type `FHIRPrimitiveExtension` """ self.fixedDistance = None """ Value must be exactly this. Type `Distance` (represented as `dict` in JSON). """ + self._fixedDistance = None + """ Primitive extension for fixedDistance. Type `FHIRPrimitiveExtension` """ self.fixedDosage = None """ Value must be exactly this. Type `Dosage` (represented as `dict` in JSON). """ + self._fixedDosage = None + """ Primitive extension for fixedDosage. Type `FHIRPrimitiveExtension` """ self.fixedDuration = None """ Value must be exactly this. Type `Duration` (represented as `dict` in JSON). """ + self._fixedDuration = None + """ Primitive extension for fixedDuration. Type `FHIRPrimitiveExtension` """ self.fixedExpression = None """ Value must be exactly this. Type `Expression` (represented as `dict` in JSON). """ + self._fixedExpression = None + """ Primitive extension for fixedExpression. Type `FHIRPrimitiveExtension` """ self.fixedHumanName = None """ Value must be exactly this. Type `HumanName` (represented as `dict` in JSON). """ + self._fixedHumanName = None + """ Primitive extension for fixedHumanName. Type `FHIRPrimitiveExtension` """ self.fixedId = None """ Value must be exactly this. Type `str`. """ + self._fixedId = None + """ Primitive extension for fixedId. Type `FHIRPrimitiveExtension` """ self.fixedIdentifier = None """ Value must be exactly this. Type `Identifier` (represented as `dict` in JSON). """ + self._fixedIdentifier = None + """ Primitive extension for fixedIdentifier. Type `FHIRPrimitiveExtension` """ self.fixedInstant = None """ Value must be exactly this. Type `FHIRInstant` (represented as `str` in JSON). """ + self._fixedInstant = None + """ Primitive extension for fixedInstant. Type `FHIRPrimitiveExtension` """ self.fixedInteger = None """ Value must be exactly this. Type `int`. """ + self._fixedInteger = None + """ Primitive extension for fixedInteger. Type `FHIRPrimitiveExtension` """ self.fixedMarkdown = None """ Value must be exactly this. Type `str`. """ + self._fixedMarkdown = None + """ Primitive extension for fixedMarkdown. Type `FHIRPrimitiveExtension` """ self.fixedMeta = None """ Value must be exactly this. Type `Meta` (represented as `dict` in JSON). """ + self._fixedMeta = None + """ Primitive extension for fixedMeta. Type `FHIRPrimitiveExtension` """ self.fixedMoney = None """ Value must be exactly this. Type `Money` (represented as `dict` in JSON). """ + self._fixedMoney = None + """ Primitive extension for fixedMoney. Type `FHIRPrimitiveExtension` """ self.fixedOid = None """ Value must be exactly this. Type `str`. """ + self._fixedOid = None + """ Primitive extension for fixedOid. Type `FHIRPrimitiveExtension` """ self.fixedParameterDefinition = None """ Value must be exactly this. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._fixedParameterDefinition = None + """ Primitive extension for fixedParameterDefinition. Type `FHIRPrimitiveExtension` """ self.fixedPeriod = None """ Value must be exactly this. Type `Period` (represented as `dict` in JSON). """ + self._fixedPeriod = None + """ Primitive extension for fixedPeriod. Type `FHIRPrimitiveExtension` """ self.fixedPositiveInt = None """ Value must be exactly this. Type `int`. """ + self._fixedPositiveInt = None + """ Primitive extension for fixedPositiveInt. Type `FHIRPrimitiveExtension` """ self.fixedQuantity = None """ Value must be exactly this. Type `Quantity` (represented as `dict` in JSON). """ + self._fixedQuantity = None + """ Primitive extension for fixedQuantity. Type `FHIRPrimitiveExtension` """ self.fixedRange = None """ Value must be exactly this. Type `Range` (represented as `dict` in JSON). """ + self._fixedRange = None + """ Primitive extension for fixedRange. Type `FHIRPrimitiveExtension` """ self.fixedRatio = None """ Value must be exactly this. Type `Ratio` (represented as `dict` in JSON). """ + self._fixedRatio = None + """ Primitive extension for fixedRatio. Type `FHIRPrimitiveExtension` """ self.fixedReference = None """ Value must be exactly this. Type `FHIRReference` (represented as `dict` in JSON). """ + self._fixedReference = None + """ Primitive extension for fixedReference. Type `FHIRPrimitiveExtension` """ self.fixedRelatedArtifact = None """ Value must be exactly this. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._fixedRelatedArtifact = None + """ Primitive extension for fixedRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.fixedSampledData = None """ Value must be exactly this. Type `SampledData` (represented as `dict` in JSON). """ + self._fixedSampledData = None + """ Primitive extension for fixedSampledData. Type `FHIRPrimitiveExtension` """ self.fixedSignature = None """ Value must be exactly this. Type `Signature` (represented as `dict` in JSON). """ + self._fixedSignature = None + """ Primitive extension for fixedSignature. Type `FHIRPrimitiveExtension` """ self.fixedString = None """ Value must be exactly this. Type `str`. """ + self._fixedString = None + """ Primitive extension for fixedString. Type `FHIRPrimitiveExtension` """ self.fixedTime = None """ Value must be exactly this. Type `FHIRTime` (represented as `str` in JSON). """ + self._fixedTime = None + """ Primitive extension for fixedTime. Type `FHIRPrimitiveExtension` """ self.fixedTiming = None """ Value must be exactly this. Type `Timing` (represented as `dict` in JSON). """ + self._fixedTiming = None + """ Primitive extension for fixedTiming. Type `FHIRPrimitiveExtension` """ self.fixedTriggerDefinition = None """ Value must be exactly this. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._fixedTriggerDefinition = None + """ Primitive extension for fixedTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.fixedUnsignedInt = None """ Value must be exactly this. Type `int`. """ + self._fixedUnsignedInt = None + """ Primitive extension for fixedUnsignedInt. Type `FHIRPrimitiveExtension` """ self.fixedUri = None """ Value must be exactly this. Type `str`. """ + self._fixedUri = None + """ Primitive extension for fixedUri. Type `FHIRPrimitiveExtension` """ self.fixedUrl = None """ Value must be exactly this. Type `str`. """ + self._fixedUrl = None + """ Primitive extension for fixedUrl. Type `FHIRPrimitiveExtension` """ self.fixedUsageContext = None """ Value must be exactly this. Type `UsageContext` (represented as `dict` in JSON). """ + self._fixedUsageContext = None + """ Primitive extension for fixedUsageContext. Type `FHIRPrimitiveExtension` """ self.fixedUuid = None """ Value must be exactly this. Type `str`. """ + self._fixedUuid = None + """ Primitive extension for fixedUuid. Type `FHIRPrimitiveExtension` """ self.isModifier = None """ If this modifies the meaning of other elements. Type `bool`. """ + self._isModifier = None + """ Primitive extension for isModifier. Type `FHIRPrimitiveExtension` """ self.isModifierReason = None """ Reason that this element is marked as a modifier. Type `str`. """ + self._isModifierReason = None + """ Primitive extension for isModifierReason. Type `FHIRPrimitiveExtension` """ self.isSummary = None """ Include when _summary = true?. Type `bool`. """ + self._isSummary = None + """ Primitive extension for isSummary. Type `FHIRPrimitiveExtension` """ self.label = None """ Name for element to display with or prompt for element. Type `str`. """ + self._label = None + """ Primitive extension for label. Type `FHIRPrimitiveExtension` """ self.mapping = None """ Map element to another set of definitions. List of `ElementDefinitionMapping` items (represented as `dict` in JSON). """ + self._mapping = None + """ Primitive extension for mapping. List of `FHIRPrimitiveExtension` """ self.max = None """ Maximum Cardinality (a number or *). Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.maxLength = None """ Max length for strings. Type `int`. """ + self._maxLength = None + """ Primitive extension for maxLength. Type `FHIRPrimitiveExtension` """ self.maxValueDate = None """ Maximum Allowed Value (for some types). Type `FHIRDate` (represented as `str` in JSON). """ + self._maxValueDate = None + """ Primitive extension for maxValueDate. Type `FHIRPrimitiveExtension` """ self.maxValueDateTime = None """ Maximum Allowed Value (for some types). Type `FHIRDateTime` (represented as `str` in JSON). """ + self._maxValueDateTime = None + """ Primitive extension for maxValueDateTime. Type `FHIRPrimitiveExtension` """ self.maxValueDecimal = None """ Maximum Allowed Value (for some types). Type `float`. """ + self._maxValueDecimal = None + """ Primitive extension for maxValueDecimal. Type `FHIRPrimitiveExtension` """ self.maxValueInstant = None """ Maximum Allowed Value (for some types). Type `FHIRInstant` (represented as `str` in JSON). """ + self._maxValueInstant = None + """ Primitive extension for maxValueInstant. Type `FHIRPrimitiveExtension` """ self.maxValueInteger = None """ Maximum Allowed Value (for some types). Type `int`. """ + self._maxValueInteger = None + """ Primitive extension for maxValueInteger. Type `FHIRPrimitiveExtension` """ self.maxValuePositiveInt = None """ Maximum Allowed Value (for some types). Type `int`. """ + self._maxValuePositiveInt = None + """ Primitive extension for maxValuePositiveInt. Type `FHIRPrimitiveExtension` """ self.maxValueQuantity = None """ Maximum Allowed Value (for some types). Type `Quantity` (represented as `dict` in JSON). """ + self._maxValueQuantity = None + """ Primitive extension for maxValueQuantity. Type `FHIRPrimitiveExtension` """ self.maxValueTime = None """ Maximum Allowed Value (for some types). Type `FHIRTime` (represented as `str` in JSON). """ + self._maxValueTime = None + """ Primitive extension for maxValueTime. Type `FHIRPrimitiveExtension` """ self.maxValueUnsignedInt = None """ Maximum Allowed Value (for some types). Type `int`. """ + self._maxValueUnsignedInt = None + """ Primitive extension for maxValueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.meaningWhenMissing = None """ Implicit meaning when this element is missing. Type `str`. """ + self._meaningWhenMissing = None + """ Primitive extension for meaningWhenMissing. Type `FHIRPrimitiveExtension` """ self.min = None """ Minimum Cardinality. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.minValueDate = None """ Minimum Allowed Value (for some types). Type `FHIRDate` (represented as `str` in JSON). """ + self._minValueDate = None + """ Primitive extension for minValueDate. Type `FHIRPrimitiveExtension` """ self.minValueDateTime = None """ Minimum Allowed Value (for some types). Type `FHIRDateTime` (represented as `str` in JSON). """ + self._minValueDateTime = None + """ Primitive extension for minValueDateTime. Type `FHIRPrimitiveExtension` """ self.minValueDecimal = None """ Minimum Allowed Value (for some types). Type `float`. """ + self._minValueDecimal = None + """ Primitive extension for minValueDecimal. Type `FHIRPrimitiveExtension` """ self.minValueInstant = None """ Minimum Allowed Value (for some types). Type `FHIRInstant` (represented as `str` in JSON). """ + self._minValueInstant = None + """ Primitive extension for minValueInstant. Type `FHIRPrimitiveExtension` """ self.minValueInteger = None """ Minimum Allowed Value (for some types). Type `int`. """ + self._minValueInteger = None + """ Primitive extension for minValueInteger. Type `FHIRPrimitiveExtension` """ self.minValuePositiveInt = None """ Minimum Allowed Value (for some types). Type `int`. """ + self._minValuePositiveInt = None + """ Primitive extension for minValuePositiveInt. Type `FHIRPrimitiveExtension` """ self.minValueQuantity = None """ Minimum Allowed Value (for some types). Type `Quantity` (represented as `dict` in JSON). """ + self._minValueQuantity = None + """ Primitive extension for minValueQuantity. Type `FHIRPrimitiveExtension` """ self.minValueTime = None """ Minimum Allowed Value (for some types). Type `FHIRTime` (represented as `str` in JSON). """ + self._minValueTime = None + """ Primitive extension for minValueTime. Type `FHIRPrimitiveExtension` """ self.minValueUnsignedInt = None """ Minimum Allowed Value (for some types). Type `int`. """ + self._minValueUnsignedInt = None + """ Primitive extension for minValueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.mustSupport = None """ If the element must be supported. Type `bool`. """ + self._mustSupport = None + """ Primitive extension for mustSupport. Type `FHIRPrimitiveExtension` """ self.orderMeaning = None """ What the order of the elements means. Type `str`. """ + self._orderMeaning = None + """ Primitive extension for orderMeaning. Type `FHIRPrimitiveExtension` """ self.path = None """ Path of the element in the hierarchy of elements. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.patternAddress = None """ Value must have at least these property values. Type `Address` (represented as `dict` in JSON). """ + self._patternAddress = None + """ Primitive extension for patternAddress. Type `FHIRPrimitiveExtension` """ self.patternAge = None """ Value must have at least these property values. Type `Age` (represented as `dict` in JSON). """ + self._patternAge = None + """ Primitive extension for patternAge. Type `FHIRPrimitiveExtension` """ self.patternAnnotation = None """ Value must have at least these property values. Type `Annotation` (represented as `dict` in JSON). """ + self._patternAnnotation = None + """ Primitive extension for patternAnnotation. Type `FHIRPrimitiveExtension` """ self.patternAttachment = None """ Value must have at least these property values. Type `Attachment` (represented as `dict` in JSON). """ + self._patternAttachment = None + """ Primitive extension for patternAttachment. Type `FHIRPrimitiveExtension` """ self.patternBase64Binary = None """ Value must have at least these property values. Type `str`. """ + self._patternBase64Binary = None + """ Primitive extension for patternBase64Binary. Type `FHIRPrimitiveExtension` """ self.patternBoolean = None """ Value must have at least these property values. Type `bool`. """ + self._patternBoolean = None + """ Primitive extension for patternBoolean. Type `FHIRPrimitiveExtension` """ self.patternCanonical = None """ Value must have at least these property values. Type `str`. """ + self._patternCanonical = None + """ Primitive extension for patternCanonical. Type `FHIRPrimitiveExtension` """ self.patternCode = None """ Value must have at least these property values. Type `str`. """ + self._patternCode = None + """ Primitive extension for patternCode. Type `FHIRPrimitiveExtension` """ self.patternCodeableConcept = None """ Value must have at least these property values. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._patternCodeableConcept = None + """ Primitive extension for patternCodeableConcept. Type `FHIRPrimitiveExtension` """ self.patternCoding = None """ Value must have at least these property values. Type `Coding` (represented as `dict` in JSON). """ + self._patternCoding = None + """ Primitive extension for patternCoding. Type `FHIRPrimitiveExtension` """ self.patternContactDetail = None """ Value must have at least these property values. Type `ContactDetail` (represented as `dict` in JSON). """ + self._patternContactDetail = None + """ Primitive extension for patternContactDetail. Type `FHIRPrimitiveExtension` """ self.patternContactPoint = None """ Value must have at least these property values. Type `ContactPoint` (represented as `dict` in JSON). """ + self._patternContactPoint = None + """ Primitive extension for patternContactPoint. Type `FHIRPrimitiveExtension` """ self.patternContributor = None """ Value must have at least these property values. Type `Contributor` (represented as `dict` in JSON). """ + self._patternContributor = None + """ Primitive extension for patternContributor. Type `FHIRPrimitiveExtension` """ self.patternCount = None """ Value must have at least these property values. Type `Count` (represented as `dict` in JSON). """ + self._patternCount = None + """ Primitive extension for patternCount. Type `FHIRPrimitiveExtension` """ self.patternDataRequirement = None """ Value must have at least these property values. Type `DataRequirement` (represented as `dict` in JSON). """ + self._patternDataRequirement = None + """ Primitive extension for patternDataRequirement. Type `FHIRPrimitiveExtension` """ self.patternDate = None """ Value must have at least these property values. Type `FHIRDate` (represented as `str` in JSON). """ + self._patternDate = None + """ Primitive extension for patternDate. Type `FHIRPrimitiveExtension` """ self.patternDateTime = None """ Value must have at least these property values. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._patternDateTime = None + """ Primitive extension for patternDateTime. Type `FHIRPrimitiveExtension` """ self.patternDecimal = None """ Value must have at least these property values. Type `float`. """ + self._patternDecimal = None + """ Primitive extension for patternDecimal. Type `FHIRPrimitiveExtension` """ self.patternDistance = None """ Value must have at least these property values. Type `Distance` (represented as `dict` in JSON). """ + self._patternDistance = None + """ Primitive extension for patternDistance. Type `FHIRPrimitiveExtension` """ self.patternDosage = None """ Value must have at least these property values. Type `Dosage` (represented as `dict` in JSON). """ + self._patternDosage = None + """ Primitive extension for patternDosage. Type `FHIRPrimitiveExtension` """ self.patternDuration = None """ Value must have at least these property values. Type `Duration` (represented as `dict` in JSON). """ + self._patternDuration = None + """ Primitive extension for patternDuration. Type `FHIRPrimitiveExtension` """ self.patternExpression = None """ Value must have at least these property values. Type `Expression` (represented as `dict` in JSON). """ + self._patternExpression = None + """ Primitive extension for patternExpression. Type `FHIRPrimitiveExtension` """ self.patternHumanName = None """ Value must have at least these property values. Type `HumanName` (represented as `dict` in JSON). """ + self._patternHumanName = None + """ Primitive extension for patternHumanName. Type `FHIRPrimitiveExtension` """ self.patternId = None """ Value must have at least these property values. Type `str`. """ + self._patternId = None + """ Primitive extension for patternId. Type `FHIRPrimitiveExtension` """ self.patternIdentifier = None """ Value must have at least these property values. Type `Identifier` (represented as `dict` in JSON). """ + self._patternIdentifier = None + """ Primitive extension for patternIdentifier. Type `FHIRPrimitiveExtension` """ self.patternInstant = None """ Value must have at least these property values. Type `FHIRInstant` (represented as `str` in JSON). """ + self._patternInstant = None + """ Primitive extension for patternInstant. Type `FHIRPrimitiveExtension` """ self.patternInteger = None """ Value must have at least these property values. Type `int`. """ + self._patternInteger = None + """ Primitive extension for patternInteger. Type `FHIRPrimitiveExtension` """ self.patternMarkdown = None """ Value must have at least these property values. Type `str`. """ + self._patternMarkdown = None + """ Primitive extension for patternMarkdown. Type `FHIRPrimitiveExtension` """ self.patternMeta = None """ Value must have at least these property values. Type `Meta` (represented as `dict` in JSON). """ + self._patternMeta = None + """ Primitive extension for patternMeta. Type `FHIRPrimitiveExtension` """ self.patternMoney = None """ Value must have at least these property values. Type `Money` (represented as `dict` in JSON). """ + self._patternMoney = None + """ Primitive extension for patternMoney. Type `FHIRPrimitiveExtension` """ self.patternOid = None """ Value must have at least these property values. Type `str`. """ + self._patternOid = None + """ Primitive extension for patternOid. Type `FHIRPrimitiveExtension` """ self.patternParameterDefinition = None """ Value must have at least these property values. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._patternParameterDefinition = None + """ Primitive extension for patternParameterDefinition. Type `FHIRPrimitiveExtension` """ self.patternPeriod = None """ Value must have at least these property values. Type `Period` (represented as `dict` in JSON). """ + self._patternPeriod = None + """ Primitive extension for patternPeriod. Type `FHIRPrimitiveExtension` """ self.patternPositiveInt = None """ Value must have at least these property values. Type `int`. """ + self._patternPositiveInt = None + """ Primitive extension for patternPositiveInt. Type `FHIRPrimitiveExtension` """ self.patternQuantity = None """ Value must have at least these property values. Type `Quantity` (represented as `dict` in JSON). """ + self._patternQuantity = None + """ Primitive extension for patternQuantity. Type `FHIRPrimitiveExtension` """ self.patternRange = None """ Value must have at least these property values. Type `Range` (represented as `dict` in JSON). """ + self._patternRange = None + """ Primitive extension for patternRange. Type `FHIRPrimitiveExtension` """ self.patternRatio = None """ Value must have at least these property values. Type `Ratio` (represented as `dict` in JSON). """ + self._patternRatio = None + """ Primitive extension for patternRatio. Type `FHIRPrimitiveExtension` """ self.patternReference = None """ Value must have at least these property values. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patternReference = None + """ Primitive extension for patternReference. Type `FHIRPrimitiveExtension` """ self.patternRelatedArtifact = None """ Value must have at least these property values. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._patternRelatedArtifact = None + """ Primitive extension for patternRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.patternSampledData = None """ Value must have at least these property values. Type `SampledData` (represented as `dict` in JSON). """ + self._patternSampledData = None + """ Primitive extension for patternSampledData. Type `FHIRPrimitiveExtension` """ self.patternSignature = None """ Value must have at least these property values. Type `Signature` (represented as `dict` in JSON). """ + self._patternSignature = None + """ Primitive extension for patternSignature. Type `FHIRPrimitiveExtension` """ self.patternString = None """ Value must have at least these property values. Type `str`. """ + self._patternString = None + """ Primitive extension for patternString. Type `FHIRPrimitiveExtension` """ self.patternTime = None """ Value must have at least these property values. Type `FHIRTime` (represented as `str` in JSON). """ + self._patternTime = None + """ Primitive extension for patternTime. Type `FHIRPrimitiveExtension` """ self.patternTiming = None """ Value must have at least these property values. Type `Timing` (represented as `dict` in JSON). """ + self._patternTiming = None + """ Primitive extension for patternTiming. Type `FHIRPrimitiveExtension` """ self.patternTriggerDefinition = None """ Value must have at least these property values. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._patternTriggerDefinition = None + """ Primitive extension for patternTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.patternUnsignedInt = None """ Value must have at least these property values. Type `int`. """ + self._patternUnsignedInt = None + """ Primitive extension for patternUnsignedInt. Type `FHIRPrimitiveExtension` """ self.patternUri = None """ Value must have at least these property values. Type `str`. """ + self._patternUri = None + """ Primitive extension for patternUri. Type `FHIRPrimitiveExtension` """ self.patternUrl = None """ Value must have at least these property values. Type `str`. """ + self._patternUrl = None + """ Primitive extension for patternUrl. Type `FHIRPrimitiveExtension` """ self.patternUsageContext = None """ Value must have at least these property values. Type `UsageContext` (represented as `dict` in JSON). """ + self._patternUsageContext = None + """ Primitive extension for patternUsageContext. Type `FHIRPrimitiveExtension` """ self.patternUuid = None """ Value must have at least these property values. Type `str`. """ + self._patternUuid = None + """ Primitive extension for patternUuid. Type `FHIRPrimitiveExtension` """ self.representation = None """ xmlAttr | xmlText | typeAttr | cdaText | xhtml. List of `str` items. """ + self._representation = None + """ Primitive extension for representation. List of `FHIRPrimitiveExtension` """ self.requirements = None """ Why this resource has been created. Type `str`. """ + self._requirements = None + """ Primitive extension for requirements. Type `FHIRPrimitiveExtension` """ self.short = None """ Concise definition for space-constrained presentation. Type `str`. """ + self._short = None + """ Primitive extension for short. Type `FHIRPrimitiveExtension` """ self.sliceIsConstraining = None """ If this slice definition constrains an inherited slice definition (or not). Type `bool`. """ + self._sliceIsConstraining = None + """ Primitive extension for sliceIsConstraining. Type `FHIRPrimitiveExtension` """ self.sliceName = None """ Name for this particular element (in a set of slices). Type `str`. """ + self._sliceName = None + """ Primitive extension for sliceName. Type `FHIRPrimitiveExtension` """ self.slicing = None """ This element is sliced - slices follow. Type `ElementDefinitionSlicing` (represented as `dict` in JSON). """ + self._slicing = None + """ Primitive extension for slicing. Type `FHIRPrimitiveExtension` """ self.type = None """ Data type and Profile for this element. List of `ElementDefinitionType` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(ElementDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -816,202 +1210,399 @@ def elementProperties(self): js = super(ElementDefinition, self).elementProperties() js.extend([ ("alias", "alias", str, True, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("base", "base", ElementDefinitionBase, False, None, False), + ("_base", "_base", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("binding", "binding", ElementDefinitionBinding, False, None, False), + ("_binding", "_binding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", coding.Coding, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", str, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("constraint", "constraint", ElementDefinitionConstraint, True, None, False), + ("_constraint", "_constraint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contentReference", "contentReference", str, False, None, False), + ("_contentReference", "_contentReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAddress", "defaultValueAddress", address.Address, False, "defaultValue", False), + ("_defaultValueAddress", "_defaultValueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAge", "defaultValueAge", age.Age, False, "defaultValue", False), + ("_defaultValueAge", "_defaultValueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAnnotation", "defaultValueAnnotation", annotation.Annotation, False, "defaultValue", False), + ("_defaultValueAnnotation", "_defaultValueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAttachment", "defaultValueAttachment", attachment.Attachment, False, "defaultValue", False), + ("_defaultValueAttachment", "_defaultValueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueBase64Binary", "defaultValueBase64Binary", str, False, "defaultValue", False), + ("_defaultValueBase64Binary", "_defaultValueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueBoolean", "defaultValueBoolean", bool, False, "defaultValue", False), + ("_defaultValueBoolean", "_defaultValueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCanonical", "defaultValueCanonical", str, False, "defaultValue", False), + ("_defaultValueCanonical", "_defaultValueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCode", "defaultValueCode", str, False, "defaultValue", False), + ("_defaultValueCode", "_defaultValueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCodeableConcept", "defaultValueCodeableConcept", codeableconcept.CodeableConcept, False, "defaultValue", False), + ("_defaultValueCodeableConcept", "_defaultValueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCoding", "defaultValueCoding", coding.Coding, False, "defaultValue", False), + ("_defaultValueCoding", "_defaultValueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContactDetail", "defaultValueContactDetail", contactdetail.ContactDetail, False, "defaultValue", False), + ("_defaultValueContactDetail", "_defaultValueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContactPoint", "defaultValueContactPoint", contactpoint.ContactPoint, False, "defaultValue", False), + ("_defaultValueContactPoint", "_defaultValueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContributor", "defaultValueContributor", contributor.Contributor, False, "defaultValue", False), + ("_defaultValueContributor", "_defaultValueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCount", "defaultValueCount", count.Count, False, "defaultValue", False), + ("_defaultValueCount", "_defaultValueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDataRequirement", "defaultValueDataRequirement", datarequirement.DataRequirement, False, "defaultValue", False), + ("_defaultValueDataRequirement", "_defaultValueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDate", "defaultValueDate", fhirdate.FHIRDate, False, "defaultValue", False), + ("_defaultValueDate", "_defaultValueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDateTime", "defaultValueDateTime", fhirdatetime.FHIRDateTime, False, "defaultValue", False), + ("_defaultValueDateTime", "_defaultValueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDecimal", "defaultValueDecimal", float, False, "defaultValue", False), + ("_defaultValueDecimal", "_defaultValueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDistance", "defaultValueDistance", distance.Distance, False, "defaultValue", False), + ("_defaultValueDistance", "_defaultValueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDosage", "defaultValueDosage", dosage.Dosage, False, "defaultValue", False), + ("_defaultValueDosage", "_defaultValueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDuration", "defaultValueDuration", duration.Duration, False, "defaultValue", False), + ("_defaultValueDuration", "_defaultValueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueExpression", "defaultValueExpression", expression.Expression, False, "defaultValue", False), + ("_defaultValueExpression", "_defaultValueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueHumanName", "defaultValueHumanName", humanname.HumanName, False, "defaultValue", False), + ("_defaultValueHumanName", "_defaultValueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueId", "defaultValueId", str, False, "defaultValue", False), + ("_defaultValueId", "_defaultValueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueIdentifier", "defaultValueIdentifier", identifier.Identifier, False, "defaultValue", False), + ("_defaultValueIdentifier", "_defaultValueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueInstant", "defaultValueInstant", fhirinstant.FHIRInstant, False, "defaultValue", False), + ("_defaultValueInstant", "_defaultValueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueInteger", "defaultValueInteger", int, False, "defaultValue", False), + ("_defaultValueInteger", "_defaultValueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMarkdown", "defaultValueMarkdown", str, False, "defaultValue", False), + ("_defaultValueMarkdown", "_defaultValueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMeta", "defaultValueMeta", meta.Meta, False, "defaultValue", False), + ("_defaultValueMeta", "_defaultValueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMoney", "defaultValueMoney", money.Money, False, "defaultValue", False), + ("_defaultValueMoney", "_defaultValueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueOid", "defaultValueOid", str, False, "defaultValue", False), + ("_defaultValueOid", "_defaultValueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueParameterDefinition", "defaultValueParameterDefinition", parameterdefinition.ParameterDefinition, False, "defaultValue", False), + ("_defaultValueParameterDefinition", "_defaultValueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValuePeriod", "defaultValuePeriod", period.Period, False, "defaultValue", False), + ("_defaultValuePeriod", "_defaultValuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValuePositiveInt", "defaultValuePositiveInt", int, False, "defaultValue", False), + ("_defaultValuePositiveInt", "_defaultValuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueQuantity", "defaultValueQuantity", quantity.Quantity, False, "defaultValue", False), + ("_defaultValueQuantity", "_defaultValueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRange", "defaultValueRange", range.Range, False, "defaultValue", False), + ("_defaultValueRange", "_defaultValueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRatio", "defaultValueRatio", ratio.Ratio, False, "defaultValue", False), + ("_defaultValueRatio", "_defaultValueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueReference", "defaultValueReference", fhirreference.FHIRReference, False, "defaultValue", False), + ("_defaultValueReference", "_defaultValueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRelatedArtifact", "defaultValueRelatedArtifact", relatedartifact.RelatedArtifact, False, "defaultValue", False), + ("_defaultValueRelatedArtifact", "_defaultValueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueSampledData", "defaultValueSampledData", sampleddata.SampledData, False, "defaultValue", False), + ("_defaultValueSampledData", "_defaultValueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueSignature", "defaultValueSignature", signature.Signature, False, "defaultValue", False), + ("_defaultValueSignature", "_defaultValueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueString", "defaultValueString", str, False, "defaultValue", False), + ("_defaultValueString", "_defaultValueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTime", "defaultValueTime", fhirtime.FHIRTime, False, "defaultValue", False), + ("_defaultValueTime", "_defaultValueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTiming", "defaultValueTiming", timing.Timing, False, "defaultValue", False), + ("_defaultValueTiming", "_defaultValueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTriggerDefinition", "defaultValueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "defaultValue", False), + ("_defaultValueTriggerDefinition", "_defaultValueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUnsignedInt", "defaultValueUnsignedInt", int, False, "defaultValue", False), + ("_defaultValueUnsignedInt", "_defaultValueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUri", "defaultValueUri", str, False, "defaultValue", False), + ("_defaultValueUri", "_defaultValueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUrl", "defaultValueUrl", str, False, "defaultValue", False), + ("_defaultValueUrl", "_defaultValueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUsageContext", "defaultValueUsageContext", usagecontext.UsageContext, False, "defaultValue", False), + ("_defaultValueUsageContext", "_defaultValueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUuid", "defaultValueUuid", str, False, "defaultValue", False), + ("_defaultValueUuid", "_defaultValueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("example", "example", ElementDefinitionExample, True, None, False), + ("_example", "_example", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("fixedAddress", "fixedAddress", address.Address, False, "fixed", False), + ("_fixedAddress", "_fixedAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedAge", "fixedAge", age.Age, False, "fixed", False), + ("_fixedAge", "_fixedAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedAnnotation", "fixedAnnotation", annotation.Annotation, False, "fixed", False), + ("_fixedAnnotation", "_fixedAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedAttachment", "fixedAttachment", attachment.Attachment, False, "fixed", False), + ("_fixedAttachment", "_fixedAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedBase64Binary", "fixedBase64Binary", str, False, "fixed", False), + ("_fixedBase64Binary", "_fixedBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedBoolean", "fixedBoolean", bool, False, "fixed", False), + ("_fixedBoolean", "_fixedBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedCanonical", "fixedCanonical", str, False, "fixed", False), + ("_fixedCanonical", "_fixedCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedCode", "fixedCode", str, False, "fixed", False), + ("_fixedCode", "_fixedCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedCodeableConcept", "fixedCodeableConcept", codeableconcept.CodeableConcept, False, "fixed", False), + ("_fixedCodeableConcept", "_fixedCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedCoding", "fixedCoding", coding.Coding, False, "fixed", False), + ("_fixedCoding", "_fixedCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedContactDetail", "fixedContactDetail", contactdetail.ContactDetail, False, "fixed", False), + ("_fixedContactDetail", "_fixedContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedContactPoint", "fixedContactPoint", contactpoint.ContactPoint, False, "fixed", False), + ("_fixedContactPoint", "_fixedContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedContributor", "fixedContributor", contributor.Contributor, False, "fixed", False), + ("_fixedContributor", "_fixedContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedCount", "fixedCount", count.Count, False, "fixed", False), + ("_fixedCount", "_fixedCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDataRequirement", "fixedDataRequirement", datarequirement.DataRequirement, False, "fixed", False), + ("_fixedDataRequirement", "_fixedDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDate", "fixedDate", fhirdate.FHIRDate, False, "fixed", False), + ("_fixedDate", "_fixedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDateTime", "fixedDateTime", fhirdatetime.FHIRDateTime, False, "fixed", False), + ("_fixedDateTime", "_fixedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDecimal", "fixedDecimal", float, False, "fixed", False), + ("_fixedDecimal", "_fixedDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDistance", "fixedDistance", distance.Distance, False, "fixed", False), + ("_fixedDistance", "_fixedDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDosage", "fixedDosage", dosage.Dosage, False, "fixed", False), + ("_fixedDosage", "_fixedDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedDuration", "fixedDuration", duration.Duration, False, "fixed", False), + ("_fixedDuration", "_fixedDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedExpression", "fixedExpression", expression.Expression, False, "fixed", False), + ("_fixedExpression", "_fixedExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedHumanName", "fixedHumanName", humanname.HumanName, False, "fixed", False), + ("_fixedHumanName", "_fixedHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedId", "fixedId", str, False, "fixed", False), + ("_fixedId", "_fixedId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedIdentifier", "fixedIdentifier", identifier.Identifier, False, "fixed", False), + ("_fixedIdentifier", "_fixedIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedInstant", "fixedInstant", fhirinstant.FHIRInstant, False, "fixed", False), + ("_fixedInstant", "_fixedInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedInteger", "fixedInteger", int, False, "fixed", False), + ("_fixedInteger", "_fixedInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedMarkdown", "fixedMarkdown", str, False, "fixed", False), + ("_fixedMarkdown", "_fixedMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedMeta", "fixedMeta", meta.Meta, False, "fixed", False), + ("_fixedMeta", "_fixedMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedMoney", "fixedMoney", money.Money, False, "fixed", False), + ("_fixedMoney", "_fixedMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedOid", "fixedOid", str, False, "fixed", False), + ("_fixedOid", "_fixedOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedParameterDefinition", "fixedParameterDefinition", parameterdefinition.ParameterDefinition, False, "fixed", False), + ("_fixedParameterDefinition", "_fixedParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedPeriod", "fixedPeriod", period.Period, False, "fixed", False), + ("_fixedPeriod", "_fixedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedPositiveInt", "fixedPositiveInt", int, False, "fixed", False), + ("_fixedPositiveInt", "_fixedPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedQuantity", "fixedQuantity", quantity.Quantity, False, "fixed", False), + ("_fixedQuantity", "_fixedQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedRange", "fixedRange", range.Range, False, "fixed", False), + ("_fixedRange", "_fixedRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedRatio", "fixedRatio", ratio.Ratio, False, "fixed", False), + ("_fixedRatio", "_fixedRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedReference", "fixedReference", fhirreference.FHIRReference, False, "fixed", False), + ("_fixedReference", "_fixedReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedRelatedArtifact", "fixedRelatedArtifact", relatedartifact.RelatedArtifact, False, "fixed", False), + ("_fixedRelatedArtifact", "_fixedRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedSampledData", "fixedSampledData", sampleddata.SampledData, False, "fixed", False), + ("_fixedSampledData", "_fixedSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedSignature", "fixedSignature", signature.Signature, False, "fixed", False), + ("_fixedSignature", "_fixedSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedString", "fixedString", str, False, "fixed", False), + ("_fixedString", "_fixedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedTime", "fixedTime", fhirtime.FHIRTime, False, "fixed", False), + ("_fixedTime", "_fixedTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedTiming", "fixedTiming", timing.Timing, False, "fixed", False), + ("_fixedTiming", "_fixedTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedTriggerDefinition", "fixedTriggerDefinition", triggerdefinition.TriggerDefinition, False, "fixed", False), + ("_fixedTriggerDefinition", "_fixedTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedUnsignedInt", "fixedUnsignedInt", int, False, "fixed", False), + ("_fixedUnsignedInt", "_fixedUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedUri", "fixedUri", str, False, "fixed", False), + ("_fixedUri", "_fixedUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedUrl", "fixedUrl", str, False, "fixed", False), + ("_fixedUrl", "_fixedUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedUsageContext", "fixedUsageContext", usagecontext.UsageContext, False, "fixed", False), + ("_fixedUsageContext", "_fixedUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixedUuid", "fixedUuid", str, False, "fixed", False), + ("_fixedUuid", "_fixedUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("isModifier", "isModifier", bool, False, None, False), + ("_isModifier", "_isModifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("isModifierReason", "isModifierReason", str, False, None, False), + ("_isModifierReason", "_isModifierReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("isSummary", "isSummary", bool, False, None, False), + ("_isSummary", "_isSummary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("label", "label", str, False, None, False), + ("_label", "_label", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mapping", "mapping", ElementDefinitionMapping, True, None, False), + ("_mapping", "_mapping", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("max", "max", str, False, None, False), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxLength", "maxLength", int, False, None, False), + ("_maxLength", "_maxLength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueDate", "maxValueDate", fhirdate.FHIRDate, False, "maxValue", False), + ("_maxValueDate", "_maxValueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueDateTime", "maxValueDateTime", fhirdatetime.FHIRDateTime, False, "maxValue", False), + ("_maxValueDateTime", "_maxValueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueDecimal", "maxValueDecimal", float, False, "maxValue", False), + ("_maxValueDecimal", "_maxValueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueInstant", "maxValueInstant", fhirinstant.FHIRInstant, False, "maxValue", False), + ("_maxValueInstant", "_maxValueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueInteger", "maxValueInteger", int, False, "maxValue", False), + ("_maxValueInteger", "_maxValueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValuePositiveInt", "maxValuePositiveInt", int, False, "maxValue", False), + ("_maxValuePositiveInt", "_maxValuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueQuantity", "maxValueQuantity", quantity.Quantity, False, "maxValue", False), + ("_maxValueQuantity", "_maxValueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueTime", "maxValueTime", fhirtime.FHIRTime, False, "maxValue", False), + ("_maxValueTime", "_maxValueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxValueUnsignedInt", "maxValueUnsignedInt", int, False, "maxValue", False), + ("_maxValueUnsignedInt", "_maxValueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("meaningWhenMissing", "meaningWhenMissing", str, False, None, False), + ("_meaningWhenMissing", "_meaningWhenMissing", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, False), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueDate", "minValueDate", fhirdate.FHIRDate, False, "minValue", False), + ("_minValueDate", "_minValueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueDateTime", "minValueDateTime", fhirdatetime.FHIRDateTime, False, "minValue", False), + ("_minValueDateTime", "_minValueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueDecimal", "minValueDecimal", float, False, "minValue", False), + ("_minValueDecimal", "_minValueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueInstant", "minValueInstant", fhirinstant.FHIRInstant, False, "minValue", False), + ("_minValueInstant", "_minValueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueInteger", "minValueInteger", int, False, "minValue", False), + ("_minValueInteger", "_minValueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValuePositiveInt", "minValuePositiveInt", int, False, "minValue", False), + ("_minValuePositiveInt", "_minValuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueQuantity", "minValueQuantity", quantity.Quantity, False, "minValue", False), + ("_minValueQuantity", "_minValueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueTime", "minValueTime", fhirtime.FHIRTime, False, "minValue", False), + ("_minValueTime", "_minValueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minValueUnsignedInt", "minValueUnsignedInt", int, False, "minValue", False), + ("_minValueUnsignedInt", "_minValueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mustSupport", "mustSupport", bool, False, None, False), + ("_mustSupport", "_mustSupport", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orderMeaning", "orderMeaning", str, False, None, False), + ("_orderMeaning", "_orderMeaning", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, True), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternAddress", "patternAddress", address.Address, False, "pattern", False), + ("_patternAddress", "_patternAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternAge", "patternAge", age.Age, False, "pattern", False), + ("_patternAge", "_patternAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternAnnotation", "patternAnnotation", annotation.Annotation, False, "pattern", False), + ("_patternAnnotation", "_patternAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternAttachment", "patternAttachment", attachment.Attachment, False, "pattern", False), + ("_patternAttachment", "_patternAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternBase64Binary", "patternBase64Binary", str, False, "pattern", False), + ("_patternBase64Binary", "_patternBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternBoolean", "patternBoolean", bool, False, "pattern", False), + ("_patternBoolean", "_patternBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternCanonical", "patternCanonical", str, False, "pattern", False), + ("_patternCanonical", "_patternCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternCode", "patternCode", str, False, "pattern", False), + ("_patternCode", "_patternCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternCodeableConcept", "patternCodeableConcept", codeableconcept.CodeableConcept, False, "pattern", False), + ("_patternCodeableConcept", "_patternCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternCoding", "patternCoding", coding.Coding, False, "pattern", False), + ("_patternCoding", "_patternCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternContactDetail", "patternContactDetail", contactdetail.ContactDetail, False, "pattern", False), + ("_patternContactDetail", "_patternContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternContactPoint", "patternContactPoint", contactpoint.ContactPoint, False, "pattern", False), + ("_patternContactPoint", "_patternContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternContributor", "patternContributor", contributor.Contributor, False, "pattern", False), + ("_patternContributor", "_patternContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternCount", "patternCount", count.Count, False, "pattern", False), + ("_patternCount", "_patternCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDataRequirement", "patternDataRequirement", datarequirement.DataRequirement, False, "pattern", False), + ("_patternDataRequirement", "_patternDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDate", "patternDate", fhirdate.FHIRDate, False, "pattern", False), + ("_patternDate", "_patternDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDateTime", "patternDateTime", fhirdatetime.FHIRDateTime, False, "pattern", False), + ("_patternDateTime", "_patternDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDecimal", "patternDecimal", float, False, "pattern", False), + ("_patternDecimal", "_patternDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDistance", "patternDistance", distance.Distance, False, "pattern", False), + ("_patternDistance", "_patternDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDosage", "patternDosage", dosage.Dosage, False, "pattern", False), + ("_patternDosage", "_patternDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternDuration", "patternDuration", duration.Duration, False, "pattern", False), + ("_patternDuration", "_patternDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternExpression", "patternExpression", expression.Expression, False, "pattern", False), + ("_patternExpression", "_patternExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternHumanName", "patternHumanName", humanname.HumanName, False, "pattern", False), + ("_patternHumanName", "_patternHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternId", "patternId", str, False, "pattern", False), + ("_patternId", "_patternId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternIdentifier", "patternIdentifier", identifier.Identifier, False, "pattern", False), + ("_patternIdentifier", "_patternIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternInstant", "patternInstant", fhirinstant.FHIRInstant, False, "pattern", False), + ("_patternInstant", "_patternInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternInteger", "patternInteger", int, False, "pattern", False), + ("_patternInteger", "_patternInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternMarkdown", "patternMarkdown", str, False, "pattern", False), + ("_patternMarkdown", "_patternMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternMeta", "patternMeta", meta.Meta, False, "pattern", False), + ("_patternMeta", "_patternMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternMoney", "patternMoney", money.Money, False, "pattern", False), + ("_patternMoney", "_patternMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternOid", "patternOid", str, False, "pattern", False), + ("_patternOid", "_patternOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternParameterDefinition", "patternParameterDefinition", parameterdefinition.ParameterDefinition, False, "pattern", False), + ("_patternParameterDefinition", "_patternParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternPeriod", "patternPeriod", period.Period, False, "pattern", False), + ("_patternPeriod", "_patternPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternPositiveInt", "patternPositiveInt", int, False, "pattern", False), + ("_patternPositiveInt", "_patternPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternQuantity", "patternQuantity", quantity.Quantity, False, "pattern", False), + ("_patternQuantity", "_patternQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternRange", "patternRange", range.Range, False, "pattern", False), + ("_patternRange", "_patternRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternRatio", "patternRatio", ratio.Ratio, False, "pattern", False), + ("_patternRatio", "_patternRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternReference", "patternReference", fhirreference.FHIRReference, False, "pattern", False), + ("_patternReference", "_patternReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternRelatedArtifact", "patternRelatedArtifact", relatedartifact.RelatedArtifact, False, "pattern", False), + ("_patternRelatedArtifact", "_patternRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternSampledData", "patternSampledData", sampleddata.SampledData, False, "pattern", False), + ("_patternSampledData", "_patternSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternSignature", "patternSignature", signature.Signature, False, "pattern", False), + ("_patternSignature", "_patternSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternString", "patternString", str, False, "pattern", False), + ("_patternString", "_patternString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternTime", "patternTime", fhirtime.FHIRTime, False, "pattern", False), + ("_patternTime", "_patternTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternTiming", "patternTiming", timing.Timing, False, "pattern", False), + ("_patternTiming", "_patternTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternTriggerDefinition", "patternTriggerDefinition", triggerdefinition.TriggerDefinition, False, "pattern", False), + ("_patternTriggerDefinition", "_patternTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternUnsignedInt", "patternUnsignedInt", int, False, "pattern", False), + ("_patternUnsignedInt", "_patternUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternUri", "patternUri", str, False, "pattern", False), + ("_patternUri", "_patternUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternUrl", "patternUrl", str, False, "pattern", False), + ("_patternUrl", "_patternUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternUsageContext", "patternUsageContext", usagecontext.UsageContext, False, "pattern", False), + ("_patternUsageContext", "_patternUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patternUuid", "patternUuid", str, False, "pattern", False), + ("_patternUuid", "_patternUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("representation", "representation", str, True, None, False), + ("_representation", "_representation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requirements", "requirements", str, False, None, False), + ("_requirements", "_requirements", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("short", "short", str, False, None, False), + ("_short", "_short", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sliceIsConstraining", "sliceIsConstraining", bool, False, None, False), + ("_sliceIsConstraining", "_sliceIsConstraining", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sliceName", "sliceName", str, False, None, False), + ("_sliceName", "_sliceName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("slicing", "slicing", ElementDefinitionSlicing, False, None, False), + ("_slicing", "_slicing", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", ElementDefinitionType, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -1044,14 +1635,20 @@ def __init__(self, jsondict=None, strict=True): self.max = None """ Max cardinality of the base element. Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Min cardinality of the base element. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.path = None """ Path that identifies the base element. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionBase, self).__init__(jsondict=jsondict, strict=strict) @@ -1059,8 +1656,11 @@ def elementProperties(self): js = super(ElementDefinitionBase, self).elementProperties() js.extend([ ("max", "max", str, False, None, True), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, True), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, True), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1085,14 +1685,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Human explanation of the value set. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.strength = None """ required | extensible | preferred | example. Type `str`. """ + self._strength = None + """ Primitive extension for strength. Type `FHIRPrimitiveExtension` """ self.valueSet = None """ Source of value set. Type `str`. """ + self._valueSet = None + """ Primitive extension for valueSet. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionBinding, self).__init__(jsondict=jsondict, strict=strict) @@ -1100,8 +1706,11 @@ def elementProperties(self): js = super(ElementDefinitionBinding, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", str, False, None, True), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSet", "valueSet", str, False, None, False), + ("_valueSet", "_valueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1126,30 +1735,44 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ FHIRPath expression of constraint. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.human = None """ Human description of constraint. Type `str`. """ + self._human = None + """ Primitive extension for human. Type `FHIRPrimitiveExtension` """ self.key = None """ Target of 'condition' reference above. Type `str`. """ + self._key = None + """ Primitive extension for key. Type `FHIRPrimitiveExtension` """ self.requirements = None """ Why this constraint is necessary or appropriate. Type `str`. """ + self._requirements = None + """ Primitive extension for requirements. Type `FHIRPrimitiveExtension` """ self.severity = None """ error | warning. Type `str`. """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ self.source = None """ Reference to original source of constraint. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.xpath = None """ XPath expression of constraint. Type `str`. """ + self._xpath = None + """ Primitive extension for xpath. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionConstraint, self).__init__(jsondict=jsondict, strict=strict) @@ -1157,12 +1780,19 @@ def elementProperties(self): js = super(ElementDefinitionConstraint, self).elementProperties() js.extend([ ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("human", "human", str, False, None, True), + ("_human", "_human", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("key", "key", str, False, None, True), + ("_key", "_key", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requirements", "requirements", str, False, None, False), + ("_requirements", "_requirements", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("severity", "severity", str, False, None, True), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", str, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("xpath", "xpath", str, False, None, False), + ("_xpath", "_xpath", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1187,206 +1817,308 @@ def __init__(self, jsondict=None, strict=True): self.label = None """ Describes the purpose of this example. Type `str`. """ + self._label = None + """ Primitive extension for label. Type `FHIRPrimitiveExtension` """ self.valueAddress = None """ Value of Example (one of allowed types). Type `Address` (represented as `dict` in JSON). """ + self._valueAddress = None + """ Primitive extension for valueAddress. Type `FHIRPrimitiveExtension` """ self.valueAge = None """ Value of Example (one of allowed types). Type `Age` (represented as `dict` in JSON). """ + self._valueAge = None + """ Primitive extension for valueAge. Type `FHIRPrimitiveExtension` """ self.valueAnnotation = None """ Value of Example (one of allowed types). Type `Annotation` (represented as `dict` in JSON). """ + self._valueAnnotation = None + """ Primitive extension for valueAnnotation. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Value of Example (one of allowed types). Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of Example (one of allowed types). Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCanonical = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueCanonical = None + """ Primitive extension for valueCanonical. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value of Example (one of allowed types). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Value of Example (one of allowed types). Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueContactDetail = None """ Value of Example (one of allowed types). Type `ContactDetail` (represented as `dict` in JSON). """ + self._valueContactDetail = None + """ Primitive extension for valueContactDetail. Type `FHIRPrimitiveExtension` """ self.valueContactPoint = None """ Value of Example (one of allowed types). Type `ContactPoint` (represented as `dict` in JSON). """ + self._valueContactPoint = None + """ Primitive extension for valueContactPoint. Type `FHIRPrimitiveExtension` """ self.valueContributor = None """ Value of Example (one of allowed types). Type `Contributor` (represented as `dict` in JSON). """ + self._valueContributor = None + """ Primitive extension for valueContributor. Type `FHIRPrimitiveExtension` """ self.valueCount = None """ Value of Example (one of allowed types). Type `Count` (represented as `dict` in JSON). """ + self._valueCount = None + """ Primitive extension for valueCount. Type `FHIRPrimitiveExtension` """ self.valueDataRequirement = None """ Value of Example (one of allowed types). Type `DataRequirement` (represented as `dict` in JSON). """ + self._valueDataRequirement = None + """ Primitive extension for valueDataRequirement. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Value of Example (one of allowed types). Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Value of Example (one of allowed types). Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Value of Example (one of allowed types). Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueDistance = None """ Value of Example (one of allowed types). Type `Distance` (represented as `dict` in JSON). """ + self._valueDistance = None + """ Primitive extension for valueDistance. Type `FHIRPrimitiveExtension` """ self.valueDosage = None """ Value of Example (one of allowed types). Type `Dosage` (represented as `dict` in JSON). """ + self._valueDosage = None + """ Primitive extension for valueDosage. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ Value of Example (one of allowed types). Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valueExpression = None """ Value of Example (one of allowed types). Type `Expression` (represented as `dict` in JSON). """ + self._valueExpression = None + """ Primitive extension for valueExpression. Type `FHIRPrimitiveExtension` """ self.valueHumanName = None """ Value of Example (one of allowed types). Type `HumanName` (represented as `dict` in JSON). """ + self._valueHumanName = None + """ Primitive extension for valueHumanName. Type `FHIRPrimitiveExtension` """ self.valueId = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueIdentifier = None """ Value of Example (one of allowed types). Type `Identifier` (represented as `dict` in JSON). """ + self._valueIdentifier = None + """ Primitive extension for valueIdentifier. Type `FHIRPrimitiveExtension` """ self.valueInstant = None """ Value of Example (one of allowed types). Type `FHIRInstant` (represented as `str` in JSON). """ + self._valueInstant = None + """ Primitive extension for valueInstant. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Value of Example (one of allowed types). Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueMarkdown = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueMarkdown = None + """ Primitive extension for valueMarkdown. Type `FHIRPrimitiveExtension` """ self.valueMeta = None """ Value of Example (one of allowed types). Type `Meta` (represented as `dict` in JSON). """ + self._valueMeta = None + """ Primitive extension for valueMeta. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ Value of Example (one of allowed types). Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueOid = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueOid = None + """ Primitive extension for valueOid. Type `FHIRPrimitiveExtension` """ self.valueParameterDefinition = None """ Value of Example (one of allowed types). Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._valueParameterDefinition = None + """ Primitive extension for valueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Value of Example (one of allowed types). Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valuePositiveInt = None """ Value of Example (one of allowed types). Type `int`. """ + self._valuePositiveInt = None + """ Primitive extension for valuePositiveInt. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value of Example (one of allowed types). Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value of Example (one of allowed types). Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Value of Example (one of allowed types). Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Value of Example (one of allowed types). Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueRelatedArtifact = None """ Value of Example (one of allowed types). Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._valueRelatedArtifact = None + """ Primitive extension for valueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Value of Example (one of allowed types). Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueSignature = None """ Value of Example (one of allowed types). Type `Signature` (represented as `dict` in JSON). """ + self._valueSignature = None + """ Primitive extension for valueSignature. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Value of Example (one of allowed types). Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueTiming = None """ Value of Example (one of allowed types). Type `Timing` (represented as `dict` in JSON). """ + self._valueTiming = None + """ Primitive extension for valueTiming. Type `FHIRPrimitiveExtension` """ self.valueTriggerDefinition = None """ Value of Example (one of allowed types). Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._valueTriggerDefinition = None + """ Primitive extension for valueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.valueUnsignedInt = None """ Value of Example (one of allowed types). Type `int`. """ + self._valueUnsignedInt = None + """ Primitive extension for valueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ self.valueUrl = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueUrl = None + """ Primitive extension for valueUrl. Type `FHIRPrimitiveExtension` """ self.valueUsageContext = None """ Value of Example (one of allowed types). Type `UsageContext` (represented as `dict` in JSON). """ + self._valueUsageContext = None + """ Primitive extension for valueUsageContext. Type `FHIRPrimitiveExtension` """ self.valueUuid = None """ Value of Example (one of allowed types). Type `str`. """ + self._valueUuid = None + """ Primitive extension for valueUuid. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionExample, self).__init__(jsondict=jsondict, strict=strict) @@ -1394,56 +2126,107 @@ def elementProperties(self): js = super(ElementDefinitionExample, self).elementProperties() js.extend([ ("label", "label", str, False, None, True), + ("_label", "_label", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAddress", "valueAddress", address.Address, False, "value", True), + ("_valueAddress", "_valueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAge", "valueAge", age.Age, False, "value", True), + ("_valueAge", "_valueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAnnotation", "valueAnnotation", annotation.Annotation, False, "value", True), + ("_valueAnnotation", "_valueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", True), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", True), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCanonical", "valueCanonical", str, False, "value", True), + ("_valueCanonical", "_valueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", True), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", True), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactDetail", "valueContactDetail", contactdetail.ContactDetail, False, "value", True), + ("_valueContactDetail", "_valueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactPoint", "valueContactPoint", contactpoint.ContactPoint, False, "value", True), + ("_valueContactPoint", "_valueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContributor", "valueContributor", contributor.Contributor, False, "value", True), + ("_valueContributor", "_valueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCount", "valueCount", count.Count, False, "value", True), + ("_valueCount", "_valueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDataRequirement", "valueDataRequirement", datarequirement.DataRequirement, False, "value", True), + ("_valueDataRequirement", "_valueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDistance", "valueDistance", distance.Distance, False, "value", True), + ("_valueDistance", "_valueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDosage", "valueDosage", dosage.Dosage, False, "value", True), + ("_valueDosage", "_valueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", True), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueExpression", "valueExpression", expression.Expression, False, "value", True), + ("_valueExpression", "_valueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueHumanName", "valueHumanName", humanname.HumanName, False, "value", True), + ("_valueHumanName", "_valueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", True), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueIdentifier", "valueIdentifier", identifier.Identifier, False, "value", True), + ("_valueIdentifier", "_valueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInstant", "valueInstant", fhirinstant.FHIRInstant, False, "value", True), + ("_valueInstant", "_valueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMarkdown", "valueMarkdown", str, False, "value", True), + ("_valueMarkdown", "_valueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMeta", "valueMeta", meta.Meta, False, "value", True), + ("_valueMeta", "_valueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", True), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueOid", "valueOid", str, False, "value", True), + ("_valueOid", "_valueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueParameterDefinition", "valueParameterDefinition", parameterdefinition.ParameterDefinition, False, "value", True), + ("_valueParameterDefinition", "_valueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", True), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePositiveInt", "valuePositiveInt", int, False, "value", True), + ("_valuePositiveInt", "_valuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", True), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", True), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRelatedArtifact", "valueRelatedArtifact", relatedartifact.RelatedArtifact, False, "value", True), + ("_valueRelatedArtifact", "_valueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", True), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSignature", "valueSignature", signature.Signature, False, "value", True), + ("_valueSignature", "_valueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTiming", "valueTiming", timing.Timing, False, "value", True), + ("_valueTiming", "_valueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTriggerDefinition", "valueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "value", True), + ("_valueTriggerDefinition", "_valueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUnsignedInt", "valueUnsignedInt", int, False, "value", True), + ("_valueUnsignedInt", "_valueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", True), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUrl", "valueUrl", str, False, "value", True), + ("_valueUrl", "_valueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUsageContext", "valueUsageContext", usagecontext.UsageContext, False, "value", True), + ("_valueUsageContext", "_valueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUuid", "valueUuid", str, False, "value", True), + ("_valueUuid", "_valueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1468,18 +2251,26 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Comments about the mapping or its use. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.identity = None """ Reference to mapping declaration. Type `str`. """ + self._identity = None + """ Primitive extension for identity. Type `FHIRPrimitiveExtension` """ self.language = None """ Computable language of mapping. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.map = None """ Details of the mapping. Type `str`. """ + self._map = None + """ Primitive extension for map. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionMapping, self).__init__(jsondict=jsondict, strict=strict) @@ -1487,9 +2278,13 @@ def elementProperties(self): js = super(ElementDefinitionMapping, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identity", "identity", str, False, None, True), + ("_identity", "_identity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("map", "map", str, False, None, True), + ("_map", "_map", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1519,18 +2314,26 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Text description of how slicing works (or not). Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.discriminator = None """ Element values that are used to distinguish the slices. List of `ElementDefinitionSlicingDiscriminator` items (represented as `dict` in JSON). """ + self._discriminator = None + """ Primitive extension for discriminator. List of `FHIRPrimitiveExtension` """ self.ordered = None """ If elements must be in same order as slices. Type `bool`. """ + self._ordered = None + """ Primitive extension for ordered. Type `FHIRPrimitiveExtension` """ self.rules = None """ closed | open | openAtEnd. Type `str`. """ + self._rules = None + """ Primitive extension for rules. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionSlicing, self).__init__(jsondict=jsondict, strict=strict) @@ -1538,9 +2341,13 @@ def elementProperties(self): js = super(ElementDefinitionSlicing, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("discriminator", "discriminator", ElementDefinitionSlicingDiscriminator, True, None, False), + ("_discriminator", "_discriminator", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ordered", "ordered", bool, False, None, False), + ("_ordered", "_ordered", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rules", "rules", str, False, None, True), + ("_rules", "_rules", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1568,10 +2375,14 @@ def __init__(self, jsondict=None, strict=True): self.path = None """ Path to element value. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.type = None """ value | exists | pattern | type | profile. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionSlicingDiscriminator, self).__init__(jsondict=jsondict, strict=strict) @@ -1579,7 +2390,9 @@ def elementProperties(self): js = super(ElementDefinitionSlicingDiscriminator, self).elementProperties() js.extend([ ("path", "path", str, False, None, True), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1604,23 +2417,33 @@ def __init__(self, jsondict=None, strict=True): self.aggregation = None """ contained | referenced | bundled - how aggregated. List of `str` items. """ + self._aggregation = None + """ Primitive extension for aggregation. List of `FHIRPrimitiveExtension` """ self.code = None """ Data type or Resource (reference to definition). Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.profile = None """ Profiles (StructureDefinition or IG) - one must apply. List of `str` items. """ + self._profile = None + """ Primitive extension for profile. List of `FHIRPrimitiveExtension` """ self.targetProfile = None """ Profile (StructureDefinition or IG) on the Reference/canonical target - one must apply. List of `str` items. """ + self._targetProfile = None + """ Primitive extension for targetProfile. List of `FHIRPrimitiveExtension` """ self.versioning = None """ either | independent | specific. Type `str`. """ + self._versioning = None + """ Primitive extension for versioning. Type `FHIRPrimitiveExtension` """ super(ElementDefinitionType, self).__init__(jsondict=jsondict, strict=strict) @@ -1628,13 +2451,19 @@ def elementProperties(self): js = super(ElementDefinitionType, self).elementProperties() js.extend([ ("aggregation", "aggregation", str, True, None, False), + ("_aggregation", "_aggregation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, True, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("targetProfile", "targetProfile", str, True, None, False), + ("_targetProfile", "_targetProfile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("versioning", "versioning", str, False, None, False), + ("_versioning", "_versioning", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import age @@ -1670,4 +2499,4 @@ def elementProperties(self): from . import signature from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/encounter.py b/fhirclient/models/encounter.py index 9cedeea1..381c37e1 100644 --- a/fhirclient/models/encounter.py +++ b/fhirclient/models/encounter.py @@ -25,95 +25,141 @@ def __init__(self, jsondict=None, strict=True): self.account = None """ The set of accounts that may be used for billing for this Encounter. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._account = None + """ Primitive extension for account. List of `FHIRPrimitiveExtension` """ self.appointment = None """ The appointment that scheduled this encounter. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._appointment = None + """ Primitive extension for appointment. List of `FHIRPrimitiveExtension` """ self.basedOn = None """ The ServiceRequest that initiated this encounter. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.classHistory = None """ List of past encounter classes. List of `EncounterClassHistory` items (represented as `dict` in JSON). """ + self._classHistory = None + """ Primitive extension for classHistory. List of `FHIRPrimitiveExtension` """ self.class_fhir = None """ Classification of patient encounter. Type `Coding` (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. Type `FHIRPrimitiveExtension` """ self.diagnosis = None """ The list of diagnosis relevant to this encounter. List of `EncounterDiagnosis` items (represented as `dict` in JSON). """ + self._diagnosis = None + """ Primitive extension for diagnosis. List of `FHIRPrimitiveExtension` """ self.episodeOfCare = None """ Episode(s) of care that this encounter should be recorded against. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._episodeOfCare = None + """ Primitive extension for episodeOfCare. List of `FHIRPrimitiveExtension` """ self.hospitalization = None """ Details about the admission to a healthcare service. Type `EncounterHospitalization` (represented as `dict` in JSON). """ + self._hospitalization = None + """ Primitive extension for hospitalization. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier(s) by which this encounter is known. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.length = None """ Quantity of time the encounter lasted (less time absent). Type `Duration` (represented as `dict` in JSON). """ + self._length = None + """ Primitive extension for length. Type `FHIRPrimitiveExtension` """ self.location = None """ List of locations where the patient has been. List of `EncounterLocation` items (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Another Encounter this encounter is part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. Type `FHIRPrimitiveExtension` """ self.participant = None """ List of participants involved in the encounter. List of `EncounterParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.period = None """ The start and end time of the encounter. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.priority = None """ Indicates the urgency of the encounter. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Coded reason the encounter takes place. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Reason the encounter takes place (reference). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.serviceProvider = None """ The organization (facility) responsible for this encounter. Type `FHIRReference` (represented as `dict` in JSON). """ + self._serviceProvider = None + """ Primitive extension for serviceProvider. Type `FHIRPrimitiveExtension` """ self.serviceType = None """ Specific type of service. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._serviceType = None + """ Primitive extension for serviceType. Type `FHIRPrimitiveExtension` """ self.status = None """ planned | arrived | triaged | in-progress | onleave | finished | cancelled +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusHistory = None """ List of past encounter statuses. List of `EncounterStatusHistory` items (represented as `dict` in JSON). """ + self._statusHistory = None + """ Primitive extension for statusHistory. List of `FHIRPrimitiveExtension` """ self.subject = None """ The patient or group present at the encounter. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ Specific type of encounter. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(Encounter, self).__init__(jsondict=jsondict, strict=strict) @@ -121,28 +167,51 @@ def elementProperties(self): js = super(Encounter, self).elementProperties() js.extend([ ("account", "account", fhirreference.FHIRReference, True, None, False), + ("_account", "_account", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("appointment", "appointment", fhirreference.FHIRReference, True, None, False), + ("_appointment", "_appointment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("classHistory", "classHistory", EncounterClassHistory, True, None, False), + ("_classHistory", "_classHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("class_fhir", "class", coding.Coding, False, None, True), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosis", "diagnosis", EncounterDiagnosis, True, None, False), + ("_diagnosis", "_diagnosis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("episodeOfCare", "episodeOfCare", fhirreference.FHIRReference, True, None, False), + ("_episodeOfCare", "_episodeOfCare", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("hospitalization", "hospitalization", EncounterHospitalization, False, None, False), + ("_hospitalization", "_hospitalization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("length", "length", duration.Duration, False, None, False), + ("_length", "_length", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", EncounterLocation, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, False, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participant", "participant", EncounterParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceProvider", "serviceProvider", fhirreference.FHIRReference, False, None, False), + ("_serviceProvider", "_serviceProvider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("serviceType", "serviceType", codeableconcept.CodeableConcept, False, None, False), + ("_serviceType", "_serviceType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusHistory", "statusHistory", EncounterStatusHistory, True, None, False), + ("_statusHistory", "_statusHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -174,10 +243,14 @@ def __init__(self, jsondict=None, strict=True): self.class_fhir = None """ inpatient | outpatient | ambulatory | emergency +. Type `Coding` (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. Type `FHIRPrimitiveExtension` """ self.period = None """ The time that the episode was in the specified class. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ super(EncounterClassHistory, self).__init__(jsondict=jsondict, strict=strict) @@ -185,7 +258,9 @@ def elementProperties(self): js = super(EncounterClassHistory, self).elementProperties() js.extend([ ("class_fhir", "class", coding.Coding, False, None, True), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -207,15 +282,21 @@ def __init__(self, jsondict=None, strict=True): self.condition = None """ The diagnosis or procedure relevant to the encounter. Type `FHIRReference` (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.rank = None """ Ranking of the diagnosis (for each role type). Type `int`. """ + self._rank = None + """ Primitive extension for rank. Type `FHIRPrimitiveExtension` """ self.use = None """ Role that this diagnosis has within the encounter (e.g. admission, billing, discharge …). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(EncounterDiagnosis, self).__init__(jsondict=jsondict, strict=strict) @@ -223,8 +304,11 @@ def elementProperties(self): js = super(EncounterDiagnosis, self).elementProperties() js.extend([ ("condition", "condition", fhirreference.FHIRReference, False, None, True), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rank", "rank", int, False, None, False), + ("_rank", "_rank", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", codeableconcept.CodeableConcept, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -246,40 +330,58 @@ def __init__(self, jsondict=None, strict=True): self.admitSource = None """ From where patient was admitted (physician referral, transfer). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._admitSource = None + """ Primitive extension for admitSource. Type `FHIRPrimitiveExtension` """ self.destination = None """ Location/organization to which the patient is discharged. Type `FHIRReference` (represented as `dict` in JSON). """ + self._destination = None + """ Primitive extension for destination. Type `FHIRPrimitiveExtension` """ self.dietPreference = None """ Diet preferences reported by the patient. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._dietPreference = None + """ Primitive extension for dietPreference. List of `FHIRPrimitiveExtension` """ self.dischargeDisposition = None """ Category or kind of location after discharge. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._dischargeDisposition = None + """ Primitive extension for dischargeDisposition. Type `FHIRPrimitiveExtension` """ self.origin = None """ The location/organization from which the patient came before admission. Type `FHIRReference` (represented as `dict` in JSON). """ + self._origin = None + """ Primitive extension for origin. Type `FHIRPrimitiveExtension` """ self.preAdmissionIdentifier = None """ Pre-admission identifier. Type `Identifier` (represented as `dict` in JSON). """ + self._preAdmissionIdentifier = None + """ Primitive extension for preAdmissionIdentifier. Type `FHIRPrimitiveExtension` """ self.reAdmission = None """ The type of hospital re-admission that has occurred (if any). If the value is absent, then this is not identified as a readmission. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reAdmission = None + """ Primitive extension for reAdmission. Type `FHIRPrimitiveExtension` """ self.specialArrangement = None """ Wheelchair, translator, stretcher, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialArrangement = None + """ Primitive extension for specialArrangement. List of `FHIRPrimitiveExtension` """ self.specialCourtesy = None """ Special courtesies (VIP, board member). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialCourtesy = None + """ Primitive extension for specialCourtesy. List of `FHIRPrimitiveExtension` """ super(EncounterHospitalization, self).__init__(jsondict=jsondict, strict=strict) @@ -287,14 +389,23 @@ def elementProperties(self): js = super(EncounterHospitalization, self).elementProperties() js.extend([ ("admitSource", "admitSource", codeableconcept.CodeableConcept, False, None, False), + ("_admitSource", "_admitSource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", fhirreference.FHIRReference, False, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dietPreference", "dietPreference", codeableconcept.CodeableConcept, True, None, False), + ("_dietPreference", "_dietPreference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dischargeDisposition", "dischargeDisposition", codeableconcept.CodeableConcept, False, None, False), + ("_dischargeDisposition", "_dischargeDisposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("origin", "origin", fhirreference.FHIRReference, False, None, False), + ("_origin", "_origin", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAdmissionIdentifier", "preAdmissionIdentifier", identifier.Identifier, False, None, False), + ("_preAdmissionIdentifier", "_preAdmissionIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reAdmission", "reAdmission", codeableconcept.CodeableConcept, False, None, False), + ("_reAdmission", "_reAdmission", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specialArrangement", "specialArrangement", codeableconcept.CodeableConcept, True, None, False), + ("_specialArrangement", "_specialArrangement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialCourtesy", "specialCourtesy", codeableconcept.CodeableConcept, True, None, False), + ("_specialCourtesy", "_specialCourtesy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -318,19 +429,27 @@ def __init__(self, jsondict=None, strict=True): self.location = None """ Location the encounter takes place. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.period = None """ Time period during which the patient was present at the location. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.physicalType = None """ The physical type of the location (usually the level in the location hierachy - bed room ward etc.). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._physicalType = None + """ Primitive extension for physicalType. Type `FHIRPrimitiveExtension` """ self.status = None """ planned | active | reserved | completed. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(EncounterLocation, self).__init__(jsondict=jsondict, strict=strict) @@ -338,9 +457,13 @@ def elementProperties(self): js = super(EncounterLocation, self).elementProperties() js.extend([ ("location", "location", fhirreference.FHIRReference, False, None, True), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("physicalType", "physicalType", codeableconcept.CodeableConcept, False, None, False), + ("_physicalType", "_physicalType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -364,15 +487,21 @@ def __init__(self, jsondict=None, strict=True): self.individual = None """ Persons involved in the encounter other than the patient. Type `FHIRReference` (represented as `dict` in JSON). """ + self._individual = None + """ Primitive extension for individual. Type `FHIRPrimitiveExtension` """ self.period = None """ Period of time during the encounter that the participant participated. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.type = None """ Role of participant in encounter. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(EncounterParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -380,8 +509,11 @@ def elementProperties(self): js = super(EncounterParticipant, self).elementProperties() js.extend([ ("individual", "individual", fhirreference.FHIRReference, False, None, False), + ("_individual", "_individual", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -407,11 +539,15 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ The time that the episode was in the specified status. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.status = None """ planned | arrived | triaged | in-progress | onleave | finished | cancelled +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(EncounterStatusHistory, self).__init__(jsondict=jsondict, strict=strict) @@ -419,14 +555,17 @@ def elementProperties(self): js = super(EncounterStatusHistory, self).elementProperties() js.extend([ ("period", "period", period.Period, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import duration from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/endpoint.py b/fhirclient/models/endpoint.py index 707a02d3..7aa7d6fa 100644 --- a/fhirclient/models/endpoint.py +++ b/fhirclient/models/endpoint.py @@ -26,49 +26,71 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ The technical base address for connecting to this endpoint. Type `str`. """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.connectionType = None """ Protocol/Profile/Standard to be used with this endpoint connection. Type `Coding` (represented as `dict` in JSON). """ + self._connectionType = None + """ Primitive extension for connectionType. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for source (e.g. troubleshooting). List of `ContactPoint` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.header = None """ Usage depends on the channel type. List of `str` items. """ + self._header = None + """ Primitive extension for header. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Identifies this endpoint across multiple systems. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ Organization that manages this endpoint (might not be the organization that exposes the endpoint). Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. Type `FHIRPrimitiveExtension` """ self.name = None """ A name that this endpoint can be identified by. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.payloadMimeType = None """ Mimetype to send. If not specified, the content could be anything (including no payload, if the connectionType defined this). List of `str` items. """ + self._payloadMimeType = None + """ Primitive extension for payloadMimeType. List of `FHIRPrimitiveExtension` """ self.payloadType = None """ The type of content that may be used at this endpoint (e.g. XDS Discharge summaries). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._payloadType = None + """ Primitive extension for payloadType. List of `FHIRPrimitiveExtension` """ self.period = None """ Interval the endpoint is expected to be operational. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.status = None """ active | suspended | error | off | entered-in-error | test. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Endpoint, self).__init__(jsondict=jsondict, strict=strict) @@ -76,23 +98,35 @@ def elementProperties(self): js = super(Endpoint, self).elementProperties() js.extend([ ("address", "address", str, False, None, True), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("connectionType", "connectionType", coding.Coding, False, None, True), + ("_connectionType", "_connectionType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactpoint.ContactPoint, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("header", "header", str, True, None, False), + ("_header", "_header", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, False, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payloadMimeType", "payloadMimeType", str, True, None, False), + ("_payloadMimeType", "_payloadMimeType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("payloadType", "payloadType", codeableconcept.CodeableConcept, True, None, True), + ("_payloadType", "_payloadType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import contactpoint from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/enrollmentrequest.py b/fhirclient/models/enrollmentrequest.py index 52847da6..13b2d5b6 100644 --- a/fhirclient/models/enrollmentrequest.py +++ b/fhirclient/models/enrollmentrequest.py @@ -24,30 +24,44 @@ def __init__(self, jsondict=None, strict=True): self.candidate = None """ The subject to be enrolled. Type `FHIRReference` (represented as `dict` in JSON). """ + self._candidate = None + """ Primitive extension for candidate. Type `FHIRPrimitiveExtension` """ self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.created = None """ Creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Target. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.provider = None """ Responsible practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(EnrollmentRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -55,16 +69,24 @@ def elementProperties(self): js = super(EnrollmentRequest, self).elementProperties() js.extend([ ("candidate", "candidate", fhirreference.FHIRReference, False, None, False), + ("_candidate", "_candidate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("coverage", "coverage", fhirreference.FHIRReference, False, None, False), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, False), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/enrollmentresponse.py b/fhirclient/models/enrollmentresponse.py index 0eae79cd..5ecd2655 100644 --- a/fhirclient/models/enrollmentresponse.py +++ b/fhirclient/models/enrollmentresponse.py @@ -24,34 +24,50 @@ def __init__(self, jsondict=None, strict=True): self.created = None """ Creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.disposition = None """ Disposition Message. Type `str`. """ + self._disposition = None + """ Primitive extension for disposition. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.organization = None """ Insurer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. Type `FHIRPrimitiveExtension` """ self.outcome = None """ queued | complete | error | partial. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.request = None """ Claim reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.requestProvider = None """ Responsible practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requestProvider = None + """ Primitive extension for requestProvider. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(EnrollmentResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -59,17 +75,26 @@ def elementProperties(self): js = super(EnrollmentResponse, self).elementProperties() js.extend([ ("created", "created", fhirdatetime.FHIRDateTime, False, None, False), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("disposition", "disposition", str, False, None, False), + ("_disposition", "_disposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("organization", "organization", fhirreference.FHIRReference, False, None, False), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", str, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestProvider", "requestProvider", fhirreference.FHIRReference, False, None, False), + ("_requestProvider", "_requestProvider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/episodeofcare.py b/fhirclient/models/episodeofcare.py index 9ad50df4..6731d519 100644 --- a/fhirclient/models/episodeofcare.py +++ b/fhirclient/models/episodeofcare.py @@ -29,52 +29,76 @@ def __init__(self, jsondict=None, strict=True): """ The set of accounts that may be used for billing for this EpisodeOfCare. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._account = None + """ Primitive extension for account. List of `FHIRPrimitiveExtension` """ self.careManager = None """ Care manager/care coordinator for the patient. Type `FHIRReference` (represented as `dict` in JSON). """ + self._careManager = None + """ Primitive extension for careManager. Type `FHIRPrimitiveExtension` """ self.diagnosis = None """ The list of diagnosis relevant to this episode of care. List of `EpisodeOfCareDiagnosis` items (represented as `dict` in JSON). """ + self._diagnosis = None + """ Primitive extension for diagnosis. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier(s) relevant for this EpisodeOfCare. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ Organization that assumes care. Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. Type `FHIRPrimitiveExtension` """ self.patient = None """ The patient who is the focus of this episode of care. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.period = None """ Interval during responsibility is assumed. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.referralRequest = None """ Originating Referral Request(s). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._referralRequest = None + """ Primitive extension for referralRequest. List of `FHIRPrimitiveExtension` """ self.status = None """ planned | waitlist | active | onhold | finished | cancelled | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusHistory = None """ Past list of status codes (the current status may be included to cover the start date of the status). List of `EpisodeOfCareStatusHistory` items (represented as `dict` in JSON). """ + self._statusHistory = None + """ Primitive extension for statusHistory. List of `FHIRPrimitiveExtension` """ self.team = None """ Other practitioners facilitating this episode of care. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._team = None + """ Primitive extension for team. List of `FHIRPrimitiveExtension` """ self.type = None """ Type/class - e.g. specialist referral, disease management. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(EpisodeOfCare, self).__init__(jsondict=jsondict, strict=strict) @@ -82,17 +106,29 @@ def elementProperties(self): js = super(EpisodeOfCare, self).elementProperties() js.extend([ ("account", "account", fhirreference.FHIRReference, True, None, False), + ("_account", "_account", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("careManager", "careManager", fhirreference.FHIRReference, False, None, False), + ("_careManager", "_careManager", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosis", "diagnosis", EpisodeOfCareDiagnosis, True, None, False), + ("_diagnosis", "_diagnosis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, False, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referralRequest", "referralRequest", fhirreference.FHIRReference, True, None, False), + ("_referralRequest", "_referralRequest", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusHistory", "statusHistory", EpisodeOfCareStatusHistory, True, None, False), + ("_statusHistory", "_statusHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("team", "team", fhirreference.FHIRReference, True, None, False), + ("_team", "_team", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -116,15 +152,21 @@ def __init__(self, jsondict=None, strict=True): self.condition = None """ Conditions/problems/diagnoses this episode of care is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.rank = None """ Ranking of the diagnosis (for each role type). Type `int`. """ + self._rank = None + """ Primitive extension for rank. Type `FHIRPrimitiveExtension` """ self.role = None """ Role that this diagnosis has within the episode of care (e.g. admission, billing, discharge …). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ super(EpisodeOfCareDiagnosis, self).__init__(jsondict=jsondict, strict=strict) @@ -132,8 +174,11 @@ def elementProperties(self): js = super(EpisodeOfCareDiagnosis, self).elementProperties() js.extend([ ("condition", "condition", fhirreference.FHIRReference, False, None, True), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rank", "rank", int, False, None, False), + ("_rank", "_rank", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -159,11 +204,15 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ Duration the EpisodeOfCare was in the specified status. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.status = None """ planned | waitlist | active | onhold | finished | cancelled | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(EpisodeOfCareStatusHistory, self).__init__(jsondict=jsondict, strict=strict) @@ -171,12 +220,15 @@ def elementProperties(self): js = super(EpisodeOfCareStatusHistory, self).elementProperties() js.extend([ ("period", "period", period.Period, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/eventdefinition.py b/fhirclient/models/eventdefinition.py index 19de02a4..d24c6a42 100644 --- a/fhirclient/models/eventdefinition.py +++ b/fhirclient/models/eventdefinition.py @@ -24,119 +24,177 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the event definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the event definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the event definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the event definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for event definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the event definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this event definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this event definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ Type of individual the event definition is focused on. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ Type of individual the event definition is focused on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the event definition. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this event definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ E.g. Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.trigger = None """ "when" the event occurs (multiple = 'or'). List of `TriggerDefinition` items (represented as `dict` in JSON). """ + self._trigger = None + """ Primitive extension for trigger. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this event definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the event definition. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the event definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(EventDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -144,37 +202,67 @@ def elementProperties(self): js = super(EventDefinition, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("trigger", "trigger", triggerdefinition.TriggerDefinition, True, None, True), + ("_trigger", "_trigger", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail @@ -185,4 +273,4 @@ def elementProperties(self): from . import period from . import relatedartifact from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/evidence.py b/fhirclient/models/evidence.py index 0f4b6fe9..13aaa04a 100644 --- a/fhirclient/models/evidence.py +++ b/fhirclient/models/evidence.py @@ -25,116 +25,172 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the evidence was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the evidence. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the evidence is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.exposureBackground = None """ What population?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposureBackground = None + """ Primitive extension for exposureBackground. Type `FHIRPrimitiveExtension` """ self.exposureVariant = None """ What exposure?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._exposureVariant = None + """ Primitive extension for exposureVariant. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the evidence. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for evidence (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the evidence was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this evidence (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.outcome = None """ What outcome?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.shortTitle = None """ Title for use in informal contexts. Type `str`. """ + self._shortTitle = None + """ Primitive extension for shortTitle. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the Evidence. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this evidence (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the Evidence, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this evidence, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the evidence. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Evidence, self).__init__(jsondict=jsondict, strict=strict) @@ -142,36 +198,65 @@ def elementProperties(self): js = super(Evidence, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("exposureBackground", "exposureBackground", fhirreference.FHIRReference, False, None, True), + ("_exposureBackground", "_exposureBackground", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposureVariant", "exposureVariant", fhirreference.FHIRReference, True, None, False), + ("_exposureVariant", "_exposureVariant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", fhirreference.FHIRReference, True, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("shortTitle", "shortTitle", str, False, None, False), + ("_shortTitle", "_shortTitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -182,4 +267,4 @@ def elementProperties(self): from . import identifier from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/evidencevariable.py b/fhirclient/models/evidencevariable.py index 72de2e4c..e0e5a11c 100644 --- a/fhirclient/models/evidencevariable.py +++ b/fhirclient/models/evidencevariable.py @@ -24,112 +24,166 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the evidence variable was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.characteristic = None """ What defines the members of the evidence element. List of `EvidenceVariableCharacteristic` items (represented as `dict` in JSON). """ + self._characteristic = None + """ Primitive extension for characteristic. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the evidence variable. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the evidence variable is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the evidence variable. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for evidence variable (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the evidence variable was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this evidence variable (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.shortTitle = None """ Title for use in informal contexts. Type `str`. """ + self._shortTitle = None + """ Primitive extension for shortTitle. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the EvidenceVariable. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this evidence variable (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the EvidenceVariable, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.type = None """ dichotomous | continuous | descriptive. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this evidence variable, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the evidence variable. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(EvidenceVariable, self).__init__(jsondict=jsondict, strict=strict) @@ -137,32 +191,59 @@ def elementProperties(self): js = super(EvidenceVariable, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("characteristic", "characteristic", EvidenceVariableCharacteristic, True, None, True), + ("_characteristic", "_characteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("shortTitle", "shortTitle", str, False, None, False), + ("_shortTitle", "_shortTitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -189,63 +270,93 @@ def __init__(self, jsondict=None, strict=True): self.definitionCanonical = None """ What code or expression defines members?. Type `str`. """ + self._definitionCanonical = None + """ Primitive extension for definitionCanonical. Type `FHIRPrimitiveExtension` """ self.definitionCodeableConcept = None """ What code or expression defines members?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._definitionCodeableConcept = None + """ Primitive extension for definitionCodeableConcept. Type `FHIRPrimitiveExtension` """ self.definitionDataRequirement = None """ What code or expression defines members?. Type `DataRequirement` (represented as `dict` in JSON). """ + self._definitionDataRequirement = None + """ Primitive extension for definitionDataRequirement. Type `FHIRPrimitiveExtension` """ self.definitionExpression = None """ What code or expression defines members?. Type `Expression` (represented as `dict` in JSON). """ + self._definitionExpression = None + """ Primitive extension for definitionExpression. Type `FHIRPrimitiveExtension` """ self.definitionReference = None """ What code or expression defines members?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._definitionReference = None + """ Primitive extension for definitionReference. Type `FHIRPrimitiveExtension` """ self.definitionTriggerDefinition = None """ What code or expression defines members?. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._definitionTriggerDefinition = None + """ Primitive extension for definitionTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the characteristic. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.exclude = None """ Whether the characteristic includes or excludes members. Type `bool`. """ + self._exclude = None + """ Primitive extension for exclude. Type `FHIRPrimitiveExtension` """ self.groupMeasure = None """ mean | median | mean-of-mean | mean-of-median | median-of-mean | median-of-median. Type `str`. """ + self._groupMeasure = None + """ Primitive extension for groupMeasure. Type `FHIRPrimitiveExtension` """ self.participantEffectiveDateTime = None """ What time period do participants cover. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._participantEffectiveDateTime = None + """ Primitive extension for participantEffectiveDateTime. Type `FHIRPrimitiveExtension` """ self.participantEffectiveDuration = None """ What time period do participants cover. Type `Duration` (represented as `dict` in JSON). """ + self._participantEffectiveDuration = None + """ Primitive extension for participantEffectiveDuration. Type `FHIRPrimitiveExtension` """ self.participantEffectivePeriod = None """ What time period do participants cover. Type `Period` (represented as `dict` in JSON). """ + self._participantEffectivePeriod = None + """ Primitive extension for participantEffectivePeriod. Type `FHIRPrimitiveExtension` """ self.participantEffectiveTiming = None """ What time period do participants cover. Type `Timing` (represented as `dict` in JSON). """ + self._participantEffectiveTiming = None + """ Primitive extension for participantEffectiveTiming. Type `FHIRPrimitiveExtension` """ self.timeFromStart = None """ Observation time from study start. Type `Duration` (represented as `dict` in JSON). """ + self._timeFromStart = None + """ Primitive extension for timeFromStart. Type `FHIRPrimitiveExtension` """ self.usageContext = None """ What code/value pairs define members?. List of `UsageContext` items (represented as `dict` in JSON). """ + self._usageContext = None + """ Primitive extension for usageContext. List of `FHIRPrimitiveExtension` """ super(EvidenceVariableCharacteristic, self).__init__(jsondict=jsondict, strict=strict) @@ -253,23 +364,39 @@ def elementProperties(self): js = super(EvidenceVariableCharacteristic, self).elementProperties() js.extend([ ("definitionCanonical", "definitionCanonical", str, False, "definition", True), + ("_definitionCanonical", "_definitionCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionCodeableConcept", "definitionCodeableConcept", codeableconcept.CodeableConcept, False, "definition", True), + ("_definitionCodeableConcept", "_definitionCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionDataRequirement", "definitionDataRequirement", datarequirement.DataRequirement, False, "definition", True), + ("_definitionDataRequirement", "_definitionDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionExpression", "definitionExpression", expression.Expression, False, "definition", True), + ("_definitionExpression", "_definitionExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionReference", "definitionReference", fhirreference.FHIRReference, False, "definition", True), + ("_definitionReference", "_definitionReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionTriggerDefinition", "definitionTriggerDefinition", triggerdefinition.TriggerDefinition, False, "definition", True), + ("_definitionTriggerDefinition", "_definitionTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exclude", "exclude", bool, False, None, False), + ("_exclude", "_exclude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupMeasure", "groupMeasure", str, False, None, False), + ("_groupMeasure", "_groupMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveDateTime", "participantEffectiveDateTime", fhirdatetime.FHIRDateTime, False, "participantEffective", False), + ("_participantEffectiveDateTime", "_participantEffectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveDuration", "participantEffectiveDuration", duration.Duration, False, "participantEffective", False), + ("_participantEffectiveDuration", "_participantEffectiveDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectivePeriod", "participantEffectivePeriod", period.Period, False, "participantEffective", False), + ("_participantEffectivePeriod", "_participantEffectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveTiming", "participantEffectiveTiming", timing.Timing, False, "participantEffective", False), + ("_participantEffectiveTiming", "_participantEffectiveTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timeFromStart", "timeFromStart", duration.Duration, False, None, False), + ("_timeFromStart", "_timeFromStart", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usageContext", "usageContext", usagecontext.UsageContext, True, None, False), + ("_usageContext", "_usageContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -285,4 +412,4 @@ def elementProperties(self): from . import relatedartifact from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/examplescenario.py b/fhirclient/models/examplescenario.py index d5c6d81c..6da15d1d 100644 --- a/fhirclient/models/examplescenario.py +++ b/fhirclient/models/examplescenario.py @@ -21,71 +21,105 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Actor participating in the resource. List of `ExampleScenarioActor` items (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the example scenario. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instance = None """ Each resource and each version that is present in the workflow. List of `ExampleScenarioInstance` items (represented as `dict` in JSON). """ + self._instance = None + """ Primitive extension for instance. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for example scenario (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this example scenario (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.process = None """ Each major process - a group of operations. List of `ExampleScenarioProcess` items (represented as `dict` in JSON). """ + self._process = None + """ Primitive extension for process. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ The purpose of the example, e.g. to illustrate a scenario. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this example scenario, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the example scenario. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ self.workflow = None """ Another nested workflow. List of `str` items. """ + self._workflow = None + """ Primitive extension for workflow. List of `FHIRPrimitiveExtension` """ super(ExampleScenario, self).__init__(jsondict=jsondict, strict=strict) @@ -93,22 +127,39 @@ def elementProperties(self): js = super(ExampleScenario, self).elementProperties() js.extend([ ("actor", "actor", ExampleScenarioActor, True, None, False), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instance", "instance", ExampleScenarioInstance, True, None, False), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("process", "process", ExampleScenarioProcess, True, None, False), + ("_process", "_process", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("workflow", "workflow", str, True, None, False), + ("_workflow", "_workflow", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -132,18 +183,26 @@ def __init__(self, jsondict=None, strict=True): self.actorId = None """ ID or acronym of the actor. Type `str`. """ + self._actorId = None + """ Primitive extension for actorId. Type `FHIRPrimitiveExtension` """ self.description = None """ The description of the actor. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ The name of the actor as shown in the page. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ person | entity. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioActor, self).__init__(jsondict=jsondict, strict=strict) @@ -151,9 +210,13 @@ def elementProperties(self): js = super(ExampleScenarioActor, self).elementProperties() js.extend([ ("actorId", "actorId", str, False, None, True), + ("_actorId", "_actorId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -175,26 +238,38 @@ def __init__(self, jsondict=None, strict=True): self.containedInstance = None """ Resources contained in the instance. List of `ExampleScenarioInstanceContainedInstance` items (represented as `dict` in JSON). """ + self._containedInstance = None + """ Primitive extension for containedInstance. List of `FHIRPrimitiveExtension` """ self.description = None """ Human-friendly description of the resource instance. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ A short name for the resource instance. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.resourceId = None """ The id of the resource for referencing. Type `str`. """ + self._resourceId = None + """ Primitive extension for resourceId. Type `FHIRPrimitiveExtension` """ self.resourceType = None """ The type of the resource. Type `str`. """ + self._resourceType = None + """ Primitive extension for resourceType. Type `FHIRPrimitiveExtension` """ self.version = None """ A specific version of the resource. List of `ExampleScenarioInstanceVersion` items (represented as `dict` in JSON). """ + self._version = None + """ Primitive extension for version. List of `FHIRPrimitiveExtension` """ super(ExampleScenarioInstance, self).__init__(jsondict=jsondict, strict=strict) @@ -202,11 +277,17 @@ def elementProperties(self): js = super(ExampleScenarioInstance, self).elementProperties() js.extend([ ("containedInstance", "containedInstance", ExampleScenarioInstanceContainedInstance, True, None, False), + ("_containedInstance", "_containedInstance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resourceId", "resourceId", str, False, None, True), + ("_resourceId", "_resourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resourceType", "resourceType", str, False, None, True), + ("_resourceType", "_resourceType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", ExampleScenarioInstanceVersion, True, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -231,10 +312,14 @@ def __init__(self, jsondict=None, strict=True): self.resourceId = None """ Each resource contained in the instance. Type `str`. """ + self._resourceId = None + """ Primitive extension for resourceId. Type `FHIRPrimitiveExtension` """ self.versionId = None """ A specific version of a resource contained in the instance. Type `str`. """ + self._versionId = None + """ Primitive extension for versionId. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioInstanceContainedInstance, self).__init__(jsondict=jsondict, strict=strict) @@ -242,7 +327,9 @@ def elementProperties(self): js = super(ExampleScenarioInstanceContainedInstance, self).elementProperties() js.extend([ ("resourceId", "resourceId", str, False, None, True), + ("_resourceId", "_resourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("versionId", "versionId", str, False, None, False), + ("_versionId", "_versionId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -264,10 +351,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ The description of the resource version. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.versionId = None """ The identifier of a specific version of a resource. Type `str`. """ + self._versionId = None + """ Primitive extension for versionId. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioInstanceVersion, self).__init__(jsondict=jsondict, strict=strict) @@ -275,7 +366,9 @@ def elementProperties(self): js = super(ExampleScenarioInstanceVersion, self).elementProperties() js.extend([ ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("versionId", "versionId", str, False, None, True), + ("_versionId", "_versionId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -297,22 +390,32 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ A longer description of the group of operations. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.postConditions = None """ Description of final status after the process ends. Type `str`. """ + self._postConditions = None + """ Primitive extension for postConditions. Type `FHIRPrimitiveExtension` """ self.preConditions = None """ Description of initial status before the process starts. Type `str`. """ + self._preConditions = None + """ Primitive extension for preConditions. Type `FHIRPrimitiveExtension` """ self.step = None """ Each step of the process. List of `ExampleScenarioProcessStep` items (represented as `dict` in JSON). """ + self._step = None + """ Primitive extension for step. List of `FHIRPrimitiveExtension` """ self.title = None """ The diagram title of the group of operations. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioProcess, self).__init__(jsondict=jsondict, strict=strict) @@ -320,10 +423,15 @@ def elementProperties(self): js = super(ExampleScenarioProcess, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("postConditions", "postConditions", str, False, None, False), + ("_postConditions", "_postConditions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preConditions", "preConditions", str, False, None, False), + ("_preConditions", "_preConditions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("step", "step", ExampleScenarioProcessStep, True, None, False), + ("_step", "_step", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, True), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -345,18 +453,26 @@ def __init__(self, jsondict=None, strict=True): self.alternative = None """ Alternate non-typical step action. List of `ExampleScenarioProcessStepAlternative` items (represented as `dict` in JSON). """ + self._alternative = None + """ Primitive extension for alternative. List of `FHIRPrimitiveExtension` """ self.operation = None """ Each interaction or action. Type `ExampleScenarioProcessStepOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ self.pause = None """ If there is a pause in the flow. Type `bool`. """ + self._pause = None + """ Primitive extension for pause. Type `FHIRPrimitiveExtension` """ self.process = None """ Nested process. List of `ExampleScenarioProcess` items (represented as `dict` in JSON). """ + self._process = None + """ Primitive extension for process. List of `FHIRPrimitiveExtension` """ super(ExampleScenarioProcessStep, self).__init__(jsondict=jsondict, strict=strict) @@ -364,9 +480,13 @@ def elementProperties(self): js = super(ExampleScenarioProcessStep, self).elementProperties() js.extend([ ("alternative", "alternative", ExampleScenarioProcessStepAlternative, True, None, False), + ("_alternative", "_alternative", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("operation", "operation", ExampleScenarioProcessStepOperation, False, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("pause", "pause", bool, False, None, False), + ("_pause", "_pause", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("process", "process", ExampleScenarioProcess, True, None, False), + ("_process", "_process", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -391,14 +511,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ A human-readable description of each option. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.step = None """ What happens in each alternative option. List of `ExampleScenarioProcessStep` items (represented as `dict` in JSON). """ + self._step = None + """ Primitive extension for step. List of `FHIRPrimitiveExtension` """ self.title = None """ Label for alternative. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioProcessStepAlternative, self).__init__(jsondict=jsondict, strict=strict) @@ -406,8 +532,11 @@ def elementProperties(self): js = super(ExampleScenarioProcessStepAlternative, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("step", "step", ExampleScenarioProcessStep, True, None, False), + ("_step", "_step", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, True), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -429,42 +558,62 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ A comment to be inserted in the diagram. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.initiator = None """ Who starts the transaction. Type `str`. """ + self._initiator = None + """ Primitive extension for initiator. Type `FHIRPrimitiveExtension` """ self.initiatorActive = None """ Whether the initiator is deactivated right after the transaction. Type `bool`. """ + self._initiatorActive = None + """ Primitive extension for initiatorActive. Type `FHIRPrimitiveExtension` """ self.name = None """ The human-friendly name of the interaction. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.number = None """ The sequential number of the interaction. Type `str`. """ + self._number = None + """ Primitive extension for number. Type `FHIRPrimitiveExtension` """ self.receiver = None """ Who receives the transaction. Type `str`. """ + self._receiver = None + """ Primitive extension for receiver. Type `FHIRPrimitiveExtension` """ self.receiverActive = None """ Whether the receiver is deactivated right after the transaction. Type `bool`. """ + self._receiverActive = None + """ Primitive extension for receiverActive. Type `FHIRPrimitiveExtension` """ self.request = None """ Each resource instance used by the initiator. Type `ExampleScenarioInstanceContainedInstance` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.response = None """ Each resource instance used by the responder. Type `ExampleScenarioInstanceContainedInstance` (represented as `dict` in JSON). """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of operation - CRUD. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExampleScenarioProcessStepOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -472,21 +621,32 @@ def elementProperties(self): js = super(ExampleScenarioProcessStepOperation, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("initiator", "initiator", str, False, None, False), + ("_initiator", "_initiator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("initiatorActive", "initiatorActive", bool, False, None, False), + ("_initiatorActive", "_initiatorActive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("number", "number", str, False, None, True), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("receiver", "receiver", str, False, None, False), + ("_receiver", "_receiver", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("receiverActive", "receiverActive", bool, False, None, False), + ("_receiverActive", "_receiverActive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", ExampleScenarioInstanceContainedInstance, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", ExampleScenarioInstanceContainedInstance, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/explanationofbenefit.py b/fhirclient/models/explanationofbenefit.py index 46d6a520..92b91ff1 100644 --- a/fhirclient/models/explanationofbenefit.py +++ b/fhirclient/models/explanationofbenefit.py @@ -25,174 +25,260 @@ def __init__(self, jsondict=None, strict=True): self.accident = None """ Details of the event. Type `ExplanationOfBenefitAccident` (represented as `dict` in JSON). """ + self._accident = None + """ Primitive extension for accident. Type `FHIRPrimitiveExtension` """ self.addItem = None """ Insurer added line items. List of `ExplanationOfBenefitAddItem` items (represented as `dict` in JSON). """ + self._addItem = None + """ Primitive extension for addItem. List of `FHIRPrimitiveExtension` """ self.adjudication = None """ Header-level adjudication. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.benefitBalance = None """ Balance by Benefit Category. List of `ExplanationOfBenefitBenefitBalance` items (represented as `dict` in JSON). """ + self._benefitBalance = None + """ Primitive extension for benefitBalance. List of `FHIRPrimitiveExtension` """ self.benefitPeriod = None """ When the benefits are applicable. Type `Period` (represented as `dict` in JSON). """ + self._benefitPeriod = None + """ Primitive extension for benefitPeriod. Type `FHIRPrimitiveExtension` """ self.billablePeriod = None """ Relevant time frame for the claim. Type `Period` (represented as `dict` in JSON). """ + self._billablePeriod = None + """ Primitive extension for billablePeriod. Type `FHIRPrimitiveExtension` """ self.careTeam = None """ Care Team members. List of `ExplanationOfBenefitCareTeam` items (represented as `dict` in JSON). """ + self._careTeam = None + """ Primitive extension for careTeam. List of `FHIRPrimitiveExtension` """ self.claim = None """ Claim reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claim = None + """ Primitive extension for claim. Type `FHIRPrimitiveExtension` """ self.claimResponse = None """ Claim response reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claimResponse = None + """ Primitive extension for claimResponse. Type `FHIRPrimitiveExtension` """ self.created = None """ Response creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.diagnosis = None """ Pertinent diagnosis information. List of `ExplanationOfBenefitDiagnosis` items (represented as `dict` in JSON). """ + self._diagnosis = None + """ Primitive extension for diagnosis. List of `FHIRPrimitiveExtension` """ self.disposition = None """ Disposition Message. Type `str`. """ + self._disposition = None + """ Primitive extension for disposition. Type `FHIRPrimitiveExtension` """ self.enterer = None """ Author of the claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._enterer = None + """ Primitive extension for enterer. Type `FHIRPrimitiveExtension` """ self.facility = None """ Servicing Facility. Type `FHIRReference` (represented as `dict` in JSON). """ + self._facility = None + """ Primitive extension for facility. Type `FHIRPrimitiveExtension` """ self.form = None """ Printed reference or actual form. Type `Attachment` (represented as `dict` in JSON). """ + self._form = None + """ Primitive extension for form. Type `FHIRPrimitiveExtension` """ self.formCode = None """ Printed form identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._formCode = None + """ Primitive extension for formCode. Type `FHIRPrimitiveExtension` """ self.fundsReserve = None """ Funds reserved status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fundsReserve = None + """ Primitive extension for fundsReserve. Type `FHIRPrimitiveExtension` """ self.fundsReserveRequested = None """ For whom to reserve funds. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fundsReserveRequested = None + """ Primitive extension for fundsReserveRequested. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for the resource. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Patient insurance information. List of `ExplanationOfBenefitInsurance` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.insurer = None """ Party responsible for reimbursement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._insurer = None + """ Primitive extension for insurer. Type `FHIRPrimitiveExtension` """ self.item = None """ Product or service provided. List of `ExplanationOfBenefitItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.originalPrescription = None """ Original prescription if superceded by fulfiller. Type `FHIRReference` (represented as `dict` in JSON). """ + self._originalPrescription = None + """ Primitive extension for originalPrescription. Type `FHIRPrimitiveExtension` """ self.outcome = None """ queued | complete | error | partial. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.patient = None """ The recipient of the products and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.payee = None """ Recipient of benefits payable. Type `ExplanationOfBenefitPayee` (represented as `dict` in JSON). """ + self._payee = None + """ Primitive extension for payee. Type `FHIRPrimitiveExtension` """ self.payment = None """ Payment Details. Type `ExplanationOfBenefitPayment` (represented as `dict` in JSON). """ + self._payment = None + """ Primitive extension for payment. Type `FHIRPrimitiveExtension` """ self.preAuthRef = None """ Preauthorization reference. List of `str` items. """ + self._preAuthRef = None + """ Primitive extension for preAuthRef. List of `FHIRPrimitiveExtension` """ self.preAuthRefPeriod = None """ Preauthorization in-effect period. List of `Period` items (represented as `dict` in JSON). """ + self._preAuthRefPeriod = None + """ Primitive extension for preAuthRefPeriod. List of `FHIRPrimitiveExtension` """ self.precedence = None """ Precedence (primary, secondary, etc.). Type `int`. """ + self._precedence = None + """ Primitive extension for precedence. Type `FHIRPrimitiveExtension` """ self.prescription = None """ Prescription authorizing services or products. Type `FHIRReference` (represented as `dict` in JSON). """ + self._prescription = None + """ Primitive extension for prescription. Type `FHIRPrimitiveExtension` """ self.priority = None """ Desired processing urgency. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.procedure = None """ Clinical procedures performed. List of `ExplanationOfBenefitProcedure` items (represented as `dict` in JSON). """ + self._procedure = None + """ Primitive extension for procedure. List of `FHIRPrimitiveExtension` """ self.processNote = None """ Note concerning adjudication. List of `ExplanationOfBenefitProcessNote` items (represented as `dict` in JSON). """ + self._processNote = None + """ Primitive extension for processNote. List of `FHIRPrimitiveExtension` """ self.provider = None """ Party responsible for the claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.referral = None """ Treatment Referral. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referral = None + """ Primitive extension for referral. Type `FHIRPrimitiveExtension` """ self.related = None """ Prior or corollary claims. List of `ExplanationOfBenefitRelated` items (represented as `dict` in JSON). """ + self._related = None + """ Primitive extension for related. List of `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subType = None """ More granular claim type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subType = None + """ Primitive extension for subType. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Supporting information. List of `ExplanationOfBenefitSupportingInfo` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ self.total = None """ Adjudication totals. List of `ExplanationOfBenefitTotal` items (represented as `dict` in JSON). """ + self._total = None + """ Primitive extension for total. List of `FHIRPrimitiveExtension` """ self.type = None """ Category or discipline. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ claim | preauthorization | predetermination. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefit, self).__init__(jsondict=jsondict, strict=strict) @@ -200,48 +286,91 @@ def elementProperties(self): js = super(ExplanationOfBenefit, self).elementProperties() js.extend([ ("accident", "accident", ExplanationOfBenefitAccident, False, None, False), + ("_accident", "_accident", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("addItem", "addItem", ExplanationOfBenefitAddItem, True, None, False), + ("_addItem", "_addItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("benefitBalance", "benefitBalance", ExplanationOfBenefitBenefitBalance, True, None, False), + ("_benefitBalance", "_benefitBalance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("benefitPeriod", "benefitPeriod", period.Period, False, None, False), + ("_benefitPeriod", "_benefitPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("billablePeriod", "billablePeriod", period.Period, False, None, False), + ("_billablePeriod", "_billablePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("careTeam", "careTeam", ExplanationOfBenefitCareTeam, True, None, False), + ("_careTeam", "_careTeam", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("claim", "claim", fhirreference.FHIRReference, False, None, False), + ("_claim", "_claim", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("claimResponse", "claimResponse", fhirreference.FHIRReference, False, None, False), + ("_claimResponse", "_claimResponse", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosis", "diagnosis", ExplanationOfBenefitDiagnosis, True, None, False), + ("_diagnosis", "_diagnosis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("disposition", "disposition", str, False, None, False), + ("_disposition", "_disposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enterer", "enterer", fhirreference.FHIRReference, False, None, False), + ("_enterer", "_enterer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("facility", "facility", fhirreference.FHIRReference, False, None, False), + ("_facility", "_facility", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("form", "form", attachment.Attachment, False, None, False), + ("_form", "_form", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("formCode", "formCode", codeableconcept.CodeableConcept, False, None, False), + ("_formCode", "_formCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fundsReserve", "fundsReserve", codeableconcept.CodeableConcept, False, None, False), + ("_fundsReserve", "_fundsReserve", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fundsReserveRequested", "fundsReserveRequested", codeableconcept.CodeableConcept, False, None, False), + ("_fundsReserveRequested", "_fundsReserveRequested", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", ExplanationOfBenefitInsurance, True, None, True), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurer", "insurer", fhirreference.FHIRReference, False, None, True), + ("_insurer", "_insurer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", ExplanationOfBenefitItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("originalPrescription", "originalPrescription", fhirreference.FHIRReference, False, None, False), + ("_originalPrescription", "_originalPrescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", str, False, None, True), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payee", "payee", ExplanationOfBenefitPayee, False, None, False), + ("_payee", "_payee", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payment", "payment", ExplanationOfBenefitPayment, False, None, False), + ("_payment", "_payment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthRef", "preAuthRef", str, True, None, False), + ("_preAuthRef", "_preAuthRef", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("preAuthRefPeriod", "preAuthRefPeriod", period.Period, True, None, False), + ("_preAuthRefPeriod", "_preAuthRefPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("precedence", "precedence", int, False, None, False), + ("_precedence", "_precedence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prescription", "prescription", fhirreference.FHIRReference, False, None, False), + ("_prescription", "_prescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedure", "procedure", ExplanationOfBenefitProcedure, True, None, False), + ("_procedure", "_procedure", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("processNote", "processNote", ExplanationOfBenefitProcessNote, True, None, False), + ("_processNote", "_processNote", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, True), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referral", "referral", fhirreference.FHIRReference, False, None, False), + ("_referral", "_referral", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("related", "related", ExplanationOfBenefitRelated, True, None, False), + ("_related", "_related", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subType", "subType", codeableconcept.CodeableConcept, False, None, False), + ("_subType", "_subType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", ExplanationOfBenefitSupportingInfo, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("total", "total", ExplanationOfBenefitTotal, True, None, False), + ("_total", "_total", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -268,18 +397,26 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When the incident occurred. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.locationAddress = None """ Where the event occurred. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Where the event occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.type = None """ The nature of the accident. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitAccident, self).__init__(jsondict=jsondict, strict=strict) @@ -287,9 +424,13 @@ def elementProperties(self): js = super(ExplanationOfBenefitAccident, self).elementProperties() js.extend([ ("date", "date", fhirdate.FHIRDate, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -314,86 +455,128 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items adjudication. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Anatomical location. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.detail = None """ Insurer added line items. List of `ExplanationOfBenefitAddItemDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.detailSequence = None """ Detail sequence number. List of `int` items. """ + self._detailSequence = None + """ Primitive extension for detailSequence. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.itemSequence = None """ Item sequence number. List of `int` items. """ + self._itemSequence = None + """ Primitive extension for itemSequence. List of `FHIRPrimitiveExtension` """ self.locationAddress = None """ Place of service or where product was supplied. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationCodeableConcept = None """ Place of service or where product was supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._locationCodeableConcept = None + """ Primitive extension for locationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Place of service or where product was supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.provider = None """ Authorized providers. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.servicedDate = None """ Date or dates of service or product delivery. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Date or dates of service or product delivery. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.subDetailSequence = None """ Subdetail sequence number. List of `int` items. """ + self._subDetailSequence = None + """ Primitive extension for subDetailSequence. List of `FHIRPrimitiveExtension` """ self.subSite = None """ Anatomical sub-location. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subSite = None + """ Primitive extension for subSite. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitAddItem, self).__init__(jsondict=jsondict, strict=strict) @@ -401,26 +584,47 @@ def elementProperties(self): js = super(ExplanationOfBenefitAddItem, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", ExplanationOfBenefitAddItemDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("detailSequence", "detailSequence", int, True, None, False), + ("_detailSequence", "_detailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemSequence", "itemSequence", int, True, None, False), + ("_itemSequence", "_itemSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationCodeableConcept", "locationCodeableConcept", codeableconcept.CodeableConcept, False, "location", False), + ("_locationCodeableConcept", "_locationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("provider", "provider", fhirreference.FHIRReference, True, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetailSequence", "subDetailSequence", int, True, None, False), + ("_subDetailSequence", "_subDetailSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subSite", "subSite", codeableconcept.CodeableConcept, True, None, False), + ("_subSite", "_subSite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -444,38 +648,56 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items adjudication. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.subDetail = None """ Insurer added line items. List of `ExplanationOfBenefitAddItemDetailSubDetail` items (represented as `dict` in JSON). """ + self._subDetail = None + """ Primitive extension for subDetail. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitAddItemDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -483,14 +705,23 @@ def elementProperties(self): js = super(ExplanationOfBenefitAddItemDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetail", "subDetail", ExplanationOfBenefitAddItemDetailSubDetail, True, None, False), + ("_subDetail", "_subDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -514,34 +745,50 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Added items adjudication. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitAddItemDetailSubDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -549,13 +796,21 @@ def elementProperties(self): js = super(ExplanationOfBenefitAddItemDetailSubDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -577,34 +832,50 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.description = None """ Description of the benefit or services covered. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.excluded = None """ Excluded from the plan. Type `bool`. """ + self._excluded = None + """ Primitive extension for excluded. Type `FHIRPrimitiveExtension` """ self.financial = None """ Benefit Summary. List of `ExplanationOfBenefitBenefitBalanceFinancial` items (represented as `dict` in JSON). """ + self._financial = None + """ Primitive extension for financial. List of `FHIRPrimitiveExtension` """ self.name = None """ Short name for the benefit. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.network = None """ In or out of network. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. Type `FHIRPrimitiveExtension` """ self.term = None """ Annual or lifetime. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._term = None + """ Primitive extension for term. Type `FHIRPrimitiveExtension` """ self.unit = None """ Individual or family. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unit = None + """ Primitive extension for unit. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitBenefitBalance, self).__init__(jsondict=jsondict, strict=strict) @@ -612,13 +883,21 @@ def elementProperties(self): js = super(ExplanationOfBenefitBenefitBalance, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("excluded", "excluded", bool, False, None, False), + ("_excluded", "_excluded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("financial", "financial", ExplanationOfBenefitBenefitBalanceFinancial, True, None, False), + ("_financial", "_financial", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("network", "network", codeableconcept.CodeableConcept, False, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("term", "term", codeableconcept.CodeableConcept, False, None, False), + ("_term", "_term", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unit", "unit", codeableconcept.CodeableConcept, False, None, False), + ("_unit", "_unit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -642,26 +921,38 @@ def __init__(self, jsondict=None, strict=True): self.allowedMoney = None """ Benefits allowed. Type `Money` (represented as `dict` in JSON). """ + self._allowedMoney = None + """ Primitive extension for allowedMoney. Type `FHIRPrimitiveExtension` """ self.allowedString = None """ Benefits allowed. Type `str`. """ + self._allowedString = None + """ Primitive extension for allowedString. Type `FHIRPrimitiveExtension` """ self.allowedUnsignedInt = None """ Benefits allowed. Type `int`. """ + self._allowedUnsignedInt = None + """ Primitive extension for allowedUnsignedInt. Type `FHIRPrimitiveExtension` """ self.type = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.usedMoney = None """ Benefits used. Type `Money` (represented as `dict` in JSON). """ + self._usedMoney = None + """ Primitive extension for usedMoney. Type `FHIRPrimitiveExtension` """ self.usedUnsignedInt = None """ Benefits used. Type `int`. """ + self._usedUnsignedInt = None + """ Primitive extension for usedUnsignedInt. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitBenefitBalanceFinancial, self).__init__(jsondict=jsondict, strict=strict) @@ -669,11 +960,17 @@ def elementProperties(self): js = super(ExplanationOfBenefitBenefitBalanceFinancial, self).elementProperties() js.extend([ ("allowedMoney", "allowedMoney", money.Money, False, "allowed", False), + ("_allowedMoney", "_allowedMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("allowedString", "allowedString", str, False, "allowed", False), + ("_allowedString", "_allowedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("allowedUnsignedInt", "allowedUnsignedInt", int, False, "allowed", False), + ("_allowedUnsignedInt", "_allowedUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedMoney", "usedMoney", money.Money, False, "used", False), + ("_usedMoney", "_usedMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedUnsignedInt", "usedUnsignedInt", int, False, "used", False), + ("_usedUnsignedInt", "_usedUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -697,22 +994,32 @@ def __init__(self, jsondict=None, strict=True): self.provider = None """ Practitioner or organization. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.qualification = None """ Practitioner credential or specialization. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._qualification = None + """ Primitive extension for qualification. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Indicator of the lead practitioner. Type `bool`. """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.role = None """ Function within the team. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Order of care team. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitCareTeam, self).__init__(jsondict=jsondict, strict=strict) @@ -720,10 +1027,15 @@ def elementProperties(self): js = super(ExplanationOfBenefitCareTeam, self).elementProperties() js.extend([ ("provider", "provider", fhirreference.FHIRReference, False, None, True), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("qualification", "qualification", codeableconcept.CodeableConcept, False, None, False), + ("_qualification", "_qualification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", bool, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -747,26 +1059,38 @@ def __init__(self, jsondict=None, strict=True): self.diagnosisCodeableConcept = None """ Nature of illness or problem. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diagnosisCodeableConcept = None + """ Primitive extension for diagnosisCodeableConcept. Type `FHIRPrimitiveExtension` """ self.diagnosisReference = None """ Nature of illness or problem. Type `FHIRReference` (represented as `dict` in JSON). """ + self._diagnosisReference = None + """ Primitive extension for diagnosisReference. Type `FHIRPrimitiveExtension` """ self.onAdmission = None """ Present on admission. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._onAdmission = None + """ Primitive extension for onAdmission. Type `FHIRPrimitiveExtension` """ self.packageCode = None """ Package billing code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._packageCode = None + """ Primitive extension for packageCode. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Diagnosis instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.type = None """ Timing or nature of the diagnosis. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitDiagnosis, self).__init__(jsondict=jsondict, strict=strict) @@ -774,11 +1098,17 @@ def elementProperties(self): js = super(ExplanationOfBenefitDiagnosis, self).elementProperties() js.extend([ ("diagnosisCodeableConcept", "diagnosisCodeableConcept", codeableconcept.CodeableConcept, False, "diagnosis", True), + ("_diagnosisCodeableConcept", "_diagnosisCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnosisReference", "diagnosisReference", fhirreference.FHIRReference, False, "diagnosis", True), + ("_diagnosisReference", "_diagnosisReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onAdmission", "onAdmission", codeableconcept.CodeableConcept, False, None, False), + ("_onAdmission", "_onAdmission", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("packageCode", "packageCode", codeableconcept.CodeableConcept, False, None, False), + ("_packageCode", "_packageCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -803,14 +1133,20 @@ def __init__(self, jsondict=None, strict=True): self.coverage = None """ Insurance information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. Type `FHIRPrimitiveExtension` """ self.focal = None """ Coverage to be used for adjudication. Type `bool`. """ + self._focal = None + """ Primitive extension for focal. Type `FHIRPrimitiveExtension` """ self.preAuthRef = None """ Prior authorization reference number. List of `str` items. """ + self._preAuthRef = None + """ Primitive extension for preAuthRef. List of `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitInsurance, self).__init__(jsondict=jsondict, strict=strict) @@ -818,8 +1154,11 @@ def elementProperties(self): js = super(ExplanationOfBenefitInsurance, self).elementProperties() js.extend([ ("coverage", "coverage", fhirreference.FHIRReference, False, None, True), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focal", "focal", bool, False, None, True), + ("_focal", "_focal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preAuthRef", "preAuthRef", str, True, None, False), + ("_preAuthRef", "_preAuthRef", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -844,106 +1183,158 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Adjudication details. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Anatomical location. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.careTeamSequence = None """ Applicable care team members. List of `int` items. """ + self._careTeamSequence = None + """ Primitive extension for careTeamSequence. List of `FHIRPrimitiveExtension` """ self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.detail = None """ Additional items. List of `ExplanationOfBenefitItemDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.diagnosisSequence = None """ Applicable diagnoses. List of `int` items. """ + self._diagnosisSequence = None + """ Primitive extension for diagnosisSequence. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounters related to this billed item. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. List of `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.informationSequence = None """ Applicable exception and supporting information. List of `int` items. """ + self._informationSequence = None + """ Primitive extension for informationSequence. List of `FHIRPrimitiveExtension` """ self.locationAddress = None """ Place of service or where product was supplied. Type `Address` (represented as `dict` in JSON). """ + self._locationAddress = None + """ Primitive extension for locationAddress. Type `FHIRPrimitiveExtension` """ self.locationCodeableConcept = None """ Place of service or where product was supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._locationCodeableConcept = None + """ Primitive extension for locationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.locationReference = None """ Place of service or where product was supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Product or service billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.procedureSequence = None """ Applicable procedures. List of `int` items. """ + self._procedureSequence = None + """ Primitive extension for procedureSequence. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Item instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.servicedDate = None """ Date or dates of service or product delivery. Type `FHIRDate` (represented as `str` in JSON). """ + self._servicedDate = None + """ Primitive extension for servicedDate. Type `FHIRPrimitiveExtension` """ self.servicedPeriod = None """ Date or dates of service or product delivery. Type `Period` (represented as `dict` in JSON). """ + self._servicedPeriod = None + """ Primitive extension for servicedPeriod. Type `FHIRPrimitiveExtension` """ self.subSite = None """ Anatomical sub-location. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subSite = None + """ Primitive extension for subSite. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitItem, self).__init__(jsondict=jsondict, strict=strict) @@ -951,31 +1342,57 @@ def elementProperties(self): js = super(ExplanationOfBenefitItem, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("careTeamSequence", "careTeamSequence", int, True, None, False), + ("_careTeamSequence", "_careTeamSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", ExplanationOfBenefitItemDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("diagnosisSequence", "diagnosisSequence", int, True, None, False), + ("_diagnosisSequence", "_diagnosisSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, True, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("informationSequence", "informationSequence", int, True, None, False), + ("_informationSequence", "_informationSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("locationAddress", "locationAddress", address.Address, False, "location", False), + ("_locationAddress", "_locationAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationCodeableConcept", "locationCodeableConcept", codeableconcept.CodeableConcept, False, "location", False), + ("_locationCodeableConcept", "_locationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, False, "location", False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("procedureSequence", "procedureSequence", int, True, None, False), + ("_procedureSequence", "_procedureSequence", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedDate", "servicedDate", fhirdate.FHIRDate, False, "serviced", False), + ("_servicedDate", "_servicedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("servicedPeriod", "servicedPeriod", period.Period, False, "serviced", False), + ("_servicedPeriod", "_servicedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subSite", "subSite", codeableconcept.CodeableConcept, True, None, False), + ("_subSite", "_subSite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1001,18 +1418,26 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Monetary amount. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.category = None """ Type of adjudication information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.reason = None """ Explanation of adjudication outcome. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.value = None """ Non-monitary value. Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitItemAdjudication, self).__init__(jsondict=jsondict, strict=strict) @@ -1020,9 +1445,13 @@ def elementProperties(self): js = super(ExplanationOfBenefitItemAdjudication, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1046,58 +1475,86 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Detail level adjudication details. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Product or service provided. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.subDetail = None """ Additional items. List of `ExplanationOfBenefitItemDetailSubDetail` items (represented as `dict` in JSON). """ + self._subDetail = None + """ Primitive extension for subDetail. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitItemDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -1105,19 +1562,33 @@ def elementProperties(self): js = super(ExplanationOfBenefitItemDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subDetail", "subDetail", ExplanationOfBenefitItemDetailSubDetail, True, None, False), + ("_subDetail", "_subDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1141,54 +1612,80 @@ def __init__(self, jsondict=None, strict=True): self.adjudication = None """ Subdetail level adjudication details. List of `ExplanationOfBenefitItemAdjudication` items (represented as `dict` in JSON). """ + self._adjudication = None + """ Primitive extension for adjudication. List of `FHIRPrimitiveExtension` """ self.category = None """ Benefit classification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.factor = None """ Price scaling factor. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Service/Product billing modifiers. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.net = None """ Total item cost. Type `Money` (represented as `dict` in JSON). """ + self._net = None + """ Primitive extension for net. Type `FHIRPrimitiveExtension` """ self.noteNumber = None """ Applicable note numbers. List of `int` items. """ + self._noteNumber = None + """ Primitive extension for noteNumber. List of `FHIRPrimitiveExtension` """ self.productOrService = None """ Billing, service, product, or drug code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._productOrService = None + """ Primitive extension for productOrService. Type `FHIRPrimitiveExtension` """ self.programCode = None """ Program the product or service is provided under. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programCode = None + """ Primitive extension for programCode. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Count of products or services. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.revenue = None """ Revenue or cost center code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._revenue = None + """ Primitive extension for revenue. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Product or service provided. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ self.unitPrice = None """ Fee, charge or cost per item. Type `Money` (represented as `dict` in JSON). """ + self._unitPrice = None + """ Primitive extension for unitPrice. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitItemDetailSubDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -1196,18 +1693,31 @@ def elementProperties(self): js = super(ExplanationOfBenefitItemDetailSubDetail, self).elementProperties() js.extend([ ("adjudication", "adjudication", ExplanationOfBenefitItemAdjudication, True, None, False), + ("_adjudication", "_adjudication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("net", "net", money.Money, False, None, False), + ("_net", "_net", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("noteNumber", "noteNumber", int, True, None, False), + ("_noteNumber", "_noteNumber", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productOrService", "productOrService", codeableconcept.CodeableConcept, False, None, True), + ("_productOrService", "_productOrService", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programCode", "programCode", codeableconcept.CodeableConcept, True, None, False), + ("_programCode", "_programCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("revenue", "revenue", codeableconcept.CodeableConcept, False, None, False), + ("_revenue", "_revenue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitPrice", "unitPrice", money.Money, False, None, False), + ("_unitPrice", "_unitPrice", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1232,10 +1742,14 @@ def __init__(self, jsondict=None, strict=True): self.party = None """ Recipient reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._party = None + """ Primitive extension for party. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of recipient. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitPayee, self).__init__(jsondict=jsondict, strict=strict) @@ -1243,7 +1757,9 @@ def elementProperties(self): js = super(ExplanationOfBenefitPayee, self).elementProperties() js.extend([ ("party", "party", fhirreference.FHIRReference, False, None, False), + ("_party", "_party", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1267,26 +1783,38 @@ def __init__(self, jsondict=None, strict=True): self.adjustment = None """ Payment adjustment for non-claim issues. Type `Money` (represented as `dict` in JSON). """ + self._adjustment = None + """ Primitive extension for adjustment. Type `FHIRPrimitiveExtension` """ self.adjustmentReason = None """ Explanation for the variance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._adjustmentReason = None + """ Primitive extension for adjustmentReason. Type `FHIRPrimitiveExtension` """ self.amount = None """ Payable amount after adjustment. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.date = None """ Expected date of payment. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for the payment. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.type = None """ Partial or complete payment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitPayment, self).__init__(jsondict=jsondict, strict=strict) @@ -1294,11 +1822,17 @@ def elementProperties(self): js = super(ExplanationOfBenefitPayment, self).elementProperties() js.extend([ ("adjustment", "adjustment", money.Money, False, None, False), + ("_adjustment", "_adjustment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("adjustmentReason", "adjustmentReason", codeableconcept.CodeableConcept, False, None, False), + ("_adjustmentReason", "_adjustmentReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdate.FHIRDate, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1323,26 +1857,38 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When the procedure was performed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.procedureCodeableConcept = None """ Specific clinical procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._procedureCodeableConcept = None + """ Primitive extension for procedureCodeableConcept. Type `FHIRPrimitiveExtension` """ self.procedureReference = None """ Specific clinical procedure. Type `FHIRReference` (represented as `dict` in JSON). """ + self._procedureReference = None + """ Primitive extension for procedureReference. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Procedure instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of Procedure. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.udi = None """ Unique device identifier. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._udi = None + """ Primitive extension for udi. List of `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitProcedure, self).__init__(jsondict=jsondict, strict=strict) @@ -1350,11 +1896,17 @@ def elementProperties(self): js = super(ExplanationOfBenefitProcedure, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureCodeableConcept", "procedureCodeableConcept", codeableconcept.CodeableConcept, False, "procedure", True), + ("_procedureCodeableConcept", "_procedureCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureReference", "procedureReference", fhirreference.FHIRReference, False, "procedure", True), + ("_procedureReference", "_procedureReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("udi", "udi", fhirreference.FHIRReference, True, None, False), + ("_udi", "_udi", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -1379,18 +1931,26 @@ def __init__(self, jsondict=None, strict=True): self.language = None """ Language of the text. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.number = None """ Note instance identifier. Type `int`. """ + self._number = None + """ Primitive extension for number. Type `FHIRPrimitiveExtension` """ self.text = None """ Note explanatory text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ display | print | printoper. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitProcessNote, self).__init__(jsondict=jsondict, strict=strict) @@ -1398,9 +1958,13 @@ def elementProperties(self): js = super(ExplanationOfBenefitProcessNote, self).elementProperties() js.extend([ ("language", "language", codeableconcept.CodeableConcept, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("number", "number", int, False, None, False), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1425,14 +1989,20 @@ def __init__(self, jsondict=None, strict=True): self.claim = None """ Reference to the related claim. Type `FHIRReference` (represented as `dict` in JSON). """ + self._claim = None + """ Primitive extension for claim. Type `FHIRPrimitiveExtension` """ self.reference = None """ File or case reference. Type `Identifier` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.relationship = None """ How the reference claim is related. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitRelated, self).__init__(jsondict=jsondict, strict=strict) @@ -1440,8 +2010,11 @@ def elementProperties(self): js = super(ExplanationOfBenefitRelated, self).elementProperties() js.extend([ ("claim", "claim", fhirreference.FHIRReference, False, None, False), + ("_claim", "_claim", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", identifier.Identifier, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, False, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1466,46 +2039,68 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Classification of the supplied information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.code = None """ Type of information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.reason = None """ Explanation for the information. Type `Coding` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.sequence = None """ Information instance identifier. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.timingDate = None """ When it occurred. Type `FHIRDate` (represented as `str` in JSON). """ + self._timingDate = None + """ Primitive extension for timingDate. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ When it occurred. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Data to be provided. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Data to be provided. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Data to be provided. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Data to be provided. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Data to be provided. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitSupportingInfo, self).__init__(jsondict=jsondict, strict=strict) @@ -1513,16 +2108,27 @@ def elementProperties(self): js = super(ExplanationOfBenefitSupportingInfo, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", coding.Coding, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", int, False, None, True), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDate", "timingDate", fhirdate.FHIRDate, False, "timing", False), + ("_timingDate", "_timingDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", False), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", False), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -1546,10 +2152,14 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Financial total for the category. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.category = None """ Type of adjudication information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ super(ExplanationOfBenefitTotal, self).__init__(jsondict=jsondict, strict=strict) @@ -1557,10 +2167,13 @@ def elementProperties(self): js = super(ExplanationOfBenefitTotal, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, True), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -1572,4 +2185,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/expression.py b/fhirclient/models/expression.py index 6b672956..166a7a59 100644 --- a/fhirclient/models/expression.py +++ b/fhirclient/models/expression.py @@ -25,22 +25,32 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Natural language description of the condition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expression = None """ Expression in specified language. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.language = None """ text/cql | text/fhirpath | application/x-fhir-query | etc.. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.name = None """ Short name assigned to expression for reuse. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.reference = None """ Where the expression is found. Type `str`. """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ super(Expression, self).__init__(jsondict=jsondict, strict=strict) @@ -48,11 +58,16 @@ def elementProperties(self): js = super(Expression, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, False, None, True), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", str, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/extension.py b/fhirclient/models/extension.py index 16e9b1c6..dfb9a934 100644 --- a/fhirclient/models/extension.py +++ b/fhirclient/models/extension.py @@ -23,206 +23,308 @@ def __init__(self, jsondict=None, strict=True): self.url = None """ identifies the meaning of the extension. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.valueAddress = None """ Value of extension. Type `Address` (represented as `dict` in JSON). """ + self._valueAddress = None + """ Primitive extension for valueAddress. Type `FHIRPrimitiveExtension` """ self.valueAge = None """ Value of extension. Type `Age` (represented as `dict` in JSON). """ + self._valueAge = None + """ Primitive extension for valueAge. Type `FHIRPrimitiveExtension` """ self.valueAnnotation = None """ Value of extension. Type `Annotation` (represented as `dict` in JSON). """ + self._valueAnnotation = None + """ Primitive extension for valueAnnotation. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Value of extension. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Value of extension. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of extension. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCanonical = None """ Value of extension. Type `str`. """ + self._valueCanonical = None + """ Primitive extension for valueCanonical. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Value of extension. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value of extension. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Value of extension. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueContactDetail = None """ Value of extension. Type `ContactDetail` (represented as `dict` in JSON). """ + self._valueContactDetail = None + """ Primitive extension for valueContactDetail. Type `FHIRPrimitiveExtension` """ self.valueContactPoint = None """ Value of extension. Type `ContactPoint` (represented as `dict` in JSON). """ + self._valueContactPoint = None + """ Primitive extension for valueContactPoint. Type `FHIRPrimitiveExtension` """ self.valueContributor = None """ Value of extension. Type `Contributor` (represented as `dict` in JSON). """ + self._valueContributor = None + """ Primitive extension for valueContributor. Type `FHIRPrimitiveExtension` """ self.valueCount = None """ Value of extension. Type `Count` (represented as `dict` in JSON). """ + self._valueCount = None + """ Primitive extension for valueCount. Type `FHIRPrimitiveExtension` """ self.valueDataRequirement = None """ Value of extension. Type `DataRequirement` (represented as `dict` in JSON). """ + self._valueDataRequirement = None + """ Primitive extension for valueDataRequirement. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Value of extension. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Value of extension. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Value of extension. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueDistance = None """ Value of extension. Type `Distance` (represented as `dict` in JSON). """ + self._valueDistance = None + """ Primitive extension for valueDistance. Type `FHIRPrimitiveExtension` """ self.valueDosage = None """ Value of extension. Type `Dosage` (represented as `dict` in JSON). """ + self._valueDosage = None + """ Primitive extension for valueDosage. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ Value of extension. Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valueExpression = None """ Value of extension. Type `Expression` (represented as `dict` in JSON). """ + self._valueExpression = None + """ Primitive extension for valueExpression. Type `FHIRPrimitiveExtension` """ self.valueHumanName = None """ Value of extension. Type `HumanName` (represented as `dict` in JSON). """ + self._valueHumanName = None + """ Primitive extension for valueHumanName. Type `FHIRPrimitiveExtension` """ self.valueId = None """ Value of extension. Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueIdentifier = None """ Value of extension. Type `Identifier` (represented as `dict` in JSON). """ + self._valueIdentifier = None + """ Primitive extension for valueIdentifier. Type `FHIRPrimitiveExtension` """ self.valueInstant = None """ Value of extension. Type `FHIRInstant` (represented as `str` in JSON). """ + self._valueInstant = None + """ Primitive extension for valueInstant. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Value of extension. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueMarkdown = None """ Value of extension. Type `str`. """ + self._valueMarkdown = None + """ Primitive extension for valueMarkdown. Type `FHIRPrimitiveExtension` """ self.valueMeta = None """ Value of extension. Type `Meta` (represented as `dict` in JSON). """ + self._valueMeta = None + """ Primitive extension for valueMeta. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ Value of extension. Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueOid = None """ Value of extension. Type `str`. """ + self._valueOid = None + """ Primitive extension for valueOid. Type `FHIRPrimitiveExtension` """ self.valueParameterDefinition = None """ Value of extension. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._valueParameterDefinition = None + """ Primitive extension for valueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Value of extension. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valuePositiveInt = None """ Value of extension. Type `int`. """ + self._valuePositiveInt = None + """ Primitive extension for valuePositiveInt. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value of extension. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value of extension. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Value of extension. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Value of extension. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueRelatedArtifact = None """ Value of extension. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._valueRelatedArtifact = None + """ Primitive extension for valueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Value of extension. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueSignature = None """ Value of extension. Type `Signature` (represented as `dict` in JSON). """ + self._valueSignature = None + """ Primitive extension for valueSignature. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Value of extension. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Value of extension. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueTiming = None """ Value of extension. Type `Timing` (represented as `dict` in JSON). """ + self._valueTiming = None + """ Primitive extension for valueTiming. Type `FHIRPrimitiveExtension` """ self.valueTriggerDefinition = None """ Value of extension. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._valueTriggerDefinition = None + """ Primitive extension for valueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.valueUnsignedInt = None """ Value of extension. Type `int`. """ + self._valueUnsignedInt = None + """ Primitive extension for valueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Value of extension. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ self.valueUrl = None """ Value of extension. Type `str`. """ + self._valueUrl = None + """ Primitive extension for valueUrl. Type `FHIRPrimitiveExtension` """ self.valueUsageContext = None """ Value of extension. Type `UsageContext` (represented as `dict` in JSON). """ + self._valueUsageContext = None + """ Primitive extension for valueUsageContext. Type `FHIRPrimitiveExtension` """ self.valueUuid = None """ Value of extension. Type `str`. """ + self._valueUuid = None + """ Primitive extension for valueUuid. Type `FHIRPrimitiveExtension` """ super(Extension, self).__init__(jsondict=jsondict, strict=strict) @@ -230,59 +332,111 @@ def elementProperties(self): js = super(Extension, self).elementProperties() js.extend([ ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAddress", "valueAddress", address.Address, False, "value", False), + ("_valueAddress", "_valueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAge", "valueAge", age.Age, False, "value", False), + ("_valueAge", "_valueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAnnotation", "valueAnnotation", annotation.Annotation, False, "value", False), + ("_valueAnnotation", "_valueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", False), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", False), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCanonical", "valueCanonical", str, False, "value", False), + ("_valueCanonical", "_valueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", False), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", False), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactDetail", "valueContactDetail", contactdetail.ContactDetail, False, "value", False), + ("_valueContactDetail", "_valueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactPoint", "valueContactPoint", contactpoint.ContactPoint, False, "value", False), + ("_valueContactPoint", "_valueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContributor", "valueContributor", contributor.Contributor, False, "value", False), + ("_valueContributor", "_valueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCount", "valueCount", count.Count, False, "value", False), + ("_valueCount", "_valueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDataRequirement", "valueDataRequirement", datarequirement.DataRequirement, False, "value", False), + ("_valueDataRequirement", "_valueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", False), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", False), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDistance", "valueDistance", distance.Distance, False, "value", False), + ("_valueDistance", "_valueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDosage", "valueDosage", dosage.Dosage, False, "value", False), + ("_valueDosage", "_valueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", False), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueExpression", "valueExpression", expression.Expression, False, "value", False), + ("_valueExpression", "_valueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueHumanName", "valueHumanName", humanname.HumanName, False, "value", False), + ("_valueHumanName", "_valueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", False), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueIdentifier", "valueIdentifier", identifier.Identifier, False, "value", False), + ("_valueIdentifier", "_valueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInstant", "valueInstant", fhirinstant.FHIRInstant, False, "value", False), + ("_valueInstant", "_valueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMarkdown", "valueMarkdown", str, False, "value", False), + ("_valueMarkdown", "_valueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMeta", "valueMeta", meta.Meta, False, "value", False), + ("_valueMeta", "_valueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", False), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueOid", "valueOid", str, False, "value", False), + ("_valueOid", "_valueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueParameterDefinition", "valueParameterDefinition", parameterdefinition.ParameterDefinition, False, "value", False), + ("_valueParameterDefinition", "_valueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", False), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePositiveInt", "valuePositiveInt", int, False, "value", False), + ("_valuePositiveInt", "_valuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", False), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", False), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRelatedArtifact", "valueRelatedArtifact", relatedartifact.RelatedArtifact, False, "value", False), + ("_valueRelatedArtifact", "_valueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", False), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSignature", "valueSignature", signature.Signature, False, "value", False), + ("_valueSignature", "_valueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", False), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTiming", "valueTiming", timing.Timing, False, "value", False), + ("_valueTiming", "_valueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTriggerDefinition", "valueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "value", False), + ("_valueTriggerDefinition", "_valueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUnsignedInt", "valueUnsignedInt", int, False, "value", False), + ("_valueUnsignedInt", "_valueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", False), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUrl", "valueUrl", str, False, "value", False), + ("_valueUrl", "_valueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUsageContext", "valueUsageContext", usagecontext.UsageContext, False, "value", False), + ("_valueUsageContext", "_valueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUuid", "valueUuid", str, False, "value", False), + ("_valueUuid", "_valueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import age @@ -318,4 +472,4 @@ def elementProperties(self): from . import signature from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/familymemberhistory.py b/fhirclient/models/familymemberhistory.py index fa0c9f1d..779f09da 100644 --- a/fhirclient/models/familymemberhistory.py +++ b/fhirclient/models/familymemberhistory.py @@ -24,106 +24,158 @@ def __init__(self, jsondict=None, strict=True): self.ageAge = None """ (approximate) age. Type `Age` (represented as `dict` in JSON). """ + self._ageAge = None + """ Primitive extension for ageAge. Type `FHIRPrimitiveExtension` """ self.ageRange = None """ (approximate) age. Type `Range` (represented as `dict` in JSON). """ + self._ageRange = None + """ Primitive extension for ageRange. Type `FHIRPrimitiveExtension` """ self.ageString = None """ (approximate) age. Type `str`. """ + self._ageString = None + """ Primitive extension for ageString. Type `FHIRPrimitiveExtension` """ self.bornDate = None """ (approximate) date of birth. Type `FHIRDate` (represented as `str` in JSON). """ + self._bornDate = None + """ Primitive extension for bornDate. Type `FHIRPrimitiveExtension` """ self.bornPeriod = None """ (approximate) date of birth. Type `Period` (represented as `dict` in JSON). """ + self._bornPeriod = None + """ Primitive extension for bornPeriod. Type `FHIRPrimitiveExtension` """ self.bornString = None """ (approximate) date of birth. Type `str`. """ + self._bornString = None + """ Primitive extension for bornString. Type `FHIRPrimitiveExtension` """ self.condition = None """ Condition that the related person had. List of `FamilyMemberHistoryCondition` items (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.dataAbsentReason = None """ subject-unknown | withheld | unable-to-obtain | deferred. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._dataAbsentReason = None + """ Primitive extension for dataAbsentReason. Type `FHIRPrimitiveExtension` """ self.date = None """ When history was recorded or last updated. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.deceasedAge = None """ Dead? How old/when?. Type `Age` (represented as `dict` in JSON). """ + self._deceasedAge = None + """ Primitive extension for deceasedAge. Type `FHIRPrimitiveExtension` """ self.deceasedBoolean = None """ Dead? How old/when?. Type `bool`. """ + self._deceasedBoolean = None + """ Primitive extension for deceasedBoolean. Type `FHIRPrimitiveExtension` """ self.deceasedDate = None """ Dead? How old/when?. Type `FHIRDate` (represented as `str` in JSON). """ + self._deceasedDate = None + """ Primitive extension for deceasedDate. Type `FHIRPrimitiveExtension` """ self.deceasedRange = None """ Dead? How old/when?. Type `Range` (represented as `dict` in JSON). """ + self._deceasedRange = None + """ Primitive extension for deceasedRange. Type `FHIRPrimitiveExtension` """ self.deceasedString = None """ Dead? How old/when?. Type `str`. """ + self._deceasedString = None + """ Primitive extension for deceasedString. Type `FHIRPrimitiveExtension` """ self.estimatedAge = None """ Age is estimated?. Type `bool`. """ + self._estimatedAge = None + """ Primitive extension for estimatedAge. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Id(s) for this record. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.name = None """ The family member described. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ General note about related person. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.patient = None """ Patient history is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why was family member history performed?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why was family member history performed?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.relationship = None """ Relationship to the subject. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ self.sex = None """ male | female | other | unknown. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sex = None + """ Primitive extension for sex. Type `FHIRPrimitiveExtension` """ self.status = None """ partial | completed | entered-in-error | health-unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(FamilyMemberHistory, self).__init__(jsondict=jsondict, strict=strict) @@ -131,31 +183,57 @@ def elementProperties(self): js = super(FamilyMemberHistory, self).elementProperties() js.extend([ ("ageAge", "ageAge", age.Age, False, "age", False), + ("_ageAge", "_ageAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ageRange", "ageRange", range.Range, False, "age", False), + ("_ageRange", "_ageRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ageString", "ageString", str, False, "age", False), + ("_ageString", "_ageString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("bornDate", "bornDate", fhirdate.FHIRDate, False, "born", False), + ("_bornDate", "_bornDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("bornPeriod", "bornPeriod", period.Period, False, "born", False), + ("_bornPeriod", "_bornPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("bornString", "bornString", str, False, "born", False), + ("_bornString", "_bornString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", FamilyMemberHistoryCondition, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dataAbsentReason", "dataAbsentReason", codeableconcept.CodeableConcept, False, None, False), + ("_dataAbsentReason", "_dataAbsentReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedAge", "deceasedAge", age.Age, False, "deceased", False), + ("_deceasedAge", "_deceasedAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedBoolean", "deceasedBoolean", bool, False, "deceased", False), + ("_deceasedBoolean", "_deceasedBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedDate", "deceasedDate", fhirdate.FHIRDate, False, "deceased", False), + ("_deceasedDate", "_deceasedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedRange", "deceasedRange", range.Range, False, "deceased", False), + ("_deceasedRange", "_deceasedRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedString", "deceasedString", str, False, "deceased", False), + ("_deceasedString", "_deceasedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("estimatedAge", "estimatedAge", bool, False, None, False), + ("_estimatedAge", "_estimatedAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, False, None, True), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sex", "sex", codeableconcept.CodeableConcept, False, None, False), + ("_sex", "_sex", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -184,34 +262,50 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Condition suffered by relation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contributedToDeath = None """ Whether the condition contributed to the cause of death. Type `bool`. """ + self._contributedToDeath = None + """ Primitive extension for contributedToDeath. Type `FHIRPrimitiveExtension` """ self.note = None """ Extra information about condition. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.onsetAge = None """ When condition first manifested. Type `Age` (represented as `dict` in JSON). """ + self._onsetAge = None + """ Primitive extension for onsetAge. Type `FHIRPrimitiveExtension` """ self.onsetPeriod = None """ When condition first manifested. Type `Period` (represented as `dict` in JSON). """ + self._onsetPeriod = None + """ Primitive extension for onsetPeriod. Type `FHIRPrimitiveExtension` """ self.onsetRange = None """ When condition first manifested. Type `Range` (represented as `dict` in JSON). """ + self._onsetRange = None + """ Primitive extension for onsetRange. Type `FHIRPrimitiveExtension` """ self.onsetString = None """ When condition first manifested. Type `str`. """ + self._onsetString = None + """ Primitive extension for onsetString. Type `FHIRPrimitiveExtension` """ self.outcome = None """ deceased | permanent disability | etc.. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ super(FamilyMemberHistoryCondition, self).__init__(jsondict=jsondict, strict=strict) @@ -219,16 +313,25 @@ def elementProperties(self): js = super(FamilyMemberHistoryCondition, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contributedToDeath", "contributedToDeath", bool, False, None, False), + ("_contributedToDeath", "_contributedToDeath", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("onsetAge", "onsetAge", age.Age, False, "onset", False), + ("_onsetAge", "_onsetAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetPeriod", "onsetPeriod", period.Period, False, "onset", False), + ("_onsetPeriod", "_onsetPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetRange", "onsetRange", range.Range, False, "onset", False), + ("_onsetRange", "_onsetRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onsetString", "onsetString", str, False, "onset", False), + ("_onsetString", "_onsetString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", codeableconcept.CodeableConcept, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import annotation @@ -238,4 +341,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/fhirelementfactory.py b/fhirclient/models/fhirelementfactory.py index 63919fc7..0b623ffd 100644 --- a/fhirclient/models/fhirelementfactory.py +++ b/fhirclient/models/fhirelementfactory.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Generated from FHIR 4.0.1-9346c8cc45 on 2024-07-22. +# Generated from FHIR 4.0.1-9346c8cc45 on 2024-09-10. # 2024, SMART Health IT. diff --git a/fhirclient/models/fhirprimitiveextension.py b/fhirclient/models/fhirprimitiveextension.py new file mode 100644 index 00000000..519c0247 --- /dev/null +++ b/fhirclient/models/fhirprimitiveextension.py @@ -0,0 +1,21 @@ +from . import backboneelement, extension + + +class FHIRPrimitiveExtension(backboneelement.BackboneElement): + """A special kind of FHIR extension which can be used to extend primitives. + """ + + def __init__(self, jsondict=None, strict=True): + self.extension = None + """ The extension value(s). + List of `Extension` items (represented as `list[dict]` in JSON). """ + + super(FHIRPrimitiveExtension, self).__init__(jsondict=jsondict, + strict=strict) + + def elementProperties(self): + js = super(FHIRPrimitiveExtension, self).elementProperties() + js.extend([ + ("extension", "extension", extension.Extension, True, None, False), + ]) + return js diff --git a/fhirclient/models/flag.py b/fhirclient/models/flag.py index 29a3c56e..0080ebe3 100644 --- a/fhirclient/models/flag.py +++ b/fhirclient/models/flag.py @@ -24,34 +24,50 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ Flag creator. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.category = None """ Clinical, administrative, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ Coded or textual message to display to user. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Alert relevant during encounter. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period when flag is active. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who/What is flag about?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(Flag, self).__init__(jsondict=jsondict, strict=strict) @@ -59,18 +75,27 @@ def elementProperties(self): js = super(Flag, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/goal.py b/fhirclient/models/goal.py index 5a85ecc8..a301e155 100644 --- a/fhirclient/models/goal.py +++ b/fhirclient/models/goal.py @@ -27,71 +27,105 @@ def __init__(self, jsondict=None, strict=True): """ in-progress | improving | worsening | no-change | achieved | sustaining | not-achieved | no-progress | not-attainable. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._achievementStatus = None + """ Primitive extension for achievementStatus. Type `FHIRPrimitiveExtension` """ self.addresses = None """ Issues addressed by this goal. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._addresses = None + """ Primitive extension for addresses. List of `FHIRPrimitiveExtension` """ self.category = None """ E.g. Treatment, dietary, behavioral, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.description = None """ Code or text describing goal. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expressedBy = None """ Who's responsible for creating Goal?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._expressedBy = None + """ Primitive extension for expressedBy. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this goal. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.lifecycleStatus = None """ proposed | planned | accepted | active | on-hold | completed | cancelled | entered-in-error | rejected. Type `str`. """ + self._lifecycleStatus = None + """ Primitive extension for lifecycleStatus. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments about the goal. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.outcomeCode = None """ What result was achieved regarding the goal?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._outcomeCode = None + """ Primitive extension for outcomeCode. List of `FHIRPrimitiveExtension` """ self.outcomeReference = None """ Observation that resulted from goal. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._outcomeReference = None + """ Primitive extension for outcomeReference. List of `FHIRPrimitiveExtension` """ self.priority = None """ high-priority | medium-priority | low-priority. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.startCodeableConcept = None """ When goal pursuit begins. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._startCodeableConcept = None + """ Primitive extension for startCodeableConcept. Type `FHIRPrimitiveExtension` """ self.startDate = None """ When goal pursuit begins. Type `FHIRDate` (represented as `str` in JSON). """ + self._startDate = None + """ Primitive extension for startDate. Type `FHIRPrimitiveExtension` """ self.statusDate = None """ When goal status took effect. Type `FHIRDate` (represented as `str` in JSON). """ + self._statusDate = None + """ Primitive extension for statusDate. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `str`. """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who this goal is intended for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.target = None """ Target outcome for the goal. List of `GoalTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(Goal, self).__init__(jsondict=jsondict, strict=strict) @@ -99,22 +133,39 @@ def elementProperties(self): js = super(Goal, self).elementProperties() js.extend([ ("achievementStatus", "achievementStatus", codeableconcept.CodeableConcept, False, None, False), + ("_achievementStatus", "_achievementStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("addresses", "addresses", fhirreference.FHIRReference, True, None, False), + ("_addresses", "_addresses", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", codeableconcept.CodeableConcept, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expressedBy", "expressedBy", fhirreference.FHIRReference, False, None, False), + ("_expressedBy", "_expressedBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lifecycleStatus", "lifecycleStatus", str, False, None, True), + ("_lifecycleStatus", "_lifecycleStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcomeCode", "outcomeCode", codeableconcept.CodeableConcept, True, None, False), + ("_outcomeCode", "_outcomeCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcomeReference", "outcomeReference", fhirreference.FHIRReference, True, None, False), + ("_outcomeReference", "_outcomeReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("startCodeableConcept", "startCodeableConcept", codeableconcept.CodeableConcept, False, "start", False), + ("_startCodeableConcept", "_startCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("startDate", "startDate", fhirdate.FHIRDate, False, "start", False), + ("_startDate", "_startDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusDate", "statusDate", fhirdate.FHIRDate, False, None, False), + ("_statusDate", "_statusDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", str, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", GoalTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -140,42 +191,62 @@ def __init__(self, jsondict=None, strict=True): self.detailBoolean = None """ The target value to be achieved. Type `bool`. """ + self._detailBoolean = None + """ Primitive extension for detailBoolean. Type `FHIRPrimitiveExtension` """ self.detailCodeableConcept = None """ The target value to be achieved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._detailCodeableConcept = None + """ Primitive extension for detailCodeableConcept. Type `FHIRPrimitiveExtension` """ self.detailInteger = None """ The target value to be achieved. Type `int`. """ + self._detailInteger = None + """ Primitive extension for detailInteger. Type `FHIRPrimitiveExtension` """ self.detailQuantity = None """ The target value to be achieved. Type `Quantity` (represented as `dict` in JSON). """ + self._detailQuantity = None + """ Primitive extension for detailQuantity. Type `FHIRPrimitiveExtension` """ self.detailRange = None """ The target value to be achieved. Type `Range` (represented as `dict` in JSON). """ + self._detailRange = None + """ Primitive extension for detailRange. Type `FHIRPrimitiveExtension` """ self.detailRatio = None """ The target value to be achieved. Type `Ratio` (represented as `dict` in JSON). """ + self._detailRatio = None + """ Primitive extension for detailRatio. Type `FHIRPrimitiveExtension` """ self.detailString = None """ The target value to be achieved. Type `str`. """ + self._detailString = None + """ Primitive extension for detailString. Type `FHIRPrimitiveExtension` """ self.dueDate = None """ Reach goal on or before. Type `FHIRDate` (represented as `str` in JSON). """ + self._dueDate = None + """ Primitive extension for dueDate. Type `FHIRPrimitiveExtension` """ self.dueDuration = None """ Reach goal on or before. Type `Duration` (represented as `dict` in JSON). """ + self._dueDuration = None + """ Primitive extension for dueDuration. Type `FHIRPrimitiveExtension` """ self.measure = None """ The parameter whose value is being tracked. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._measure = None + """ Primitive extension for measure. Type `FHIRPrimitiveExtension` """ super(GoalTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -183,18 +254,29 @@ def elementProperties(self): js = super(GoalTarget, self).elementProperties() js.extend([ ("detailBoolean", "detailBoolean", bool, False, "detail", False), + ("_detailBoolean", "_detailBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailCodeableConcept", "detailCodeableConcept", codeableconcept.CodeableConcept, False, "detail", False), + ("_detailCodeableConcept", "_detailCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailInteger", "detailInteger", int, False, "detail", False), + ("_detailInteger", "_detailInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailQuantity", "detailQuantity", quantity.Quantity, False, "detail", False), + ("_detailQuantity", "_detailQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailRange", "detailRange", range.Range, False, "detail", False), + ("_detailRange", "_detailRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailRatio", "detailRatio", ratio.Ratio, False, "detail", False), + ("_detailRatio", "_detailRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailString", "detailString", str, False, "detail", False), + ("_detailString", "_detailString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dueDate", "dueDate", fhirdate.FHIRDate, False, "due", False), + ("_dueDate", "_dueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dueDuration", "dueDuration", duration.Duration, False, "due", False), + ("_dueDuration", "_dueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("measure", "measure", codeableconcept.CodeableConcept, False, None, False), + ("_measure", "_measure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -204,4 +286,4 @@ def elementProperties(self): from . import identifier from . import quantity from . import range -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/graphdefinition.py b/fhirclient/models/graphdefinition.py index 9498fad1..6cf8f08b 100644 --- a/fhirclient/models/graphdefinition.py +++ b/fhirclient/models/graphdefinition.py @@ -25,63 +25,93 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the graph definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for graph definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.link = None """ Links this graph makes rules about. List of `GraphDefinitionLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this graph definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.profile = None """ Profile on base resource. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this graph definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.start = None """ Type of resource at which the graph starts. Type `str`. """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this graph definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the graph definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(GraphDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -89,20 +119,35 @@ def elementProperties(self): js = super(GraphDefinition, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("link", "link", GraphDefinitionLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", str, False, None, True), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -126,26 +171,38 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Why this link is specified. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.max = None """ Maximum occurrences for this link. Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Minimum occurrences for this link. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.path = None """ Path in the resource that contains the link. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.sliceName = None """ Which slice (if profiled). Type `str`. """ + self._sliceName = None + """ Primitive extension for sliceName. Type `FHIRPrimitiveExtension` """ self.target = None """ Potential target for the link. List of `GraphDefinitionLinkTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(GraphDefinitionLink, self).__init__(jsondict=jsondict, strict=strict) @@ -153,11 +210,17 @@ def elementProperties(self): js = super(GraphDefinitionLink, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("max", "max", str, False, None, False), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, False), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sliceName", "sliceName", str, False, None, False), + ("_sliceName", "_sliceName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", GraphDefinitionLinkTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -179,22 +242,32 @@ def __init__(self, jsondict=None, strict=True): self.compartment = None """ Compartment Consistency Rules. List of `GraphDefinitionLinkTargetCompartment` items (represented as `dict` in JSON). """ + self._compartment = None + """ Primitive extension for compartment. List of `FHIRPrimitiveExtension` """ self.link = None """ Additional links from target resource. List of `GraphDefinitionLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.params = None """ Criteria for reverse lookup. Type `str`. """ + self._params = None + """ Primitive extension for params. Type `FHIRPrimitiveExtension` """ self.profile = None """ Profile for the target resource. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of resource this link refers to. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(GraphDefinitionLinkTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -202,10 +275,15 @@ def elementProperties(self): js = super(GraphDefinitionLinkTarget, self).elementProperties() js.extend([ ("compartment", "compartment", GraphDefinitionLinkTargetCompartment, True, None, False), + ("_compartment", "_compartment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("link", "link", GraphDefinitionLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("params", "params", str, False, None, False), + ("_params", "_params", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -227,22 +305,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Patient | Encounter | RelatedPerson | Practitioner | Device. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ Documentation for FHIRPath expression. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expression = None """ Custom rule, as a FHIRPath expression. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.rule = None """ identical | matching | different | custom. Type `str`. """ + self._rule = None + """ Primitive extension for rule. Type `FHIRPrimitiveExtension` """ self.use = None """ condition | requirement. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(GraphDefinitionLinkTargetCompartment, self).__init__(jsondict=jsondict, strict=strict) @@ -250,15 +338,21 @@ def elementProperties(self): js = super(GraphDefinitionLinkTargetCompartment, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rule", "rule", str, False, None, True), + ("_rule", "_rule", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/group.py b/fhirclient/models/group.py index ab2754be..470dfe3b 100644 --- a/fhirclient/models/group.py +++ b/fhirclient/models/group.py @@ -26,42 +26,62 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this group's record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.actual = None """ Descriptive or actual. Type `bool`. """ + self._actual = None + """ Primitive extension for actual. Type `FHIRPrimitiveExtension` """ self.characteristic = None """ Include / Exclude group members by Trait. List of `GroupCharacteristic` items (represented as `dict` in JSON). """ + self._characteristic = None + """ Primitive extension for characteristic. List of `FHIRPrimitiveExtension` """ self.code = None """ Kind of Group members. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique id. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.managingEntity = None """ Entity that is the custodian of the Group's definition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingEntity = None + """ Primitive extension for managingEntity. Type `FHIRPrimitiveExtension` """ self.member = None """ Who or what is in group. List of `GroupMember` items (represented as `dict` in JSON). """ + self._member = None + """ Primitive extension for member. List of `FHIRPrimitiveExtension` """ self.name = None """ Label for Group. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Number of members. Type `int`. """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.type = None """ person | animal | practitioner | device | medication | substance. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Group, self).__init__(jsondict=jsondict, strict=strict) @@ -69,15 +89,25 @@ def elementProperties(self): js = super(Group, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("actual", "actual", bool, False, None, True), + ("_actual", "_actual", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("characteristic", "characteristic", GroupCharacteristic, True, None, False), + ("_characteristic", "_characteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingEntity", "managingEntity", fhirreference.FHIRReference, False, None, False), + ("_managingEntity", "_managingEntity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("member", "member", GroupMember, True, None, False), + ("_member", "_member", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", int, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -104,34 +134,50 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Kind of characteristic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.exclude = None """ Group includes or excludes. Type `bool`. """ + self._exclude = None + """ Primitive extension for exclude. Type `FHIRPrimitiveExtension` """ self.period = None """ Period over which characteristic is tested. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value held by characteristic. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value held by characteristic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value held by characteristic. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value held by characteristic. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Value held by characteristic. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ super(GroupCharacteristic, self).__init__(jsondict=jsondict, strict=strict) @@ -139,13 +185,21 @@ def elementProperties(self): js = super(GroupCharacteristic, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exclude", "exclude", bool, False, None, True), + ("_exclude", "_exclude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", True), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", True), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -169,14 +223,20 @@ def __init__(self, jsondict=None, strict=True): self.entity = None """ Reference to the group member. Type `FHIRReference` (represented as `dict` in JSON). """ + self._entity = None + """ Primitive extension for entity. Type `FHIRPrimitiveExtension` """ self.inactive = None """ If member is no longer in group. Type `bool`. """ + self._inactive = None + """ Primitive extension for inactive. Type `FHIRPrimitiveExtension` """ self.period = None """ Period member belonged to the group. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ super(GroupMember, self).__init__(jsondict=jsondict, strict=strict) @@ -184,15 +244,19 @@ def elementProperties(self): js = super(GroupMember, self).elementProperties() js.extend([ ("entity", "entity", fhirreference.FHIRReference, False, None, True), + ("_entity", "_entity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("inactive", "inactive", bool, False, None, False), + ("_inactive", "_inactive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier from . import period from . import quantity -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/guidanceresponse.py b/fhirclient/models/guidanceresponse.py index 43f0a3a5..2bce3402 100644 --- a/fhirclient/models/guidanceresponse.py +++ b/fhirclient/models/guidanceresponse.py @@ -25,71 +25,105 @@ def __init__(self, jsondict=None, strict=True): self.dataRequirement = None """ Additional required data. List of `DataRequirement` items (represented as `dict` in JSON). """ + self._dataRequirement = None + """ Primitive extension for dataRequirement. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter during which the response was returned. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.evaluationMessage = None """ Messages resulting from the evaluation of the artifact or artifacts. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._evaluationMessage = None + """ Primitive extension for evaluationMessage. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.moduleCanonical = None """ What guidance was requested. Type `str`. """ + self._moduleCanonical = None + """ Primitive extension for moduleCanonical. Type `FHIRPrimitiveExtension` """ self.moduleCodeableConcept = None """ What guidance was requested. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._moduleCodeableConcept = None + """ Primitive extension for moduleCodeableConcept. Type `FHIRPrimitiveExtension` """ self.moduleUri = None """ What guidance was requested. Type `str`. """ + self._moduleUri = None + """ Primitive extension for moduleUri. Type `FHIRPrimitiveExtension` """ self.note = None """ Additional notes about the response. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When the guidance response was processed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.outputParameters = None """ The output parameters of the evaluation, if any. Type `FHIRReference` (represented as `dict` in JSON). """ + self._outputParameters = None + """ Primitive extension for outputParameters. Type `FHIRPrimitiveExtension` """ self.performer = None """ Device returning the guidance. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why guidance is needed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why guidance is needed. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.requestIdentifier = None """ The identifier of the request associated with this response, if any. Type `Identifier` (represented as `dict` in JSON). """ + self._requestIdentifier = None + """ Primitive extension for requestIdentifier. Type `FHIRPrimitiveExtension` """ self.result = None """ Proposed actions, if any. Type `FHIRReference` (represented as `dict` in JSON). """ + self._result = None + """ Primitive extension for result. Type `FHIRPrimitiveExtension` """ self.status = None """ success | data-requested | data-required | in-progress | failure | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Patient the request was performed for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(GuidanceResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -97,29 +131,47 @@ def elementProperties(self): js = super(GuidanceResponse, self).elementProperties() js.extend([ ("dataRequirement", "dataRequirement", datarequirement.DataRequirement, True, None, False), + ("_dataRequirement", "_dataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("evaluationMessage", "evaluationMessage", fhirreference.FHIRReference, True, None, False), + ("_evaluationMessage", "_evaluationMessage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("moduleCanonical", "moduleCanonical", str, False, "module", True), + ("_moduleCanonical", "_moduleCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("moduleCodeableConcept", "moduleCodeableConcept", codeableconcept.CodeableConcept, False, "module", True), + ("_moduleCodeableConcept", "_moduleCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("moduleUri", "moduleUri", str, False, "module", True), + ("_moduleUri", "_moduleUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, None, False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outputParameters", "outputParameters", fhirreference.FHIRReference, False, None, False), + ("_outputParameters", "_outputParameters", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requestIdentifier", "requestIdentifier", identifier.Identifier, False, None, False), + ("_requestIdentifier", "_requestIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("result", "result", fhirreference.FHIRReference, False, None, False), + ("_result", "_result", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import datarequirement from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/healthcareservice.py b/fhirclient/models/healthcareservice.py index 74d83a12..da47a948 100644 --- a/fhirclient/models/healthcareservice.py +++ b/fhirclient/models/healthcareservice.py @@ -21,101 +21,149 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this HealthcareService record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.appointmentRequired = None """ If an appointment is required for access to this service. Type `bool`. """ + self._appointmentRequired = None + """ Primitive extension for appointmentRequired. Type `FHIRPrimitiveExtension` """ self.availabilityExceptions = None """ Description of availability exceptions. Type `str`. """ + self._availabilityExceptions = None + """ Primitive extension for availabilityExceptions. Type `FHIRPrimitiveExtension` """ self.availableTime = None """ Times the Service Site is available. List of `HealthcareServiceAvailableTime` items (represented as `dict` in JSON). """ + self._availableTime = None + """ Primitive extension for availableTime. List of `FHIRPrimitiveExtension` """ self.category = None """ Broad category of service being performed or delivered. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.characteristic = None """ Collection of characteristics (attributes). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._characteristic = None + """ Primitive extension for characteristic. List of `FHIRPrimitiveExtension` """ self.comment = None """ Additional description and/or any specific issues not covered elsewhere. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.communication = None """ The language that this service is offered in. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._communication = None + """ Primitive extension for communication. List of `FHIRPrimitiveExtension` """ self.coverageArea = None """ Location(s) service is intended for/available to. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._coverageArea = None + """ Primitive extension for coverageArea. List of `FHIRPrimitiveExtension` """ self.eligibility = None """ Specific eligibility requirements required to use the service. List of `HealthcareServiceEligibility` items (represented as `dict` in JSON). """ + self._eligibility = None + """ Primitive extension for eligibility. List of `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoints providing access to electronic services operated for the healthcare service. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.extraDetails = None """ Extra details about the service that can't be placed in the other fields. Type `str`. """ + self._extraDetails = None + """ Primitive extension for extraDetails. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External identifiers for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.location = None """ Location(s) where service may be provided. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.name = None """ Description of service as presented to a consumer while searching. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.notAvailable = None """ Not available during this time due to provided reason. List of `HealthcareServiceNotAvailable` items (represented as `dict` in JSON). """ + self._notAvailable = None + """ Primitive extension for notAvailable. List of `FHIRPrimitiveExtension` """ self.photo = None """ Facilitates quick identification of the service. Type `Attachment` (represented as `dict` in JSON). """ + self._photo = None + """ Primitive extension for photo. Type `FHIRPrimitiveExtension` """ self.program = None """ Programs that this service is applicable to. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._program = None + """ Primitive extension for program. List of `FHIRPrimitiveExtension` """ self.providedBy = None """ Organization that provides this service. Type `FHIRReference` (represented as `dict` in JSON). """ + self._providedBy = None + """ Primitive extension for providedBy. Type `FHIRPrimitiveExtension` """ self.referralMethod = None """ Ways that the service accepts referrals. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._referralMethod = None + """ Primitive extension for referralMethod. List of `FHIRPrimitiveExtension` """ self.serviceProvisionCode = None """ Conditions under which service is available/offered. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceProvisionCode = None + """ Primitive extension for serviceProvisionCode. List of `FHIRPrimitiveExtension` """ self.specialty = None """ Specialties handled by the HealthcareService. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ self.telecom = None """ Contacts related to the healthcare service. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of service that may be delivered or performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(HealthcareService, self).__init__(jsondict=jsondict, strict=strict) @@ -123,29 +171,53 @@ def elementProperties(self): js = super(HealthcareService, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("appointmentRequired", "appointmentRequired", bool, False, None, False), + ("_appointmentRequired", "_appointmentRequired", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availabilityExceptions", "availabilityExceptions", str, False, None, False), + ("_availabilityExceptions", "_availabilityExceptions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableTime", "availableTime", HealthcareServiceAvailableTime, True, None, False), + ("_availableTime", "_availableTime", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("characteristic", "characteristic", codeableconcept.CodeableConcept, True, None, False), + ("_characteristic", "_characteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("communication", "communication", codeableconcept.CodeableConcept, True, None, False), + ("_communication", "_communication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("coverageArea", "coverageArea", fhirreference.FHIRReference, True, None, False), + ("_coverageArea", "_coverageArea", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("eligibility", "eligibility", HealthcareServiceEligibility, True, None, False), + ("_eligibility", "_eligibility", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("extraDetails", "extraDetails", str, False, None, False), + ("_extraDetails", "_extraDetails", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("notAvailable", "notAvailable", HealthcareServiceNotAvailable, True, None, False), + ("_notAvailable", "_notAvailable", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("photo", "photo", attachment.Attachment, False, None, False), + ("_photo", "_photo", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("program", "program", codeableconcept.CodeableConcept, True, None, False), + ("_program", "_program", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("providedBy", "providedBy", fhirreference.FHIRReference, False, None, False), + ("_providedBy", "_providedBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referralMethod", "referralMethod", codeableconcept.CodeableConcept, True, None, False), + ("_referralMethod", "_referralMethod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceProvisionCode", "serviceProvisionCode", codeableconcept.CodeableConcept, True, None, False), + ("_serviceProvisionCode", "_serviceProvisionCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -171,18 +243,26 @@ def __init__(self, jsondict=None, strict=True): self.allDay = None """ Always available? e.g. 24 hour service. Type `bool`. """ + self._allDay = None + """ Primitive extension for allDay. Type `FHIRPrimitiveExtension` """ self.availableEndTime = None """ Closing time of day (ignored if allDay = true). Type `FHIRTime` (represented as `str` in JSON). """ + self._availableEndTime = None + """ Primitive extension for availableEndTime. Type `FHIRPrimitiveExtension` """ self.availableStartTime = None """ Opening time of day (ignored if allDay = true). Type `FHIRTime` (represented as `str` in JSON). """ + self._availableStartTime = None + """ Primitive extension for availableStartTime. Type `FHIRPrimitiveExtension` """ self.daysOfWeek = None """ mon | tue | wed | thu | fri | sat | sun. List of `str` items. """ + self._daysOfWeek = None + """ Primitive extension for daysOfWeek. List of `FHIRPrimitiveExtension` """ super(HealthcareServiceAvailableTime, self).__init__(jsondict=jsondict, strict=strict) @@ -190,9 +270,13 @@ def elementProperties(self): js = super(HealthcareServiceAvailableTime, self).elementProperties() js.extend([ ("allDay", "allDay", bool, False, None, False), + ("_allDay", "_allDay", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableEndTime", "availableEndTime", fhirtime.FHIRTime, False, None, False), + ("_availableEndTime", "_availableEndTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableStartTime", "availableStartTime", fhirtime.FHIRTime, False, None, False), + ("_availableStartTime", "_availableStartTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("daysOfWeek", "daysOfWeek", str, True, None, False), + ("_daysOfWeek", "_daysOfWeek", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -217,10 +301,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Coded value for the eligibility. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comment = None """ Describes the eligibility conditions for the service. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ super(HealthcareServiceEligibility, self).__init__(jsondict=jsondict, strict=strict) @@ -228,7 +316,9 @@ def elementProperties(self): js = super(HealthcareServiceEligibility, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -253,10 +343,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Reason presented to the user explaining why time not available. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.during = None """ Service not available from this date. Type `Period` (represented as `dict` in JSON). """ + self._during = None + """ Primitive extension for during. Type `FHIRPrimitiveExtension` """ super(HealthcareServiceNotAvailable, self).__init__(jsondict=jsondict, strict=strict) @@ -264,10 +358,13 @@ def elementProperties(self): js = super(HealthcareServiceNotAvailable, self).elementProperties() js.extend([ ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("during", "during", period.Period, False, None, False), + ("_during", "_during", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -275,4 +372,4 @@ def elementProperties(self): from . import fhirreference from . import fhirtime from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/humanname.py b/fhirclient/models/humanname.py index c01dc3b9..dab77e3a 100644 --- a/fhirclient/models/humanname.py +++ b/fhirclient/models/humanname.py @@ -23,30 +23,44 @@ def __init__(self, jsondict=None, strict=True): self.family = None """ Family name (often called 'Surname'). Type `str`. """ + self._family = None + """ Primitive extension for family. Type `FHIRPrimitiveExtension` """ self.given = None """ Given names (not always 'first'). Includes middle names. List of `str` items. """ + self._given = None + """ Primitive extension for given. List of `FHIRPrimitiveExtension` """ self.period = None """ Time period when name was/is in use. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.prefix = None """ Parts that come before the name. List of `str` items. """ + self._prefix = None + """ Primitive extension for prefix. List of `FHIRPrimitiveExtension` """ self.suffix = None """ Parts that come after the name. List of `str` items. """ + self._suffix = None + """ Primitive extension for suffix. List of `FHIRPrimitiveExtension` """ self.text = None """ Text representation of the full name. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.use = None """ usual | official | temp | nickname | anonymous | old | maiden. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(HumanName, self).__init__(jsondict=jsondict, strict=strict) @@ -54,14 +68,22 @@ def elementProperties(self): js = super(HumanName, self).elementProperties() js.extend([ ("family", "family", str, False, None, False), + ("_family", "_family", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("given", "given", str, True, None, False), + ("_given", "_given", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prefix", "prefix", str, True, None, False), + ("_prefix", "_prefix", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("suffix", "suffix", str, True, None, False), + ("_suffix", "_suffix", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/identifier.py b/fhirclient/models/identifier.py index 3da644a2..b81566ed 100644 --- a/fhirclient/models/identifier.py +++ b/fhirclient/models/identifier.py @@ -24,26 +24,38 @@ def __init__(self, jsondict=None, strict=True): self.assigner = None """ Organization that issued id (may be just text). Type `FHIRReference` (represented as `dict` in JSON). """ + self._assigner = None + """ Primitive extension for assigner. Type `FHIRPrimitiveExtension` """ self.period = None """ Time period when id is/was valid for use. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.system = None """ The namespace for the identifier value. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.type = None """ Description of identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ usual | official | temp | secondary | old (If known). Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ self.value = None """ The value that is unique. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(Identifier, self).__init__(jsondict=jsondict, strict=strict) @@ -51,15 +63,22 @@ def elementProperties(self): js = super(Identifier, self).elementProperties() js.extend([ ("assigner", "assigner", fhirreference.FHIRReference, False, None, False), + ("_assigner", "_assigner", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/imagingstudy.py b/fhirclient/models/imagingstudy.py index 2bd5769f..36b90626 100644 --- a/fhirclient/models/imagingstudy.py +++ b/fhirclient/models/imagingstudy.py @@ -28,82 +28,122 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Request fulfilled. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.description = None """ Institution-generated description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter with which this imaging study is associated. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.endpoint = None """ Study access endpoint. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Identifiers for the whole study. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.interpreter = None """ Who interpreted images. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._interpreter = None + """ Primitive extension for interpreter. List of `FHIRPrimitiveExtension` """ self.location = None """ Where ImagingStudy occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.modality = None """ All series modality if actual acquisition modalities. List of `Coding` items (represented as `dict` in JSON). """ + self._modality = None + """ Primitive extension for modality. List of `FHIRPrimitiveExtension` """ self.note = None """ User-defined comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.numberOfInstances = None """ Number of Study Related Instances. Type `int`. """ + self._numberOfInstances = None + """ Primitive extension for numberOfInstances. Type `FHIRPrimitiveExtension` """ self.numberOfSeries = None """ Number of Study Related Series. Type `int`. """ + self._numberOfSeries = None + """ Primitive extension for numberOfSeries. Type `FHIRPrimitiveExtension` """ self.procedureCode = None """ The performed procedure code. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._procedureCode = None + """ Primitive extension for procedureCode. List of `FHIRPrimitiveExtension` """ self.procedureReference = None """ The performed Procedure reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._procedureReference = None + """ Primitive extension for procedureReference. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why the study was requested. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why was study performed. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.referrer = None """ Referring physician. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referrer = None + """ Primitive extension for referrer. Type `FHIRPrimitiveExtension` """ self.series = None """ Each study has one or more series of instances. List of `ImagingStudySeries` items (represented as `dict` in JSON). """ + self._series = None + """ Primitive extension for series. List of `FHIRPrimitiveExtension` """ self.started = None """ When the study was started. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._started = None + """ Primitive extension for started. Type `FHIRPrimitiveExtension` """ self.status = None """ registered | available | cancelled | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who or what is the subject of the study. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(ImagingStudy, self).__init__(jsondict=jsondict, strict=strict) @@ -111,25 +151,45 @@ def elementProperties(self): js = super(ImagingStudy, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("interpreter", "interpreter", fhirreference.FHIRReference, True, None, False), + ("_interpreter", "_interpreter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modality", "modality", coding.Coding, True, None, False), + ("_modality", "_modality", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("numberOfInstances", "numberOfInstances", int, False, None, False), + ("_numberOfInstances", "_numberOfInstances", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfSeries", "numberOfSeries", int, False, None, False), + ("_numberOfSeries", "_numberOfSeries", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedureCode", "procedureCode", codeableconcept.CodeableConcept, True, None, False), + ("_procedureCode", "_procedureCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("procedureReference", "procedureReference", fhirreference.FHIRReference, False, None, False), + ("_procedureReference", "_procedureReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("referrer", "referrer", fhirreference.FHIRReference, False, None, False), + ("_referrer", "_referrer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("series", "series", ImagingStudySeries, True, None, False), + ("_series", "_series", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("started", "started", fhirdatetime.FHIRDateTime, False, None, False), + ("_started", "_started", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -155,50 +215,74 @@ def __init__(self, jsondict=None, strict=True): self.bodySite = None """ Body part examined. Type `Coding` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.description = None """ A short human readable summary of the series. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.endpoint = None """ Series access endpoint. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.instance = None """ A single SOP instance from the series. List of `ImagingStudySeriesInstance` items (represented as `dict` in JSON). """ + self._instance = None + """ Primitive extension for instance. List of `FHIRPrimitiveExtension` """ self.laterality = None """ Body part laterality. Type `Coding` (represented as `dict` in JSON). """ + self._laterality = None + """ Primitive extension for laterality. Type `FHIRPrimitiveExtension` """ self.modality = None """ The modality of the instances in the series. Type `Coding` (represented as `dict` in JSON). """ + self._modality = None + """ Primitive extension for modality. Type `FHIRPrimitiveExtension` """ self.number = None """ Numeric identifier of this series. Type `int`. """ + self._number = None + """ Primitive extension for number. Type `FHIRPrimitiveExtension` """ self.numberOfInstances = None """ Number of Series Related Instances. Type `int`. """ + self._numberOfInstances = None + """ Primitive extension for numberOfInstances. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who performed the series. List of `ImagingStudySeriesPerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.specimen = None """ Specimen imaged. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._specimen = None + """ Primitive extension for specimen. List of `FHIRPrimitiveExtension` """ self.started = None """ When the series started. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._started = None + """ Primitive extension for started. Type `FHIRPrimitiveExtension` """ self.uid = None """ DICOM Series Instance UID for the series. Type `str`. """ + self._uid = None + """ Primitive extension for uid. Type `FHIRPrimitiveExtension` """ super(ImagingStudySeries, self).__init__(jsondict=jsondict, strict=strict) @@ -206,17 +290,29 @@ def elementProperties(self): js = super(ImagingStudySeries, self).elementProperties() js.extend([ ("bodySite", "bodySite", coding.Coding, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instance", "instance", ImagingStudySeriesInstance, True, None, False), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("laterality", "laterality", coding.Coding, False, None, False), + ("_laterality", "_laterality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modality", "modality", coding.Coding, False, None, True), + ("_modality", "_modality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("number", "number", int, False, None, False), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfInstances", "numberOfInstances", int, False, None, False), + ("_numberOfInstances", "_numberOfInstances", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", ImagingStudySeriesPerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimen", "specimen", fhirreference.FHIRReference, True, None, False), + ("_specimen", "_specimen", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("started", "started", fhirdatetime.FHIRDateTime, False, None, False), + ("_started", "_started", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uid", "uid", str, False, None, True), + ("_uid", "_uid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -241,18 +337,26 @@ def __init__(self, jsondict=None, strict=True): self.number = None """ The number of this instance in the series. Type `int`. """ + self._number = None + """ Primitive extension for number. Type `FHIRPrimitiveExtension` """ self.sopClass = None """ DICOM class type. Type `Coding` (represented as `dict` in JSON). """ + self._sopClass = None + """ Primitive extension for sopClass. Type `FHIRPrimitiveExtension` """ self.title = None """ Description of instance. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.uid = None """ DICOM SOP Instance UID. Type `str`. """ + self._uid = None + """ Primitive extension for uid. Type `FHIRPrimitiveExtension` """ super(ImagingStudySeriesInstance, self).__init__(jsondict=jsondict, strict=strict) @@ -260,9 +364,13 @@ def elementProperties(self): js = super(ImagingStudySeriesInstance, self).elementProperties() js.extend([ ("number", "number", int, False, None, False), + ("_number", "_number", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sopClass", "sopClass", coding.Coding, False, None, True), + ("_sopClass", "_sopClass", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uid", "uid", str, False, None, True), + ("_uid", "_uid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -286,10 +394,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Who performed the series. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ Type of performance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ super(ImagingStudySeriesPerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -297,14 +409,17 @@ def elementProperties(self): js = super(ImagingStudySeriesPerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import coding from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/immunization.py b/fhirclient/models/immunization.py index 34f355eb..ee7f0d7b 100644 --- a/fhirclient/models/immunization.py +++ b/fhirclient/models/immunization.py @@ -24,118 +24,176 @@ def __init__(self, jsondict=None, strict=True): self.doseQuantity = None """ Amount of vaccine administered. Type `Quantity` (represented as `dict` in JSON). """ + self._doseQuantity = None + """ Primitive extension for doseQuantity. Type `FHIRPrimitiveExtension` """ self.education = None """ Educational material presented to patient. List of `ImmunizationEducation` items (represented as `dict` in JSON). """ + self._education = None + """ Primitive extension for education. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter immunization was part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.expirationDate = None """ Vaccine expiration date. Type `FHIRDate` (represented as `str` in JSON). """ + self._expirationDate = None + """ Primitive extension for expirationDate. Type `FHIRPrimitiveExtension` """ self.fundingSource = None """ Funding source for the vaccine. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fundingSource = None + """ Primitive extension for fundingSource. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.isSubpotent = None """ Dose potency. Type `bool`. """ + self._isSubpotent = None + """ Primitive extension for isSubpotent. Type `FHIRPrimitiveExtension` """ self.location = None """ Where immunization occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.lotNumber = None """ Vaccine lot number. Type `str`. """ + self._lotNumber = None + """ Primitive extension for lotNumber. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ Vaccine manufacturer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. Type `FHIRPrimitiveExtension` """ self.note = None """ Additional immunization notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ Vaccine administration date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrenceString = None """ Vaccine administration date. Type `str`. """ + self._occurrenceString = None + """ Primitive extension for occurrenceString. Type `FHIRPrimitiveExtension` """ self.patient = None """ Who was immunized. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who performed event. List of `ImmunizationPerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.primarySource = None """ Indicates context the data was recorded in. Type `bool`. """ + self._primarySource = None + """ Primitive extension for primarySource. Type `FHIRPrimitiveExtension` """ self.programEligibility = None """ Patient eligibility for a vaccination program. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._programEligibility = None + """ Primitive extension for programEligibility. List of `FHIRPrimitiveExtension` """ self.protocolApplied = None """ Protocol followed by the provider. List of `ImmunizationProtocolApplied` items (represented as `dict` in JSON). """ + self._protocolApplied = None + """ Primitive extension for protocolApplied. List of `FHIRPrimitiveExtension` """ self.reaction = None """ Details of a reaction that follows immunization. List of `ImmunizationReaction` items (represented as `dict` in JSON). """ + self._reaction = None + """ Primitive extension for reaction. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why immunization occurred. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why immunization occurred. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.recorded = None """ When the immunization was first captured in the subject's record. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._recorded = None + """ Primitive extension for recorded. Type `FHIRPrimitiveExtension` """ self.reportOrigin = None """ Indicates the source of a secondarily reported record. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reportOrigin = None + """ Primitive extension for reportOrigin. Type `FHIRPrimitiveExtension` """ self.route = None """ How vaccine entered body. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._route = None + """ Primitive extension for route. Type `FHIRPrimitiveExtension` """ self.site = None """ Body site vaccine was administered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._site = None + """ Primitive extension for site. Type `FHIRPrimitiveExtension` """ self.status = None """ completed | entered-in-error | not-done. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason not done. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subpotentReason = None """ Reason for being subpotent. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subpotentReason = None + """ Primitive extension for subpotentReason. List of `FHIRPrimitiveExtension` """ self.vaccineCode = None """ Vaccine product administered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._vaccineCode = None + """ Primitive extension for vaccineCode. Type `FHIRPrimitiveExtension` """ super(Immunization, self).__init__(jsondict=jsondict, strict=strict) @@ -143,34 +201,63 @@ def elementProperties(self): js = super(Immunization, self).elementProperties() js.extend([ ("doseQuantity", "doseQuantity", quantity.Quantity, False, None, False), + ("_doseQuantity", "_doseQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("education", "education", ImmunizationEducation, True, None, False), + ("_education", "_education", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expirationDate", "expirationDate", fhirdate.FHIRDate, False, None, False), + ("_expirationDate", "_expirationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fundingSource", "fundingSource", codeableconcept.CodeableConcept, False, None, False), + ("_fundingSource", "_fundingSource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("isSubpotent", "isSubpotent", bool, False, None, False), + ("_isSubpotent", "_isSubpotent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lotNumber", "lotNumber", str, False, None, False), + ("_lotNumber", "_lotNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, False, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", True), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceString", "occurrenceString", str, False, "occurrence", True), + ("_occurrenceString", "_occurrenceString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", ImmunizationPerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("primarySource", "primarySource", bool, False, None, False), + ("_primarySource", "_primarySource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("programEligibility", "programEligibility", codeableconcept.CodeableConcept, True, None, False), + ("_programEligibility", "_programEligibility", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("protocolApplied", "protocolApplied", ImmunizationProtocolApplied, True, None, False), + ("_protocolApplied", "_protocolApplied", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reaction", "reaction", ImmunizationReaction, True, None, False), + ("_reaction", "_reaction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recorded", "recorded", fhirdatetime.FHIRDateTime, False, None, False), + ("_recorded", "_recorded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reportOrigin", "reportOrigin", codeableconcept.CodeableConcept, False, None, False), + ("_reportOrigin", "_reportOrigin", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("route", "route", codeableconcept.CodeableConcept, False, None, False), + ("_route", "_route", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("site", "site", codeableconcept.CodeableConcept, False, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subpotentReason", "subpotentReason", codeableconcept.CodeableConcept, True, None, False), + ("_subpotentReason", "_subpotentReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("vaccineCode", "vaccineCode", codeableconcept.CodeableConcept, False, None, True), + ("_vaccineCode", "_vaccineCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -197,18 +284,26 @@ def __init__(self, jsondict=None, strict=True): self.documentType = None """ Educational material document identifier. Type `str`. """ + self._documentType = None + """ Primitive extension for documentType. Type `FHIRPrimitiveExtension` """ self.presentationDate = None """ Educational material presentation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._presentationDate = None + """ Primitive extension for presentationDate. Type `FHIRPrimitiveExtension` """ self.publicationDate = None """ Educational material publication date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._publicationDate = None + """ Primitive extension for publicationDate. Type `FHIRPrimitiveExtension` """ self.reference = None """ Educational material reference pointer. Type `str`. """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ super(ImmunizationEducation, self).__init__(jsondict=jsondict, strict=strict) @@ -216,9 +311,13 @@ def elementProperties(self): js = super(ImmunizationEducation, self).elementProperties() js.extend([ ("documentType", "documentType", str, False, None, False), + ("_documentType", "_documentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("presentationDate", "presentationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_presentationDate", "_presentationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publicationDate", "publicationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_publicationDate", "_publicationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", str, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -242,10 +341,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Individual or organization who was performing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ What type of performance was done. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ super(ImmunizationPerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -253,7 +356,9 @@ def elementProperties(self): js = super(ImmunizationPerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -278,30 +383,44 @@ def __init__(self, jsondict=None, strict=True): self.authority = None """ Who is responsible for publishing the recommendations. Type `FHIRReference` (represented as `dict` in JSON). """ + self._authority = None + """ Primitive extension for authority. Type `FHIRPrimitiveExtension` """ self.doseNumberPositiveInt = None """ Dose number within series. Type `int`. """ + self._doseNumberPositiveInt = None + """ Primitive extension for doseNumberPositiveInt. Type `FHIRPrimitiveExtension` """ self.doseNumberString = None """ Dose number within series. Type `str`. """ + self._doseNumberString = None + """ Primitive extension for doseNumberString. Type `FHIRPrimitiveExtension` """ self.series = None """ Name of vaccine series. Type `str`. """ + self._series = None + """ Primitive extension for series. Type `FHIRPrimitiveExtension` """ self.seriesDosesPositiveInt = None """ Recommended number of doses for immunity. Type `int`. """ + self._seriesDosesPositiveInt = None + """ Primitive extension for seriesDosesPositiveInt. Type `FHIRPrimitiveExtension` """ self.seriesDosesString = None """ Recommended number of doses for immunity. Type `str`. """ + self._seriesDosesString = None + """ Primitive extension for seriesDosesString. Type `FHIRPrimitiveExtension` """ self.targetDisease = None """ Vaccine preventatable disease being targetted. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._targetDisease = None + """ Primitive extension for targetDisease. List of `FHIRPrimitiveExtension` """ super(ImmunizationProtocolApplied, self).__init__(jsondict=jsondict, strict=strict) @@ -309,12 +428,19 @@ def elementProperties(self): js = super(ImmunizationProtocolApplied, self).elementProperties() js.extend([ ("authority", "authority", fhirreference.FHIRReference, False, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberPositiveInt", "doseNumberPositiveInt", int, False, "doseNumber", True), + ("_doseNumberPositiveInt", "_doseNumberPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberString", "doseNumberString", str, False, "doseNumber", True), + ("_doseNumberString", "_doseNumberString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("series", "series", str, False, None, False), + ("_series", "_series", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesPositiveInt", "seriesDosesPositiveInt", int, False, "seriesDoses", False), + ("_seriesDosesPositiveInt", "_seriesDosesPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesString", "seriesDosesString", str, False, "seriesDoses", False), + ("_seriesDosesString", "_seriesDosesString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetDisease", "targetDisease", codeableconcept.CodeableConcept, True, None, False), + ("_targetDisease", "_targetDisease", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -339,14 +465,20 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When reaction started. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.detail = None """ Additional information on reaction. Type `FHIRReference` (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. Type `FHIRPrimitiveExtension` """ self.reported = None """ Indicates self-reported reaction. Type `bool`. """ + self._reported = None + """ Primitive extension for reported. Type `FHIRPrimitiveExtension` """ super(ImmunizationReaction, self).__init__(jsondict=jsondict, strict=strict) @@ -354,11 +486,15 @@ def elementProperties(self): js = super(ImmunizationReaction, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", fhirreference.FHIRReference, False, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reported", "reported", bool, False, None, False), + ("_reported", "_reported", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -366,4 +502,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/immunizationevaluation.py b/fhirclient/models/immunizationevaluation.py index 55174904..58585a82 100644 --- a/fhirclient/models/immunizationevaluation.py +++ b/fhirclient/models/immunizationevaluation.py @@ -25,62 +25,92 @@ def __init__(self, jsondict=None, strict=True): self.authority = None """ Who is responsible for publishing the recommendations. Type `FHIRReference` (represented as `dict` in JSON). """ + self._authority = None + """ Primitive extension for authority. Type `FHIRPrimitiveExtension` """ self.date = None """ Date evaluation was performed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Evaluation notes. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.doseNumberPositiveInt = None """ Dose number within series. Type `int`. """ + self._doseNumberPositiveInt = None + """ Primitive extension for doseNumberPositiveInt. Type `FHIRPrimitiveExtension` """ self.doseNumberString = None """ Dose number within series. Type `str`. """ + self._doseNumberString = None + """ Primitive extension for doseNumberString. Type `FHIRPrimitiveExtension` """ self.doseStatus = None """ Status of the dose relative to published recommendations. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._doseStatus = None + """ Primitive extension for doseStatus. Type `FHIRPrimitiveExtension` """ self.doseStatusReason = None """ Reason for the dose status. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._doseStatusReason = None + """ Primitive extension for doseStatusReason. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.immunizationEvent = None """ Immunization being evaluated. Type `FHIRReference` (represented as `dict` in JSON). """ + self._immunizationEvent = None + """ Primitive extension for immunizationEvent. Type `FHIRPrimitiveExtension` """ self.patient = None """ Who this evaluation is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.series = None """ Name of vaccine series. Type `str`. """ + self._series = None + """ Primitive extension for series. Type `FHIRPrimitiveExtension` """ self.seriesDosesPositiveInt = None """ Recommended number of doses for immunity. Type `int`. """ + self._seriesDosesPositiveInt = None + """ Primitive extension for seriesDosesPositiveInt. Type `FHIRPrimitiveExtension` """ self.seriesDosesString = None """ Recommended number of doses for immunity. Type `str`. """ + self._seriesDosesString = None + """ Primitive extension for seriesDosesString. Type `FHIRPrimitiveExtension` """ self.status = None """ completed | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.targetDisease = None """ Evaluation target disease. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._targetDisease = None + """ Primitive extension for targetDisease. Type `FHIRPrimitiveExtension` """ super(ImmunizationEvaluation, self).__init__(jsondict=jsondict, strict=strict) @@ -88,25 +118,41 @@ def elementProperties(self): js = super(ImmunizationEvaluation, self).elementProperties() js.extend([ ("authority", "authority", fhirreference.FHIRReference, False, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberPositiveInt", "doseNumberPositiveInt", int, False, "doseNumber", False), + ("_doseNumberPositiveInt", "_doseNumberPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberString", "doseNumberString", str, False, "doseNumber", False), + ("_doseNumberString", "_doseNumberString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseStatus", "doseStatus", codeableconcept.CodeableConcept, False, None, True), + ("_doseStatus", "_doseStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseStatusReason", "doseStatusReason", codeableconcept.CodeableConcept, True, None, False), + ("_doseStatusReason", "_doseStatusReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("immunizationEvent", "immunizationEvent", fhirreference.FHIRReference, False, None, True), + ("_immunizationEvent", "_immunizationEvent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("series", "series", str, False, None, False), + ("_series", "_series", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesPositiveInt", "seriesDosesPositiveInt", int, False, "seriesDoses", False), + ("_seriesDosesPositiveInt", "_seriesDosesPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesString", "seriesDosesString", str, False, "seriesDoses", False), + ("_seriesDosesString", "_seriesDosesString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetDisease", "targetDisease", codeableconcept.CodeableConcept, False, None, True), + ("_targetDisease", "_targetDisease", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/immunizationrecommendation.py b/fhirclient/models/immunizationrecommendation.py index ec6ce249..2dc45f15 100644 --- a/fhirclient/models/immunizationrecommendation.py +++ b/fhirclient/models/immunizationrecommendation.py @@ -24,22 +24,32 @@ def __init__(self, jsondict=None, strict=True): self.authority = None """ Who is responsible for protocol. Type `FHIRReference` (represented as `dict` in JSON). """ + self._authority = None + """ Primitive extension for authority. Type `FHIRPrimitiveExtension` """ self.date = None """ Date recommendation(s) created. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.patient = None """ Who this profile is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.recommendation = None """ Vaccine administration recommendations. List of `ImmunizationRecommendationRecommendation` items (represented as `dict` in JSON). """ + self._recommendation = None + """ Primitive extension for recommendation. List of `FHIRPrimitiveExtension` """ super(ImmunizationRecommendation, self).__init__(jsondict=jsondict, strict=strict) @@ -47,10 +57,15 @@ def elementProperties(self): js = super(ImmunizationRecommendation, self).elementProperties() js.extend([ ("authority", "authority", fhirreference.FHIRReference, False, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recommendation", "recommendation", ImmunizationRecommendationRecommendation, True, None, True), + ("_recommendation", "_recommendation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -74,58 +89,86 @@ def __init__(self, jsondict=None, strict=True): self.contraindicatedVaccineCode = None """ Vaccine which is contraindicated to fulfill the recommendation. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._contraindicatedVaccineCode = None + """ Primitive extension for contraindicatedVaccineCode. List of `FHIRPrimitiveExtension` """ self.dateCriterion = None """ Dates governing proposed immunization. List of `ImmunizationRecommendationRecommendationDateCriterion` items (represented as `dict` in JSON). """ + self._dateCriterion = None + """ Primitive extension for dateCriterion. List of `FHIRPrimitiveExtension` """ self.description = None """ Protocol details. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.doseNumberPositiveInt = None """ Recommended dose number within series. Type `int`. """ + self._doseNumberPositiveInt = None + """ Primitive extension for doseNumberPositiveInt. Type `FHIRPrimitiveExtension` """ self.doseNumberString = None """ Recommended dose number within series. Type `str`. """ + self._doseNumberString = None + """ Primitive extension for doseNumberString. Type `FHIRPrimitiveExtension` """ self.forecastReason = None """ Vaccine administration status reason. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._forecastReason = None + """ Primitive extension for forecastReason. List of `FHIRPrimitiveExtension` """ self.forecastStatus = None """ Vaccine recommendation status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._forecastStatus = None + """ Primitive extension for forecastStatus. Type `FHIRPrimitiveExtension` """ self.series = None """ Name of vaccination series. Type `str`. """ + self._series = None + """ Primitive extension for series. Type `FHIRPrimitiveExtension` """ self.seriesDosesPositiveInt = None """ Recommended number of doses for immunity. Type `int`. """ + self._seriesDosesPositiveInt = None + """ Primitive extension for seriesDosesPositiveInt. Type `FHIRPrimitiveExtension` """ self.seriesDosesString = None """ Recommended number of doses for immunity. Type `str`. """ + self._seriesDosesString = None + """ Primitive extension for seriesDosesString. Type `FHIRPrimitiveExtension` """ self.supportingImmunization = None """ Past immunizations supporting recommendation. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingImmunization = None + """ Primitive extension for supportingImmunization. List of `FHIRPrimitiveExtension` """ self.supportingPatientInformation = None """ Patient observations supporting recommendation. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingPatientInformation = None + """ Primitive extension for supportingPatientInformation. List of `FHIRPrimitiveExtension` """ self.targetDisease = None """ Disease to be immunized against. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._targetDisease = None + """ Primitive extension for targetDisease. Type `FHIRPrimitiveExtension` """ self.vaccineCode = None """ Vaccine or vaccine group recommendation applies to. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._vaccineCode = None + """ Primitive extension for vaccineCode. List of `FHIRPrimitiveExtension` """ super(ImmunizationRecommendationRecommendation, self).__init__(jsondict=jsondict, strict=strict) @@ -133,19 +176,33 @@ def elementProperties(self): js = super(ImmunizationRecommendationRecommendation, self).elementProperties() js.extend([ ("contraindicatedVaccineCode", "contraindicatedVaccineCode", codeableconcept.CodeableConcept, True, None, False), + ("_contraindicatedVaccineCode", "_contraindicatedVaccineCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dateCriterion", "dateCriterion", ImmunizationRecommendationRecommendationDateCriterion, True, None, False), + ("_dateCriterion", "_dateCriterion", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberPositiveInt", "doseNumberPositiveInt", int, False, "doseNumber", False), + ("_doseNumberPositiveInt", "_doseNumberPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doseNumberString", "doseNumberString", str, False, "doseNumber", False), + ("_doseNumberString", "_doseNumberString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("forecastReason", "forecastReason", codeableconcept.CodeableConcept, True, None, False), + ("_forecastReason", "_forecastReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("forecastStatus", "forecastStatus", codeableconcept.CodeableConcept, False, None, True), + ("_forecastStatus", "_forecastStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("series", "series", str, False, None, False), + ("_series", "_series", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesPositiveInt", "seriesDosesPositiveInt", int, False, "seriesDoses", False), + ("_seriesDosesPositiveInt", "_seriesDosesPositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("seriesDosesString", "seriesDosesString", str, False, "seriesDoses", False), + ("_seriesDosesString", "_seriesDosesString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingImmunization", "supportingImmunization", fhirreference.FHIRReference, True, None, False), + ("_supportingImmunization", "_supportingImmunization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("supportingPatientInformation", "supportingPatientInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingPatientInformation", "_supportingPatientInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("targetDisease", "targetDisease", codeableconcept.CodeableConcept, False, None, False), + ("_targetDisease", "_targetDisease", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("vaccineCode", "vaccineCode", codeableconcept.CodeableConcept, True, None, False), + ("_vaccineCode", "_vaccineCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -170,10 +227,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Type of date. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.value = None """ Recommended date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ImmunizationRecommendationRecommendationDateCriterion, self).__init__(jsondict=jsondict, strict=strict) @@ -181,12 +242,15 @@ def elementProperties(self): js = super(ImmunizationRecommendationRecommendationDateCriterion, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", fhirdatetime.FHIRDateTime, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/implementationguide.py b/fhirclient/models/implementationguide.py index 6494b1f1..64076286 100644 --- a/fhirclient/models/implementationguide.py +++ b/fhirclient/models/implementationguide.py @@ -26,83 +26,123 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.definition = None """ Information needed to build the IG. Type `ImplementationGuideDefinition` (represented as `dict` in JSON). """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.dependsOn = None """ Another Implementation guide this depends on. List of `ImplementationGuideDependsOn` items (represented as `dict` in JSON). """ + self._dependsOn = None + """ Primitive extension for dependsOn. List of `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the implementation guide. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.fhirVersion = None """ FHIR Version(s) this Implementation Guide targets. List of `str` items. """ + self._fhirVersion = None + """ Primitive extension for fhirVersion. List of `FHIRPrimitiveExtension` """ self.global_fhir = None """ Profiles that apply globally. List of `ImplementationGuideGlobal` items (represented as `dict` in JSON). """ + self._global_fhir = None + """ Primitive extension for global_fhir. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for implementation guide (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.license = None """ SPDX license code for this IG (or not-open-source). Type `str`. """ + self._license = None + """ Primitive extension for license. Type `FHIRPrimitiveExtension` """ self.manifest = None """ Information about an assembled IG. Type `ImplementationGuideManifest` (represented as `dict` in JSON). """ + self._manifest = None + """ Primitive extension for manifest. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this implementation guide (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.packageId = None """ NPM Package name for IG. Type `str`. """ + self._packageId = None + """ Primitive extension for packageId. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this implementation guide (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this implementation guide, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the implementation guide. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ImplementationGuide, self).__init__(jsondict=jsondict, strict=strict) @@ -110,25 +150,45 @@ def elementProperties(self): js = super(ImplementationGuide, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definition", "definition", ImplementationGuideDefinition, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dependsOn", "dependsOn", ImplementationGuideDependsOn, True, None, False), + ("_dependsOn", "_dependsOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fhirVersion", "fhirVersion", str, True, None, True), + ("_fhirVersion", "_fhirVersion", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("global_fhir", "global", ImplementationGuideGlobal, True, None, False), + ("_global_fhir", "_global_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("license", "license", str, False, None, False), + ("_license", "_license", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manifest", "manifest", ImplementationGuideManifest, False, None, False), + ("_manifest", "_manifest", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("packageId", "packageId", str, False, None, True), + ("_packageId", "_packageId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -155,22 +215,32 @@ def __init__(self, jsondict=None, strict=True): self.grouping = None """ Grouping used to present related resources in the IG. List of `ImplementationGuideDefinitionGrouping` items (represented as `dict` in JSON). """ + self._grouping = None + """ Primitive extension for grouping. List of `FHIRPrimitiveExtension` """ self.page = None """ Page/Section in the Guide. Type `ImplementationGuideDefinitionPage` (represented as `dict` in JSON). """ + self._page = None + """ Primitive extension for page. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Defines how IG is built by tools. List of `ImplementationGuideDefinitionParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.resource = None """ Resource in the implementation guide. List of `ImplementationGuideDefinitionResource` items (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. List of `FHIRPrimitiveExtension` """ self.template = None """ A template for building resources. List of `ImplementationGuideDefinitionTemplate` items (represented as `dict` in JSON). """ + self._template = None + """ Primitive extension for template. List of `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -178,10 +248,15 @@ def elementProperties(self): js = super(ImplementationGuideDefinition, self).elementProperties() js.extend([ ("grouping", "grouping", ImplementationGuideDefinitionGrouping, True, None, False), + ("_grouping", "_grouping", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("page", "page", ImplementationGuideDefinitionPage, False, None, False), + ("_page", "_page", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", ImplementationGuideDefinitionParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resource", "resource", ImplementationGuideDefinitionResource, True, None, True), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("template", "template", ImplementationGuideDefinitionTemplate, True, None, False), + ("_template", "_template", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -206,10 +281,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Human readable text describing the package. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ Descriptive name for the package. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinitionGrouping, self).__init__(jsondict=jsondict, strict=strict) @@ -217,7 +296,9 @@ def elementProperties(self): js = super(ImplementationGuideDefinitionGrouping, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -242,22 +323,32 @@ def __init__(self, jsondict=None, strict=True): self.generation = None """ html | markdown | xml | generated. Type `str`. """ + self._generation = None + """ Primitive extension for generation. Type `FHIRPrimitiveExtension` """ self.nameReference = None """ Where to find that page. Type `FHIRReference` (represented as `dict` in JSON). """ + self._nameReference = None + """ Primitive extension for nameReference. Type `FHIRPrimitiveExtension` """ self.nameUrl = None """ Where to find that page. Type `str`. """ + self._nameUrl = None + """ Primitive extension for nameUrl. Type `FHIRPrimitiveExtension` """ self.page = None """ Nested Pages / Sections. List of `ImplementationGuideDefinitionPage` items (represented as `dict` in JSON). """ + self._page = None + """ Primitive extension for page. List of `FHIRPrimitiveExtension` """ self.title = None """ Short title shown for navigational assistance. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinitionPage, self).__init__(jsondict=jsondict, strict=strict) @@ -265,10 +356,15 @@ def elementProperties(self): js = super(ImplementationGuideDefinitionPage, self).elementProperties() js.extend([ ("generation", "generation", str, False, None, True), + ("_generation", "_generation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nameReference", "nameReference", fhirreference.FHIRReference, False, "name", True), + ("_nameReference", "_nameReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nameUrl", "nameUrl", str, False, "name", True), + ("_nameUrl", "_nameUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("page", "page", ImplementationGuideDefinitionPage, True, None, False), + ("_page", "_page", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, True), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -292,10 +388,14 @@ def __init__(self, jsondict=None, strict=True): parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.value = None """ Value for named type. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinitionParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -303,7 +403,9 @@ def elementProperties(self): js = super(ImplementationGuideDefinitionParameter, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -330,30 +432,44 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Reason why included in guide. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.exampleBoolean = None """ Is an example/What is this an example of?. Type `bool`. """ + self._exampleBoolean = None + """ Primitive extension for exampleBoolean. Type `FHIRPrimitiveExtension` """ self.exampleCanonical = None """ Is an example/What is this an example of?. Type `str`. """ + self._exampleCanonical = None + """ Primitive extension for exampleCanonical. Type `FHIRPrimitiveExtension` """ self.fhirVersion = None """ Versions this applies to (if different to IG). List of `str` items. """ + self._fhirVersion = None + """ Primitive extension for fhirVersion. List of `FHIRPrimitiveExtension` """ self.groupingId = None """ Grouping this is part of. Type `str`. """ + self._groupingId = None + """ Primitive extension for groupingId. Type `FHIRPrimitiveExtension` """ self.name = None """ Human Name for the resource. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.reference = None """ Location of the resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinitionResource, self).__init__(jsondict=jsondict, strict=strict) @@ -361,12 +477,19 @@ def elementProperties(self): js = super(ImplementationGuideDefinitionResource, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exampleBoolean", "exampleBoolean", bool, False, "example", False), + ("_exampleBoolean", "_exampleBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exampleCanonical", "exampleCanonical", str, False, "example", False), + ("_exampleCanonical", "_exampleCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fhirVersion", "fhirVersion", str, True, None, False), + ("_fhirVersion", "_fhirVersion", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("groupingId", "groupingId", str, False, None, False), + ("_groupingId", "_groupingId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", fhirreference.FHIRReference, False, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -388,14 +511,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Type of template specified. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.scope = None """ The scope in which the template applies. Type `str`. """ + self._scope = None + """ Primitive extension for scope. Type `FHIRPrimitiveExtension` """ self.source = None """ The source location for the template. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDefinitionTemplate, self).__init__(jsondict=jsondict, strict=strict) @@ -403,8 +532,11 @@ def elementProperties(self): js = super(ImplementationGuideDefinitionTemplate, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scope", "scope", str, False, None, False), + ("_scope", "_scope", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", str, False, None, True), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -430,14 +562,20 @@ def __init__(self, jsondict=None, strict=True): self.packageId = None """ NPM Package name for IG this depends on. Type `str`. """ + self._packageId = None + """ Primitive extension for packageId. Type `FHIRPrimitiveExtension` """ self.uri = None """ Identity of the IG that this depends on. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ self.version = None """ Version of the IG. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideDependsOn, self).__init__(jsondict=jsondict, strict=strict) @@ -445,8 +583,11 @@ def elementProperties(self): js = super(ImplementationGuideDependsOn, self).elementProperties() js.extend([ ("packageId", "packageId", str, False, None, False), + ("_packageId", "_packageId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, True), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -471,10 +612,14 @@ def __init__(self, jsondict=None, strict=True): self.profile = None """ Profile that all resources must conform to. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.type = None """ Type this profile applies to. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideGlobal, self).__init__(jsondict=jsondict, strict=strict) @@ -482,7 +627,9 @@ def elementProperties(self): js = super(ImplementationGuideGlobal, self).elementProperties() js.extend([ ("profile", "profile", str, False, None, True), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -507,22 +654,32 @@ def __init__(self, jsondict=None, strict=True): self.image = None """ Image within the IG. List of `str` items. """ + self._image = None + """ Primitive extension for image. List of `FHIRPrimitiveExtension` """ self.other = None """ Additional linkable file in IG. List of `str` items. """ + self._other = None + """ Primitive extension for other. List of `FHIRPrimitiveExtension` """ self.page = None """ HTML page within the parent IG. List of `ImplementationGuideManifestPage` items (represented as `dict` in JSON). """ + self._page = None + """ Primitive extension for page. List of `FHIRPrimitiveExtension` """ self.rendering = None """ Location of rendered implementation guide. Type `str`. """ + self._rendering = None + """ Primitive extension for rendering. Type `FHIRPrimitiveExtension` """ self.resource = None """ Resource in the implementation guide. List of `ImplementationGuideManifestResource` items (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. List of `FHIRPrimitiveExtension` """ super(ImplementationGuideManifest, self).__init__(jsondict=jsondict, strict=strict) @@ -530,10 +687,15 @@ def elementProperties(self): js = super(ImplementationGuideManifest, self).elementProperties() js.extend([ ("image", "image", str, True, None, False), + ("_image", "_image", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("other", "other", str, True, None, False), + ("_other", "_other", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("page", "page", ImplementationGuideManifestPage, True, None, False), + ("_page", "_page", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rendering", "rendering", str, False, None, False), + ("_rendering", "_rendering", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", ImplementationGuideManifestResource, True, None, True), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -557,14 +719,20 @@ def __init__(self, jsondict=None, strict=True): self.anchor = None """ Anchor available on the page. List of `str` items. """ + self._anchor = None + """ Primitive extension for anchor. List of `FHIRPrimitiveExtension` """ self.name = None """ HTML page name. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.title = None """ Title of the page, for references. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideManifestPage, self).__init__(jsondict=jsondict, strict=strict) @@ -572,8 +740,11 @@ def elementProperties(self): js = super(ImplementationGuideManifestPage, self).elementProperties() js.extend([ ("anchor", "anchor", str, True, None, False), + ("_anchor", "_anchor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -600,18 +771,26 @@ def __init__(self, jsondict=None, strict=True): self.exampleBoolean = None """ Is an example/What is this an example of?. Type `bool`. """ + self._exampleBoolean = None + """ Primitive extension for exampleBoolean. Type `FHIRPrimitiveExtension` """ self.exampleCanonical = None """ Is an example/What is this an example of?. Type `str`. """ + self._exampleCanonical = None + """ Primitive extension for exampleCanonical. Type `FHIRPrimitiveExtension` """ self.reference = None """ Location of the resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.relativePath = None """ Relative path for page in IG. Type `str`. """ + self._relativePath = None + """ Primitive extension for relativePath. Type `FHIRPrimitiveExtension` """ super(ImplementationGuideManifestResource, self).__init__(jsondict=jsondict, strict=strict) @@ -619,15 +798,20 @@ def elementProperties(self): js = super(ImplementationGuideManifestResource, self).elementProperties() js.extend([ ("exampleBoolean", "exampleBoolean", bool, False, "example", False), + ("_exampleBoolean", "_exampleBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exampleCanonical", "exampleCanonical", str, False, "example", False), + ("_exampleCanonical", "_exampleCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", fhirreference.FHIRReference, False, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relativePath", "relativePath", str, False, None, False), + ("_relativePath", "_relativePath", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime from . import fhirreference -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/insuranceplan.py b/fhirclient/models/insuranceplan.py index d812ab7b..e07232f3 100644 --- a/fhirclient/models/insuranceplan.py +++ b/fhirclient/models/insuranceplan.py @@ -21,58 +21,86 @@ def __init__(self, jsondict=None, strict=True): self.administeredBy = None """ Product administrator. Type `FHIRReference` (represented as `dict` in JSON). """ + self._administeredBy = None + """ Primitive extension for administeredBy. Type `FHIRPrimitiveExtension` """ self.alias = None """ Alternate names. List of `str` items. """ + self._alias = None + """ Primitive extension for alias. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact for the product. List of `InsurancePlanContact` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.coverage = None """ Coverage details. List of `InsurancePlanCoverage` items (represented as `dict` in JSON). """ + self._coverage = None + """ Primitive extension for coverage. List of `FHIRPrimitiveExtension` """ self.coverageArea = None """ Where product applies. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._coverageArea = None + """ Primitive extension for coverageArea. List of `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoint. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for Product. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.name = None """ Official name. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.network = None """ What networks are Included. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. List of `FHIRPrimitiveExtension` """ self.ownedBy = None """ Plan issuer. Type `FHIRReference` (represented as `dict` in JSON). """ + self._ownedBy = None + """ Primitive extension for ownedBy. Type `FHIRPrimitiveExtension` """ self.period = None """ When the product is available. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.plan = None """ Plan details. List of `InsurancePlanPlan` items (represented as `dict` in JSON). """ + self._plan = None + """ Primitive extension for plan. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of product. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(InsurancePlan, self).__init__(jsondict=jsondict, strict=strict) @@ -80,19 +108,33 @@ def elementProperties(self): js = super(InsurancePlan, self).elementProperties() js.extend([ ("administeredBy", "administeredBy", fhirreference.FHIRReference, False, None, False), + ("_administeredBy", "_administeredBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("alias", "alias", str, True, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", InsurancePlanContact, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("coverage", "coverage", InsurancePlanCoverage, True, None, False), + ("_coverage", "_coverage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("coverageArea", "coverageArea", fhirreference.FHIRReference, True, None, False), + ("_coverageArea", "_coverageArea", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("network", "network", fhirreference.FHIRReference, True, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ownedBy", "ownedBy", fhirreference.FHIRReference, False, None, False), + ("_ownedBy", "_ownedBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("plan", "plan", InsurancePlanPlan, True, None, False), + ("_plan", "_plan", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -118,18 +160,26 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Visiting or postal addresses for the contact. Type `Address` (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the contact. Type `HumanName` (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.purpose = None """ The type of contact. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details (telephone, email, etc.) for a contact. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(InsurancePlanContact, self).__init__(jsondict=jsondict, strict=strict) @@ -137,9 +187,13 @@ def elementProperties(self): js = super(InsurancePlanContact, self).elementProperties() js.extend([ ("address", "address", address.Address, False, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", humanname.HumanName, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", codeableconcept.CodeableConcept, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -163,14 +217,20 @@ def __init__(self, jsondict=None, strict=True): self.benefit = None """ List of benefits. List of `InsurancePlanCoverageBenefit` items (represented as `dict` in JSON). """ + self._benefit = None + """ Primitive extension for benefit. List of `FHIRPrimitiveExtension` """ self.network = None """ What networks provide coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of coverage. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InsurancePlanCoverage, self).__init__(jsondict=jsondict, strict=strict) @@ -178,8 +238,11 @@ def elementProperties(self): js = super(InsurancePlanCoverage, self).elementProperties() js.extend([ ("benefit", "benefit", InsurancePlanCoverageBenefit, True, None, True), + ("_benefit", "_benefit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("network", "network", fhirreference.FHIRReference, True, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -203,14 +266,20 @@ def __init__(self, jsondict=None, strict=True): self.limit = None """ Benefit limits. List of `InsurancePlanCoverageBenefitLimit` items (represented as `dict` in JSON). """ + self._limit = None + """ Primitive extension for limit. List of `FHIRPrimitiveExtension` """ self.requirement = None """ Referral requirements. Type `str`. """ + self._requirement = None + """ Primitive extension for requirement. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of benefit. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InsurancePlanCoverageBenefit, self).__init__(jsondict=jsondict, strict=strict) @@ -218,8 +287,11 @@ def elementProperties(self): js = super(InsurancePlanCoverageBenefit, self).elementProperties() js.extend([ ("limit", "limit", InsurancePlanCoverageBenefitLimit, True, None, False), + ("_limit", "_limit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requirement", "requirement", str, False, None, False), + ("_requirement", "_requirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -243,10 +315,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Benefit limit details. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.value = None """ Maximum value allowed. Type `Quantity` (represented as `dict` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(InsurancePlanCoverageBenefitLimit, self).__init__(jsondict=jsondict, strict=strict) @@ -254,7 +330,9 @@ def elementProperties(self): js = super(InsurancePlanCoverageBenefitLimit, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", quantity.Quantity, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -278,26 +356,38 @@ def __init__(self, jsondict=None, strict=True): self.coverageArea = None """ Where product applies. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._coverageArea = None + """ Primitive extension for coverageArea. List of `FHIRPrimitiveExtension` """ self.generalCost = None """ Overall costs. List of `InsurancePlanPlanGeneralCost` items (represented as `dict` in JSON). """ + self._generalCost = None + """ Primitive extension for generalCost. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for Product. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.network = None """ What networks provide coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. List of `FHIRPrimitiveExtension` """ self.specificCost = None """ Specific costs. List of `InsurancePlanPlanSpecificCost` items (represented as `dict` in JSON). """ + self._specificCost = None + """ Primitive extension for specificCost. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of plan. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InsurancePlanPlan, self).__init__(jsondict=jsondict, strict=strict) @@ -305,11 +395,17 @@ def elementProperties(self): js = super(InsurancePlanPlan, self).elementProperties() js.extend([ ("coverageArea", "coverageArea", fhirreference.FHIRReference, True, None, False), + ("_coverageArea", "_coverageArea", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("generalCost", "generalCost", InsurancePlanPlanGeneralCost, True, None, False), + ("_generalCost", "_generalCost", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("network", "network", fhirreference.FHIRReference, True, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specificCost", "specificCost", InsurancePlanPlanSpecificCost, True, None, False), + ("_specificCost", "_specificCost", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -333,18 +429,26 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Additional cost information. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.cost = None """ Cost value. Type `Money` (represented as `dict` in JSON). """ + self._cost = None + """ Primitive extension for cost. Type `FHIRPrimitiveExtension` """ self.groupSize = None """ Number of enrollees. Type `int`. """ + self._groupSize = None + """ Primitive extension for groupSize. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of cost. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InsurancePlanPlanGeneralCost, self).__init__(jsondict=jsondict, strict=strict) @@ -352,9 +456,13 @@ def elementProperties(self): js = super(InsurancePlanPlanGeneralCost, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("cost", "cost", money.Money, False, None, False), + ("_cost", "_cost", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupSize", "groupSize", int, False, None, False), + ("_groupSize", "_groupSize", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -378,10 +486,14 @@ def __init__(self, jsondict=None, strict=True): self.benefit = None """ Benefits list. List of `InsurancePlanPlanSpecificCostBenefit` items (represented as `dict` in JSON). """ + self._benefit = None + """ Primitive extension for benefit. List of `FHIRPrimitiveExtension` """ self.category = None """ General category of benefit. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ super(InsurancePlanPlanSpecificCost, self).__init__(jsondict=jsondict, strict=strict) @@ -389,7 +501,9 @@ def elementProperties(self): js = super(InsurancePlanPlanSpecificCost, self).elementProperties() js.extend([ ("benefit", "benefit", InsurancePlanPlanSpecificCostBenefit, True, None, False), + ("_benefit", "_benefit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, True), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -413,10 +527,14 @@ def __init__(self, jsondict=None, strict=True): self.cost = None """ List of the costs. List of `InsurancePlanPlanSpecificCostBenefitCost` items (represented as `dict` in JSON). """ + self._cost = None + """ Primitive extension for cost. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of specific benefit. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InsurancePlanPlanSpecificCostBenefit, self).__init__(jsondict=jsondict, strict=strict) @@ -424,7 +542,9 @@ def elementProperties(self): js = super(InsurancePlanPlanSpecificCostBenefit, self).elementProperties() js.extend([ ("cost", "cost", InsurancePlanPlanSpecificCostBenefitCost, True, None, False), + ("_cost", "_cost", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -448,18 +568,26 @@ def __init__(self, jsondict=None, strict=True): self.applicability = None """ in-network | out-of-network | other. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._applicability = None + """ Primitive extension for applicability. Type `FHIRPrimitiveExtension` """ self.qualifiers = None """ Additional information about the cost. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._qualifiers = None + """ Primitive extension for qualifiers. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of cost. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.value = None """ The actual cost value. Type `Quantity` (represented as `dict` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(InsurancePlanPlanSpecificCostBenefitCost, self).__init__(jsondict=jsondict, strict=strict) @@ -467,12 +595,17 @@ def elementProperties(self): js = super(InsurancePlanPlanSpecificCostBenefitCost, self).elementProperties() js.extend([ ("applicability", "applicability", codeableconcept.CodeableConcept, False, None, False), + ("_applicability", "_applicability", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("qualifiers", "qualifiers", codeableconcept.CodeableConcept, True, None, False), + ("_qualifiers", "_qualifiers", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", quantity.Quantity, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import codeableconcept @@ -482,4 +615,4 @@ def elementProperties(self): from . import identifier from . import money from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/invoice.py b/fhirclient/models/invoice.py index 24807fa8..f64eb228 100644 --- a/fhirclient/models/invoice.py +++ b/fhirclient/models/invoice.py @@ -24,66 +24,98 @@ def __init__(self, jsondict=None, strict=True): self.account = None """ Account that is being balanced. Type `FHIRReference` (represented as `dict` in JSON). """ + self._account = None + """ Primitive extension for account. Type `FHIRPrimitiveExtension` """ self.cancelledReason = None """ Reason for cancellation of this Invoice. Type `str`. """ + self._cancelledReason = None + """ Primitive extension for cancelledReason. Type `FHIRPrimitiveExtension` """ self.date = None """ Invoice date / posting date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.issuer = None """ Issuing Organization of Invoice. Type `FHIRReference` (represented as `dict` in JSON). """ + self._issuer = None + """ Primitive extension for issuer. Type `FHIRPrimitiveExtension` """ self.lineItem = None """ Line items of this Invoice. List of `InvoiceLineItem` items (represented as `dict` in JSON). """ + self._lineItem = None + """ Primitive extension for lineItem. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the invoice. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.participant = None """ Participant in creation of this Invoice. List of `InvoiceParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.paymentTerms = None """ Payment details. Type `str`. """ + self._paymentTerms = None + """ Primitive extension for paymentTerms. Type `FHIRPrimitiveExtension` """ self.recipient = None """ Recipient of this invoice. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | issued | balanced | cancelled | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Recipient(s) of goods and services. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.totalGross = None """ Gross total of this Invoice. Type `Money` (represented as `dict` in JSON). """ + self._totalGross = None + """ Primitive extension for totalGross. Type `FHIRPrimitiveExtension` """ self.totalNet = None """ Net total of this Invoice. Type `Money` (represented as `dict` in JSON). """ + self._totalNet = None + """ Primitive extension for totalNet. Type `FHIRPrimitiveExtension` """ self.totalPriceComponent = None """ Components of Invoice total. List of `InvoiceLineItemPriceComponent` items (represented as `dict` in JSON). """ + self._totalPriceComponent = None + """ Primitive extension for totalPriceComponent. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of Invoice. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Invoice, self).__init__(jsondict=jsondict, strict=strict) @@ -91,21 +123,37 @@ def elementProperties(self): js = super(Invoice, self).elementProperties() js.extend([ ("account", "account", fhirreference.FHIRReference, False, None, False), + ("_account", "_account", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("cancelledReason", "cancelledReason", str, False, None, False), + ("_cancelledReason", "_cancelledReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("issuer", "issuer", fhirreference.FHIRReference, False, None, False), + ("_issuer", "_issuer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lineItem", "lineItem", InvoiceLineItem, True, None, False), + ("_lineItem", "_lineItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("participant", "participant", InvoiceParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("paymentTerms", "paymentTerms", str, False, None, False), + ("_paymentTerms", "_paymentTerms", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, False, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("totalGross", "totalGross", money.Money, False, None, False), + ("_totalGross", "_totalGross", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("totalNet", "totalNet", money.Money, False, None, False), + ("_totalNet", "_totalNet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("totalPriceComponent", "totalPriceComponent", InvoiceLineItemPriceComponent, True, None, False), + ("_totalPriceComponent", "_totalPriceComponent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -134,19 +182,27 @@ def __init__(self, jsondict=None, strict=True): """ Reference to ChargeItem containing details of this line item or an inline billing code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._chargeItemCodeableConcept = None + """ Primitive extension for chargeItemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.chargeItemReference = None """ Reference to ChargeItem containing details of this line item or an inline billing code. Type `FHIRReference` (represented as `dict` in JSON). """ + self._chargeItemReference = None + """ Primitive extension for chargeItemReference. Type `FHIRPrimitiveExtension` """ self.priceComponent = None """ Components of total line item price. List of `InvoiceLineItemPriceComponent` items (represented as `dict` in JSON). """ + self._priceComponent = None + """ Primitive extension for priceComponent. List of `FHIRPrimitiveExtension` """ self.sequence = None """ Sequence number of line item. Type `int`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ super(InvoiceLineItem, self).__init__(jsondict=jsondict, strict=strict) @@ -154,9 +210,13 @@ def elementProperties(self): js = super(InvoiceLineItem, self).elementProperties() js.extend([ ("chargeItemCodeableConcept", "chargeItemCodeableConcept", codeableconcept.CodeableConcept, False, "chargeItem", True), + ("_chargeItemCodeableConcept", "_chargeItemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("chargeItemReference", "chargeItemReference", fhirreference.FHIRReference, False, "chargeItem", True), + ("_chargeItemReference", "_chargeItemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priceComponent", "priceComponent", InvoiceLineItemPriceComponent, True, None, False), + ("_priceComponent", "_priceComponent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sequence", "sequence", int, False, None, False), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -185,18 +245,26 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Monetary amount associated with this component. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.code = None """ Code identifying the specific component. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.factor = None """ Factor used for calculating this component. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.type = None """ base | surcharge | deduction | discount | tax | informational. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(InvoiceLineItemPriceComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -204,9 +272,13 @@ def elementProperties(self): js = super(InvoiceLineItemPriceComponent, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -230,10 +302,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Individual who was involved. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.role = None """ Type of involvement in creation of this Invoice. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ super(InvoiceParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -241,14 +317,17 @@ def elementProperties(self): js = super(InvoiceParticipant, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import money +from . import money \ No newline at end of file diff --git a/fhirclient/models/library.py b/fhirclient/models/library.py index 5222195a..4d610c5c 100644 --- a/fhirclient/models/library.py +++ b/fhirclient/models/library.py @@ -26,132 +26,196 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the library was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.content = None """ Contents of the library, either embedded or referenced. List of `Attachment` items (represented as `dict` in JSON). """ + self._content = None + """ Primitive extension for content. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.dataRequirement = None """ What data is referenced by this library. List of `DataRequirement` items (represented as `dict` in JSON). """ + self._dataRequirement = None + """ Primitive extension for dataRequirement. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the library. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the library is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the library. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for library (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the library was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this library (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Parameters defined by the library. List of `ParameterDefinition` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this library is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ Type of individual the library content is focused on. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ Type of individual the library content is focused on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the library. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this library (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ E.g. Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.type = None """ logic-library | model-definition | asset-collection | module- definition. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this library, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the library. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the library. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Library, self).__init__(jsondict=jsondict, strict=strict) @@ -159,40 +223,73 @@ def elementProperties(self): js = super(Library, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("content", "content", attachment.Attachment, True, None, False), + ("_content", "_content", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dataRequirement", "dataRequirement", datarequirement.DataRequirement, True, None, False), + ("_dataRequirement", "_dataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", parameterdefinition.ParameterDefinition, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -205,4 +302,4 @@ def elementProperties(self): from . import parameterdefinition from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/linkage.py b/fhirclient/models/linkage.py index 6145f4bd..b8d3cc54 100644 --- a/fhirclient/models/linkage.py +++ b/fhirclient/models/linkage.py @@ -24,14 +24,20 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this linkage assertion is active or not. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.author = None """ Who is responsible for linkages. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.item = None """ Item to be linked. List of `LinkageItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ super(Linkage, self).__init__(jsondict=jsondict, strict=strict) @@ -39,8 +45,11 @@ def elementProperties(self): js = super(Linkage, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", LinkageItem, True, None, True), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -68,10 +77,14 @@ def __init__(self, jsondict=None, strict=True): self.resource = None """ Resource being linked. Type `FHIRReference` (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.type = None """ source | alternate | historical. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(LinkageItem, self).__init__(jsondict=jsondict, strict=strict) @@ -79,9 +92,12 @@ def elementProperties(self): js = super(LinkageItem, self).elementProperties() js.extend([ ("resource", "resource", fhirreference.FHIRReference, False, None, True), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/list.py b/fhirclient/models/list.py index 8712a4f6..53352c5c 100644 --- a/fhirclient/models/list.py +++ b/fhirclient/models/list.py @@ -21,54 +21,80 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ What the purpose of this list is. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.date = None """ When the list was prepared. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.emptyReason = None """ Why list is empty. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._emptyReason = None + """ Primitive extension for emptyReason. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Context in which list created. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.entry = None """ Entries in the list. List of `ListEntry` items (represented as `dict` in JSON). """ + self._entry = None + """ Primitive extension for entry. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.mode = None """ working | snapshot | changes. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments about the list. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.orderedBy = None """ What order the list has. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._orderedBy = None + """ Primitive extension for orderedBy. Type `FHIRPrimitiveExtension` """ self.source = None """ Who and/or what defined the list contents (aka Author). Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.status = None """ current | retired | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ If all resources have the same subject. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.title = None """ Descriptive name for the list. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(List, self).__init__(jsondict=jsondict, strict=strict) @@ -76,18 +102,31 @@ def elementProperties(self): js = super(List, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("emptyReason", "emptyReason", codeableconcept.CodeableConcept, False, None, False), + ("_emptyReason", "_emptyReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("entry", "entry", ListEntry, True, None, False), + ("_entry", "_entry", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("orderedBy", "orderedBy", codeableconcept.CodeableConcept, False, None, False), + ("_orderedBy", "_orderedBy", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -113,18 +152,26 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When item added to list. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.deleted = None """ If this item is actually marked as deleted. Type `bool`. """ + self._deleted = None + """ Primitive extension for deleted. Type `FHIRPrimitiveExtension` """ self.flag = None """ Status/Workflow information about this item. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._flag = None + """ Primitive extension for flag. Type `FHIRPrimitiveExtension` """ self.item = None """ Actual entry. Type `FHIRReference` (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. Type `FHIRPrimitiveExtension` """ super(ListEntry, self).__init__(jsondict=jsondict, strict=strict) @@ -132,15 +179,20 @@ def elementProperties(self): js = super(ListEntry, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deleted", "deleted", bool, False, None, False), + ("_deleted", "_deleted", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("flag", "flag", codeableconcept.CodeableConcept, False, None, False), + ("_flag", "_flag", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", fhirreference.FHIRReference, False, None, True), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/location.py b/fhirclient/models/location.py index e0d49fbe..820c5af3 100644 --- a/fhirclient/models/location.py +++ b/fhirclient/models/location.py @@ -25,74 +25,108 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Physical location. Type `Address` (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.alias = None """ A list of alternate names that the location is known as, or was known as, in the past. List of `str` items. """ + self._alias = None + """ Primitive extension for alias. List of `FHIRPrimitiveExtension` """ self.availabilityExceptions = None """ Description of availability exceptions. Type `str`. """ + self._availabilityExceptions = None + """ Primitive extension for availabilityExceptions. Type `FHIRPrimitiveExtension` """ self.description = None """ Additional details about the location that could be displayed as further information to identify the location beyond its name. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoints providing access to services operated for the location. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.hoursOfOperation = None """ What days/times during a week is this location usually open. List of `LocationHoursOfOperation` items (represented as `dict` in JSON). """ + self._hoursOfOperation = None + """ Primitive extension for hoursOfOperation. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Unique code or number identifying the location to its users. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ Organization responsible for provisioning and upkeep. Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. Type `FHIRPrimitiveExtension` """ self.mode = None """ instance | kind. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.name = None """ Name of the location as used by humans. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.operationalStatus = None """ The operational status of the location (typically only for a bed/room). Type `Coding` (represented as `dict` in JSON). """ + self._operationalStatus = None + """ Primitive extension for operationalStatus. Type `FHIRPrimitiveExtension` """ self.partOf = None """ Another Location this one is physically a part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. Type `FHIRPrimitiveExtension` """ self.physicalType = None """ Physical form of the location. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._physicalType = None + """ Primitive extension for physicalType. Type `FHIRPrimitiveExtension` """ self.position = None """ The absolute geographic location. Type `LocationPosition` (represented as `dict` in JSON). """ + self._position = None + """ Primitive extension for position. Type `FHIRPrimitiveExtension` """ self.status = None """ active | suspended | inactive. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details of the location. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of function performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(Location, self).__init__(jsondict=jsondict, strict=strict) @@ -100,22 +134,39 @@ def elementProperties(self): js = super(Location, self).elementProperties() js.extend([ ("address", "address", address.Address, False, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("alias", "alias", str, True, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("availabilityExceptions", "availabilityExceptions", str, False, None, False), + ("_availabilityExceptions", "_availabilityExceptions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("hoursOfOperation", "hoursOfOperation", LocationHoursOfOperation, True, None, False), + ("_hoursOfOperation", "_hoursOfOperation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, False, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, False), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operationalStatus", "operationalStatus", coding.Coding, False, None, False), + ("_operationalStatus", "_operationalStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, False, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("physicalType", "physicalType", codeableconcept.CodeableConcept, False, None, False), + ("_physicalType", "_physicalType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("position", "position", LocationPosition, False, None, False), + ("_position", "_position", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -139,18 +190,26 @@ def __init__(self, jsondict=None, strict=True): self.allDay = None """ The Location is open all day. Type `bool`. """ + self._allDay = None + """ Primitive extension for allDay. Type `FHIRPrimitiveExtension` """ self.closingTime = None """ Time that the Location closes. Type `FHIRTime` (represented as `str` in JSON). """ + self._closingTime = None + """ Primitive extension for closingTime. Type `FHIRPrimitiveExtension` """ self.daysOfWeek = None """ mon | tue | wed | thu | fri | sat | sun. List of `str` items. """ + self._daysOfWeek = None + """ Primitive extension for daysOfWeek. List of `FHIRPrimitiveExtension` """ self.openingTime = None """ Time that the Location opens. Type `FHIRTime` (represented as `str` in JSON). """ + self._openingTime = None + """ Primitive extension for openingTime. Type `FHIRPrimitiveExtension` """ super(LocationHoursOfOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -158,9 +217,13 @@ def elementProperties(self): js = super(LocationHoursOfOperation, self).elementProperties() js.extend([ ("allDay", "allDay", bool, False, None, False), + ("_allDay", "_allDay", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("closingTime", "closingTime", fhirtime.FHIRTime, False, None, False), + ("_closingTime", "_closingTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("daysOfWeek", "daysOfWeek", str, True, None, False), + ("_daysOfWeek", "_daysOfWeek", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("openingTime", "openingTime", fhirtime.FHIRTime, False, None, False), + ("_openingTime", "_openingTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -185,14 +248,20 @@ def __init__(self, jsondict=None, strict=True): self.altitude = None """ Altitude with WGS84 datum. Type `float`. """ + self._altitude = None + """ Primitive extension for altitude. Type `FHIRPrimitiveExtension` """ self.latitude = None """ Latitude with WGS84 datum. Type `float`. """ + self._latitude = None + """ Primitive extension for latitude. Type `FHIRPrimitiveExtension` """ self.longitude = None """ Longitude with WGS84 datum. Type `float`. """ + self._longitude = None + """ Primitive extension for longitude. Type `FHIRPrimitiveExtension` """ super(LocationPosition, self).__init__(jsondict=jsondict, strict=strict) @@ -200,11 +269,15 @@ def elementProperties(self): js = super(LocationPosition, self).elementProperties() js.extend([ ("altitude", "altitude", float, False, None, False), + ("_altitude", "_altitude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("latitude", "latitude", float, False, None, True), + ("_latitude", "_latitude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("longitude", "longitude", float, False, None, True), + ("_longitude", "_longitude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import codeableconcept @@ -212,4 +285,4 @@ def elementProperties(self): from . import contactpoint from . import fhirreference from . import fhirtime -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/marketingstatus.py b/fhirclient/models/marketingstatus.py index c17f8643..3b3fa6f7 100644 --- a/fhirclient/models/marketingstatus.py +++ b/fhirclient/models/marketingstatus.py @@ -25,6 +25,8 @@ def __init__(self, jsondict=None, strict=True): shall be specified It should be specified using the ISO 3166 ‑ 1 alpha-2 code elements. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. Type `FHIRPrimitiveExtension` """ self.dateRange = None """ The date when the Medicinal Product is placed on the market by the @@ -35,6 +37,8 @@ def __init__(self, jsondict=None, strict=True): market” refers to the release of the Medicinal Product into the distribution chain. Type `Period` (represented as `dict` in JSON). """ + self._dateRange = None + """ Primitive extension for dateRange. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Where a Medicines Regulatory Agency has granted a marketing @@ -43,6 +47,8 @@ def __init__(self, jsondict=None, strict=True): controlled terminology The controlled term and the controlled term identifier shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. Type `FHIRPrimitiveExtension` """ self.restoreDate = None """ The date when the Medicinal Product is placed on the market by the @@ -53,12 +59,16 @@ def __init__(self, jsondict=None, strict=True): market” refers to the release of the Medicinal Product into the distribution chain. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._restoreDate = None + """ Primitive extension for restoreDate. Type `FHIRPrimitiveExtension` """ self.status = None """ This attribute provides information on the status of the marketing of the medicinal product See ISO/TS 20443 for more information and examples. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(MarketingStatus, self).__init__(jsondict=jsondict, strict=strict) @@ -66,14 +76,20 @@ def elementProperties(self): js = super(MarketingStatus, self).elementProperties() js.extend([ ("country", "country", codeableconcept.CodeableConcept, False, None, True), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dateRange", "dateRange", period.Period, False, None, True), + ("_dateRange", "_dateRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, False, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("restoreDate", "restoreDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_restoreDate", "_restoreDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/measure.py b/fhirclient/models/measure.py index 3bd687d9..ca66eebf 100644 --- a/fhirclient/models/measure.py +++ b/fhirclient/models/measure.py @@ -23,175 +23,259 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the measure was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.clinicalRecommendationStatement = None """ Summary of clinical guidelines. Type `str`. """ + self._clinicalRecommendationStatement = None + """ Primitive extension for clinicalRecommendationStatement. Type `FHIRPrimitiveExtension` """ self.compositeScoring = None """ opportunity | all-or-nothing | linear | weighted. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._compositeScoring = None + """ Primitive extension for compositeScoring. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.definition = None """ Defined terms used in the measure documentation. List of `str` items. """ + self._definition = None + """ Primitive extension for definition. List of `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the measure. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.disclaimer = None """ Disclaimer for use of the measure or its referenced content. Type `str`. """ + self._disclaimer = None + """ Primitive extension for disclaimer. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the measure is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.group = None """ Population criteria group. List of `MeasureGroup` items (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. List of `FHIRPrimitiveExtension` """ self.guidance = None """ Additional guidance for implementers. Type `str`. """ + self._guidance = None + """ Primitive extension for guidance. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the measure. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.improvementNotation = None """ increase | decrease. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._improvementNotation = None + """ Primitive extension for improvementNotation. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for measure (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the measure was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.library = None """ Logic used by the measure. List of `str` items. """ + self._library = None + """ Primitive extension for library. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this measure (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this measure is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.rateAggregation = None """ How is rate aggregation performed for this measure. Type `str`. """ + self._rateAggregation = None + """ Primitive extension for rateAggregation. Type `FHIRPrimitiveExtension` """ self.rationale = None """ Detailed description of why the measure exists. Type `str`. """ + self._rationale = None + """ Primitive extension for rationale. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.riskAdjustment = None """ How risk adjustment is applied for this measure. Type `str`. """ + self._riskAdjustment = None + """ Primitive extension for riskAdjustment. Type `FHIRPrimitiveExtension` """ self.scoring = None """ proportion | ratio | continuous-variable | cohort. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._scoring = None + """ Primitive extension for scoring. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the measure. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.supplementalData = None """ What other data should be reported with the measure. List of `MeasureSupplementalData` items (represented as `dict` in JSON). """ + self._supplementalData = None + """ Primitive extension for supplementalData. List of `FHIRPrimitiveExtension` """ self.title = None """ Name for this measure (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the measure, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.type = None """ process | outcome | structure | patient-reported-outcome | composite. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this measure, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the measure. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the measure. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Measure, self).__init__(jsondict=jsondict, strict=strict) @@ -199,47 +283,89 @@ def elementProperties(self): js = super(Measure, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("clinicalRecommendationStatement", "clinicalRecommendationStatement", str, False, None, False), + ("_clinicalRecommendationStatement", "_clinicalRecommendationStatement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("compositeScoring", "compositeScoring", codeableconcept.CodeableConcept, False, None, False), + ("_compositeScoring", "_compositeScoring", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definition", "definition", str, True, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("disclaimer", "disclaimer", str, False, None, False), + ("_disclaimer", "_disclaimer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("group", "group", MeasureGroup, True, None, False), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("guidance", "guidance", str, False, None, False), + ("_guidance", "_guidance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("improvementNotation", "improvementNotation", codeableconcept.CodeableConcept, False, None, False), + ("_improvementNotation", "_improvementNotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("library", "library", str, True, None, False), + ("_library", "_library", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateAggregation", "rateAggregation", str, False, None, False), + ("_rateAggregation", "_rateAggregation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rationale", "rationale", str, False, None, False), + ("_rationale", "_rationale", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("riskAdjustment", "riskAdjustment", str, False, None, False), + ("_riskAdjustment", "_riskAdjustment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scoring", "scoring", codeableconcept.CodeableConcept, False, None, False), + ("_scoring", "_scoring", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supplementalData", "supplementalData", MeasureSupplementalData, True, None, False), + ("_supplementalData", "_supplementalData", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -265,18 +391,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Meaning of the group. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ Summary description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.population = None """ Population criteria. List of `MeasureGroupPopulation` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.stratifier = None """ Stratifier criteria for the measure. List of `MeasureGroupStratifier` items (represented as `dict` in JSON). """ + self._stratifier = None + """ Primitive extension for stratifier. List of `FHIRPrimitiveExtension` """ super(MeasureGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -284,9 +418,13 @@ def elementProperties(self): js = super(MeasureGroup, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", MeasureGroupPopulation, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("stratifier", "stratifier", MeasureGroupStratifier, True, None, False), + ("_stratifier", "_stratifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -312,14 +450,20 @@ def __init__(self, jsondict=None, strict=True): | denominator-exclusion | denominator-exception | measure- population | measure-population-exclusion | measure-observation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.criteria = None """ The criteria that defines this population. Type `Expression` (represented as `dict` in JSON). """ + self._criteria = None + """ Primitive extension for criteria. Type `FHIRPrimitiveExtension` """ self.description = None """ The human readable description of this population criteria. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ super(MeasureGroupPopulation, self).__init__(jsondict=jsondict, strict=strict) @@ -327,8 +471,11 @@ def elementProperties(self): js = super(MeasureGroupPopulation, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("criteria", "criteria", expression.Expression, False, None, True), + ("_criteria", "_criteria", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -354,18 +501,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Meaning of the stratifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.component = None """ Stratifier criteria component for the measure. List of `MeasureGroupStratifierComponent` items (represented as `dict` in JSON). """ + self._component = None + """ Primitive extension for component. List of `FHIRPrimitiveExtension` """ self.criteria = None """ How the measure should be stratified. Type `Expression` (represented as `dict` in JSON). """ + self._criteria = None + """ Primitive extension for criteria. Type `FHIRPrimitiveExtension` """ self.description = None """ The human readable description of this stratifier. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ super(MeasureGroupStratifier, self).__init__(jsondict=jsondict, strict=strict) @@ -373,9 +528,13 @@ def elementProperties(self): js = super(MeasureGroupStratifier, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("component", "component", MeasureGroupStratifierComponent, True, None, False), + ("_component", "_component", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("criteria", "criteria", expression.Expression, False, None, False), + ("_criteria", "_criteria", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -401,14 +560,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Meaning of the stratifier component. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.criteria = None """ Component of how the measure should be stratified. Type `Expression` (represented as `dict` in JSON). """ + self._criteria = None + """ Primitive extension for criteria. Type `FHIRPrimitiveExtension` """ self.description = None """ The human readable description of this stratifier component. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ super(MeasureGroupStratifierComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -416,8 +581,11 @@ def elementProperties(self): js = super(MeasureGroupStratifierComponent, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("criteria", "criteria", expression.Expression, False, None, True), + ("_criteria", "_criteria", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -443,18 +611,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Meaning of the supplemental data. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.criteria = None """ Expression describing additional data to be reported. Type `Expression` (represented as `dict` in JSON). """ + self._criteria = None + """ Primitive extension for criteria. Type `FHIRPrimitiveExtension` """ self.description = None """ The human readable description of this supplemental data. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.usage = None """ supplemental-data | risk-adjustment-factor. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._usage = None + """ Primitive extension for usage. List of `FHIRPrimitiveExtension` """ super(MeasureSupplementalData, self).__init__(jsondict=jsondict, strict=strict) @@ -462,12 +638,17 @@ def elementProperties(self): js = super(MeasureSupplementalData, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("criteria", "criteria", expression.Expression, False, None, True), + ("_criteria", "_criteria", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", codeableconcept.CodeableConcept, True, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail @@ -478,4 +659,4 @@ def elementProperties(self): from . import identifier from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/measurereport.py b/fhirclient/models/measurereport.py index bba6144f..7bc85958 100644 --- a/fhirclient/models/measurereport.py +++ b/fhirclient/models/measurereport.py @@ -25,46 +25,68 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ When the report was generated. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.evaluatedResource = None """ What data was used to calculate the measure score. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._evaluatedResource = None + """ Primitive extension for evaluatedResource. List of `FHIRPrimitiveExtension` """ self.group = None """ Measure results for each group. List of `MeasureReportGroup` items (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the MeasureReport. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.improvementNotation = None """ increase | decrease. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._improvementNotation = None + """ Primitive extension for improvementNotation. Type `FHIRPrimitiveExtension` """ self.measure = None """ What measure was calculated. Type `str`. """ + self._measure = None + """ Primitive extension for measure. Type `FHIRPrimitiveExtension` """ self.period = None """ What period the report covers. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.reporter = None """ Who is reporting the data. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reporter = None + """ Primitive extension for reporter. Type `FHIRPrimitiveExtension` """ self.status = None """ complete | pending | error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ What individual(s) the report is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ individual | subject-list | summary | data-collection. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MeasureReport, self).__init__(jsondict=jsondict, strict=strict) @@ -72,16 +94,27 @@ def elementProperties(self): js = super(MeasureReport, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("evaluatedResource", "evaluatedResource", fhirreference.FHIRReference, True, None, False), + ("_evaluatedResource", "_evaluatedResource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("group", "group", MeasureReportGroup, True, None, False), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("improvementNotation", "improvementNotation", codeableconcept.CodeableConcept, False, None, False), + ("_improvementNotation", "_improvementNotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("measure", "measure", str, False, None, True), + ("_measure", "_measure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reporter", "reporter", fhirreference.FHIRReference, False, None, False), + ("_reporter", "_reporter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -108,18 +141,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Meaning of the group. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.measureScore = None """ What score this group achieved. Type `Quantity` (represented as `dict` in JSON). """ + self._measureScore = None + """ Primitive extension for measureScore. Type `FHIRPrimitiveExtension` """ self.population = None """ The populations in the group. List of `MeasureReportGroupPopulation` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.stratifier = None """ Stratification results. List of `MeasureReportGroupStratifier` items (represented as `dict` in JSON). """ + self._stratifier = None + """ Primitive extension for stratifier. List of `FHIRPrimitiveExtension` """ super(MeasureReportGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -127,9 +168,13 @@ def elementProperties(self): js = super(MeasureReportGroup, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("measureScore", "measureScore", quantity.Quantity, False, None, False), + ("_measureScore", "_measureScore", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", MeasureReportGroupPopulation, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("stratifier", "stratifier", MeasureReportGroupStratifier, True, None, False), + ("_stratifier", "_stratifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -156,14 +201,20 @@ def __init__(self, jsondict=None, strict=True): | denominator-exclusion | denominator-exception | measure- population | measure-population-exclusion | measure-observation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.count = None """ Size of the population. Type `int`. """ + self._count = None + """ Primitive extension for count. Type `FHIRPrimitiveExtension` """ self.subjectResults = None """ For subject-list reports, the subject results in this population. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectResults = None + """ Primitive extension for subjectResults. Type `FHIRPrimitiveExtension` """ super(MeasureReportGroupPopulation, self).__init__(jsondict=jsondict, strict=strict) @@ -171,8 +222,11 @@ def elementProperties(self): js = super(MeasureReportGroupPopulation, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("count", "count", int, False, None, False), + ("_count", "_count", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectResults", "subjectResults", fhirreference.FHIRReference, False, None, False), + ("_subjectResults", "_subjectResults", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -197,11 +251,15 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ What stratifier of the group. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.stratum = None """ Stratum results, one for each unique value, or set of values, in the stratifier, or stratifier components. List of `MeasureReportGroupStratifierStratum` items (represented as `dict` in JSON). """ + self._stratum = None + """ Primitive extension for stratum. List of `FHIRPrimitiveExtension` """ super(MeasureReportGroupStratifier, self).__init__(jsondict=jsondict, strict=strict) @@ -209,7 +267,9 @@ def elementProperties(self): js = super(MeasureReportGroupStratifier, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("stratum", "stratum", MeasureReportGroupStratifierStratum, True, None, False), + ("_stratum", "_stratum", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -236,18 +296,26 @@ def __init__(self, jsondict=None, strict=True): self.component = None """ Stratifier component values. List of `MeasureReportGroupStratifierStratumComponent` items (represented as `dict` in JSON). """ + self._component = None + """ Primitive extension for component. List of `FHIRPrimitiveExtension` """ self.measureScore = None """ What score this stratum achieved. Type `Quantity` (represented as `dict` in JSON). """ + self._measureScore = None + """ Primitive extension for measureScore. Type `FHIRPrimitiveExtension` """ self.population = None """ Population results in this stratum. List of `MeasureReportGroupStratifierStratumPopulation` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.value = None """ The stratum value, e.g. male. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(MeasureReportGroupStratifierStratum, self).__init__(jsondict=jsondict, strict=strict) @@ -255,9 +323,13 @@ def elementProperties(self): js = super(MeasureReportGroupStratifierStratum, self).elementProperties() js.extend([ ("component", "component", MeasureReportGroupStratifierStratumComponent, True, None, False), + ("_component", "_component", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("measureScore", "measureScore", quantity.Quantity, False, None, False), + ("_measureScore", "_measureScore", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", MeasureReportGroupStratifierStratumPopulation, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("value", "value", codeableconcept.CodeableConcept, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -281,10 +353,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ What stratifier component of the group. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.value = None """ The stratum component value, e.g. male. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(MeasureReportGroupStratifierStratumComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -292,7 +368,9 @@ def elementProperties(self): js = super(MeasureReportGroupStratifierStratumComponent, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", codeableconcept.CodeableConcept, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -319,14 +397,20 @@ def __init__(self, jsondict=None, strict=True): | denominator-exclusion | denominator-exception | measure- population | measure-population-exclusion | measure-observation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.count = None """ Size of the population. Type `int`. """ + self._count = None + """ Primitive extension for count. Type `FHIRPrimitiveExtension` """ self.subjectResults = None """ For subject-list reports, the subject results in this population. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectResults = None + """ Primitive extension for subjectResults. Type `FHIRPrimitiveExtension` """ super(MeasureReportGroupStratifierStratumPopulation, self).__init__(jsondict=jsondict, strict=strict) @@ -334,15 +418,19 @@ def elementProperties(self): js = super(MeasureReportGroupStratifierStratumPopulation, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("count", "count", int, False, None, False), + ("_count", "_count", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectResults", "subjectResults", fhirreference.FHIRReference, False, None, False), + ("_subjectResults", "_subjectResults", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/media.py b/fhirclient/models/media.py index 553217b6..20b26419 100644 --- a/fhirclient/models/media.py +++ b/fhirclient/models/media.py @@ -22,95 +22,141 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Procedure that caused this media to be created. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Observed body part. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.content = None """ Actual Media - reference or data. Type `Attachment` (represented as `dict` in JSON). """ + self._content = None + """ Primitive extension for content. Type `FHIRPrimitiveExtension` """ self.createdDateTime = None """ When Media was collected. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._createdDateTime = None + """ Primitive extension for createdDateTime. Type `FHIRPrimitiveExtension` """ self.createdPeriod = None """ When Media was collected. Type `Period` (represented as `dict` in JSON). """ + self._createdPeriod = None + """ Primitive extension for createdPeriod. Type `FHIRPrimitiveExtension` """ self.device = None """ Observing Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. Type `FHIRPrimitiveExtension` """ self.deviceName = None """ Name of the device/manufacturer. Type `str`. """ + self._deviceName = None + """ Primitive extension for deviceName. Type `FHIRPrimitiveExtension` """ self.duration = None """ Length in seconds (audio / video). Type `float`. """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter associated with media. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.frames = None """ Number of frames if > 1 (photo). Type `int`. """ + self._frames = None + """ Primitive extension for frames. Type `FHIRPrimitiveExtension` """ self.height = None """ Height of the image in pixels (photo/video). Type `int`. """ + self._height = None + """ Primitive extension for height. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier(s) for the image. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.issued = None """ Date/Time this version was made available. Type `FHIRInstant` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.modality = None """ The type of acquisition equipment/process. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._modality = None + """ Primitive extension for modality. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the media. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.operator = None """ The person who generated the image. Type `FHIRReference` (represented as `dict` in JSON). """ + self._operator = None + """ Primitive extension for operator. Type `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why was event performed?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.status = None """ preparation | in-progress | not-done | on-hold | stopped | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who/What this Media is a record of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ Classification of media as image, video, or audio. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.view = None """ Imaging view, e.g. Lateral or Antero-posterior. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._view = None + """ Primitive extension for view. Type `FHIRPrimitiveExtension` """ self.width = None """ Width of the image in pixels (photo/video). Type `int`. """ + self._width = None + """ Primitive extension for width. Type `FHIRPrimitiveExtension` """ super(Media, self).__init__(jsondict=jsondict, strict=strict) @@ -118,31 +164,55 @@ def elementProperties(self): js = super(Media, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("content", "content", attachment.Attachment, False, None, True), + ("_content", "_content", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("createdDateTime", "createdDateTime", fhirdatetime.FHIRDateTime, False, "created", False), + ("_createdDateTime", "_createdDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("createdPeriod", "createdPeriod", period.Period, False, "created", False), + ("_createdPeriod", "_createdPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("device", "device", fhirreference.FHIRReference, False, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deviceName", "deviceName", str, False, None, False), + ("_deviceName", "_deviceName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("duration", "duration", float, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("frames", "frames", int, False, None, False), + ("_frames", "_frames", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("height", "height", int, False, None, False), + ("_height", "_height", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("issued", "issued", fhirinstant.FHIRInstant, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modality", "modality", codeableconcept.CodeableConcept, False, None, False), + ("_modality", "_modality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("operator", "operator", fhirreference.FHIRReference, False, None, False), + ("_operator", "_operator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("view", "view", codeableconcept.CodeableConcept, False, None, False), + ("_view", "_view", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("width", "width", int, False, None, False), + ("_width", "_width", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import attachment @@ -151,4 +221,4 @@ def elementProperties(self): from . import fhirinstant from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/medication.py b/fhirclient/models/medication.py index 0e7d2f66..69590406 100644 --- a/fhirclient/models/medication.py +++ b/fhirclient/models/medication.py @@ -25,34 +25,50 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Amount of drug in package. Type `Ratio` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.batch = None """ Details about packaged medications. Type `MedicationBatch` (represented as `dict` in JSON). """ + self._batch = None + """ Primitive extension for batch. Type `FHIRPrimitiveExtension` """ self.code = None """ Codes that identify this medication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.form = None """ powder | tablets | capsule +. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._form = None + """ Primitive extension for form. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for this medication. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.ingredient = None """ Active or inactive ingredient. List of `MedicationIngredient` items (represented as `dict` in JSON). """ + self._ingredient = None + """ Primitive extension for ingredient. List of `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of the item. Type `FHIRReference` (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. Type `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Medication, self).__init__(jsondict=jsondict, strict=strict) @@ -60,13 +76,21 @@ def elementProperties(self): js = super(Medication, self).elementProperties() js.extend([ ("amount", "amount", ratio.Ratio, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("batch", "batch", MedicationBatch, False, None, False), + ("_batch", "_batch", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("form", "form", codeableconcept.CodeableConcept, False, None, False), + ("_form", "_form", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ingredient", "ingredient", MedicationIngredient, True, None, False), + ("_ingredient", "_ingredient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, False, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -92,10 +116,14 @@ def __init__(self, jsondict=None, strict=True): self.expirationDate = None """ When batch will expire. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._expirationDate = None + """ Primitive extension for expirationDate. Type `FHIRPrimitiveExtension` """ self.lotNumber = None """ Identifier assigned to batch. Type `str`. """ + self._lotNumber = None + """ Primitive extension for lotNumber. Type `FHIRPrimitiveExtension` """ super(MedicationBatch, self).__init__(jsondict=jsondict, strict=strict) @@ -103,7 +131,9 @@ def elementProperties(self): js = super(MedicationBatch, self).elementProperties() js.extend([ ("expirationDate", "expirationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_expirationDate", "_expirationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lotNumber", "lotNumber", str, False, None, False), + ("_lotNumber", "_lotNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -127,18 +157,26 @@ def __init__(self, jsondict=None, strict=True): self.isActive = None """ Active ingredient indicator. Type `bool`. """ + self._isActive = None + """ Primitive extension for isActive. Type `FHIRPrimitiveExtension` """ self.itemCodeableConcept = None """ The actual ingredient or content. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ The actual ingredient or content. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ self.strength = None """ Quantity of ingredient present. Type `Ratio` (represented as `dict` in JSON). """ + self._strength = None + """ Primitive extension for strength. Type `FHIRPrimitiveExtension` """ super(MedicationIngredient, self).__init__(jsondict=jsondict, strict=strict) @@ -146,15 +184,20 @@ def elementProperties(self): js = super(MedicationIngredient, self).elementProperties() js.extend([ ("isActive", "isActive", bool, False, None, False), + ("_isActive", "_isActive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, "item", True), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, "item", True), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", ratio.Ratio, False, None, False), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/medicationadministration.py b/fhirclient/models/medicationadministration.py index d6241e88..2b769867 100644 --- a/fhirclient/models/medicationadministration.py +++ b/fhirclient/models/medicationadministration.py @@ -27,88 +27,130 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ Type of medication usage. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.context = None """ Encounter or Episode of Care administered as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.device = None """ Device used to administer. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. List of `FHIRPrimitiveExtension` """ self.dosage = None """ Details of how medication was taken. Type `MedicationAdministrationDosage` (represented as `dict` in JSON). """ + self._dosage = None + """ Primitive extension for dosage. Type `FHIRPrimitiveExtension` """ self.effectiveDateTime = None """ Start and end time of administration. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDateTime = None + """ Primitive extension for effectiveDateTime. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ Start and end time of administration. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.eventHistory = None """ A list of events of interest in the lifecycle. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._eventHistory = None + """ Primitive extension for eventHistory. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiates = None """ Instantiates protocol or definition. List of `str` items. """ + self._instantiates = None + """ Primitive extension for instantiates. List of `FHIRPrimitiveExtension` """ self.medicationCodeableConcept = None """ What was administered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ What was administered. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.note = None """ Information about the administration. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performer = None """ Who performed the medication administration and what they did. List of `MedicationAdministrationPerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Reason administration performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Condition or observation that supports why the medication was administered. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.request = None """ Request administration performed against. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.status = None """ in-progress | not-done | on-hold | completed | entered-in-error | stopped | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason administration not performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. List of `FHIRPrimitiveExtension` """ self.subject = None """ Who received medication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.supportingInformation = None """ Additional information to support administration. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. List of `FHIRPrimitiveExtension` """ super(MedicationAdministration, self).__init__(jsondict=jsondict, strict=strict) @@ -116,26 +158,47 @@ def elementProperties(self): js = super(MedicationAdministration, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", fhirreference.FHIRReference, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("device", "device", fhirreference.FHIRReference, True, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dosage", "dosage", MedicationAdministrationDosage, False, None, False), + ("_dosage", "_dosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveDateTime", "effectiveDateTime", fhirdatetime.FHIRDateTime, False, "effective", True), + ("_effectiveDateTime", "_effectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, "effective", True), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventHistory", "eventHistory", fhirreference.FHIRReference, True, None, False), + ("_eventHistory", "_eventHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiates", "instantiates", str, True, None, False), + ("_instantiates", "_instantiates", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", MedicationAdministrationPerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, True, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInformation", "supportingInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -162,30 +225,44 @@ def __init__(self, jsondict=None, strict=True): self.dose = None """ Amount of medication per dose. Type `Quantity` (represented as `dict` in JSON). """ + self._dose = None + """ Primitive extension for dose. Type `FHIRPrimitiveExtension` """ self.method = None """ How drug was administered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.rateQuantity = None """ Dose quantity per unit of time. Type `Quantity` (represented as `dict` in JSON). """ + self._rateQuantity = None + """ Primitive extension for rateQuantity. Type `FHIRPrimitiveExtension` """ self.rateRatio = None """ Dose quantity per unit of time. Type `Ratio` (represented as `dict` in JSON). """ + self._rateRatio = None + """ Primitive extension for rateRatio. Type `FHIRPrimitiveExtension` """ self.route = None """ Path of substance into body. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._route = None + """ Primitive extension for route. Type `FHIRPrimitiveExtension` """ self.site = None """ Body site administered to. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._site = None + """ Primitive extension for site. Type `FHIRPrimitiveExtension` """ self.text = None """ Free text dosage instructions e.g. SIG. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ super(MedicationAdministrationDosage, self).__init__(jsondict=jsondict, strict=strict) @@ -193,12 +270,19 @@ def elementProperties(self): js = super(MedicationAdministrationDosage, self).elementProperties() js.extend([ ("dose", "dose", quantity.Quantity, False, None, False), + ("_dose", "_dose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateQuantity", "rateQuantity", quantity.Quantity, False, "rate", False), + ("_rateQuantity", "_rateQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateRatio", "rateRatio", ratio.Ratio, False, "rate", False), + ("_rateRatio", "_rateRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("route", "route", codeableconcept.CodeableConcept, False, None, False), + ("_route", "_route", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("site", "site", codeableconcept.CodeableConcept, False, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -223,10 +307,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Who performed the medication administration. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ Type of performance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ super(MedicationAdministrationPerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -234,10 +322,13 @@ def elementProperties(self): js = super(MedicationAdministrationPerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -246,4 +337,4 @@ def elementProperties(self): from . import identifier from . import period from . import quantity -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/medicationdispense.py b/fhirclient/models/medicationdispense.py index 3900ffe4..182b87e5 100644 --- a/fhirclient/models/medicationdispense.py +++ b/fhirclient/models/medicationdispense.py @@ -27,108 +27,160 @@ def __init__(self, jsondict=None, strict=True): self.authorizingPrescription = None """ Medication order that authorizes the dispense. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._authorizingPrescription = None + """ Primitive extension for authorizingPrescription. List of `FHIRPrimitiveExtension` """ self.category = None """ Type of medication dispense. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.context = None """ Encounter / Episode associated with event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.daysSupply = None """ Amount of medication expressed as a timing amount. Type `Quantity` (represented as `dict` in JSON). """ + self._daysSupply = None + """ Primitive extension for daysSupply. Type `FHIRPrimitiveExtension` """ self.destination = None """ Where the medication was sent. Type `FHIRReference` (represented as `dict` in JSON). """ + self._destination = None + """ Primitive extension for destination. Type `FHIRPrimitiveExtension` """ self.detectedIssue = None """ Clinical issue with action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detectedIssue = None + """ Primitive extension for detectedIssue. List of `FHIRPrimitiveExtension` """ self.dosageInstruction = None """ How the medication is to be used by the patient or administered by the caregiver. List of `Dosage` items (represented as `dict` in JSON). """ + self._dosageInstruction = None + """ Primitive extension for dosageInstruction. List of `FHIRPrimitiveExtension` """ self.eventHistory = None """ A list of relevant lifecycle events. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._eventHistory = None + """ Primitive extension for eventHistory. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.location = None """ Where the dispense occurred. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.medicationCodeableConcept = None """ What medication was supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ What medication was supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.note = None """ Information about the dispense. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Event that dispense is part of. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performer = None """ Who performed event. List of `MedicationDispensePerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.quantity = None """ Amount dispensed. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.receiver = None """ Who collected the medication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._receiver = None + """ Primitive extension for receiver. List of `FHIRPrimitiveExtension` """ self.status = None """ preparation | in-progress | cancelled | on-hold | completed | entered-in-error | stopped | declined | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReasonCodeableConcept = None """ Why a dispense was not performed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReasonCodeableConcept = None + """ Primitive extension for statusReasonCodeableConcept. Type `FHIRPrimitiveExtension` """ self.statusReasonReference = None """ Why a dispense was not performed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._statusReasonReference = None + """ Primitive extension for statusReasonReference. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who the dispense is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.substitution = None """ Whether a substitution was performed on the dispense. Type `MedicationDispenseSubstitution` (represented as `dict` in JSON). """ + self._substitution = None + """ Primitive extension for substitution. Type `FHIRPrimitiveExtension` """ self.supportingInformation = None """ Information that supports the dispensing of the medication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. List of `FHIRPrimitiveExtension` """ self.type = None """ Trial fill, partial fill, emergency fill, etc.. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.whenHandedOver = None """ When product was given out. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._whenHandedOver = None + """ Primitive extension for whenHandedOver. Type `FHIRPrimitiveExtension` """ self.whenPrepared = None """ When product was packaged and reviewed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._whenPrepared = None + """ Primitive extension for whenPrepared. Type `FHIRPrimitiveExtension` """ super(MedicationDispense, self).__init__(jsondict=jsondict, strict=strict) @@ -136,31 +188,57 @@ def elementProperties(self): js = super(MedicationDispense, self).elementProperties() js.extend([ ("authorizingPrescription", "authorizingPrescription", fhirreference.FHIRReference, True, None, False), + ("_authorizingPrescription", "_authorizingPrescription", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", fhirreference.FHIRReference, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("daysSupply", "daysSupply", quantity.Quantity, False, None, False), + ("_daysSupply", "_daysSupply", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", fhirreference.FHIRReference, False, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detectedIssue", "detectedIssue", fhirreference.FHIRReference, True, None, False), + ("_detectedIssue", "_detectedIssue", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dosageInstruction", "dosageInstruction", dosage.Dosage, True, None, False), + ("_dosageInstruction", "_dosageInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("eventHistory", "eventHistory", fhirreference.FHIRReference, True, None, False), + ("_eventHistory", "_eventHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", MedicationDispensePerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("receiver", "receiver", fhirreference.FHIRReference, True, None, False), + ("_receiver", "_receiver", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReasonCodeableConcept", "statusReasonCodeableConcept", codeableconcept.CodeableConcept, False, "statusReason", False), + ("_statusReasonCodeableConcept", "_statusReasonCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReasonReference", "statusReasonReference", fhirreference.FHIRReference, False, "statusReason", False), + ("_statusReasonReference", "_statusReasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substitution", "substitution", MedicationDispenseSubstitution, False, None, False), + ("_substitution", "_substitution", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInformation", "supportingInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("whenHandedOver", "whenHandedOver", fhirdatetime.FHIRDateTime, False, None, False), + ("_whenHandedOver", "_whenHandedOver", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("whenPrepared", "whenPrepared", fhirdatetime.FHIRDateTime, False, None, False), + ("_whenPrepared", "_whenPrepared", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -186,10 +264,14 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ Individual who was performing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ Who performed the dispense and what they did. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ super(MedicationDispensePerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -197,7 +279,9 @@ def elementProperties(self): js = super(MedicationDispensePerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -225,19 +309,27 @@ def __init__(self, jsondict=None, strict=True): self.reason = None """ Why was substitution made. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. List of `FHIRPrimitiveExtension` """ self.responsibleParty = None """ Who is responsible for the substitution. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._responsibleParty = None + """ Primitive extension for responsibleParty. List of `FHIRPrimitiveExtension` """ self.type = None """ Code signifying whether a different drug was dispensed from what was prescribed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.wasSubstituted = None """ Whether a substitution was or was not performed on the dispense. Type `bool`. """ + self._wasSubstituted = None + """ Primitive extension for wasSubstituted. Type `FHIRPrimitiveExtension` """ super(MedicationDispenseSubstitution, self).__init__(jsondict=jsondict, strict=strict) @@ -245,12 +337,17 @@ def elementProperties(self): js = super(MedicationDispenseSubstitution, self).elementProperties() js.extend([ ("reason", "reason", codeableconcept.CodeableConcept, True, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("responsibleParty", "responsibleParty", fhirreference.FHIRReference, True, None, False), + ("_responsibleParty", "_responsibleParty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("wasSubstituted", "wasSubstituted", bool, False, None, True), + ("_wasSubstituted", "_wasSubstituted", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -258,4 +355,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/medicationknowledge.py b/fhirclient/models/medicationknowledge.py index 001ff807..ef0db6e0 100644 --- a/fhirclient/models/medicationknowledge.py +++ b/fhirclient/models/medicationknowledge.py @@ -23,92 +23,136 @@ def __init__(self, jsondict=None, strict=True): self.administrationGuidelines = None """ Guidelines for administration of the medication. List of `MedicationKnowledgeAdministrationGuidelines` items (represented as `dict` in JSON). """ + self._administrationGuidelines = None + """ Primitive extension for administrationGuidelines. List of `FHIRPrimitiveExtension` """ self.amount = None """ Amount of drug in package. Type `Quantity` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.associatedMedication = None """ A medication resource that is associated with this medication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._associatedMedication = None + """ Primitive extension for associatedMedication. List of `FHIRPrimitiveExtension` """ self.code = None """ Code that identifies this medication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contraindication = None """ Potential clinical issue with or between medication(s). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._contraindication = None + """ Primitive extension for contraindication. List of `FHIRPrimitiveExtension` """ self.cost = None """ The pricing of the medication. List of `MedicationKnowledgeCost` items (represented as `dict` in JSON). """ + self._cost = None + """ Primitive extension for cost. List of `FHIRPrimitiveExtension` """ self.doseForm = None """ powder | tablets | capsule +. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._doseForm = None + """ Primitive extension for doseForm. Type `FHIRPrimitiveExtension` """ self.drugCharacteristic = None """ Specifies descriptive properties of the medicine. List of `MedicationKnowledgeDrugCharacteristic` items (represented as `dict` in JSON). """ + self._drugCharacteristic = None + """ Primitive extension for drugCharacteristic. List of `FHIRPrimitiveExtension` """ self.ingredient = None """ Active or inactive ingredient. List of `MedicationKnowledgeIngredient` items (represented as `dict` in JSON). """ + self._ingredient = None + """ Primitive extension for ingredient. List of `FHIRPrimitiveExtension` """ self.intendedRoute = None """ The intended or approved route of administration. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._intendedRoute = None + """ Primitive extension for intendedRoute. List of `FHIRPrimitiveExtension` """ self.kinetics = None """ The time course of drug absorption, distribution, metabolism and excretion of a medication from the body. List of `MedicationKnowledgeKinetics` items (represented as `dict` in JSON). """ + self._kinetics = None + """ Primitive extension for kinetics. List of `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of the item. Type `FHIRReference` (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. Type `FHIRPrimitiveExtension` """ self.medicineClassification = None """ Categorization of the medication within a formulary or classification system. List of `MedicationKnowledgeMedicineClassification` items (represented as `dict` in JSON). """ + self._medicineClassification = None + """ Primitive extension for medicineClassification. List of `FHIRPrimitiveExtension` """ self.monitoringProgram = None """ Program under which a medication is reviewed. List of `MedicationKnowledgeMonitoringProgram` items (represented as `dict` in JSON). """ + self._monitoringProgram = None + """ Primitive extension for monitoringProgram. List of `FHIRPrimitiveExtension` """ self.monograph = None """ Associated documentation about the medication. List of `MedicationKnowledgeMonograph` items (represented as `dict` in JSON). """ + self._monograph = None + """ Primitive extension for monograph. List of `FHIRPrimitiveExtension` """ self.packaging = None """ Details about packaged medications. Type `MedicationKnowledgePackaging` (represented as `dict` in JSON). """ + self._packaging = None + """ Primitive extension for packaging. Type `FHIRPrimitiveExtension` """ self.preparationInstruction = None """ The instructions for preparing the medication. Type `str`. """ + self._preparationInstruction = None + """ Primitive extension for preparationInstruction. Type `FHIRPrimitiveExtension` """ self.productType = None """ Category of the medication or product. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._productType = None + """ Primitive extension for productType. List of `FHIRPrimitiveExtension` """ self.regulatory = None """ Regulatory information about a medication. List of `MedicationKnowledgeRegulatory` items (represented as `dict` in JSON). """ + self._regulatory = None + """ Primitive extension for regulatory. List of `FHIRPrimitiveExtension` """ self.relatedMedicationKnowledge = None """ Associated or related medication information. List of `MedicationKnowledgeRelatedMedicationKnowledge` items (represented as `dict` in JSON). """ + self._relatedMedicationKnowledge = None + """ Primitive extension for relatedMedicationKnowledge. List of `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.synonym = None """ Additional names for a medication. List of `str` items. """ + self._synonym = None + """ Primitive extension for synonym. List of `FHIRPrimitiveExtension` """ super(MedicationKnowledge, self).__init__(jsondict=jsondict, strict=strict) @@ -116,27 +160,49 @@ def elementProperties(self): js = super(MedicationKnowledge, self).elementProperties() js.extend([ ("administrationGuidelines", "administrationGuidelines", MedicationKnowledgeAdministrationGuidelines, True, None, False), + ("_administrationGuidelines", "_administrationGuidelines", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("amount", "amount", quantity.Quantity, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("associatedMedication", "associatedMedication", fhirreference.FHIRReference, True, None, False), + ("_associatedMedication", "_associatedMedication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contraindication", "contraindication", fhirreference.FHIRReference, True, None, False), + ("_contraindication", "_contraindication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("cost", "cost", MedicationKnowledgeCost, True, None, False), + ("_cost", "_cost", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("doseForm", "doseForm", codeableconcept.CodeableConcept, False, None, False), + ("_doseForm", "_doseForm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("drugCharacteristic", "drugCharacteristic", MedicationKnowledgeDrugCharacteristic, True, None, False), + ("_drugCharacteristic", "_drugCharacteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ingredient", "ingredient", MedicationKnowledgeIngredient, True, None, False), + ("_ingredient", "_ingredient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intendedRoute", "intendedRoute", codeableconcept.CodeableConcept, True, None, False), + ("_intendedRoute", "_intendedRoute", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kinetics", "kinetics", MedicationKnowledgeKinetics, True, None, False), + ("_kinetics", "_kinetics", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, False, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicineClassification", "medicineClassification", MedicationKnowledgeMedicineClassification, True, None, False), + ("_medicineClassification", "_medicineClassification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("monitoringProgram", "monitoringProgram", MedicationKnowledgeMonitoringProgram, True, None, False), + ("_monitoringProgram", "_monitoringProgram", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("monograph", "monograph", MedicationKnowledgeMonograph, True, None, False), + ("_monograph", "_monograph", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("packaging", "packaging", MedicationKnowledgePackaging, False, None, False), + ("_packaging", "_packaging", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preparationInstruction", "preparationInstruction", str, False, None, False), + ("_preparationInstruction", "_preparationInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productType", "productType", codeableconcept.CodeableConcept, True, None, False), + ("_productType", "_productType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("regulatory", "regulatory", MedicationKnowledgeRegulatory, True, None, False), + ("_regulatory", "_regulatory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relatedMedicationKnowledge", "relatedMedicationKnowledge", MedicationKnowledgeRelatedMedicationKnowledge, True, None, False), + ("_relatedMedicationKnowledge", "_relatedMedicationKnowledge", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("synonym", "synonym", str, True, None, False), + ("_synonym", "_synonym", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -162,21 +228,29 @@ def __init__(self, jsondict=None, strict=True): self.dosage = None """ Dosage for the medication for the specific guidelines. List of `MedicationKnowledgeAdministrationGuidelinesDosage` items (represented as `dict` in JSON). """ + self._dosage = None + """ Primitive extension for dosage. List of `FHIRPrimitiveExtension` """ self.indicationCodeableConcept = None """ Indication for use that apply to the specific administration guidelines. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._indicationCodeableConcept = None + """ Primitive extension for indicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.indicationReference = None """ Indication for use that apply to the specific administration guidelines. Type `FHIRReference` (represented as `dict` in JSON). """ + self._indicationReference = None + """ Primitive extension for indicationReference. Type `FHIRPrimitiveExtension` """ self.patientCharacteristics = None """ Characteristics of the patient that are relevant to the administration guidelines. List of `MedicationKnowledgeAdministrationGuidelinesPatientCharacteristics` items (represented as `dict` in JSON). """ + self._patientCharacteristics = None + """ Primitive extension for patientCharacteristics. List of `FHIRPrimitiveExtension` """ super(MedicationKnowledgeAdministrationGuidelines, self).__init__(jsondict=jsondict, strict=strict) @@ -184,9 +258,13 @@ def elementProperties(self): js = super(MedicationKnowledgeAdministrationGuidelines, self).elementProperties() js.extend([ ("dosage", "dosage", MedicationKnowledgeAdministrationGuidelinesDosage, True, None, False), + ("_dosage", "_dosage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("indicationCodeableConcept", "indicationCodeableConcept", codeableconcept.CodeableConcept, False, "indication", False), + ("_indicationCodeableConcept", "_indicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("indicationReference", "indicationReference", fhirreference.FHIRReference, False, "indication", False), + ("_indicationReference", "_indicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patientCharacteristics", "patientCharacteristics", MedicationKnowledgeAdministrationGuidelinesPatientCharacteristics, True, None, False), + ("_patientCharacteristics", "_patientCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -208,10 +286,14 @@ def __init__(self, jsondict=None, strict=True): self.dosage = None """ Dosage for the medication for the specific guidelines. List of `Dosage` items (represented as `dict` in JSON). """ + self._dosage = None + """ Primitive extension for dosage. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of dosage. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeAdministrationGuidelinesDosage, self).__init__(jsondict=jsondict, strict=strict) @@ -219,7 +301,9 @@ def elementProperties(self): js = super(MedicationKnowledgeAdministrationGuidelinesDosage, self).elementProperties() js.extend([ ("dosage", "dosage", dosage.Dosage, True, None, True), + ("_dosage", "_dosage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -246,15 +330,21 @@ def __init__(self, jsondict=None, strict=True): """ Specific characteristic that is relevant to the administration guideline. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._characteristicCodeableConcept = None + """ Primitive extension for characteristicCodeableConcept. Type `FHIRPrimitiveExtension` """ self.characteristicQuantity = None """ Specific characteristic that is relevant to the administration guideline. Type `Quantity` (represented as `dict` in JSON). """ + self._characteristicQuantity = None + """ Primitive extension for characteristicQuantity. Type `FHIRPrimitiveExtension` """ self.value = None """ The specific characteristic. List of `str` items. """ + self._value = None + """ Primitive extension for value. List of `FHIRPrimitiveExtension` """ super(MedicationKnowledgeAdministrationGuidelinesPatientCharacteristics, self).__init__(jsondict=jsondict, strict=strict) @@ -262,8 +352,11 @@ def elementProperties(self): js = super(MedicationKnowledgeAdministrationGuidelinesPatientCharacteristics, self).elementProperties() js.extend([ ("characteristicCodeableConcept", "characteristicCodeableConcept", codeableconcept.CodeableConcept, False, "characteristic", True), + ("_characteristicCodeableConcept", "_characteristicCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("characteristicQuantity", "characteristicQuantity", quantity.Quantity, False, "characteristic", True), + ("_characteristicQuantity", "_characteristicQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, True, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -287,14 +380,20 @@ def __init__(self, jsondict=None, strict=True): self.cost = None """ The price of the medication. Type `Money` (represented as `dict` in JSON). """ + self._cost = None + """ Primitive extension for cost. Type `FHIRPrimitiveExtension` """ self.source = None """ The source or owner for the price information. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.type = None """ The category of the cost information. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeCost, self).__init__(jsondict=jsondict, strict=strict) @@ -302,8 +401,11 @@ def elementProperties(self): js = super(MedicationKnowledgeCost, self).elementProperties() js.extend([ ("cost", "cost", money.Money, False, None, True), + ("_cost", "_cost", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", str, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -328,22 +430,32 @@ def __init__(self, jsondict=None, strict=True): self.type = None """ Code specifying the type of characteristic of medication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Description of the characteristic. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Description of the characteristic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Description of the characteristic. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Description of the characteristic. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeDrugCharacteristic, self).__init__(jsondict=jsondict, strict=strict) @@ -351,10 +463,15 @@ def elementProperties(self): js = super(MedicationKnowledgeDrugCharacteristic, self).elementProperties() js.extend([ ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", False), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -378,18 +495,26 @@ def __init__(self, jsondict=None, strict=True): self.isActive = None """ Active ingredient indicator. Type `bool`. """ + self._isActive = None + """ Primitive extension for isActive. Type `FHIRPrimitiveExtension` """ self.itemCodeableConcept = None """ Medication(s) or substance(s) contained in the medication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ Medication(s) or substance(s) contained in the medication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ self.strength = None """ Quantity of ingredient present. Type `Ratio` (represented as `dict` in JSON). """ + self._strength = None + """ Primitive extension for strength. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeIngredient, self).__init__(jsondict=jsondict, strict=strict) @@ -397,9 +522,13 @@ def elementProperties(self): js = super(MedicationKnowledgeIngredient, self).elementProperties() js.extend([ ("isActive", "isActive", bool, False, None, False), + ("_isActive", "_isActive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, "item", True), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, "item", True), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", ratio.Ratio, False, None, False), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -422,14 +551,20 @@ def __init__(self, jsondict=None, strict=True): self.areaUnderCurve = None """ The drug concentration measured at certain discrete points in time. List of `Quantity` items (represented as `dict` in JSON). """ + self._areaUnderCurve = None + """ Primitive extension for areaUnderCurve. List of `FHIRPrimitiveExtension` """ self.halfLifePeriod = None """ Time required for concentration in the body to decrease by half. Type `Duration` (represented as `dict` in JSON). """ + self._halfLifePeriod = None + """ Primitive extension for halfLifePeriod. Type `FHIRPrimitiveExtension` """ self.lethalDose50 = None """ The median lethal dose of a drug. List of `Quantity` items (represented as `dict` in JSON). """ + self._lethalDose50 = None + """ Primitive extension for lethalDose50. List of `FHIRPrimitiveExtension` """ super(MedicationKnowledgeKinetics, self).__init__(jsondict=jsondict, strict=strict) @@ -437,8 +572,11 @@ def elementProperties(self): js = super(MedicationKnowledgeKinetics, self).elementProperties() js.extend([ ("areaUnderCurve", "areaUnderCurve", quantity.Quantity, True, None, False), + ("_areaUnderCurve", "_areaUnderCurve", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("halfLifePeriod", "halfLifePeriod", duration.Duration, False, None, False), + ("_halfLifePeriod", "_halfLifePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lethalDose50", "lethalDose50", quantity.Quantity, True, None, False), + ("_lethalDose50", "_lethalDose50", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -461,11 +599,15 @@ def __init__(self, jsondict=None, strict=True): self.classification = None """ Specific category assigned to the medication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. List of `FHIRPrimitiveExtension` """ self.type = None """ The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeMedicineClassification, self).__init__(jsondict=jsondict, strict=strict) @@ -473,7 +615,9 @@ def elementProperties(self): js = super(MedicationKnowledgeMedicineClassification, self).elementProperties() js.extend([ ("classification", "classification", codeableconcept.CodeableConcept, True, None, False), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -497,10 +641,14 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Name of the reviewing program. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of program under which the medication is monitored. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeMonitoringProgram, self).__init__(jsondict=jsondict, strict=strict) @@ -508,7 +656,9 @@ def elementProperties(self): js = super(MedicationKnowledgeMonitoringProgram, self).elementProperties() js.extend([ ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -530,10 +680,14 @@ def __init__(self, jsondict=None, strict=True): self.source = None """ Associated documentation about the medication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.type = None """ The category of medication document. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeMonograph, self).__init__(jsondict=jsondict, strict=strict) @@ -541,7 +695,9 @@ def elementProperties(self): js = super(MedicationKnowledgeMonograph, self).elementProperties() js.extend([ ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -566,11 +722,15 @@ def __init__(self, jsondict=None, strict=True): """ The number of product units the package would contain if fully loaded. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.type = None """ A code that defines the specific type of packaging that the medication can be found in. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgePackaging, self).__init__(jsondict=jsondict, strict=strict) @@ -578,7 +738,9 @@ def elementProperties(self): js = super(MedicationKnowledgePackaging, self).elementProperties() js.extend([ ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -601,19 +763,27 @@ def __init__(self, jsondict=None, strict=True): """ The maximum number of units of the medication that can be dispensed in a period. Type `MedicationKnowledgeRegulatoryMaxDispense` (represented as `dict` in JSON). """ + self._maxDispense = None + """ Primitive extension for maxDispense. Type `FHIRPrimitiveExtension` """ self.regulatoryAuthority = None """ Specifies the authority of the regulation. Type `FHIRReference` (represented as `dict` in JSON). """ + self._regulatoryAuthority = None + """ Primitive extension for regulatoryAuthority. Type `FHIRPrimitiveExtension` """ self.schedule = None """ Specifies the schedule of a medication in jurisdiction. List of `MedicationKnowledgeRegulatorySchedule` items (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. List of `FHIRPrimitiveExtension` """ self.substitution = None """ Specifies if changes are allowed when dispensing a medication from a regulatory perspective. List of `MedicationKnowledgeRegulatorySubstitution` items (represented as `dict` in JSON). """ + self._substitution = None + """ Primitive extension for substitution. List of `FHIRPrimitiveExtension` """ super(MedicationKnowledgeRegulatory, self).__init__(jsondict=jsondict, strict=strict) @@ -621,9 +791,13 @@ def elementProperties(self): js = super(MedicationKnowledgeRegulatory, self).elementProperties() js.extend([ ("maxDispense", "maxDispense", MedicationKnowledgeRegulatoryMaxDispense, False, None, False), + ("_maxDispense", "_maxDispense", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("regulatoryAuthority", "regulatoryAuthority", fhirreference.FHIRReference, False, None, True), + ("_regulatoryAuthority", "_regulatoryAuthority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("schedule", "schedule", MedicationKnowledgeRegulatorySchedule, True, None, False), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("substitution", "substitution", MedicationKnowledgeRegulatorySubstitution, True, None, False), + ("_substitution", "_substitution", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -646,10 +820,14 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ The period that applies to the maximum number of units. Type `Duration` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The maximum number of units of the medication that can be dispensed. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeRegulatoryMaxDispense, self).__init__(jsondict=jsondict, strict=strict) @@ -657,7 +835,9 @@ def elementProperties(self): js = super(MedicationKnowledgeRegulatoryMaxDispense, self).elementProperties() js.extend([ ("period", "period", duration.Duration, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, True), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -679,6 +859,8 @@ def __init__(self, jsondict=None, strict=True): self.schedule = None """ Specifies the specific drug schedule. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeRegulatorySchedule, self).__init__(jsondict=jsondict, strict=strict) @@ -686,6 +868,7 @@ def elementProperties(self): js = super(MedicationKnowledgeRegulatorySchedule, self).elementProperties() js.extend([ ("schedule", "schedule", codeableconcept.CodeableConcept, False, None, True), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -709,10 +892,14 @@ def __init__(self, jsondict=None, strict=True): """ Specifies if regulation allows for changes in the medication when dispensing. Type `bool`. """ + self._allowed = None + """ Primitive extension for allowed. Type `FHIRPrimitiveExtension` """ self.type = None """ Specifies the type of substitution allowed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeRegulatorySubstitution, self).__init__(jsondict=jsondict, strict=strict) @@ -720,7 +907,9 @@ def elementProperties(self): js = super(MedicationKnowledgeRegulatorySubstitution, self).elementProperties() js.extend([ ("allowed", "allowed", bool, False, None, True), + ("_allowed", "_allowed", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -744,10 +933,14 @@ def __init__(self, jsondict=None, strict=True): self.reference = None """ Associated documentation about the associated medication knowledge. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reference = None + """ Primitive extension for reference. List of `FHIRPrimitiveExtension` """ self.type = None """ Category of medicationKnowledge. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicationKnowledgeRelatedMedicationKnowledge, self).__init__(jsondict=jsondict, strict=strict) @@ -755,10 +948,13 @@ def elementProperties(self): js = super(MedicationKnowledgeRelatedMedicationKnowledge, self).elementProperties() js.extend([ ("reference", "reference", fhirreference.FHIRReference, True, None, True), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import dosage @@ -766,4 +962,4 @@ def elementProperties(self): from . import fhirreference from . import money from . import quantity -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/medicationrequest.py b/fhirclient/models/medicationrequest.py index 59507308..ac26e6d5 100644 --- a/fhirclient/models/medicationrequest.py +++ b/fhirclient/models/medicationrequest.py @@ -28,141 +28,209 @@ def __init__(self, jsondict=None, strict=True): self.authoredOn = None """ When request was initially authored. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ What request fulfills. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.category = None """ Type of medication usage. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.courseOfTherapyType = None """ Overall pattern of medication administration. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._courseOfTherapyType = None + """ Primitive extension for courseOfTherapyType. Type `FHIRPrimitiveExtension` """ self.detectedIssue = None """ Clinical Issue with action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._detectedIssue = None + """ Primitive extension for detectedIssue. List of `FHIRPrimitiveExtension` """ self.dispenseRequest = None """ Medication supply authorization. Type `MedicationRequestDispenseRequest` (represented as `dict` in JSON). """ + self._dispenseRequest = None + """ Primitive extension for dispenseRequest. Type `FHIRPrimitiveExtension` """ self.doNotPerform = None """ True if request is prohibiting action. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.dosageInstruction = None """ How the medication should be taken. List of `Dosage` items (represented as `dict` in JSON). """ + self._dosageInstruction = None + """ Primitive extension for dosageInstruction. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of encounter/admission/stay. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.eventHistory = None """ A list of events of interest in the lifecycle. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._eventHistory = None + """ Primitive extension for eventHistory. List of `FHIRPrimitiveExtension` """ self.groupIdentifier = None """ Composite request this is part of. Type `Identifier` (represented as `dict` in JSON). """ + self._groupIdentifier = None + """ Primitive extension for groupIdentifier. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External ids for this request. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Associated insurance coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | order | original-order | reflex-order | filler- order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.medicationCodeableConcept = None """ Medication to be taken. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ Medication to be taken. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.note = None """ Information about the prescription. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.performer = None """ Intended performer of administration. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.performerType = None """ Desired kind of performer of the medication administration. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._performerType = None + """ Primitive extension for performerType. Type `FHIRPrimitiveExtension` """ self.priorPrescription = None """ An order/prescription that is being replaced. Type `FHIRReference` (represented as `dict` in JSON). """ + self._priorPrescription = None + """ Primitive extension for priorPrescription. Type `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Reason or indication for ordering or not ordering the medication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Condition or observation that supports why the prescription is being written. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.recorder = None """ Person who entered the request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recorder = None + """ Primitive extension for recorder. Type `FHIRPrimitiveExtension` """ self.reportedBoolean = None """ Reported rather than primary record. Type `bool`. """ + self._reportedBoolean = None + """ Primitive extension for reportedBoolean. Type `FHIRPrimitiveExtension` """ self.reportedReference = None """ Reported rather than primary record. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reportedReference = None + """ Primitive extension for reportedReference. Type `FHIRPrimitiveExtension` """ self.requester = None """ Who/What requested the Request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.status = None """ active | on-hold | cancelled | completed | entered-in-error | stopped | draft | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who or group medication request is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.substitution = None """ Any restrictions on medication substitution. Type `MedicationRequestSubstitution` (represented as `dict` in JSON). """ + self._substitution = None + """ Primitive extension for substitution. Type `FHIRPrimitiveExtension` """ self.supportingInformation = None """ Information to support ordering of the medication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. List of `FHIRPrimitiveExtension` """ super(MedicationRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -170,39 +238,73 @@ def elementProperties(self): js = super(MedicationRequest, self).elementProperties() js.extend([ ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("courseOfTherapyType", "courseOfTherapyType", codeableconcept.CodeableConcept, False, None, False), + ("_courseOfTherapyType", "_courseOfTherapyType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detectedIssue", "detectedIssue", fhirreference.FHIRReference, True, None, False), + ("_detectedIssue", "_detectedIssue", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dispenseRequest", "dispenseRequest", MedicationRequestDispenseRequest, False, None, False), + ("_dispenseRequest", "_dispenseRequest", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dosageInstruction", "dosageInstruction", dosage.Dosage, True, None, False), + ("_dosageInstruction", "_dosageInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventHistory", "eventHistory", fhirreference.FHIRReference, True, None, False), + ("_eventHistory", "_eventHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("groupIdentifier", "groupIdentifier", identifier.Identifier, False, None, False), + ("_groupIdentifier", "_groupIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", fhirreference.FHIRReference, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performerType", "performerType", codeableconcept.CodeableConcept, False, None, False), + ("_performerType", "_performerType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priorPrescription", "priorPrescription", fhirreference.FHIRReference, False, None, False), + ("_priorPrescription", "_priorPrescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recorder", "recorder", fhirreference.FHIRReference, False, None, False), + ("_recorder", "_recorder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reportedBoolean", "reportedBoolean", bool, False, "reported", False), + ("_reportedBoolean", "_reportedBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reportedReference", "reportedReference", fhirreference.FHIRReference, False, "reported", False), + ("_reportedReference", "_reportedReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substitution", "substitution", MedicationRequestSubstitution, False, None, False), + ("_substitution", "_substitution", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInformation", "supportingInformation", fhirreference.FHIRReference, True, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -233,30 +335,44 @@ def __init__(self, jsondict=None, strict=True): self.dispenseInterval = None """ Minimum period of time between dispenses. Type `Duration` (represented as `dict` in JSON). """ + self._dispenseInterval = None + """ Primitive extension for dispenseInterval. Type `FHIRPrimitiveExtension` """ self.expectedSupplyDuration = None """ Number of days supply per dispense. Type `Duration` (represented as `dict` in JSON). """ + self._expectedSupplyDuration = None + """ Primitive extension for expectedSupplyDuration. Type `FHIRPrimitiveExtension` """ self.initialFill = None """ First fill details. Type `MedicationRequestDispenseRequestInitialFill` (represented as `dict` in JSON). """ + self._initialFill = None + """ Primitive extension for initialFill. Type `FHIRPrimitiveExtension` """ self.numberOfRepeatsAllowed = None """ Number of refills authorized. Type `int`. """ + self._numberOfRepeatsAllowed = None + """ Primitive extension for numberOfRepeatsAllowed. Type `FHIRPrimitiveExtension` """ self.performer = None """ Intended dispenser. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Amount of medication to supply per dispense. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.validityPeriod = None """ Time period supply is authorized for. Type `Period` (represented as `dict` in JSON). """ + self._validityPeriod = None + """ Primitive extension for validityPeriod. Type `FHIRPrimitiveExtension` """ super(MedicationRequestDispenseRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -264,12 +380,19 @@ def elementProperties(self): js = super(MedicationRequestDispenseRequest, self).elementProperties() js.extend([ ("dispenseInterval", "dispenseInterval", duration.Duration, False, None, False), + ("_dispenseInterval", "_dispenseInterval", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expectedSupplyDuration", "expectedSupplyDuration", duration.Duration, False, None, False), + ("_expectedSupplyDuration", "_expectedSupplyDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("initialFill", "initialFill", MedicationRequestDispenseRequestInitialFill, False, None, False), + ("_initialFill", "_initialFill", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfRepeatsAllowed", "numberOfRepeatsAllowed", int, False, None, False), + ("_numberOfRepeatsAllowed", "_numberOfRepeatsAllowed", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validityPeriod", "validityPeriod", period.Period, False, None, False), + ("_validityPeriod", "_validityPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -294,10 +417,14 @@ def __init__(self, jsondict=None, strict=True): self.duration = None """ First fill duration. Type `Duration` (represented as `dict` in JSON). """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.quantity = None """ First fill quantity. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ super(MedicationRequestDispenseRequestInitialFill, self).__init__(jsondict=jsondict, strict=strict) @@ -305,7 +432,9 @@ def elementProperties(self): js = super(MedicationRequestDispenseRequestInitialFill, self).elementProperties() js.extend([ ("duration", "duration", duration.Duration, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -332,14 +461,20 @@ def __init__(self, jsondict=None, strict=True): self.allowedBoolean = None """ Whether substitution is allowed or not. Type `bool`. """ + self._allowedBoolean = None + """ Primitive extension for allowedBoolean. Type `FHIRPrimitiveExtension` """ self.allowedCodeableConcept = None """ Whether substitution is allowed or not. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._allowedCodeableConcept = None + """ Primitive extension for allowedCodeableConcept. Type `FHIRPrimitiveExtension` """ self.reason = None """ Why should (not) substitution be made. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ super(MedicationRequestSubstitution, self).__init__(jsondict=jsondict, strict=strict) @@ -347,11 +482,15 @@ def elementProperties(self): js = super(MedicationRequestSubstitution, self).elementProperties() js.extend([ ("allowedBoolean", "allowedBoolean", bool, False, "allowed", True), + ("_allowedBoolean", "_allowedBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("allowedCodeableConcept", "allowedCodeableConcept", codeableconcept.CodeableConcept, False, "allowed", True), + ("_allowedCodeableConcept", "_allowedCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -361,4 +500,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/medicationstatement.py b/fhirclient/models/medicationstatement.py index 13d0dab3..4f1bf2d8 100644 --- a/fhirclient/models/medicationstatement.py +++ b/fhirclient/models/medicationstatement.py @@ -46,81 +46,119 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Fulfils plan, proposal or order. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.category = None """ Type of medication usage. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.context = None """ Encounter / Episode associated with MedicationStatement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.dateAsserted = None """ When the statement was asserted?. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateAsserted = None + """ Primitive extension for dateAsserted. Type `FHIRPrimitiveExtension` """ self.derivedFrom = None """ Additional supporting information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._derivedFrom = None + """ Primitive extension for derivedFrom. List of `FHIRPrimitiveExtension` """ self.dosage = None """ Details of how medication is/was taken or should be taken. List of `Dosage` items (represented as `dict` in JSON). """ + self._dosage = None + """ Primitive extension for dosage. List of `FHIRPrimitiveExtension` """ self.effectiveDateTime = None """ The date/time or interval when the medication is/was/will be taken. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDateTime = None + """ Primitive extension for effectiveDateTime. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ The date/time or interval when the medication is/was/will be taken. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.informationSource = None """ Person or organization that provided the information about the taking of this medication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._informationSource = None + """ Primitive extension for informationSource. Type `FHIRPrimitiveExtension` """ self.medicationCodeableConcept = None """ What medication was taken. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ What medication was taken. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.note = None """ Further information about the statement. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Reason for why the medication is being/was taken. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Condition or observation that supports why the medication is being/was taken. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.status = None """ active | completed | entered-in-error | intended | stopped | on- hold | unknown | not-taken. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. List of `FHIRPrimitiveExtension` """ self.subject = None """ Who is/was taking the medication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(MedicationStatement, self).__init__(jsondict=jsondict, strict=strict) @@ -128,27 +166,47 @@ def elementProperties(self): js = super(MedicationStatement, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", fhirreference.FHIRReference, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dateAsserted", "dateAsserted", fhirdatetime.FHIRDateTime, False, None, False), + ("_dateAsserted", "_dateAsserted", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFrom", "derivedFrom", fhirreference.FHIRReference, True, None, False), + ("_derivedFrom", "_derivedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dosage", "dosage", dosage.Dosage, True, None, False), + ("_dosage", "_dosage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectiveDateTime", "effectiveDateTime", fhirdatetime.FHIRDateTime, False, "effective", False), + ("_effectiveDateTime", "_effectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, "effective", False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("informationSource", "informationSource", fhirreference.FHIRReference, False, None, False), + ("_informationSource", "_informationSource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, True, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -156,4 +214,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/medicinalproduct.py b/fhirclient/models/medicinalproduct.py index 822cecbe..8ad1ee79 100644 --- a/fhirclient/models/medicinalproduct.py +++ b/fhirclient/models/medicinalproduct.py @@ -23,90 +23,130 @@ def __init__(self, jsondict=None, strict=True): """ Whether the Medicinal Product is subject to additional monitoring for regulatory reasons. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._additionalMonitoringIndicator = None + """ Primitive extension for additionalMonitoringIndicator. Type `FHIRPrimitiveExtension` """ self.attachedDocument = None """ Supporting documentation, typically for regulatory submission. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._attachedDocument = None + """ Primitive extension for attachedDocument. List of `FHIRPrimitiveExtension` """ self.clinicalTrial = None """ Clinical trials or studies that this product is involved in. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._clinicalTrial = None + """ Primitive extension for clinicalTrial. List of `FHIRPrimitiveExtension` """ self.combinedPharmaceuticalDoseForm = None """ The dose form for a single part product, or combined form of a multiple part product. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._combinedPharmaceuticalDoseForm = None + """ Primitive extension for combinedPharmaceuticalDoseForm. Type `FHIRPrimitiveExtension` """ self.contact = None """ A product specific contact, person (in a role), or an organization. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.crossReference = None """ Reference to another product, e.g. for linking authorised to investigational product. List of `Identifier` items (represented as `dict` in JSON). """ + self._crossReference = None + """ Primitive extension for crossReference. List of `FHIRPrimitiveExtension` """ self.domain = None """ If this medicine applies to human or veterinary uses. Type `Coding` (represented as `dict` in JSON). """ + self._domain = None + """ Primitive extension for domain. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for this product. Could be an MPID. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.legalStatusOfSupply = None """ The legal status of supply of the medicinal product as classified by the regulator. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._legalStatusOfSupply = None + """ Primitive extension for legalStatusOfSupply. Type `FHIRPrimitiveExtension` """ self.manufacturingBusinessOperation = None """ An operation applied to the product, for manufacturing or adminsitrative purpose. List of `MedicinalProductManufacturingBusinessOperation` items (represented as `dict` in JSON). """ + self._manufacturingBusinessOperation = None + """ Primitive extension for manufacturingBusinessOperation. List of `FHIRPrimitiveExtension` """ self.marketingStatus = None """ Marketing status of the medicinal product, in contrast to marketing authorizaton. List of `MarketingStatus` items (represented as `dict` in JSON). """ + self._marketingStatus = None + """ Primitive extension for marketingStatus. List of `FHIRPrimitiveExtension` """ self.masterFile = None """ A master file for to the medicinal product (e.g. Pharmacovigilance System Master File). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._masterFile = None + """ Primitive extension for masterFile. List of `FHIRPrimitiveExtension` """ self.name = None """ The product's name, including full name and possibly coded parts. List of `MedicinalProductName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.packagedMedicinalProduct = None """ Package representation for the product. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._packagedMedicinalProduct = None + """ Primitive extension for packagedMedicinalProduct. List of `FHIRPrimitiveExtension` """ self.paediatricUseIndicator = None """ If authorised for use in children. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._paediatricUseIndicator = None + """ Primitive extension for paediatricUseIndicator. Type `FHIRPrimitiveExtension` """ self.pharmaceuticalProduct = None """ Pharmaceutical aspects of product. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._pharmaceuticalProduct = None + """ Primitive extension for pharmaceuticalProduct. List of `FHIRPrimitiveExtension` """ self.productClassification = None """ Allows the product to be classified by various systems. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._productClassification = None + """ Primitive extension for productClassification. List of `FHIRPrimitiveExtension` """ self.specialDesignation = None """ Indicates if the medicinal product has an orphan designation for the treatment of a rare disease. List of `MedicinalProductSpecialDesignation` items (represented as `dict` in JSON). """ + self._specialDesignation = None + """ Primitive extension for specialDesignation. List of `FHIRPrimitiveExtension` """ self.specialMeasures = None """ Whether the Medicinal Product is subject to special measures for regulatory reasons. List of `str` items. """ + self._specialMeasures = None + """ Primitive extension for specialMeasures. List of `FHIRPrimitiveExtension` """ self.type = None """ Regulatory type, e.g. Investigational or Authorized. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProduct, self).__init__(jsondict=jsondict, strict=strict) @@ -114,25 +154,45 @@ def elementProperties(self): js = super(MedicinalProduct, self).elementProperties() js.extend([ ("additionalMonitoringIndicator", "additionalMonitoringIndicator", codeableconcept.CodeableConcept, False, None, False), + ("_additionalMonitoringIndicator", "_additionalMonitoringIndicator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("attachedDocument", "attachedDocument", fhirreference.FHIRReference, True, None, False), + ("_attachedDocument", "_attachedDocument", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("clinicalTrial", "clinicalTrial", fhirreference.FHIRReference, True, None, False), + ("_clinicalTrial", "_clinicalTrial", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("combinedPharmaceuticalDoseForm", "combinedPharmaceuticalDoseForm", codeableconcept.CodeableConcept, False, None, False), + ("_combinedPharmaceuticalDoseForm", "_combinedPharmaceuticalDoseForm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", fhirreference.FHIRReference, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("crossReference", "crossReference", identifier.Identifier, True, None, False), + ("_crossReference", "_crossReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("domain", "domain", coding.Coding, False, None, False), + ("_domain", "_domain", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("legalStatusOfSupply", "legalStatusOfSupply", codeableconcept.CodeableConcept, False, None, False), + ("_legalStatusOfSupply", "_legalStatusOfSupply", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturingBusinessOperation", "manufacturingBusinessOperation", MedicinalProductManufacturingBusinessOperation, True, None, False), + ("_manufacturingBusinessOperation", "_manufacturingBusinessOperation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("marketingStatus", "marketingStatus", marketingstatus.MarketingStatus, True, None, False), + ("_marketingStatus", "_marketingStatus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("masterFile", "masterFile", fhirreference.FHIRReference, True, None, False), + ("_masterFile", "_masterFile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", MedicinalProductName, True, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("packagedMedicinalProduct", "packagedMedicinalProduct", fhirreference.FHIRReference, True, None, False), + ("_packagedMedicinalProduct", "_packagedMedicinalProduct", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("paediatricUseIndicator", "paediatricUseIndicator", codeableconcept.CodeableConcept, False, None, False), + ("_paediatricUseIndicator", "_paediatricUseIndicator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("pharmaceuticalProduct", "pharmaceuticalProduct", fhirreference.FHIRReference, True, None, False), + ("_pharmaceuticalProduct", "_pharmaceuticalProduct", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productClassification", "productClassification", codeableconcept.CodeableConcept, True, None, False), + ("_productClassification", "_productClassification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialDesignation", "specialDesignation", MedicinalProductSpecialDesignation, True, None, False), + ("_specialDesignation", "_specialDesignation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialMeasures", "specialMeasures", str, True, None, False), + ("_specialMeasures", "_specialMeasures", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -157,26 +217,38 @@ def __init__(self, jsondict=None, strict=True): self.authorisationReferenceNumber = None """ Regulatory authorization reference number. Type `Identifier` (represented as `dict` in JSON). """ + self._authorisationReferenceNumber = None + """ Primitive extension for authorisationReferenceNumber. Type `FHIRPrimitiveExtension` """ self.confidentialityIndicator = None """ To indicate if this proces is commercially confidential. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._confidentialityIndicator = None + """ Primitive extension for confidentialityIndicator. Type `FHIRPrimitiveExtension` """ self.effectiveDate = None """ Regulatory authorization date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDate = None + """ Primitive extension for effectiveDate. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ The manufacturer or establishment associated with the process. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. List of `FHIRPrimitiveExtension` """ self.operationType = None """ The type of manufacturing operation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._operationType = None + """ Primitive extension for operationType. Type `FHIRPrimitiveExtension` """ self.regulator = None """ A regulator which oversees the operation. Type `FHIRReference` (represented as `dict` in JSON). """ + self._regulator = None + """ Primitive extension for regulator. Type `FHIRPrimitiveExtension` """ super(MedicinalProductManufacturingBusinessOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -184,11 +256,17 @@ def elementProperties(self): js = super(MedicinalProductManufacturingBusinessOperation, self).elementProperties() js.extend([ ("authorisationReferenceNumber", "authorisationReferenceNumber", identifier.Identifier, False, None, False), + ("_authorisationReferenceNumber", "_authorisationReferenceNumber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("confidentialityIndicator", "confidentialityIndicator", codeableconcept.CodeableConcept, False, None, False), + ("_confidentialityIndicator", "_confidentialityIndicator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveDate", "effectiveDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_effectiveDate", "_effectiveDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, True, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("operationType", "operationType", codeableconcept.CodeableConcept, False, None, False), + ("_operationType", "_operationType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("regulator", "regulator", fhirreference.FHIRReference, False, None, False), + ("_regulator", "_regulator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -210,14 +288,20 @@ def __init__(self, jsondict=None, strict=True): self.countryLanguage = None """ Country where the name applies. List of `MedicinalProductNameCountryLanguage` items (represented as `dict` in JSON). """ + self._countryLanguage = None + """ Primitive extension for countryLanguage. List of `FHIRPrimitiveExtension` """ self.namePart = None """ Coding words or phrases of the name. List of `MedicinalProductNameNamePart` items (represented as `dict` in JSON). """ + self._namePart = None + """ Primitive extension for namePart. List of `FHIRPrimitiveExtension` """ self.productName = None """ The full product name. Type `str`. """ + self._productName = None + """ Primitive extension for productName. Type `FHIRPrimitiveExtension` """ super(MedicinalProductName, self).__init__(jsondict=jsondict, strict=strict) @@ -225,8 +309,11 @@ def elementProperties(self): js = super(MedicinalProductName, self).elementProperties() js.extend([ ("countryLanguage", "countryLanguage", MedicinalProductNameCountryLanguage, True, None, False), + ("_countryLanguage", "_countryLanguage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("namePart", "namePart", MedicinalProductNameNamePart, True, None, False), + ("_namePart", "_namePart", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("productName", "productName", str, False, None, True), + ("_productName", "_productName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -248,14 +335,20 @@ def __init__(self, jsondict=None, strict=True): self.country = None """ Country code for where this name applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Jurisdiction code for where this name applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. Type `FHIRPrimitiveExtension` """ self.language = None """ Language code for this name. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ super(MedicinalProductNameCountryLanguage, self).__init__(jsondict=jsondict, strict=strict) @@ -263,8 +356,11 @@ def elementProperties(self): js = super(MedicinalProductNameCountryLanguage, self).elementProperties() js.extend([ ("country", "country", codeableconcept.CodeableConcept, False, None, True), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, False, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", codeableconcept.CodeableConcept, False, None, True), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -286,10 +382,14 @@ def __init__(self, jsondict=None, strict=True): self.part = None """ A fragment of a product name. Type `str`. """ + self._part = None + """ Primitive extension for part. Type `FHIRPrimitiveExtension` """ self.type = None """ Idenifying type for this part of the name (e.g. strength part). Type `Coding` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProductNameNamePart, self).__init__(jsondict=jsondict, strict=strict) @@ -297,7 +397,9 @@ def elementProperties(self): js = super(MedicinalProductNameNamePart, self).elementProperties() js.extend([ ("part", "part", str, False, None, True), + ("_part", "_part", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", coding.Coding, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -320,34 +422,50 @@ def __init__(self, jsondict=None, strict=True): self.date = None """ Date when the designation was granted. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier for the designation, or procedure number. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.indicationCodeableConcept = None """ Condition for which the medicinal use applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._indicationCodeableConcept = None + """ Primitive extension for indicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.indicationReference = None """ Condition for which the medicinal use applies. Type `FHIRReference` (represented as `dict` in JSON). """ + self._indicationReference = None + """ Primitive extension for indicationReference. Type `FHIRPrimitiveExtension` """ self.intendedUse = None """ The intended use of the product, e.g. prevention, treatment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._intendedUse = None + """ Primitive extension for intendedUse. Type `FHIRPrimitiveExtension` """ self.species = None """ Animal species for which this applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._species = None + """ Primitive extension for species. Type `FHIRPrimitiveExtension` """ self.status = None """ For example granted, pending, expired or withdrawn. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of special designation, e.g. orphan drug, minor use. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProductSpecialDesignation, self).__init__(jsondict=jsondict, strict=strict) @@ -355,20 +473,29 @@ def elementProperties(self): js = super(MedicinalProductSpecialDesignation, self).elementProperties() js.extend([ ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("indicationCodeableConcept", "indicationCodeableConcept", codeableconcept.CodeableConcept, False, "indication", False), + ("_indicationCodeableConcept", "_indicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("indicationReference", "indicationReference", fhirreference.FHIRReference, False, "indication", False), + ("_indicationReference", "_indicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("intendedUse", "intendedUse", codeableconcept.CodeableConcept, False, None, False), + ("_intendedUse", "_intendedUse", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("species", "species", codeableconcept.CodeableConcept, False, None, False), + ("_species", "_species", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import fhirdatetime from . import fhirreference from . import identifier -from . import marketingstatus +from . import marketingstatus \ No newline at end of file diff --git a/fhirclient/models/medicinalproductauthorization.py b/fhirclient/models/medicinalproductauthorization.py index e5fede21..28e045e1 100644 --- a/fhirclient/models/medicinalproductauthorization.py +++ b/fhirclient/models/medicinalproductauthorization.py @@ -21,68 +21,98 @@ def __init__(self, jsondict=None, strict=True): self.country = None """ The country in which the marketing authorization has been granted. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. List of `FHIRPrimitiveExtension` """ self.dataExclusivityPeriod = None """ A period of time after authorization before generic product applicatiosn can be submitted. Type `Period` (represented as `dict` in JSON). """ + self._dataExclusivityPeriod = None + """ Primitive extension for dataExclusivityPeriod. Type `FHIRPrimitiveExtension` """ self.dateOfFirstAuthorization = None """ The date when the first authorization was granted by a Medicines Regulatory Agency. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateOfFirstAuthorization = None + """ Primitive extension for dateOfFirstAuthorization. Type `FHIRPrimitiveExtension` """ self.holder = None """ Marketing Authorization Holder. Type `FHIRReference` (represented as `dict` in JSON). """ + self._holder = None + """ Primitive extension for holder. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for the marketing authorization, as assigned by a regulator. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.internationalBirthDate = None """ Date of first marketing authorization for a company's new medicinal product in any country in the World. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._internationalBirthDate = None + """ Primitive extension for internationalBirthDate. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Jurisdiction within a country. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.jurisdictionalAuthorization = None """ Authorization in areas within a country. List of `MedicinalProductAuthorizationJurisdictionalAuthorization` items (represented as `dict` in JSON). """ + self._jurisdictionalAuthorization = None + """ Primitive extension for jurisdictionalAuthorization. List of `FHIRPrimitiveExtension` """ self.legalBasis = None """ The legal framework against which this authorization is granted. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._legalBasis = None + """ Primitive extension for legalBasis. Type `FHIRPrimitiveExtension` """ self.procedure = None """ The regulatory procedure for granting or amending a marketing authorization. Type `MedicinalProductAuthorizationProcedure` (represented as `dict` in JSON). """ + self._procedure = None + """ Primitive extension for procedure. Type `FHIRPrimitiveExtension` """ self.regulator = None """ Medicines Regulatory Agency. Type `FHIRReference` (represented as `dict` in JSON). """ + self._regulator = None + """ Primitive extension for regulator. Type `FHIRPrimitiveExtension` """ self.restoreDate = None """ The date when a suspended the marketing or the marketing authorization of the product is anticipated to be restored. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._restoreDate = None + """ Primitive extension for restoreDate. Type `FHIRPrimitiveExtension` """ self.status = None """ The status of the marketing authorization. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusDate = None """ The date at which the given status has become applicable. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._statusDate = None + """ Primitive extension for statusDate. Type `FHIRPrimitiveExtension` """ self.subject = None """ The medicinal product that is being authorized. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.validityPeriod = None """ The beginning of the time period in which the marketing @@ -90,6 +120,8 @@ def __init__(self, jsondict=None, strict=True): complete date consisting of day, month and year shall be specified using the ISO 8601 date format. Type `Period` (represented as `dict` in JSON). """ + self._validityPeriod = None + """ Primitive extension for validityPeriod. Type `FHIRPrimitiveExtension` """ super(MedicinalProductAuthorization, self).__init__(jsondict=jsondict, strict=strict) @@ -97,21 +129,37 @@ def elementProperties(self): js = super(MedicinalProductAuthorization, self).elementProperties() js.extend([ ("country", "country", codeableconcept.CodeableConcept, True, None, False), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dataExclusivityPeriod", "dataExclusivityPeriod", period.Period, False, None, False), + ("_dataExclusivityPeriod", "_dataExclusivityPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dateOfFirstAuthorization", "dateOfFirstAuthorization", fhirdatetime.FHIRDateTime, False, None, False), + ("_dateOfFirstAuthorization", "_dateOfFirstAuthorization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("holder", "holder", fhirreference.FHIRReference, False, None, False), + ("_holder", "_holder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("internationalBirthDate", "internationalBirthDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_internationalBirthDate", "_internationalBirthDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdictionalAuthorization", "jurisdictionalAuthorization", MedicinalProductAuthorizationJurisdictionalAuthorization, True, None, False), + ("_jurisdictionalAuthorization", "_jurisdictionalAuthorization", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("legalBasis", "legalBasis", codeableconcept.CodeableConcept, False, None, False), + ("_legalBasis", "_legalBasis", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedure", "procedure", MedicinalProductAuthorizationProcedure, False, None, False), + ("_procedure", "_procedure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("regulator", "regulator", fhirreference.FHIRReference, False, None, False), + ("_regulator", "_regulator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("restoreDate", "restoreDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_restoreDate", "_restoreDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusDate", "statusDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_statusDate", "_statusDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validityPeriod", "validityPeriod", period.Period, False, None, False), + ("_validityPeriod", "_validityPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -135,22 +183,32 @@ def __init__(self, jsondict=None, strict=True): self.country = None """ Country of authorization. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. Type `FHIRPrimitiveExtension` """ self.identifier = None """ The assigned number for the marketing authorization. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Jurisdiction within a country. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.legalStatusOfSupply = None """ The legal status of supply in a jurisdiction or region. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._legalStatusOfSupply = None + """ Primitive extension for legalStatusOfSupply. Type `FHIRPrimitiveExtension` """ self.validityPeriod = None """ The start and expected end date of the authorization. Type `Period` (represented as `dict` in JSON). """ + self._validityPeriod = None + """ Primitive extension for validityPeriod. Type `FHIRPrimitiveExtension` """ super(MedicinalProductAuthorizationJurisdictionalAuthorization, self).__init__(jsondict=jsondict, strict=strict) @@ -158,10 +216,15 @@ def elementProperties(self): js = super(MedicinalProductAuthorizationJurisdictionalAuthorization, self).elementProperties() js.extend([ ("country", "country", codeableconcept.CodeableConcept, False, None, False), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("legalStatusOfSupply", "legalStatusOfSupply", codeableconcept.CodeableConcept, False, None, False), + ("_legalStatusOfSupply", "_legalStatusOfSupply", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validityPeriod", "validityPeriod", period.Period, False, None, False), + ("_validityPeriod", "_validityPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -183,22 +246,32 @@ def __init__(self, jsondict=None, strict=True): self.application = None """ Applcations submitted to obtain a marketing authorization. List of `MedicinalProductAuthorizationProcedure` items (represented as `dict` in JSON). """ + self._application = None + """ Primitive extension for application. List of `FHIRPrimitiveExtension` """ self.dateDateTime = None """ Date of procedure. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateDateTime = None + """ Primitive extension for dateDateTime. Type `FHIRPrimitiveExtension` """ self.datePeriod = None """ Date of procedure. Type `Period` (represented as `dict` in JSON). """ + self._datePeriod = None + """ Primitive extension for datePeriod. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier for this procedure. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProductAuthorizationProcedure, self).__init__(jsondict=jsondict, strict=strict) @@ -206,16 +279,22 @@ def elementProperties(self): js = super(MedicinalProductAuthorizationProcedure, self).elementProperties() js.extend([ ("application", "application", MedicinalProductAuthorizationProcedure, True, None, False), + ("_application", "_application", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dateDateTime", "dateDateTime", fhirdatetime.FHIRDateTime, False, "date", False), + ("_dateDateTime", "_dateDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("datePeriod", "datePeriod", period.Period, False, "date", False), + ("_datePeriod", "_datePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/medicinalproductcontraindication.py b/fhirclient/models/medicinalproductcontraindication.py index 50ac4db5..20946d9c 100644 --- a/fhirclient/models/medicinalproductcontraindication.py +++ b/fhirclient/models/medicinalproductcontraindication.py @@ -24,32 +24,46 @@ def __init__(self, jsondict=None, strict=True): self.comorbidity = None """ A comorbidity (concurrent condition) or coinfection. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._comorbidity = None + """ Primitive extension for comorbidity. List of `FHIRPrimitiveExtension` """ self.disease = None """ The disease, symptom or procedure for the contraindication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._disease = None + """ Primitive extension for disease. Type `FHIRPrimitiveExtension` """ self.diseaseStatus = None """ The status of the disease or symptom for the contraindication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diseaseStatus = None + """ Primitive extension for diseaseStatus. Type `FHIRPrimitiveExtension` """ self.otherTherapy = None """ Information about the use of the medicinal product in relation to other therapies described as part of the indication. List of `MedicinalProductContraindicationOtherTherapy` items (represented as `dict` in JSON). """ + self._otherTherapy = None + """ Primitive extension for otherTherapy. List of `FHIRPrimitiveExtension` """ self.population = None """ The population group to which this applies. List of `Population` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.subject = None """ The medication for which this is an indication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.therapeuticIndication = None """ Information about the use of the medicinal product in relation to other therapies as part of the indication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._therapeuticIndication = None + """ Primitive extension for therapeuticIndication. List of `FHIRPrimitiveExtension` """ super(MedicinalProductContraindication, self).__init__(jsondict=jsondict, strict=strict) @@ -57,12 +71,19 @@ def elementProperties(self): js = super(MedicinalProductContraindication, self).elementProperties() js.extend([ ("comorbidity", "comorbidity", codeableconcept.CodeableConcept, True, None, False), + ("_comorbidity", "_comorbidity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("disease", "disease", codeableconcept.CodeableConcept, False, None, False), + ("_disease", "_disease", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diseaseStatus", "diseaseStatus", codeableconcept.CodeableConcept, False, None, False), + ("_diseaseStatus", "_diseaseStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("otherTherapy", "otherTherapy", MedicinalProductContraindicationOtherTherapy, True, None, False), + ("_otherTherapy", "_otherTherapy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("population", "population", population.Population, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("therapeuticIndication", "therapeuticIndication", fhirreference.FHIRReference, True, None, False), + ("_therapeuticIndication", "_therapeuticIndication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -89,17 +110,23 @@ def __init__(self, jsondict=None, strict=True): product or class of products) as part of an indication or contraindication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ Reference to a specific medication (active substance, medicinal product or class of products) as part of an indication or contraindication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.therapyRelationshipType = None """ The type of relationship between the medicinal product indication or contraindication and another therapy. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._therapyRelationshipType = None + """ Primitive extension for therapyRelationshipType. Type `FHIRPrimitiveExtension` """ super(MedicinalProductContraindicationOtherTherapy, self).__init__(jsondict=jsondict, strict=strict) @@ -107,12 +134,16 @@ def elementProperties(self): js = super(MedicinalProductContraindicationOtherTherapy, self).elementProperties() js.extend([ ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("therapyRelationshipType", "therapyRelationshipType", codeableconcept.CodeableConcept, False, None, True), + ("_therapyRelationshipType", "_therapyRelationshipType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference -from . import population +from . import population \ No newline at end of file diff --git a/fhirclient/models/medicinalproductindication.py b/fhirclient/models/medicinalproductindication.py index a2a55f4b..b1a83d6b 100644 --- a/fhirclient/models/medicinalproductindication.py +++ b/fhirclient/models/medicinalproductindication.py @@ -24,42 +24,60 @@ def __init__(self, jsondict=None, strict=True): """ Comorbidity (concurrent condition) or co-infection as part of the indication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._comorbidity = None + """ Primitive extension for comorbidity. List of `FHIRPrimitiveExtension` """ self.diseaseStatus = None """ The status of the disease or symptom for which the indication applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diseaseStatus = None + """ Primitive extension for diseaseStatus. Type `FHIRPrimitiveExtension` """ self.diseaseSymptomProcedure = None """ The disease, symptom or procedure that is the indication for treatment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._diseaseSymptomProcedure = None + """ Primitive extension for diseaseSymptomProcedure. Type `FHIRPrimitiveExtension` """ self.duration = None """ Timing or duration information as part of the indication. Type `Quantity` (represented as `dict` in JSON). """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.intendedEffect = None """ The intended effect, aim or strategy to be achieved by the indication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._intendedEffect = None + """ Primitive extension for intendedEffect. Type `FHIRPrimitiveExtension` """ self.otherTherapy = None """ Information about the use of the medicinal product in relation to other therapies described as part of the indication. List of `MedicinalProductIndicationOtherTherapy` items (represented as `dict` in JSON). """ + self._otherTherapy = None + """ Primitive extension for otherTherapy. List of `FHIRPrimitiveExtension` """ self.population = None """ The population group to which this applies. List of `Population` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.subject = None """ The medication for which this is an indication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.undesirableEffect = None """ Describe the undesirable effects of the medicinal product. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._undesirableEffect = None + """ Primitive extension for undesirableEffect. List of `FHIRPrimitiveExtension` """ super(MedicinalProductIndication, self).__init__(jsondict=jsondict, strict=strict) @@ -67,14 +85,23 @@ def elementProperties(self): js = super(MedicinalProductIndication, self).elementProperties() js.extend([ ("comorbidity", "comorbidity", codeableconcept.CodeableConcept, True, None, False), + ("_comorbidity", "_comorbidity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("diseaseStatus", "diseaseStatus", codeableconcept.CodeableConcept, False, None, False), + ("_diseaseStatus", "_diseaseStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diseaseSymptomProcedure", "diseaseSymptomProcedure", codeableconcept.CodeableConcept, False, None, False), + ("_diseaseSymptomProcedure", "_diseaseSymptomProcedure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("duration", "duration", quantity.Quantity, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("intendedEffect", "intendedEffect", codeableconcept.CodeableConcept, False, None, False), + ("_intendedEffect", "_intendedEffect", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("otherTherapy", "otherTherapy", MedicinalProductIndicationOtherTherapy, True, None, False), + ("_otherTherapy", "_otherTherapy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("population", "population", population.Population, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("undesirableEffect", "undesirableEffect", fhirreference.FHIRReference, True, None, False), + ("_undesirableEffect", "_undesirableEffect", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -101,17 +128,23 @@ def __init__(self, jsondict=None, strict=True): product or class of products) as part of an indication or contraindication. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._medicationCodeableConcept = None + """ Primitive extension for medicationCodeableConcept. Type `FHIRPrimitiveExtension` """ self.medicationReference = None """ Reference to a specific medication (active substance, medicinal product or class of products) as part of an indication or contraindication. Type `FHIRReference` (represented as `dict` in JSON). """ + self._medicationReference = None + """ Primitive extension for medicationReference. Type `FHIRPrimitiveExtension` """ self.therapyRelationshipType = None """ The type of relationship between the medicinal product indication or contraindication and another therapy. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._therapyRelationshipType = None + """ Primitive extension for therapyRelationshipType. Type `FHIRPrimitiveExtension` """ super(MedicinalProductIndicationOtherTherapy, self).__init__(jsondict=jsondict, strict=strict) @@ -119,13 +152,17 @@ def elementProperties(self): js = super(MedicinalProductIndicationOtherTherapy, self).elementProperties() js.extend([ ("medicationCodeableConcept", "medicationCodeableConcept", codeableconcept.CodeableConcept, False, "medication", True), + ("_medicationCodeableConcept", "_medicationCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("medicationReference", "medicationReference", fhirreference.FHIRReference, False, "medication", True), + ("_medicationReference", "_medicationReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("therapyRelationshipType", "therapyRelationshipType", codeableconcept.CodeableConcept, False, None, True), + ("_therapyRelationshipType", "_therapyRelationshipType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import population -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/medicinalproductingredient.py b/fhirclient/models/medicinalproductingredient.py index 7924d5f0..45447f1a 100644 --- a/fhirclient/models/medicinalproductingredient.py +++ b/fhirclient/models/medicinalproductingredient.py @@ -21,26 +21,38 @@ def __init__(self, jsondict=None, strict=True): self.allergenicIndicator = None """ If the ingredient is a known or suspected allergen. Type `bool`. """ + self._allergenicIndicator = None + """ Primitive extension for allergenicIndicator. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier for the ingredient. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of this Ingredient. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. List of `FHIRPrimitiveExtension` """ self.role = None """ Ingredient role e.g. Active ingredient, excipient. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.specifiedSubstance = None """ A specified substance that comprises this ingredient. List of `MedicinalProductIngredientSpecifiedSubstance` items (represented as `dict` in JSON). """ + self._specifiedSubstance = None + """ Primitive extension for specifiedSubstance. List of `FHIRPrimitiveExtension` """ self.substance = None """ The ingredient substance. Type `MedicinalProductIngredientSubstance` (represented as `dict` in JSON). """ + self._substance = None + """ Primitive extension for substance. Type `FHIRPrimitiveExtension` """ super(MedicinalProductIngredient, self).__init__(jsondict=jsondict, strict=strict) @@ -48,11 +60,17 @@ def elementProperties(self): js = super(MedicinalProductIngredient, self).elementProperties() js.extend([ ("allergenicIndicator", "allergenicIndicator", bool, False, None, False), + ("_allergenicIndicator", "_allergenicIndicator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, True, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, True), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specifiedSubstance", "specifiedSubstance", MedicinalProductIngredientSpecifiedSubstance, True, None, False), + ("_specifiedSubstance", "_specifiedSubstance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("substance", "substance", MedicinalProductIngredientSubstance, False, None, False), + ("_substance", "_substance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -76,19 +94,27 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ The specified substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.confidentiality = None """ Confidentiality level of the specified substance as the ingredient. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._confidentiality = None + """ Primitive extension for confidentiality. Type `FHIRPrimitiveExtension` """ self.group = None """ The group of specified substance, e.g. group 1 to 4. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. Type `FHIRPrimitiveExtension` """ self.strength = None """ Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product. List of `MedicinalProductIngredientSpecifiedSubstanceStrength` items (represented as `dict` in JSON). """ + self._strength = None + """ Primitive extension for strength. List of `FHIRPrimitiveExtension` """ super(MedicinalProductIngredientSpecifiedSubstance, self).__init__(jsondict=jsondict, strict=strict) @@ -96,9 +122,13 @@ def elementProperties(self): js = super(MedicinalProductIngredientSpecifiedSubstance, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("confidentiality", "confidentiality", codeableconcept.CodeableConcept, False, None, False), + ("_confidentiality", "_confidentiality", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("group", "group", codeableconcept.CodeableConcept, False, None, True), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", MedicinalProductIngredientSpecifiedSubstanceStrength, True, None, False), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -121,26 +151,36 @@ def __init__(self, jsondict=None, strict=True): self.concentration = None """ The strength per unitary volume (or mass). Type `Ratio` (represented as `dict` in JSON). """ + self._concentration = None + """ Primitive extension for concentration. Type `FHIRPrimitiveExtension` """ self.concentrationLowLimit = None """ A lower limit for the strength per unitary volume (or mass), for when there is a range. The concentration attribute then becomes the upper limit. Type `Ratio` (represented as `dict` in JSON). """ + self._concentrationLowLimit = None + """ Primitive extension for concentrationLowLimit. Type `FHIRPrimitiveExtension` """ self.country = None """ The country or countries for which the strength range applies. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. List of `FHIRPrimitiveExtension` """ self.measurementPoint = None """ For when strength is measured at a particular point or distance. Type `str`. """ + self._measurementPoint = None + """ Primitive extension for measurementPoint. Type `FHIRPrimitiveExtension` """ self.presentation = None """ The quantity of substance in the unit of presentation, or in the volume (or mass) of the single pharmaceutical product or manufactured item. Type `Ratio` (represented as `dict` in JSON). """ + self._presentation = None + """ Primitive extension for presentation. Type `FHIRPrimitiveExtension` """ self.presentationLowLimit = None """ A lower limit for the quantity of substance in the unit of @@ -148,10 +188,14 @@ def __init__(self, jsondict=None, strict=True): the lower limit, with the presentation attribute becoming the upper limit. Type `Ratio` (represented as `dict` in JSON). """ + self._presentationLowLimit = None + """ Primitive extension for presentationLowLimit. Type `FHIRPrimitiveExtension` """ self.referenceStrength = None """ Strength expressed in terms of a reference substance. List of `MedicinalProductIngredientSpecifiedSubstanceStrengthReferenceStrength` items (represented as `dict` in JSON). """ + self._referenceStrength = None + """ Primitive extension for referenceStrength. List of `FHIRPrimitiveExtension` """ super(MedicinalProductIngredientSpecifiedSubstanceStrength, self).__init__(jsondict=jsondict, strict=strict) @@ -159,12 +203,19 @@ def elementProperties(self): js = super(MedicinalProductIngredientSpecifiedSubstanceStrength, self).elementProperties() js.extend([ ("concentration", "concentration", ratio.Ratio, False, None, False), + ("_concentration", "_concentration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("concentrationLowLimit", "concentrationLowLimit", ratio.Ratio, False, None, False), + ("_concentrationLowLimit", "_concentrationLowLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("country", "country", codeableconcept.CodeableConcept, True, None, False), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("measurementPoint", "measurementPoint", str, False, None, False), + ("_measurementPoint", "_measurementPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("presentation", "presentation", ratio.Ratio, False, None, True), + ("_presentation", "_presentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("presentationLowLimit", "presentationLowLimit", ratio.Ratio, False, None, False), + ("_presentationLowLimit", "_presentationLowLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceStrength", "referenceStrength", MedicinalProductIngredientSpecifiedSubstanceStrengthReferenceStrength, True, None, False), + ("_referenceStrength", "_referenceStrength", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -186,22 +237,32 @@ def __init__(self, jsondict=None, strict=True): self.country = None """ The country or countries for which the strength range applies. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._country = None + """ Primitive extension for country. List of `FHIRPrimitiveExtension` """ self.measurementPoint = None """ For when strength is measured at a particular point or distance. Type `str`. """ + self._measurementPoint = None + """ Primitive extension for measurementPoint. Type `FHIRPrimitiveExtension` """ self.strength = None """ Strength expressed in terms of a reference substance. Type `Ratio` (represented as `dict` in JSON). """ + self._strength = None + """ Primitive extension for strength. Type `FHIRPrimitiveExtension` """ self.strengthLowLimit = None """ Strength expressed in terms of a reference substance. Type `Ratio` (represented as `dict` in JSON). """ + self._strengthLowLimit = None + """ Primitive extension for strengthLowLimit. Type `FHIRPrimitiveExtension` """ self.substance = None """ Relevant reference substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substance = None + """ Primitive extension for substance. Type `FHIRPrimitiveExtension` """ super(MedicinalProductIngredientSpecifiedSubstanceStrengthReferenceStrength, self).__init__(jsondict=jsondict, strict=strict) @@ -209,10 +270,15 @@ def elementProperties(self): js = super(MedicinalProductIngredientSpecifiedSubstanceStrengthReferenceStrength, self).elementProperties() js.extend([ ("country", "country", codeableconcept.CodeableConcept, True, None, False), + ("_country", "_country", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("measurementPoint", "measurementPoint", str, False, None, False), + ("_measurementPoint", "_measurementPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", ratio.Ratio, False, None, True), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strengthLowLimit", "strengthLowLimit", ratio.Ratio, False, None, False), + ("_strengthLowLimit", "_strengthLowLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substance", "substance", codeableconcept.CodeableConcept, False, None, False), + ("_substance", "_substance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -234,11 +300,15 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ The ingredient substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.strength = None """ Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product. List of `MedicinalProductIngredientSpecifiedSubstanceStrength` items (represented as `dict` in JSON). """ + self._strength = None + """ Primitive extension for strength. List of `FHIRPrimitiveExtension` """ super(MedicinalProductIngredientSubstance, self).__init__(jsondict=jsondict, strict=strict) @@ -246,12 +316,15 @@ def elementProperties(self): js = super(MedicinalProductIngredientSubstance, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strength", "strength", MedicinalProductIngredientSpecifiedSubstanceStrength, True, None, False), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/medicinalproductinteraction.py b/fhirclient/models/medicinalproductinteraction.py index 2f0f9d64..08dbca1c 100644 --- a/fhirclient/models/medicinalproductinteraction.py +++ b/fhirclient/models/medicinalproductinteraction.py @@ -24,32 +24,46 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ The interaction described. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.effect = None """ The effect of the interaction, for example "reduced gastric absorption of primary medication". Type `CodeableConcept` (represented as `dict` in JSON). """ + self._effect = None + """ Primitive extension for effect. Type `FHIRPrimitiveExtension` """ self.incidence = None """ The incidence of the interaction, e.g. theoretical, observed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._incidence = None + """ Primitive extension for incidence. Type `FHIRPrimitiveExtension` """ self.interactant = None """ The specific medication, food or laboratory test that interacts. List of `MedicinalProductInteractionInteractant` items (represented as `dict` in JSON). """ + self._interactant = None + """ Primitive extension for interactant. List of `FHIRPrimitiveExtension` """ self.management = None """ Actions for managing the interaction. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._management = None + """ Primitive extension for management. Type `FHIRPrimitiveExtension` """ self.subject = None """ The medication for which this is a described interaction. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.type = None """ The type of the interaction e.g. drug-drug interaction, drug-food interaction, drug-lab test interaction. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProductInteraction, self).__init__(jsondict=jsondict, strict=strict) @@ -57,12 +71,19 @@ def elementProperties(self): js = super(MedicinalProductInteraction, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effect", "effect", codeableconcept.CodeableConcept, False, None, False), + ("_effect", "_effect", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("incidence", "incidence", codeableconcept.CodeableConcept, False, None, False), + ("_incidence", "_incidence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("interactant", "interactant", MedicinalProductInteractionInteractant, True, None, False), + ("_interactant", "_interactant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("management", "management", codeableconcept.CodeableConcept, False, None, False), + ("_management", "_management", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -86,10 +107,14 @@ def __init__(self, jsondict=None, strict=True): self.itemCodeableConcept = None """ The specific medication, food or laboratory test that interacts. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ The specific medication, food or laboratory test that interacts. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ super(MedicinalProductInteractionInteractant, self).__init__(jsondict=jsondict, strict=strict) @@ -97,10 +122,13 @@ def elementProperties(self): js = super(MedicinalProductInteractionInteractant, self).elementProperties() js.extend([ ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, "item", True), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, "item", True), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/medicinalproductmanufactured.py b/fhirclient/models/medicinalproductmanufactured.py index fefba4d6..488bdd72 100644 --- a/fhirclient/models/medicinalproductmanufactured.py +++ b/fhirclient/models/medicinalproductmanufactured.py @@ -21,33 +21,47 @@ def __init__(self, jsondict=None, strict=True): self.ingredient = None """ Ingredient. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._ingredient = None + """ Primitive extension for ingredient. List of `FHIRPrimitiveExtension` """ self.manufacturedDoseForm = None """ Dose form as manufactured and before any transformation into the pharmaceutical product. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._manufacturedDoseForm = None + """ Primitive extension for manufacturedDoseForm. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of the item (Note that this should be named "manufacturer" but it currently causes technical issues). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. List of `FHIRPrimitiveExtension` """ self.otherCharacteristics = None """ Other codeable characteristics. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._otherCharacteristics = None + """ Primitive extension for otherCharacteristics. List of `FHIRPrimitiveExtension` """ self.physicalCharacteristics = None """ Dimensions, color etc.. Type `ProdCharacteristic` (represented as `dict` in JSON). """ + self._physicalCharacteristics = None + """ Primitive extension for physicalCharacteristics. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The quantity or "count number" of the manufactured item. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.unitOfPresentation = None """ The “real world” units in which the quantity of the manufactured item is described. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unitOfPresentation = None + """ Primitive extension for unitOfPresentation. Type `FHIRPrimitiveExtension` """ super(MedicinalProductManufactured, self).__init__(jsondict=jsondict, strict=strict) @@ -55,17 +69,25 @@ def elementProperties(self): js = super(MedicinalProductManufactured, self).elementProperties() js.extend([ ("ingredient", "ingredient", fhirreference.FHIRReference, True, None, False), + ("_ingredient", "_ingredient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturedDoseForm", "manufacturedDoseForm", codeableconcept.CodeableConcept, False, None, True), + ("_manufacturedDoseForm", "_manufacturedDoseForm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, True, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("otherCharacteristics", "otherCharacteristics", codeableconcept.CodeableConcept, True, None, False), + ("_otherCharacteristics", "_otherCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("physicalCharacteristics", "physicalCharacteristics", prodcharacteristic.ProdCharacteristic, False, None, False), + ("_physicalCharacteristics", "_physicalCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, True), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitOfPresentation", "unitOfPresentation", codeableconcept.CodeableConcept, False, None, False), + ("_unitOfPresentation", "_unitOfPresentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import prodcharacteristic -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/medicinalproductpackaged.py b/fhirclient/models/medicinalproductpackaged.py index d13fe135..132c189f 100644 --- a/fhirclient/models/medicinalproductpackaged.py +++ b/fhirclient/models/medicinalproductpackaged.py @@ -21,40 +21,58 @@ def __init__(self, jsondict=None, strict=True): self.batchIdentifier = None """ Batch numbering. List of `MedicinalProductPackagedBatchIdentifier` items (represented as `dict` in JSON). """ + self._batchIdentifier = None + """ Primitive extension for batchIdentifier. List of `FHIRPrimitiveExtension` """ self.description = None """ Textual description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.legalStatusOfSupply = None """ The legal status of supply of the medicinal product as classified by the regulator. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._legalStatusOfSupply = None + """ Primitive extension for legalStatusOfSupply. Type `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of this Package Item. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. List of `FHIRPrimitiveExtension` """ self.marketingAuthorization = None """ Manufacturer of this Package Item. Type `FHIRReference` (represented as `dict` in JSON). """ + self._marketingAuthorization = None + """ Primitive extension for marketingAuthorization. Type `FHIRPrimitiveExtension` """ self.marketingStatus = None """ Marketing information. List of `MarketingStatus` items (represented as `dict` in JSON). """ + self._marketingStatus = None + """ Primitive extension for marketingStatus. List of `FHIRPrimitiveExtension` """ self.packageItem = None """ A packaging item, as a contained for medicine, possibly with other packaging items within. List of `MedicinalProductPackagedPackageItem` items (represented as `dict` in JSON). """ + self._packageItem = None + """ Primitive extension for packageItem. List of `FHIRPrimitiveExtension` """ self.subject = None """ The product with this is a pack for. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ super(MedicinalProductPackaged, self).__init__(jsondict=jsondict, strict=strict) @@ -62,14 +80,23 @@ def elementProperties(self): js = super(MedicinalProductPackaged, self).elementProperties() js.extend([ ("batchIdentifier", "batchIdentifier", MedicinalProductPackagedBatchIdentifier, True, None, False), + ("_batchIdentifier", "_batchIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("legalStatusOfSupply", "legalStatusOfSupply", codeableconcept.CodeableConcept, False, None, False), + ("_legalStatusOfSupply", "_legalStatusOfSupply", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, True, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("marketingAuthorization", "marketingAuthorization", fhirreference.FHIRReference, False, None, False), + ("_marketingAuthorization", "_marketingAuthorization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("marketingStatus", "marketingStatus", marketingstatus.MarketingStatus, True, None, False), + ("_marketingStatus", "_marketingStatus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("packageItem", "packageItem", MedicinalProductPackagedPackageItem, True, None, True), + ("_packageItem", "_packageItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -94,10 +121,14 @@ def __init__(self, jsondict=None, strict=True): """ A number appearing on the immediate packaging (and not the outer packaging). Type `Identifier` (represented as `dict` in JSON). """ + self._immediatePackaging = None + """ Primitive extension for immediatePackaging. Type `FHIRPrimitiveExtension` """ self.outerPackaging = None """ A number appearing on the outer packaging of a specific batch. Type `Identifier` (represented as `dict` in JSON). """ + self._outerPackaging = None + """ Primitive extension for outerPackaging. Type `FHIRPrimitiveExtension` """ super(MedicinalProductPackagedBatchIdentifier, self).__init__(jsondict=jsondict, strict=strict) @@ -105,7 +136,9 @@ def elementProperties(self): js = super(MedicinalProductPackagedBatchIdentifier, self).elementProperties() js.extend([ ("immediatePackaging", "immediatePackaging", identifier.Identifier, False, None, False), + ("_immediatePackaging", "_immediatePackaging", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outerPackaging", "outerPackaging", identifier.Identifier, False, None, True), + ("_outerPackaging", "_outerPackaging", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -128,52 +161,76 @@ def __init__(self, jsondict=None, strict=True): self.alternateMaterial = None """ A possible alternate material for the packaging. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._alternateMaterial = None + """ Primitive extension for alternateMaterial. List of `FHIRPrimitiveExtension` """ self.device = None """ A device accompanying a medicinal product. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Including possibly Data Carrier Identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.manufacturedItem = None """ The manufactured item as contained in the packaged medicinal product. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturedItem = None + """ Primitive extension for manufacturedItem. List of `FHIRPrimitiveExtension` """ self.manufacturer = None """ Manufacturer of this Package Item. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._manufacturer = None + """ Primitive extension for manufacturer. List of `FHIRPrimitiveExtension` """ self.material = None """ Material type of the package item. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._material = None + """ Primitive extension for material. List of `FHIRPrimitiveExtension` """ self.otherCharacteristics = None """ Other codeable characteristics. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._otherCharacteristics = None + """ Primitive extension for otherCharacteristics. List of `FHIRPrimitiveExtension` """ self.packageItem = None """ Allows containers within containers. List of `MedicinalProductPackagedPackageItem` items (represented as `dict` in JSON). """ + self._packageItem = None + """ Primitive extension for packageItem. List of `FHIRPrimitiveExtension` """ self.physicalCharacteristics = None """ Dimensions, color etc.. Type `ProdCharacteristic` (represented as `dict` in JSON). """ + self._physicalCharacteristics = None + """ Primitive extension for physicalCharacteristics. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The quantity of this package in the medicinal product, at the current level of packaging. The outermost is always 1. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.shelfLifeStorage = None """ Shelf Life and storage information. List of `ProductShelfLife` items (represented as `dict` in JSON). """ + self._shelfLifeStorage = None + """ Primitive extension for shelfLifeStorage. List of `FHIRPrimitiveExtension` """ self.type = None """ The physical type of the container of the medicine. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MedicinalProductPackagedPackageItem, self).__init__(jsondict=jsondict, strict=strict) @@ -181,20 +238,33 @@ def elementProperties(self): js = super(MedicinalProductPackagedPackageItem, self).elementProperties() js.extend([ ("alternateMaterial", "alternateMaterial", codeableconcept.CodeableConcept, True, None, False), + ("_alternateMaterial", "_alternateMaterial", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("device", "device", fhirreference.FHIRReference, True, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturedItem", "manufacturedItem", fhirreference.FHIRReference, True, None, False), + ("_manufacturedItem", "_manufacturedItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("manufacturer", "manufacturer", fhirreference.FHIRReference, True, None, False), + ("_manufacturer", "_manufacturer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("material", "material", codeableconcept.CodeableConcept, True, None, False), + ("_material", "_material", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("otherCharacteristics", "otherCharacteristics", codeableconcept.CodeableConcept, True, None, False), + ("_otherCharacteristics", "_otherCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("packageItem", "packageItem", MedicinalProductPackagedPackageItem, True, None, False), + ("_packageItem", "_packageItem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("physicalCharacteristics", "physicalCharacteristics", prodcharacteristic.ProdCharacteristic, False, None, False), + ("_physicalCharacteristics", "_physicalCharacteristics", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, True), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("shelfLifeStorage", "shelfLifeStorage", productshelflife.ProductShelfLife, True, None, False), + ("_shelfLifeStorage", "_shelfLifeStorage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference @@ -202,4 +272,4 @@ def elementProperties(self): from . import marketingstatus from . import prodcharacteristic from . import productshelflife -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/medicinalproductpharmaceutical.py b/fhirclient/models/medicinalproductpharmaceutical.py index 8b14452b..ab4bd2cd 100644 --- a/fhirclient/models/medicinalproductpharmaceutical.py +++ b/fhirclient/models/medicinalproductpharmaceutical.py @@ -22,31 +22,45 @@ def __init__(self, jsondict=None, strict=True): self.administrableDoseForm = None """ The administrable dose form, after necessary reconstitution. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._administrableDoseForm = None + """ Primitive extension for administrableDoseForm. Type `FHIRPrimitiveExtension` """ self.characteristics = None """ Characteristics e.g. a products onset of action. List of `MedicinalProductPharmaceuticalCharacteristics` items (represented as `dict` in JSON). """ + self._characteristics = None + """ Primitive extension for characteristics. List of `FHIRPrimitiveExtension` """ self.device = None """ Accompanying device. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. List of `FHIRPrimitiveExtension` """ self.identifier = None """ An identifier for the pharmaceutical medicinal product. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.ingredient = None """ Ingredient. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._ingredient = None + """ Primitive extension for ingredient. List of `FHIRPrimitiveExtension` """ self.routeOfAdministration = None """ The path by which the pharmaceutical product is taken into or makes contact with the body. List of `MedicinalProductPharmaceuticalRouteOfAdministration` items (represented as `dict` in JSON). """ + self._routeOfAdministration = None + """ Primitive extension for routeOfAdministration. List of `FHIRPrimitiveExtension` """ self.unitOfPresentation = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unitOfPresentation = None + """ Primitive extension for unitOfPresentation. Type `FHIRPrimitiveExtension` """ super(MedicinalProductPharmaceutical, self).__init__(jsondict=jsondict, strict=strict) @@ -54,12 +68,19 @@ def elementProperties(self): js = super(MedicinalProductPharmaceutical, self).elementProperties() js.extend([ ("administrableDoseForm", "administrableDoseForm", codeableconcept.CodeableConcept, False, None, True), + ("_administrableDoseForm", "_administrableDoseForm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("characteristics", "characteristics", MedicinalProductPharmaceuticalCharacteristics, True, None, False), + ("_characteristics", "_characteristics", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("device", "device", fhirreference.FHIRReference, True, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ingredient", "ingredient", fhirreference.FHIRReference, True, None, False), + ("_ingredient", "_ingredient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("routeOfAdministration", "routeOfAdministration", MedicinalProductPharmaceuticalRouteOfAdministration, True, None, True), + ("_routeOfAdministration", "_routeOfAdministration", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("unitOfPresentation", "unitOfPresentation", codeableconcept.CodeableConcept, False, None, False), + ("_unitOfPresentation", "_unitOfPresentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -83,10 +104,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ A coded characteristic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.status = None """ The status of characteristic e.g. assigned or pending. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(MedicinalProductPharmaceuticalCharacteristics, self).__init__(jsondict=jsondict, strict=strict) @@ -94,7 +119,9 @@ def elementProperties(self): js = super(MedicinalProductPharmaceuticalCharacteristics, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -117,39 +144,53 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Coded expression for the route. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.firstDose = None """ The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement. Type `Quantity` (represented as `dict` in JSON). """ + self._firstDose = None + """ Primitive extension for firstDose. Type `FHIRPrimitiveExtension` """ self.maxDosePerDay = None """ The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation. Type `Quantity` (represented as `dict` in JSON). """ + self._maxDosePerDay = None + """ Primitive extension for maxDosePerDay. Type `FHIRPrimitiveExtension` """ self.maxDosePerTreatmentPeriod = None """ The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation. Type `Ratio` (represented as `dict` in JSON). """ + self._maxDosePerTreatmentPeriod = None + """ Primitive extension for maxDosePerTreatmentPeriod. Type `FHIRPrimitiveExtension` """ self.maxSingleDose = None """ The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement. Type `Quantity` (represented as `dict` in JSON). """ + self._maxSingleDose = None + """ Primitive extension for maxSingleDose. Type `FHIRPrimitiveExtension` """ self.maxTreatmentPeriod = None """ The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation. Type `Duration` (represented as `dict` in JSON). """ + self._maxTreatmentPeriod = None + """ Primitive extension for maxTreatmentPeriod. Type `FHIRPrimitiveExtension` """ self.targetSpecies = None """ A species for which this route applies. List of `MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpecies` items (represented as `dict` in JSON). """ + self._targetSpecies = None + """ Primitive extension for targetSpecies. List of `FHIRPrimitiveExtension` """ super(MedicinalProductPharmaceuticalRouteOfAdministration, self).__init__(jsondict=jsondict, strict=strict) @@ -157,12 +198,19 @@ def elementProperties(self): js = super(MedicinalProductPharmaceuticalRouteOfAdministration, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("firstDose", "firstDose", quantity.Quantity, False, None, False), + ("_firstDose", "_firstDose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxDosePerDay", "maxDosePerDay", quantity.Quantity, False, None, False), + ("_maxDosePerDay", "_maxDosePerDay", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxDosePerTreatmentPeriod", "maxDosePerTreatmentPeriod", ratio.Ratio, False, None, False), + ("_maxDosePerTreatmentPeriod", "_maxDosePerTreatmentPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxSingleDose", "maxSingleDose", quantity.Quantity, False, None, False), + ("_maxSingleDose", "_maxSingleDose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxTreatmentPeriod", "maxTreatmentPeriod", duration.Duration, False, None, False), + ("_maxTreatmentPeriod", "_maxTreatmentPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetSpecies", "targetSpecies", MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpecies, True, None, False), + ("_targetSpecies", "_targetSpecies", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -184,11 +232,15 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Coded expression for the species. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.withdrawalPeriod = None """ A species specific time during which consumption of animal product is not appropriate. List of `MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpeciesWithdrawalPeriod` items (represented as `dict` in JSON). """ + self._withdrawalPeriod = None + """ Primitive extension for withdrawalPeriod. List of `FHIRPrimitiveExtension` """ super(MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpecies, self).__init__(jsondict=jsondict, strict=strict) @@ -196,7 +248,9 @@ def elementProperties(self): js = super(MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpecies, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("withdrawalPeriod", "withdrawalPeriod", MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpeciesWithdrawalPeriod, True, None, False), + ("_withdrawalPeriod", "_withdrawalPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -219,15 +273,21 @@ def __init__(self, jsondict=None, strict=True): self.supportingInformation = None """ Extra information about the withdrawal period. Type `str`. """ + self._supportingInformation = None + """ Primitive extension for supportingInformation. Type `FHIRPrimitiveExtension` """ self.tissue = None """ Coded expression for the type of tissue for which the withdrawal period applues, e.g. meat, milk. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._tissue = None + """ Primitive extension for tissue. Type `FHIRPrimitiveExtension` """ self.value = None """ A value for the time. Type `Quantity` (represented as `dict` in JSON). """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpeciesWithdrawalPeriod, self).__init__(jsondict=jsondict, strict=strict) @@ -235,15 +295,19 @@ def elementProperties(self): js = super(MedicinalProductPharmaceuticalRouteOfAdministrationTargetSpeciesWithdrawalPeriod, self).elementProperties() js.extend([ ("supportingInformation", "supportingInformation", str, False, None, False), + ("_supportingInformation", "_supportingInformation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("tissue", "tissue", codeableconcept.CodeableConcept, False, None, True), + ("_tissue", "_tissue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", quantity.Quantity, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import duration from . import fhirreference from . import identifier from . import quantity -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/medicinalproductundesirableeffect.py b/fhirclient/models/medicinalproductundesirableeffect.py index d442febb..b4e4c79e 100644 --- a/fhirclient/models/medicinalproductundesirableeffect.py +++ b/fhirclient/models/medicinalproductundesirableeffect.py @@ -23,22 +23,32 @@ def __init__(self, jsondict=None, strict=True): self.classification = None """ Classification of the effect. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. Type `FHIRPrimitiveExtension` """ self.frequencyOfOccurrence = None """ The frequency of occurrence of the effect. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._frequencyOfOccurrence = None + """ Primitive extension for frequencyOfOccurrence. Type `FHIRPrimitiveExtension` """ self.population = None """ The population group to which this applies. List of `Population` items (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. List of `FHIRPrimitiveExtension` """ self.subject = None """ The medication for which this is an indication. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. List of `FHIRPrimitiveExtension` """ self.symptomConditionEffect = None """ The symptom, condition or undesirable effect. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._symptomConditionEffect = None + """ Primitive extension for symptomConditionEffect. Type `FHIRPrimitiveExtension` """ super(MedicinalProductUndesirableEffect, self).__init__(jsondict=jsondict, strict=strict) @@ -46,14 +56,20 @@ def elementProperties(self): js = super(MedicinalProductUndesirableEffect, self).elementProperties() js.extend([ ("classification", "classification", codeableconcept.CodeableConcept, False, None, False), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("frequencyOfOccurrence", "frequencyOfOccurrence", codeableconcept.CodeableConcept, False, None, False), + ("_frequencyOfOccurrence", "_frequencyOfOccurrence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", population.Population, True, None, False), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subject", "subject", fhirreference.FHIRReference, True, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("symptomConditionEffect", "symptomConditionEffect", codeableconcept.CodeableConcept, False, None, False), + ("_symptomConditionEffect", "_symptomConditionEffect", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference -from . import population +from . import population \ No newline at end of file diff --git a/fhirclient/models/messagedefinition.py b/fhirclient/models/messagedefinition.py index 3911d3cc..efbbf598 100644 --- a/fhirclient/models/messagedefinition.py +++ b/fhirclient/models/messagedefinition.py @@ -26,102 +26,152 @@ def __init__(self, jsondict=None, strict=True): self.allowedResponse = None """ Responses to this message. List of `MessageDefinitionAllowedResponse` items (represented as `dict` in JSON). """ + self._allowedResponse = None + """ Primitive extension for allowedResponse. List of `FHIRPrimitiveExtension` """ self.base = None """ Definition this one is based on. Type `str`. """ + self._base = None + """ Primitive extension for base. Type `FHIRPrimitiveExtension` """ self.category = None """ consequence | currency | notification. Type `str`. """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the message definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.eventCoding = None """ Event code or link to the EventDefinition. Type `Coding` (represented as `dict` in JSON). """ + self._eventCoding = None + """ Primitive extension for eventCoding. Type `FHIRPrimitiveExtension` """ self.eventUri = None """ Event code or link to the EventDefinition. Type `str`. """ + self._eventUri = None + """ Primitive extension for eventUri. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.focus = None """ Resource(s) that are the subject of the event. List of `MessageDefinitionFocus` items (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. List of `FHIRPrimitiveExtension` """ self.graph = None """ Canonical reference to a GraphDefinition. List of `str` items. """ + self._graph = None + """ Primitive extension for graph. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Primary key for the message definition on a given server. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for message definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this message definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.parent = None """ Protocol/workflow this is part of. List of `str` items. """ + self._parent = None + """ Primitive extension for parent. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this message definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.replaces = None """ Takes the place of. List of `str` items. """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.responseRequired = None """ always | on-error | never | on-success. Type `str`. """ + self._responseRequired = None + """ Primitive extension for responseRequired. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this message definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Business Identifier for a given MessageDefinition. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the message definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(MessageDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -129,30 +179,55 @@ def elementProperties(self): js = super(MessageDefinition, self).elementProperties() js.extend([ ("allowedResponse", "allowedResponse", MessageDefinitionAllowedResponse, True, None, False), + ("_allowedResponse", "_allowedResponse", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("base", "base", str, False, None, False), + ("_base", "_base", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", str, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventCoding", "eventCoding", coding.Coding, False, "event", True), + ("_eventCoding", "_eventCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventUri", "eventUri", str, False, "event", True), + ("_eventUri", "_eventUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focus", "focus", MessageDefinitionFocus, True, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("graph", "graph", str, True, None, False), + ("_graph", "_graph", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parent", "parent", str, True, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("replaces", "replaces", str, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("responseRequired", "responseRequired", str, False, None, False), + ("_responseRequired", "_responseRequired", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -179,10 +254,14 @@ def __init__(self, jsondict=None, strict=True): self.message = None """ Reference to allowed message definition response. Type `str`. """ + self._message = None + """ Primitive extension for message. Type `FHIRPrimitiveExtension` """ self.situation = None """ When should this response be used. Type `str`. """ + self._situation = None + """ Primitive extension for situation. Type `FHIRPrimitiveExtension` """ super(MessageDefinitionAllowedResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -190,7 +269,9 @@ def elementProperties(self): js = super(MessageDefinitionAllowedResponse, self).elementProperties() js.extend([ ("message", "message", str, False, None, True), + ("_message", "_message", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("situation", "situation", str, False, None, False), + ("_situation", "_situation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -216,18 +297,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Type of resource. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.max = None """ Maximum number of focuses of this type. Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Minimum number of focuses of this type. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.profile = None """ Profile that must be adhered to by focus. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ super(MessageDefinitionFocus, self).__init__(jsondict=jsondict, strict=strict) @@ -235,16 +324,21 @@ def elementProperties(self): js = super(MessageDefinitionFocus, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("max", "max", str, False, None, False), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, True), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import contactdetail from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/messageheader.py b/fhirclient/models/messageheader.py index e01bb96f..60cfc700 100644 --- a/fhirclient/models/messageheader.py +++ b/fhirclient/models/messageheader.py @@ -27,52 +27,76 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ The source of the decision. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.definition = None """ Link to the definition for this message. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.destination = None """ Message destination application(s). List of `MessageHeaderDestination` items (represented as `dict` in JSON). """ + self._destination = None + """ Primitive extension for destination. List of `FHIRPrimitiveExtension` """ self.enterer = None """ The source of the data entry. Type `FHIRReference` (represented as `dict` in JSON). """ + self._enterer = None + """ Primitive extension for enterer. Type `FHIRPrimitiveExtension` """ self.eventCoding = None """ Code for the event this message represents or link to event definition. Type `Coding` (represented as `dict` in JSON). """ + self._eventCoding = None + """ Primitive extension for eventCoding. Type `FHIRPrimitiveExtension` """ self.eventUri = None """ Code for the event this message represents or link to event definition. Type `str`. """ + self._eventUri = None + """ Primitive extension for eventUri. Type `FHIRPrimitiveExtension` """ self.focus = None """ The actual content of the message. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. List of `FHIRPrimitiveExtension` """ self.reason = None """ Cause of event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.response = None """ If this is a reply to prior message. Type `MessageHeaderResponse` (represented as `dict` in JSON). """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Final responsibility for event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.sender = None """ Real world sender of the message. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sender = None + """ Primitive extension for sender. Type `FHIRPrimitiveExtension` """ self.source = None """ Message source application. Type `MessageHeaderSource` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ super(MessageHeader, self).__init__(jsondict=jsondict, strict=strict) @@ -80,17 +104,29 @@ def elementProperties(self): js = super(MessageHeader, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", MessageHeaderDestination, True, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("enterer", "enterer", fhirreference.FHIRReference, False, None, False), + ("_enterer", "_enterer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventCoding", "eventCoding", coding.Coding, False, "event", True), + ("_eventCoding", "_eventCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eventUri", "eventUri", str, False, "event", True), + ("_eventUri", "_eventUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focus", "focus", fhirreference.FHIRReference, True, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reason", "reason", codeableconcept.CodeableConcept, False, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", MessageHeaderResponse, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", fhirreference.FHIRReference, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sender", "sender", fhirreference.FHIRReference, False, None, False), + ("_sender", "_sender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", MessageHeaderSource, False, None, True), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -116,18 +152,26 @@ def __init__(self, jsondict=None, strict=True): self.endpoint = None """ Actual destination address or id. Type `str`. """ + self._endpoint = None + """ Primitive extension for endpoint. Type `FHIRPrimitiveExtension` """ self.name = None """ Name of system. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.receiver = None """ Intended "real-world" recipient for the data. Type `FHIRReference` (represented as `dict` in JSON). """ + self._receiver = None + """ Primitive extension for receiver. Type `FHIRPrimitiveExtension` """ self.target = None """ Particular delivery destination within the destination. Type `FHIRReference` (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. Type `FHIRPrimitiveExtension` """ super(MessageHeaderDestination, self).__init__(jsondict=jsondict, strict=strict) @@ -135,9 +179,13 @@ def elementProperties(self): js = super(MessageHeaderDestination, self).elementProperties() js.extend([ ("endpoint", "endpoint", str, False, None, True), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("receiver", "receiver", fhirreference.FHIRReference, False, None, False), + ("_receiver", "_receiver", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", fhirreference.FHIRReference, False, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -162,14 +210,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ ok | transient-error | fatal-error. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.details = None """ Specific list of hints/warnings/errors. Type `FHIRReference` (represented as `dict` in JSON). """ + self._details = None + """ Primitive extension for details. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Id of original message. Type `str`. """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ super(MessageHeaderResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -177,8 +231,11 @@ def elementProperties(self): js = super(MessageHeaderResponse, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("details", "details", fhirreference.FHIRReference, False, None, False), + ("_details", "_details", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", str, False, None, True), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -202,22 +259,32 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Human contact for problems. Type `ContactPoint` (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. Type `FHIRPrimitiveExtension` """ self.endpoint = None """ Actual message source address or id. Type `str`. """ + self._endpoint = None + """ Primitive extension for endpoint. Type `FHIRPrimitiveExtension` """ self.name = None """ Name of system. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.software = None """ Name of software running the system. Type `str`. """ + self._software = None + """ Primitive extension for software. Type `FHIRPrimitiveExtension` """ self.version = None """ Version of software running. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(MessageHeaderSource, self).__init__(jsondict=jsondict, strict=strict) @@ -225,15 +292,21 @@ def elementProperties(self): js = super(MessageHeaderSource, self).elementProperties() js.extend([ ("contact", "contact", contactpoint.ContactPoint, False, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endpoint", "endpoint", str, False, None, True), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("software", "software", str, False, None, False), + ("_software", "_software", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import contactpoint -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/meta.py b/fhirclient/models/meta.py index 7545e1c4..4e41d195 100644 --- a/fhirclient/models/meta.py +++ b/fhirclient/models/meta.py @@ -25,26 +25,38 @@ def __init__(self, jsondict=None, strict=True): self.lastUpdated = None """ When the resource version last changed. Type `FHIRInstant` (represented as `str` in JSON). """ + self._lastUpdated = None + """ Primitive extension for lastUpdated. Type `FHIRPrimitiveExtension` """ self.profile = None """ Profiles this resource claims to conform to. List of `str` items. """ + self._profile = None + """ Primitive extension for profile. List of `FHIRPrimitiveExtension` """ self.security = None """ Security Labels applied to this resource. List of `Coding` items (represented as `dict` in JSON). """ + self._security = None + """ Primitive extension for security. List of `FHIRPrimitiveExtension` """ self.source = None """ Identifies where the resource comes from. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.tag = None """ Tags applied to this resource. List of `Coding` items (represented as `dict` in JSON). """ + self._tag = None + """ Primitive extension for tag. List of `FHIRPrimitiveExtension` """ self.versionId = None """ Version specific identifier. Type `str`. """ + self._versionId = None + """ Primitive extension for versionId. Type `FHIRPrimitiveExtension` """ super(Meta, self).__init__(jsondict=jsondict, strict=strict) @@ -52,14 +64,21 @@ def elementProperties(self): js = super(Meta, self).elementProperties() js.extend([ ("lastUpdated", "lastUpdated", fhirinstant.FHIRInstant, False, None, False), + ("_lastUpdated", "_lastUpdated", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, True, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("security", "security", coding.Coding, True, None, False), + ("_security", "_security", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", str, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("tag", "tag", coding.Coding, True, None, False), + ("_tag", "_tag", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("versionId", "versionId", str, False, None, False), + ("_versionId", "_versionId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import coding -from . import fhirinstant +from . import fhirinstant \ No newline at end of file diff --git a/fhirclient/models/metadataresource.py b/fhirclient/models/metadataresource.py index 05b38269..fc461abb 100644 --- a/fhirclient/models/metadataresource.py +++ b/fhirclient/models/metadataresource.py @@ -22,51 +22,75 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the metadata resource. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for metadata resource (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this metadata resource (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this metadata resource (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this metadata resource, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the metadata resource. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(MetadataResource, self).__init__(jsondict=jsondict, strict=strict) @@ -74,22 +98,35 @@ def elementProperties(self): js = super(MetadataResource, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/molecularsequence.py b/fhirclient/models/molecularsequence.py index 94abfc6d..d1783f7a 100644 --- a/fhirclient/models/molecularsequence.py +++ b/fhirclient/models/molecularsequence.py @@ -25,68 +25,100 @@ def __init__(self, jsondict=None, strict=True): coordinates, inclusive start, exclusive end, 1 for 1-based numbering, inclusive start, inclusive end). Type `int`. """ + self._coordinateSystem = None + """ Primitive extension for coordinateSystem. Type `FHIRPrimitiveExtension` """ self.device = None """ The method for sequencing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique ID for this particular sequence. This is a FHIR-defined id. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.observedSeq = None """ Sequence that was observed. Type `str`. """ + self._observedSeq = None + """ Primitive extension for observedSeq. Type `FHIRPrimitiveExtension` """ self.patient = None """ Who and/or what this is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who should be responsible for test result. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.pointer = None """ Pointer to next atomic sequence. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._pointer = None + """ Primitive extension for pointer. List of `FHIRPrimitiveExtension` """ self.quality = None """ An set of value as quality of sequence. List of `MolecularSequenceQuality` items (represented as `dict` in JSON). """ + self._quality = None + """ Primitive extension for quality. List of `FHIRPrimitiveExtension` """ self.quantity = None """ The number of copies of the sequence of interest. (RNASeq). Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.readCoverage = None """ Average number of reads representing a given nucleotide in the reconstructed sequence. Type `int`. """ + self._readCoverage = None + """ Primitive extension for readCoverage. Type `FHIRPrimitiveExtension` """ self.referenceSeq = None """ A sequence used as reference. Type `MolecularSequenceReferenceSeq` (represented as `dict` in JSON). """ + self._referenceSeq = None + """ Primitive extension for referenceSeq. Type `FHIRPrimitiveExtension` """ self.repository = None """ External repository which contains detailed report related with observedSeq in this resource. List of `MolecularSequenceRepository` items (represented as `dict` in JSON). """ + self._repository = None + """ Primitive extension for repository. List of `FHIRPrimitiveExtension` """ self.specimen = None """ Specimen used for sequencing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._specimen = None + """ Primitive extension for specimen. Type `FHIRPrimitiveExtension` """ self.structureVariant = None """ Structural variant. List of `MolecularSequenceStructureVariant` items (represented as `dict` in JSON). """ + self._structureVariant = None + """ Primitive extension for structureVariant. List of `FHIRPrimitiveExtension` """ self.type = None """ aa | dna | rna. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.variant = None """ Variant in sequence. List of `MolecularSequenceVariant` items (represented as `dict` in JSON). """ + self._variant = None + """ Primitive extension for variant. List of `FHIRPrimitiveExtension` """ super(MolecularSequence, self).__init__(jsondict=jsondict, strict=strict) @@ -94,21 +126,37 @@ def elementProperties(self): js = super(MolecularSequence, self).elementProperties() js.extend([ ("coordinateSystem", "coordinateSystem", int, False, None, True), + ("_coordinateSystem", "_coordinateSystem", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("device", "device", fhirreference.FHIRReference, False, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("observedSeq", "observedSeq", str, False, None, False), + ("_observedSeq", "_observedSeq", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, False), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("pointer", "pointer", fhirreference.FHIRReference, True, None, False), + ("_pointer", "_pointer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quality", "quality", MolecularSequenceQuality, True, None, False), + ("_quality", "_quality", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("readCoverage", "readCoverage", int, False, None, False), + ("_readCoverage", "_readCoverage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceSeq", "referenceSeq", MolecularSequenceReferenceSeq, False, None, False), + ("_referenceSeq", "_referenceSeq", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("repository", "repository", MolecularSequenceRepository, True, None, False), + ("_repository", "_repository", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimen", "specimen", fhirreference.FHIRReference, False, None, False), + ("_specimen", "_specimen", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("structureVariant", "structureVariant", MolecularSequenceStructureVariant, True, None, False), + ("_structureVariant", "_structureVariant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variant", "variant", MolecularSequenceVariant, True, None, False), + ("_variant", "_variant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -136,63 +184,93 @@ def __init__(self, jsondict=None, strict=True): self.end = None """ End position of the sequence. Type `int`. """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.fScore = None """ F-score. Type `float`. """ + self._fScore = None + """ Primitive extension for fScore. Type `FHIRPrimitiveExtension` """ self.gtFP = None """ False positives where the non-REF alleles in the Truth and Query Call Sets match. Type `float`. """ + self._gtFP = None + """ Primitive extension for gtFP. Type `FHIRPrimitiveExtension` """ self.method = None """ Method to get quality. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.precision = None """ Precision of comparison. Type `float`. """ + self._precision = None + """ Primitive extension for precision. Type `FHIRPrimitiveExtension` """ self.queryFP = None """ False positives. Type `float`. """ + self._queryFP = None + """ Primitive extension for queryFP. Type `FHIRPrimitiveExtension` """ self.queryTP = None """ True positives from the perspective of the query data. Type `float`. """ + self._queryTP = None + """ Primitive extension for queryTP. Type `FHIRPrimitiveExtension` """ self.recall = None """ Recall of comparison. Type `float`. """ + self._recall = None + """ Primitive extension for recall. Type `FHIRPrimitiveExtension` """ self.roc = None """ Receiver Operator Characteristic (ROC) Curve. Type `MolecularSequenceQualityRoc` (represented as `dict` in JSON). """ + self._roc = None + """ Primitive extension for roc. Type `FHIRPrimitiveExtension` """ self.score = None """ Quality score for the comparison. Type `Quantity` (represented as `dict` in JSON). """ + self._score = None + """ Primitive extension for score. Type `FHIRPrimitiveExtension` """ self.standardSequence = None """ Standard sequence for comparison. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._standardSequence = None + """ Primitive extension for standardSequence. Type `FHIRPrimitiveExtension` """ self.start = None """ Start position of the sequence. Type `int`. """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.truthFN = None """ False negatives. Type `float`. """ + self._truthFN = None + """ Primitive extension for truthFN. Type `FHIRPrimitiveExtension` """ self.truthTP = None """ True positives from the perspective of the truth data. Type `float`. """ + self._truthTP = None + """ Primitive extension for truthTP. Type `FHIRPrimitiveExtension` """ self.type = None """ indel | snp | unknown. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceQuality, self).__init__(jsondict=jsondict, strict=strict) @@ -200,20 +278,35 @@ def elementProperties(self): js = super(MolecularSequenceQuality, self).elementProperties() js.extend([ ("end", "end", int, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fScore", "fScore", float, False, None, False), + ("_fScore", "_fScore", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gtFP", "gtFP", float, False, None, False), + ("_gtFP", "_gtFP", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("precision", "precision", float, False, None, False), + ("_precision", "_precision", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("queryFP", "queryFP", float, False, None, False), + ("_queryFP", "_queryFP", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("queryTP", "queryTP", float, False, None, False), + ("_queryTP", "_queryTP", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recall", "recall", float, False, None, False), + ("_recall", "_recall", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("roc", "roc", MolecularSequenceQualityRoc, False, None, False), + ("_roc", "_roc", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("score", "score", quantity.Quantity, False, None, False), + ("_score", "_score", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("standardSequence", "standardSequence", codeableconcept.CodeableConcept, False, None, False), + ("_standardSequence", "_standardSequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", int, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("truthFN", "truthFN", float, False, None, False), + ("_truthFN", "_truthFN", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("truthTP", "truthTP", float, False, None, False), + ("_truthTP", "_truthTP", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -238,30 +331,44 @@ def __init__(self, jsondict=None, strict=True): self.fMeasure = None """ FScore of the GQ score. List of `float` items. """ + self._fMeasure = None + """ Primitive extension for fMeasure. List of `FHIRPrimitiveExtension` """ self.numFN = None """ Roc score false negative numbers. List of `int` items. """ + self._numFN = None + """ Primitive extension for numFN. List of `FHIRPrimitiveExtension` """ self.numFP = None """ Roc score false positive numbers. List of `int` items. """ + self._numFP = None + """ Primitive extension for numFP. List of `FHIRPrimitiveExtension` """ self.numTP = None """ Roc score true positive numbers. List of `int` items. """ + self._numTP = None + """ Primitive extension for numTP. List of `FHIRPrimitiveExtension` """ self.precision = None """ Precision of the GQ score. List of `float` items. """ + self._precision = None + """ Primitive extension for precision. List of `FHIRPrimitiveExtension` """ self.score = None """ Genotype quality score. List of `int` items. """ + self._score = None + """ Primitive extension for score. List of `FHIRPrimitiveExtension` """ self.sensitivity = None """ Sensitivity of the GQ score. List of `float` items. """ + self._sensitivity = None + """ Primitive extension for sensitivity. List of `FHIRPrimitiveExtension` """ super(MolecularSequenceQualityRoc, self).__init__(jsondict=jsondict, strict=strict) @@ -269,12 +376,19 @@ def elementProperties(self): js = super(MolecularSequenceQualityRoc, self).elementProperties() js.extend([ ("fMeasure", "fMeasure", float, True, None, False), + ("_fMeasure", "_fMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("numFN", "numFN", int, True, None, False), + ("_numFN", "_numFN", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("numFP", "numFP", int, True, None, False), + ("_numFP", "_numFP", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("numTP", "numTP", int, True, None, False), + ("_numTP", "_numTP", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("precision", "precision", float, True, None, False), + ("_precision", "_precision", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("score", "score", int, True, None, False), + ("_score", "_score", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sensitivity", "sensitivity", float, True, None, False), + ("_sensitivity", "_sensitivity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -299,39 +413,57 @@ def __init__(self, jsondict=None, strict=True): self.chromosome = None """ Chromosome containing genetic finding. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._chromosome = None + """ Primitive extension for chromosome. Type `FHIRPrimitiveExtension` """ self.genomeBuild = None """ The Genome Build used for reference, following GRCh build versions e.g. 'GRCh 37'. Type `str`. """ + self._genomeBuild = None + """ Primitive extension for genomeBuild. Type `FHIRPrimitiveExtension` """ self.orientation = None """ sense | antisense. Type `str`. """ + self._orientation = None + """ Primitive extension for orientation. Type `FHIRPrimitiveExtension` """ self.referenceSeqId = None """ Reference identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._referenceSeqId = None + """ Primitive extension for referenceSeqId. Type `FHIRPrimitiveExtension` """ self.referenceSeqPointer = None """ A pointer to another MolecularSequence entity as reference sequence. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referenceSeqPointer = None + """ Primitive extension for referenceSeqPointer. Type `FHIRPrimitiveExtension` """ self.referenceSeqString = None """ A string to represent reference sequence. Type `str`. """ + self._referenceSeqString = None + """ Primitive extension for referenceSeqString. Type `FHIRPrimitiveExtension` """ self.strand = None """ watson | crick. Type `str`. """ + self._strand = None + """ Primitive extension for strand. Type `FHIRPrimitiveExtension` """ self.windowEnd = None """ End position of the window on the reference sequence. Type `int`. """ + self._windowEnd = None + """ Primitive extension for windowEnd. Type `FHIRPrimitiveExtension` """ self.windowStart = None """ Start position of the window on the reference sequence. Type `int`. """ + self._windowStart = None + """ Primitive extension for windowStart. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceReferenceSeq, self).__init__(jsondict=jsondict, strict=strict) @@ -339,14 +471,23 @@ def elementProperties(self): js = super(MolecularSequenceReferenceSeq, self).elementProperties() js.extend([ ("chromosome", "chromosome", codeableconcept.CodeableConcept, False, None, False), + ("_chromosome", "_chromosome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("genomeBuild", "genomeBuild", str, False, None, False), + ("_genomeBuild", "_genomeBuild", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orientation", "orientation", str, False, None, False), + ("_orientation", "_orientation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceSeqId", "referenceSeqId", codeableconcept.CodeableConcept, False, None, False), + ("_referenceSeqId", "_referenceSeqId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceSeqPointer", "referenceSeqPointer", fhirreference.FHIRReference, False, None, False), + ("_referenceSeqPointer", "_referenceSeqPointer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceSeqString", "referenceSeqString", str, False, None, False), + ("_referenceSeqString", "_referenceSeqString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("strand", "strand", str, False, None, False), + ("_strand", "_strand", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("windowEnd", "windowEnd", int, False, None, False), + ("_windowEnd", "_windowEnd", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("windowStart", "windowStart", int, False, None, False), + ("_windowStart", "_windowStart", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -372,26 +513,38 @@ def __init__(self, jsondict=None, strict=True): self.datasetId = None """ Id of the dataset that used to call for dataset in repository. Type `str`. """ + self._datasetId = None + """ Primitive extension for datasetId. Type `FHIRPrimitiveExtension` """ self.name = None """ Repository's name. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.readsetId = None """ Id of the read. Type `str`. """ + self._readsetId = None + """ Primitive extension for readsetId. Type `FHIRPrimitiveExtension` """ self.type = None """ directlink | openapi | login | oauth | other. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ URI of the repository. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.variantsetId = None """ Id of the variantset that used to call for variantset in repository. Type `str`. """ + self._variantsetId = None + """ Primitive extension for variantsetId. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceRepository, self).__init__(jsondict=jsondict, strict=strict) @@ -399,11 +552,17 @@ def elementProperties(self): js = super(MolecularSequenceRepository, self).elementProperties() js.extend([ ("datasetId", "datasetId", str, False, None, False), + ("_datasetId", "_datasetId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("readsetId", "readsetId", str, False, None, False), + ("_readsetId", "_readsetId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variantsetId", "variantsetId", str, False, None, False), + ("_variantsetId", "_variantsetId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -427,22 +586,32 @@ def __init__(self, jsondict=None, strict=True): self.exact = None """ Does the structural variant have base pair resolution breakpoints?. Type `bool`. """ + self._exact = None + """ Primitive extension for exact. Type `FHIRPrimitiveExtension` """ self.inner = None """ Structural variant inner. Type `MolecularSequenceStructureVariantInner` (represented as `dict` in JSON). """ + self._inner = None + """ Primitive extension for inner. Type `FHIRPrimitiveExtension` """ self.length = None """ Structural variant length. Type `int`. """ + self._length = None + """ Primitive extension for length. Type `FHIRPrimitiveExtension` """ self.outer = None """ Structural variant outer. Type `MolecularSequenceStructureVariantOuter` (represented as `dict` in JSON). """ + self._outer = None + """ Primitive extension for outer. Type `FHIRPrimitiveExtension` """ self.variantType = None """ Structural variant change type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._variantType = None + """ Primitive extension for variantType. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceStructureVariant, self).__init__(jsondict=jsondict, strict=strict) @@ -450,10 +619,15 @@ def elementProperties(self): js = super(MolecularSequenceStructureVariant, self).elementProperties() js.extend([ ("exact", "exact", bool, False, None, False), + ("_exact", "_exact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("inner", "inner", MolecularSequenceStructureVariantInner, False, None, False), + ("_inner", "_inner", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("length", "length", int, False, None, False), + ("_length", "_length", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outer", "outer", MolecularSequenceStructureVariantOuter, False, None, False), + ("_outer", "_outer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variantType", "variantType", codeableconcept.CodeableConcept, False, None, False), + ("_variantType", "_variantType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -475,10 +649,14 @@ def __init__(self, jsondict=None, strict=True): self.end = None """ Structural variant inner end. Type `int`. """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.start = None """ Structural variant inner start. Type `int`. """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceStructureVariantInner, self).__init__(jsondict=jsondict, strict=strict) @@ -486,7 +664,9 @@ def elementProperties(self): js = super(MolecularSequenceStructureVariantInner, self).elementProperties() js.extend([ ("end", "end", int, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", int, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -508,10 +688,14 @@ def __init__(self, jsondict=None, strict=True): self.end = None """ Structural variant outer end. Type `int`. """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.start = None """ Structural variant outer start. Type `int`. """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceStructureVariantOuter, self).__init__(jsondict=jsondict, strict=strict) @@ -519,7 +703,9 @@ def elementProperties(self): js = super(MolecularSequenceStructureVariantOuter, self).elementProperties() js.extend([ ("end", "end", int, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", int, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -548,26 +734,38 @@ def __init__(self, jsondict=None, strict=True): """ Extended CIGAR string for aligning the sequence with reference bases. Type `str`. """ + self._cigar = None + """ Primitive extension for cigar. Type `FHIRPrimitiveExtension` """ self.end = None """ End position of the variant on the reference sequence. Type `int`. """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.observedAllele = None """ Allele that was observed. Type `str`. """ + self._observedAllele = None + """ Primitive extension for observedAllele. Type `FHIRPrimitiveExtension` """ self.referenceAllele = None """ Allele in the reference sequence. Type `str`. """ + self._referenceAllele = None + """ Primitive extension for referenceAllele. Type `FHIRPrimitiveExtension` """ self.start = None """ Start position of the variant on the reference sequence. Type `int`. """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.variantPointer = None """ Pointer to observed variant information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._variantPointer = None + """ Primitive extension for variantPointer. Type `FHIRPrimitiveExtension` """ super(MolecularSequenceVariant, self).__init__(jsondict=jsondict, strict=strict) @@ -575,16 +773,23 @@ def elementProperties(self): js = super(MolecularSequenceVariant, self).elementProperties() js.extend([ ("cigar", "cigar", str, False, None, False), + ("_cigar", "_cigar", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("end", "end", int, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("observedAllele", "observedAllele", str, False, None, False), + ("_observedAllele", "_observedAllele", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceAllele", "referenceAllele", str, False, None, False), + ("_referenceAllele", "_referenceAllele", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", int, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variantPointer", "variantPointer", fhirreference.FHIRReference, False, None, False), + ("_variantPointer", "_variantPointer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/money.py b/fhirclient/models/money.py index 0aa0d7fa..2388e15b 100644 --- a/fhirclient/models/money.py +++ b/fhirclient/models/money.py @@ -21,10 +21,14 @@ def __init__(self, jsondict=None, strict=True): self.currency = None """ ISO 4217 Currency Code. Type `str`. """ + self._currency = None + """ Primitive extension for currency. Type `FHIRPrimitiveExtension` """ self.value = None """ Numerical value (with implicit precision). Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(Money, self).__init__(jsondict=jsondict, strict=strict) @@ -32,8 +36,10 @@ def elementProperties(self): js = super(Money, self).elementProperties() js.extend([ ("currency", "currency", str, False, None, False), + ("_currency", "_currency", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/namingsystem.py b/fhirclient/models/namingsystem.py index dfbe7eae..c3bfbeb6 100644 --- a/fhirclient/models/namingsystem.py +++ b/fhirclient/models/namingsystem.py @@ -25,54 +25,80 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the naming system. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for naming system (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.kind = None """ codesystem | identifier | root. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this naming system (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Who maintains system namespace?. Type `str`. """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.type = None """ e.g. driver, provider, patient, bank etc.. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.uniqueId = None """ Unique identifiers used for system. List of `NamingSystemUniqueId` items (represented as `dict` in JSON). """ + self._uniqueId = None + """ Primitive extension for uniqueId. List of `FHIRPrimitiveExtension` """ self.usage = None """ How/where is it used. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ super(NamingSystem, self).__init__(jsondict=jsondict, strict=strict) @@ -80,18 +106,31 @@ def elementProperties(self): js = super(NamingSystem, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", str, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uniqueId", "uniqueId", NamingSystemUniqueId, True, None, True), + ("_uniqueId", "_uniqueId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -118,22 +157,32 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Notes about identifier usage. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.period = None """ When is identifier valid?. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.preferred = None """ Is this the id that should be used for this type. Type `bool`. """ + self._preferred = None + """ Primitive extension for preferred. Type `FHIRPrimitiveExtension` """ self.type = None """ oid | uuid | uri | other. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.value = None """ The unique identifier. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(NamingSystemUniqueId, self).__init__(jsondict=jsondict, strict=strict) @@ -141,16 +190,22 @@ def elementProperties(self): js = super(NamingSystemUniqueId, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preferred", "preferred", bool, False, None, False), + ("_preferred", "_preferred", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime from . import period -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/narrative.py b/fhirclient/models/narrative.py index ddca693c..1205a80b 100644 --- a/fhirclient/models/narrative.py +++ b/fhirclient/models/narrative.py @@ -25,10 +25,14 @@ def __init__(self, jsondict=None, strict=True): self.div = None """ Limited xhtml content. Type `str`. """ + self._div = None + """ Primitive extension for div. Type `FHIRPrimitiveExtension` """ self.status = None """ generated | extensions | additional | empty. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Narrative, self).__init__(jsondict=jsondict, strict=strict) @@ -36,8 +40,10 @@ def elementProperties(self): js = super(Narrative, self).elementProperties() js.extend([ ("div", "div", str, False, None, True), + ("_div", "_div", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/nutritionorder.py b/fhirclient/models/nutritionorder.py index 50f27974..1806b9a3 100644 --- a/fhirclient/models/nutritionorder.py +++ b/fhirclient/models/nutritionorder.py @@ -25,73 +25,107 @@ def __init__(self, jsondict=None, strict=True): """ List of the patient's food and nutrition-related allergies and intolerances. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._allergyIntolerance = None + """ Primitive extension for allergyIntolerance. List of `FHIRPrimitiveExtension` """ self.dateTime = None """ Date and time the nutrition order was requested. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateTime = None + """ Primitive extension for dateTime. Type `FHIRPrimitiveExtension` """ self.encounter = None """ The encounter associated with this nutrition order. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.enteralFormula = None """ Enteral formula components. Type `NutritionOrderEnteralFormula` (represented as `dict` in JSON). """ + self._enteralFormula = None + """ Primitive extension for enteralFormula. Type `FHIRPrimitiveExtension` """ self.excludeFoodModifier = None """ Order-specific modifier about the type of food that should not be given. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._excludeFoodModifier = None + """ Primitive extension for excludeFoodModifier. List of `FHIRPrimitiveExtension` """ self.foodPreferenceModifier = None """ Order-specific modifier about the type of food that should be given. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._foodPreferenceModifier = None + """ Primitive extension for foodPreferenceModifier. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Identifiers assigned to this order. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiates = None """ Instantiates protocol or definition. List of `str` items. """ + self._instantiates = None + """ Primitive extension for instantiates. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.oralDiet = None """ Oral diet components. Type `NutritionOrderOralDiet` (represented as `dict` in JSON). """ + self._oralDiet = None + """ Primitive extension for oralDiet. Type `FHIRPrimitiveExtension` """ self.orderer = None """ Who ordered the diet, formula or nutritional supplement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._orderer = None + """ Primitive extension for orderer. Type `FHIRPrimitiveExtension` """ self.patient = None """ The person who requires the diet, formula or nutritional supplement. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.supplement = None """ Supplement components. List of `NutritionOrderSupplement` items (represented as `dict` in JSON). """ + self._supplement = None + """ Primitive extension for supplement. List of `FHIRPrimitiveExtension` """ super(NutritionOrder, self).__init__(jsondict=jsondict, strict=strict) @@ -99,22 +133,39 @@ def elementProperties(self): js = super(NutritionOrder, self).elementProperties() js.extend([ ("allergyIntolerance", "allergyIntolerance", fhirreference.FHIRReference, True, None, False), + ("_allergyIntolerance", "_allergyIntolerance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dateTime", "dateTime", fhirdatetime.FHIRDateTime, False, None, True), + ("_dateTime", "_dateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enteralFormula", "enteralFormula", NutritionOrderEnteralFormula, False, None, False), + ("_enteralFormula", "_enteralFormula", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("excludeFoodModifier", "excludeFoodModifier", codeableconcept.CodeableConcept, True, None, False), + ("_excludeFoodModifier", "_excludeFoodModifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("foodPreferenceModifier", "foodPreferenceModifier", codeableconcept.CodeableConcept, True, None, False), + ("_foodPreferenceModifier", "_foodPreferenceModifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiates", "instantiates", str, True, None, False), + ("_instantiates", "_instantiates", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("oralDiet", "oralDiet", NutritionOrderOralDiet, False, None, False), + ("_oralDiet", "_oralDiet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orderer", "orderer", fhirreference.FHIRReference, False, None, False), + ("_orderer", "_orderer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supplement", "supplement", NutritionOrderSupplement, True, None, False), + ("_supplement", "_supplement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -141,38 +192,56 @@ def __init__(self, jsondict=None, strict=True): self.additiveProductName = None """ Product or brand name of the modular additive. Type `str`. """ + self._additiveProductName = None + """ Primitive extension for additiveProductName. Type `FHIRPrimitiveExtension` """ self.additiveType = None """ Type of modular component to add to the feeding. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._additiveType = None + """ Primitive extension for additiveType. Type `FHIRPrimitiveExtension` """ self.administration = None """ Formula feeding instruction as structured data. List of `NutritionOrderEnteralFormulaAdministration` items (represented as `dict` in JSON). """ + self._administration = None + """ Primitive extension for administration. List of `FHIRPrimitiveExtension` """ self.administrationInstruction = None """ Formula feeding instructions expressed as text. Type `str`. """ + self._administrationInstruction = None + """ Primitive extension for administrationInstruction. Type `FHIRPrimitiveExtension` """ self.baseFormulaProductName = None """ Product or brand name of the enteral or infant formula. Type `str`. """ + self._baseFormulaProductName = None + """ Primitive extension for baseFormulaProductName. Type `FHIRPrimitiveExtension` """ self.baseFormulaType = None """ Type of enteral or infant formula. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._baseFormulaType = None + """ Primitive extension for baseFormulaType. Type `FHIRPrimitiveExtension` """ self.caloricDensity = None """ Amount of energy per specified volume that is required. Type `Quantity` (represented as `dict` in JSON). """ + self._caloricDensity = None + """ Primitive extension for caloricDensity. Type `FHIRPrimitiveExtension` """ self.maxVolumeToDeliver = None """ Upper limit on formula volume per unit of time. Type `Quantity` (represented as `dict` in JSON). """ + self._maxVolumeToDeliver = None + """ Primitive extension for maxVolumeToDeliver. Type `FHIRPrimitiveExtension` """ self.routeofAdministration = None """ How the formula should enter the patient's gastrointestinal tract. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._routeofAdministration = None + """ Primitive extension for routeofAdministration. Type `FHIRPrimitiveExtension` """ super(NutritionOrderEnteralFormula, self).__init__(jsondict=jsondict, strict=strict) @@ -180,14 +249,23 @@ def elementProperties(self): js = super(NutritionOrderEnteralFormula, self).elementProperties() js.extend([ ("additiveProductName", "additiveProductName", str, False, None, False), + ("_additiveProductName", "_additiveProductName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("additiveType", "additiveType", codeableconcept.CodeableConcept, False, None, False), + ("_additiveType", "_additiveType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("administration", "administration", NutritionOrderEnteralFormulaAdministration, True, None, False), + ("_administration", "_administration", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("administrationInstruction", "administrationInstruction", str, False, None, False), + ("_administrationInstruction", "_administrationInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("baseFormulaProductName", "baseFormulaProductName", str, False, None, False), + ("_baseFormulaProductName", "_baseFormulaProductName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("baseFormulaType", "baseFormulaType", codeableconcept.CodeableConcept, False, None, False), + ("_baseFormulaType", "_baseFormulaType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("caloricDensity", "caloricDensity", quantity.Quantity, False, None, False), + ("_caloricDensity", "_caloricDensity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxVolumeToDeliver", "maxVolumeToDeliver", quantity.Quantity, False, None, False), + ("_maxVolumeToDeliver", "_maxVolumeToDeliver", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("routeofAdministration", "routeofAdministration", codeableconcept.CodeableConcept, False, None, False), + ("_routeofAdministration", "_routeofAdministration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -214,18 +292,26 @@ def __init__(self, jsondict=None, strict=True): self.quantity = None """ The volume of formula to provide. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.rateQuantity = None """ Speed with which the formula is provided per period of time. Type `Quantity` (represented as `dict` in JSON). """ + self._rateQuantity = None + """ Primitive extension for rateQuantity. Type `FHIRPrimitiveExtension` """ self.rateRatio = None """ Speed with which the formula is provided per period of time. Type `Ratio` (represented as `dict` in JSON). """ + self._rateRatio = None + """ Primitive extension for rateRatio. Type `FHIRPrimitiveExtension` """ self.schedule = None """ Scheduled frequency of enteral feeding. Type `Timing` (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. Type `FHIRPrimitiveExtension` """ super(NutritionOrderEnteralFormulaAdministration, self).__init__(jsondict=jsondict, strict=strict) @@ -233,9 +319,13 @@ def elementProperties(self): js = super(NutritionOrderEnteralFormulaAdministration, self).elementProperties() js.extend([ ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateQuantity", "rateQuantity", quantity.Quantity, False, "rate", False), + ("_rateQuantity", "_rateQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rateRatio", "rateRatio", ratio.Ratio, False, "rate", False), + ("_rateRatio", "_rateRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("schedule", "schedule", timing.Timing, False, None, False), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -260,27 +350,39 @@ def __init__(self, jsondict=None, strict=True): """ The required consistency of fluids and liquids provided to the patient. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._fluidConsistencyType = None + """ Primitive extension for fluidConsistencyType. List of `FHIRPrimitiveExtension` """ self.instruction = None """ Instructions or additional information about the oral diet. Type `str`. """ + self._instruction = None + """ Primitive extension for instruction. Type `FHIRPrimitiveExtension` """ self.nutrient = None """ Required nutrient modifications. List of `NutritionOrderOralDietNutrient` items (represented as `dict` in JSON). """ + self._nutrient = None + """ Primitive extension for nutrient. List of `FHIRPrimitiveExtension` """ self.schedule = None """ Scheduled frequency of diet. List of `Timing` items (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. List of `FHIRPrimitiveExtension` """ self.texture = None """ Required texture modifications. List of `NutritionOrderOralDietTexture` items (represented as `dict` in JSON). """ + self._texture = None + """ Primitive extension for texture. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of oral diet or diet restrictions that describe what can be consumed orally. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(NutritionOrderOralDiet, self).__init__(jsondict=jsondict, strict=strict) @@ -288,11 +390,17 @@ def elementProperties(self): js = super(NutritionOrderOralDiet, self).elementProperties() js.extend([ ("fluidConsistencyType", "fluidConsistencyType", codeableconcept.CodeableConcept, True, None, False), + ("_fluidConsistencyType", "_fluidConsistencyType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instruction", "instruction", str, False, None, False), + ("_instruction", "_instruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nutrient", "nutrient", NutritionOrderOralDietNutrient, True, None, False), + ("_nutrient", "_nutrient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("schedule", "schedule", timing.Timing, True, None, False), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("texture", "texture", NutritionOrderOralDietTexture, True, None, False), + ("_texture", "_texture", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -317,10 +425,14 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Quantity of the specified nutrient. Type `Quantity` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Type of nutrient that is being modified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. Type `FHIRPrimitiveExtension` """ super(NutritionOrderOralDietNutrient, self).__init__(jsondict=jsondict, strict=strict) @@ -328,7 +440,9 @@ def elementProperties(self): js = super(NutritionOrderOralDietNutrient, self).elementProperties() js.extend([ ("amount", "amount", quantity.Quantity, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, False, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -354,10 +468,14 @@ def __init__(self, jsondict=None, strict=True): """ Concepts that are used to identify an entity that is ingested for nutritional purposes. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._foodType = None + """ Primitive extension for foodType. Type `FHIRPrimitiveExtension` """ self.modifier = None """ Code to indicate how to alter the texture of the foods, e.g. pureed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._modifier = None + """ Primitive extension for modifier. Type `FHIRPrimitiveExtension` """ super(NutritionOrderOralDietTexture, self).__init__(jsondict=jsondict, strict=strict) @@ -365,7 +483,9 @@ def elementProperties(self): js = super(NutritionOrderOralDietTexture, self).elementProperties() js.extend([ ("foodType", "foodType", codeableconcept.CodeableConcept, False, None, False), + ("_foodType", "_foodType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modifier", "modifier", codeableconcept.CodeableConcept, False, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -390,22 +510,32 @@ def __init__(self, jsondict=None, strict=True): self.instruction = None """ Instructions or additional information about the oral supplement. Type `str`. """ + self._instruction = None + """ Primitive extension for instruction. Type `FHIRPrimitiveExtension` """ self.productName = None """ Product or brand name of the nutritional supplement. Type `str`. """ + self._productName = None + """ Primitive extension for productName. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Amount of the nutritional supplement. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.schedule = None """ Scheduled frequency of supplement. List of `Timing` items (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of supplement product requested. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(NutritionOrderSupplement, self).__init__(jsondict=jsondict, strict=strict) @@ -413,13 +543,19 @@ def elementProperties(self): js = super(NutritionOrderSupplement, self).elementProperties() js.extend([ ("instruction", "instruction", str, False, None, False), + ("_instruction", "_instruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("productName", "productName", str, False, None, False), + ("_productName", "_productName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("schedule", "schedule", timing.Timing, True, None, False), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -428,4 +564,4 @@ def elementProperties(self): from . import identifier from . import quantity from . import ratio -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/observation.py b/fhirclient/models/observation.py index b520e34d..9b5202c4 100644 --- a/fhirclient/models/observation.py +++ b/fhirclient/models/observation.py @@ -24,151 +24,225 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Fulfills plan, proposal or order. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Observed body part. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.category = None """ Classification of type of observation. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ Type of observation (code / type). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.component = None """ Component results. List of `ObservationComponent` items (represented as `dict` in JSON). """ + self._component = None + """ Primitive extension for component. List of `FHIRPrimitiveExtension` """ self.dataAbsentReason = None """ Why the result is missing. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._dataAbsentReason = None + """ Primitive extension for dataAbsentReason. Type `FHIRPrimitiveExtension` """ self.derivedFrom = None """ Related measurements the observation is made from. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._derivedFrom = None + """ Primitive extension for derivedFrom. List of `FHIRPrimitiveExtension` """ self.device = None """ (Measurement) Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._device = None + """ Primitive extension for device. Type `FHIRPrimitiveExtension` """ self.effectiveDateTime = None """ Clinically relevant time/time-period for observation. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._effectiveDateTime = None + """ Primitive extension for effectiveDateTime. Type `FHIRPrimitiveExtension` """ self.effectiveInstant = None """ Clinically relevant time/time-period for observation. Type `FHIRInstant` (represented as `str` in JSON). """ + self._effectiveInstant = None + """ Primitive extension for effectiveInstant. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ Clinically relevant time/time-period for observation. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.effectiveTiming = None """ Clinically relevant time/time-period for observation. Type `Timing` (represented as `dict` in JSON). """ + self._effectiveTiming = None + """ Primitive extension for effectiveTiming. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Healthcare event during which this observation is made. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.focus = None """ What the observation is about, when it is not about the subject of record. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. List of `FHIRPrimitiveExtension` """ self.hasMember = None """ Related resource that belongs to the Observation group. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._hasMember = None + """ Primitive extension for hasMember. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for observation. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.interpretation = None """ High, low, normal, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._interpretation = None + """ Primitive extension for interpretation. List of `FHIRPrimitiveExtension` """ self.issued = None """ Date/Time this version was made available. Type `FHIRInstant` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.method = None """ How it was done. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments about the observation. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performer = None """ Who is responsible for the observation. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.referenceRange = None """ Provides guide for interpretation. List of `ObservationReferenceRange` items (represented as `dict` in JSON). """ + self._referenceRange = None + """ Primitive extension for referenceRange. List of `FHIRPrimitiveExtension` """ self.specimen = None """ Specimen used for this observation. Type `FHIRReference` (represented as `dict` in JSON). """ + self._specimen = None + """ Primitive extension for specimen. Type `FHIRPrimitiveExtension` """ self.status = None """ registered | preliminary | final | amended +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who and/or what the observation is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Actual result. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Actual result. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Actual result. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Actual result. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Actual result. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Actual result. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Actual result. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Actual result. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Actual result. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Actual result. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Actual result. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ super(Observation, self).__init__(jsondict=jsondict, strict=strict) @@ -176,42 +250,79 @@ def elementProperties(self): js = super(Observation, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("component", "component", ObservationComponent, True, None, False), + ("_component", "_component", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dataAbsentReason", "dataAbsentReason", codeableconcept.CodeableConcept, False, None, False), + ("_dataAbsentReason", "_dataAbsentReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFrom", "derivedFrom", fhirreference.FHIRReference, True, None, False), + ("_derivedFrom", "_derivedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("device", "device", fhirreference.FHIRReference, False, None, False), + ("_device", "_device", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveDateTime", "effectiveDateTime", fhirdatetime.FHIRDateTime, False, "effective", False), + ("_effectiveDateTime", "_effectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveInstant", "effectiveInstant", fhirinstant.FHIRInstant, False, "effective", False), + ("_effectiveInstant", "_effectiveInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, "effective", False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectiveTiming", "effectiveTiming", timing.Timing, False, "effective", False), + ("_effectiveTiming", "_effectiveTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focus", "focus", fhirreference.FHIRReference, True, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("hasMember", "hasMember", fhirreference.FHIRReference, True, None, False), + ("_hasMember", "_hasMember", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("interpretation", "interpretation", codeableconcept.CodeableConcept, True, None, False), + ("_interpretation", "_interpretation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("issued", "issued", fhirinstant.FHIRInstant, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performer", "performer", fhirreference.FHIRReference, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("referenceRange", "referenceRange", ObservationReferenceRange, True, None, False), + ("_referenceRange", "_referenceRange", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimen", "specimen", fhirreference.FHIRReference, False, None, False), + ("_specimen", "_specimen", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", False), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", False), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", False), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", False), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -241,62 +352,92 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Type of component observation (code / type). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.dataAbsentReason = None """ Why the component result is missing. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._dataAbsentReason = None + """ Primitive extension for dataAbsentReason. Type `FHIRPrimitiveExtension` """ self.interpretation = None """ High, low, normal, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._interpretation = None + """ Primitive extension for interpretation. List of `FHIRPrimitiveExtension` """ self.referenceRange = None """ Provides guide for interpretation of component result. List of `ObservationReferenceRange` items (represented as `dict` in JSON). """ + self._referenceRange = None + """ Primitive extension for referenceRange. List of `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Actual component result. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Actual component result. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Actual component result. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Actual component result. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Actual component result. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Actual component result. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Actual component result. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Actual component result. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Actual component result. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Actual component result. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Actual component result. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ super(ObservationComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -304,20 +445,35 @@ def elementProperties(self): js = super(ObservationComponent, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dataAbsentReason", "dataAbsentReason", codeableconcept.CodeableConcept, False, None, False), + ("_dataAbsentReason", "_dataAbsentReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("interpretation", "interpretation", codeableconcept.CodeableConcept, True, None, False), + ("_interpretation", "_interpretation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("referenceRange", "referenceRange", ObservationReferenceRange, True, None, False), + ("_referenceRange", "_referenceRange", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", False), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", False), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", False), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", False), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -344,26 +500,38 @@ def __init__(self, jsondict=None, strict=True): self.age = None """ Applicable age range, if relevant. Type `Range` (represented as `dict` in JSON). """ + self._age = None + """ Primitive extension for age. Type `FHIRPrimitiveExtension` """ self.appliesTo = None """ Reference range population. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._appliesTo = None + """ Primitive extension for appliesTo. List of `FHIRPrimitiveExtension` """ self.high = None """ High Range, if relevant. Type `Quantity` (represented as `dict` in JSON). """ + self._high = None + """ Primitive extension for high. Type `FHIRPrimitiveExtension` """ self.low = None """ Low Range, if relevant. Type `Quantity` (represented as `dict` in JSON). """ + self._low = None + """ Primitive extension for low. Type `FHIRPrimitiveExtension` """ self.text = None """ Text based reference range in an observation. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ Reference range qualifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ObservationReferenceRange, self).__init__(jsondict=jsondict, strict=strict) @@ -371,14 +539,21 @@ def elementProperties(self): js = super(ObservationReferenceRange, self).elementProperties() js.extend([ ("age", "age", range.Range, False, None, False), + ("_age", "_age", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("appliesTo", "appliesTo", codeableconcept.CodeableConcept, True, None, False), + ("_appliesTo", "_appliesTo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("high", "high", quantity.Quantity, False, None, False), + ("_high", "_high", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("low", "low", quantity.Quantity, False, None, False), + ("_low", "_low", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -392,4 +567,4 @@ def elementProperties(self): from . import range from . import ratio from . import sampleddata -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/observationdefinition.py b/fhirclient/models/observationdefinition.py index 8b483171..ef1c21fb 100644 --- a/fhirclient/models/observationdefinition.py +++ b/fhirclient/models/observationdefinition.py @@ -25,58 +25,84 @@ def __init__(self, jsondict=None, strict=True): """ Value set of abnormal coded values for the observations conforming to this ObservationDefinition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._abnormalCodedValueSet = None + """ Primitive extension for abnormalCodedValueSet. Type `FHIRPrimitiveExtension` """ self.category = None """ Category of observation. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ Type of observation (code / type). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.criticalCodedValueSet = None """ Value set of critical coded values for the observations conforming to this ObservationDefinition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._criticalCodedValueSet = None + """ Primitive extension for criticalCodedValueSet. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier for this ObservationDefinition instance. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.method = None """ Method used to produce the observation. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.multipleResultsAllowed = None """ Multiple results allowed. Type `bool`. """ + self._multipleResultsAllowed = None + """ Primitive extension for multipleResultsAllowed. Type `FHIRPrimitiveExtension` """ self.normalCodedValueSet = None """ Value set of normal coded values for the observations conforming to this ObservationDefinition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._normalCodedValueSet = None + """ Primitive extension for normalCodedValueSet. Type `FHIRPrimitiveExtension` """ self.permittedDataType = None """ Quantity | CodeableConcept | string | boolean | integer | Range | Ratio | SampledData | time | dateTime | Period. List of `str` items. """ + self._permittedDataType = None + """ Primitive extension for permittedDataType. List of `FHIRPrimitiveExtension` """ self.preferredReportName = None """ Preferred report name. Type `str`. """ + self._preferredReportName = None + """ Primitive extension for preferredReportName. Type `FHIRPrimitiveExtension` """ self.qualifiedInterval = None """ Qualified range for continuous and ordinal observation results. List of `ObservationDefinitionQualifiedInterval` items (represented as `dict` in JSON). """ + self._qualifiedInterval = None + """ Primitive extension for qualifiedInterval. List of `FHIRPrimitiveExtension` """ self.quantitativeDetails = None """ Characteristics of quantitative results. Type `ObservationDefinitionQuantitativeDetails` (represented as `dict` in JSON). """ + self._quantitativeDetails = None + """ Primitive extension for quantitativeDetails. Type `FHIRPrimitiveExtension` """ self.validCodedValueSet = None """ Value set of valid coded values for the observations conforming to this ObservationDefinition. Type `FHIRReference` (represented as `dict` in JSON). """ + self._validCodedValueSet = None + """ Primitive extension for validCodedValueSet. Type `FHIRPrimitiveExtension` """ super(ObservationDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -84,18 +110,31 @@ def elementProperties(self): js = super(ObservationDefinition, self).elementProperties() js.extend([ ("abnormalCodedValueSet", "abnormalCodedValueSet", fhirreference.FHIRReference, False, None, False), + ("_abnormalCodedValueSet", "_abnormalCodedValueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("criticalCodedValueSet", "criticalCodedValueSet", fhirreference.FHIRReference, False, None, False), + ("_criticalCodedValueSet", "_criticalCodedValueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("multipleResultsAllowed", "multipleResultsAllowed", bool, False, None, False), + ("_multipleResultsAllowed", "_multipleResultsAllowed", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("normalCodedValueSet", "normalCodedValueSet", fhirreference.FHIRReference, False, None, False), + ("_normalCodedValueSet", "_normalCodedValueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("permittedDataType", "permittedDataType", str, True, None, False), + ("_permittedDataType", "_permittedDataType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("preferredReportName", "preferredReportName", str, False, None, False), + ("_preferredReportName", "_preferredReportName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("qualifiedInterval", "qualifiedInterval", ObservationDefinitionQualifiedInterval, True, None, False), + ("_qualifiedInterval", "_qualifiedInterval", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("quantitativeDetails", "quantitativeDetails", ObservationDefinitionQuantitativeDetails, False, None, False), + ("_quantitativeDetails", "_quantitativeDetails", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validCodedValueSet", "validCodedValueSet", fhirreference.FHIRReference, False, None, False), + ("_validCodedValueSet", "_validCodedValueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -122,34 +161,50 @@ def __init__(self, jsondict=None, strict=True): self.age = None """ Applicable age range, if relevant. Type `Range` (represented as `dict` in JSON). """ + self._age = None + """ Primitive extension for age. Type `FHIRPrimitiveExtension` """ self.appliesTo = None """ Targetted population of the range. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._appliesTo = None + """ Primitive extension for appliesTo. List of `FHIRPrimitiveExtension` """ self.category = None """ reference | critical | absolute. Type `str`. """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.condition = None """ Condition associated with the reference range. Type `str`. """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.context = None """ Range context qualifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.gestationalAge = None """ Applicable gestational age range, if relevant. Type `Range` (represented as `dict` in JSON). """ + self._gestationalAge = None + """ Primitive extension for gestationalAge. Type `FHIRPrimitiveExtension` """ self.range = None """ The interval itself, for continuous or ordinal observations. Type `Range` (represented as `dict` in JSON). """ + self._range = None + """ Primitive extension for range. Type `FHIRPrimitiveExtension` """ super(ObservationDefinitionQualifiedInterval, self).__init__(jsondict=jsondict, strict=strict) @@ -157,13 +212,21 @@ def elementProperties(self): js = super(ObservationDefinitionQualifiedInterval, self).elementProperties() js.extend([ ("age", "age", range.Range, False, None, False), + ("_age", "_age", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("appliesTo", "appliesTo", codeableconcept.CodeableConcept, True, None, False), + ("_appliesTo", "_appliesTo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", str, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", str, False, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", codeableconcept.CodeableConcept, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gestationalAge", "gestationalAge", range.Range, False, None, False), + ("_gestationalAge", "_gestationalAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("range", "range", range.Range, False, None, False), + ("_range", "_range", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -187,18 +250,26 @@ def __init__(self, jsondict=None, strict=True): self.conversionFactor = None """ SI to Customary unit conversion factor. Type `float`. """ + self._conversionFactor = None + """ Primitive extension for conversionFactor. Type `FHIRPrimitiveExtension` """ self.customaryUnit = None """ Customary unit for quantitative results. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._customaryUnit = None + """ Primitive extension for customaryUnit. Type `FHIRPrimitiveExtension` """ self.decimalPrecision = None """ Decimal precision of observation quantitative results. Type `int`. """ + self._decimalPrecision = None + """ Primitive extension for decimalPrecision. Type `FHIRPrimitiveExtension` """ self.unit = None """ SI unit for quantitative results. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unit = None + """ Primitive extension for unit. Type `FHIRPrimitiveExtension` """ super(ObservationDefinitionQuantitativeDetails, self).__init__(jsondict=jsondict, strict=strict) @@ -206,14 +277,19 @@ def elementProperties(self): js = super(ObservationDefinitionQuantitativeDetails, self).elementProperties() js.extend([ ("conversionFactor", "conversionFactor", float, False, None, False), + ("_conversionFactor", "_conversionFactor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("customaryUnit", "customaryUnit", codeableconcept.CodeableConcept, False, None, False), + ("_customaryUnit", "_customaryUnit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("decimalPrecision", "decimalPrecision", int, False, None, False), + ("_decimalPrecision", "_decimalPrecision", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unit", "unit", codeableconcept.CodeableConcept, False, None, False), + ("_unit", "_unit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/operationdefinition.py b/fhirclient/models/operationdefinition.py index b62f9af0..8d5e6c42 100644 --- a/fhirclient/models/operationdefinition.py +++ b/fhirclient/models/operationdefinition.py @@ -24,107 +24,159 @@ def __init__(self, jsondict=None, strict=True): self.affectsState = None """ Whether content is changed by the operation. Type `bool`. """ + self._affectsState = None + """ Primitive extension for affectsState. Type `FHIRPrimitiveExtension` """ self.base = None """ Marks this as a profile of the base. Type `str`. """ + self._base = None + """ Primitive extension for base. Type `FHIRPrimitiveExtension` """ self.code = None """ Name used to invoke the operation. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comment = None """ Additional information about use. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the operation definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.inputProfile = None """ Validation information for in parameters. Type `str`. """ + self._inputProfile = None + """ Primitive extension for inputProfile. Type `FHIRPrimitiveExtension` """ self.instance = None """ Invoke on an instance?. Type `bool`. """ + self._instance = None + """ Primitive extension for instance. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for operation definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.kind = None """ operation | query. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this operation definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.outputProfile = None """ Validation information for out parameters. Type `str`. """ + self._outputProfile = None + """ Primitive extension for outputProfile. Type `FHIRPrimitiveExtension` """ self.overload = None """ Define overloaded variants for when generating code. List of `OperationDefinitionOverload` items (represented as `dict` in JSON). """ + self._overload = None + """ Primitive extension for overload. List of `FHIRPrimitiveExtension` """ self.parameter = None """ Parameters for the operation/query. List of `OperationDefinitionParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this operation definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.resource = None """ Types this operation applies to. List of `str` items. """ + self._resource = None + """ Primitive extension for resource. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.system = None """ Invoke at the system level?. Type `bool`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this operation definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.type = None """ Invoke at the type level?. Type `bool`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this operation definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the operation definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(OperationDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -132,31 +184,57 @@ def elementProperties(self): js = super(OperationDefinition, self).elementProperties() js.extend([ ("affectsState", "affectsState", bool, False, None, False), + ("_affectsState", "_affectsState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("base", "base", str, False, None, False), + ("_base", "_base", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("inputProfile", "inputProfile", str, False, None, False), + ("_inputProfile", "_inputProfile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("instance", "instance", bool, False, None, True), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outputProfile", "outputProfile", str, False, None, False), + ("_outputProfile", "_outputProfile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("overload", "overload", OperationDefinitionOverload, True, None, False), + ("_overload", "_overload", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("parameter", "parameter", OperationDefinitionParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", str, True, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", bool, False, None, True), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", bool, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -184,10 +262,14 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Comments to go on overload. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.parameterName = None """ Name of parameter to include in overload. List of `str` items. """ + self._parameterName = None + """ Primitive extension for parameterName. List of `FHIRPrimitiveExtension` """ super(OperationDefinitionOverload, self).__init__(jsondict=jsondict, strict=strict) @@ -195,7 +277,9 @@ def elementProperties(self): js = super(OperationDefinitionOverload, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameterName", "parameterName", str, True, None, False), + ("_parameterName", "_parameterName", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -219,47 +303,69 @@ def __init__(self, jsondict=None, strict=True): self.binding = None """ ValueSet details if this is coded. Type `OperationDefinitionParameterBinding` (represented as `dict` in JSON). """ + self._binding = None + """ Primitive extension for binding. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Description of meaning/use. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.max = None """ Maximum Cardinality (a number or *). Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Minimum Cardinality. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.name = None """ Name in Parameters.parameter.name or in URL. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.part = None """ Parts of a nested Parameter. List of `OperationDefinitionParameter` items (represented as `dict` in JSON). """ + self._part = None + """ Primitive extension for part. List of `FHIRPrimitiveExtension` """ self.referencedFrom = None """ References to this parameter. List of `OperationDefinitionParameterReferencedFrom` items (represented as `dict` in JSON). """ + self._referencedFrom = None + """ Primitive extension for referencedFrom. List of `FHIRPrimitiveExtension` """ self.searchType = None """ number | date | string | token | reference | composite | quantity | uri | special. Type `str`. """ + self._searchType = None + """ Primitive extension for searchType. Type `FHIRPrimitiveExtension` """ self.targetProfile = None """ If type is Reference | canonical, allowed targets. List of `str` items. """ + self._targetProfile = None + """ Primitive extension for targetProfile. List of `FHIRPrimitiveExtension` """ self.type = None """ What type this parameter has. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ in | out. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(OperationDefinitionParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -267,16 +373,27 @@ def elementProperties(self): js = super(OperationDefinitionParameter, self).elementProperties() js.extend([ ("binding", "binding", OperationDefinitionParameterBinding, False, None, False), + ("_binding", "_binding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("max", "max", str, False, None, True), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, True), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("part", "part", OperationDefinitionParameter, True, None, False), + ("_part", "_part", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("referencedFrom", "referencedFrom", OperationDefinitionParameterReferencedFrom, True, None, False), + ("_referencedFrom", "_referencedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("searchType", "searchType", str, False, None, False), + ("_searchType", "_searchType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetProfile", "targetProfile", str, True, None, False), + ("_targetProfile", "_targetProfile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -301,10 +418,14 @@ def __init__(self, jsondict=None, strict=True): self.strength = None """ required | extensible | preferred | example. Type `str`. """ + self._strength = None + """ Primitive extension for strength. Type `FHIRPrimitiveExtension` """ self.valueSet = None """ Source of value set. Type `str`. """ + self._valueSet = None + """ Primitive extension for valueSet. Type `FHIRPrimitiveExtension` """ super(OperationDefinitionParameterBinding, self).__init__(jsondict=jsondict, strict=strict) @@ -312,7 +433,9 @@ def elementProperties(self): js = super(OperationDefinitionParameterBinding, self).elementProperties() js.extend([ ("strength", "strength", str, False, None, True), + ("_strength", "_strength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSet", "valueSet", str, False, None, True), + ("_valueSet", "_valueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -337,10 +460,14 @@ def __init__(self, jsondict=None, strict=True): self.source = None """ Referencing parameter. Type `str`. """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.sourceId = None """ Element id of reference. Type `str`. """ + self._sourceId = None + """ Primitive extension for sourceId. Type `FHIRPrimitiveExtension` """ super(OperationDefinitionParameterReferencedFrom, self).__init__(jsondict=jsondict, strict=strict) @@ -348,12 +475,15 @@ def elementProperties(self): js = super(OperationDefinitionParameterReferencedFrom, self).elementProperties() js.extend([ ("source", "source", str, False, None, True), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceId", "sourceId", str, False, None, False), + ("_sourceId", "_sourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/operationoutcome.py b/fhirclient/models/operationoutcome.py index 734b8eb5..51875895 100644 --- a/fhirclient/models/operationoutcome.py +++ b/fhirclient/models/operationoutcome.py @@ -24,6 +24,8 @@ def __init__(self, jsondict=None, strict=True): self.issue = None """ A single issue associated with the action. List of `OperationOutcomeIssue` items (represented as `dict` in JSON). """ + self._issue = None + """ Primitive extension for issue. List of `FHIRPrimitiveExtension` """ super(OperationOutcome, self).__init__(jsondict=jsondict, strict=strict) @@ -31,6 +33,7 @@ def elementProperties(self): js = super(OperationOutcome, self).elementProperties() js.extend([ ("issue", "issue", OperationOutcomeIssue, True, None, True), + ("_issue", "_issue", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -57,26 +60,38 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Error or warning code. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.details = None """ Additional details about the error. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._details = None + """ Primitive extension for details. Type `FHIRPrimitiveExtension` """ self.diagnostics = None """ Additional diagnostic information about the issue. Type `str`. """ + self._diagnostics = None + """ Primitive extension for diagnostics. Type `FHIRPrimitiveExtension` """ self.expression = None """ FHIRPath of element(s) related to issue. List of `str` items. """ + self._expression = None + """ Primitive extension for expression. List of `FHIRPrimitiveExtension` """ self.location = None """ Deprecated: Path of element(s) related to issue. List of `str` items. """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.severity = None """ fatal | error | warning | information. Type `str`. """ + self._severity = None + """ Primitive extension for severity. Type `FHIRPrimitiveExtension` """ super(OperationOutcomeIssue, self).__init__(jsondict=jsondict, strict=strict) @@ -84,13 +99,20 @@ def elementProperties(self): js = super(OperationOutcomeIssue, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("details", "details", codeableconcept.CodeableConcept, False, None, False), + ("_details", "_details", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diagnostics", "diagnostics", str, False, None, False), + ("_diagnostics", "_diagnostics", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, True, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", str, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("severity", "severity", str, False, None, True), + ("_severity", "_severity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import codeableconcept +from . import codeableconcept \ No newline at end of file diff --git a/fhirclient/models/organization.py b/fhirclient/models/organization.py index fd39d1ce..0c285b48 100644 --- a/fhirclient/models/organization.py +++ b/fhirclient/models/organization.py @@ -26,44 +26,64 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether the organization's record is still in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.address = None """ An address for the organization. List of `Address` items (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. List of `FHIRPrimitiveExtension` """ self.alias = None """ A list of alternate names that the organization is known as, or was known as in the past. List of `str` items. """ + self._alias = None + """ Primitive extension for alias. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact for the organization for a certain purpose. List of `OrganizationContact` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoints providing access to services operated for the organization. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Identifies this organization across multiple systems. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.name = None """ Name used for the organization. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.partOf = None """ The organization of which this organization forms a part. Type `FHIRReference` (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. Type `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the organization. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ self.type = None """ Kind of organization. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ super(Organization, self).__init__(jsondict=jsondict, strict=strict) @@ -71,15 +91,25 @@ def elementProperties(self): js = super(Organization, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("address", "address", address.Address, True, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("alias", "alias", str, True, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", OrganizationContact, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, False, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -103,18 +133,26 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Visiting or postal addresses for the contact. Type `Address` (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the contact. Type `HumanName` (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.purpose = None """ The type of contact. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details (telephone, email, etc.) for a contact. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(OrganizationContact, self).__init__(jsondict=jsondict, strict=strict) @@ -122,16 +160,21 @@ def elementProperties(self): js = super(OrganizationContact, self).elementProperties() js.extend([ ("address", "address", address.Address, False, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", humanname.HumanName, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", codeableconcept.CodeableConcept, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import codeableconcept from . import contactpoint from . import fhirreference from . import humanname -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/organizationaffiliation.py b/fhirclient/models/organizationaffiliation.py index 9aeef430..0d6259b6 100644 --- a/fhirclient/models/organizationaffiliation.py +++ b/fhirclient/models/organizationaffiliation.py @@ -22,57 +22,81 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this organization affiliation record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.code = None """ Definition of the role the participatingOrganization plays. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoints providing access to services operated for this role. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.healthcareService = None """ Healthcare services provided through the role. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._healthcareService = None + """ Primitive extension for healthcareService. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifiers that are specific to this role. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.location = None """ The location(s) at which the role occurs. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.network = None """ Health insurance provider network in which the participatingOrganization provides the role's services (if defined) at the indicated locations (if defined). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._network = None + """ Primitive extension for network. List of `FHIRPrimitiveExtension` """ self.organization = None """ Organization where the role is available. Type `FHIRReference` (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. Type `FHIRPrimitiveExtension` """ self.participatingOrganization = None """ Organization that provides/performs the role (e.g. providing services or is a member of). Type `FHIRReference` (represented as `dict` in JSON). """ + self._participatingOrganization = None + """ Primitive extension for participatingOrganization. Type `FHIRPrimitiveExtension` """ self.period = None """ The period during which the participatingOrganization is affiliated with the primary organization. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.specialty = None """ Specific specialty of the participatingOrganization in the context of the role. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details at the participatingOrganization relevant to this Affiliation. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(OrganizationAffiliation, self).__init__(jsondict=jsondict, strict=strict) @@ -80,23 +104,36 @@ def elementProperties(self): js = super(OrganizationAffiliation, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("healthcareService", "healthcareService", fhirreference.FHIRReference, True, None, False), + ("_healthcareService", "_healthcareService", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("network", "network", fhirreference.FHIRReference, True, None, False), + ("_network", "_network", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("organization", "organization", fhirreference.FHIRReference, False, None, False), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participatingOrganization", "participatingOrganization", fhirreference.FHIRReference, False, None, False), + ("_participatingOrganization", "_participatingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactpoint from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/parameterdefinition.py b/fhirclient/models/parameterdefinition.py index eba5c3b7..c7a65200 100644 --- a/fhirclient/models/parameterdefinition.py +++ b/fhirclient/models/parameterdefinition.py @@ -26,30 +26,44 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ A brief description of the parameter. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.max = None """ Maximum cardinality (a number of *). Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Minimum cardinality. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.name = None """ Name used to access the parameter value. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.profile = None """ What profile the value is expected to be. Type `str`. """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ self.type = None """ What type of value. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.use = None """ in | out. Type `str`. """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ super(ParameterDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -57,13 +71,20 @@ def elementProperties(self): js = super(ParameterDefinition, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("max", "max", str, False, None, False), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, False), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", str, False, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", str, False, None, True), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/parameters.py b/fhirclient/models/parameters.py index f5e7bea9..d3f70fc7 100644 --- a/fhirclient/models/parameters.py +++ b/fhirclient/models/parameters.py @@ -25,6 +25,8 @@ def __init__(self, jsondict=None, strict=True): self.parameter = None """ Operation Parameter. List of `ParametersParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ super(Parameters, self).__init__(jsondict=jsondict, strict=strict) @@ -32,6 +34,7 @@ def elementProperties(self): js = super(Parameters, self).elementProperties() js.extend([ ("parameter", "parameter", ParametersParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -57,214 +60,320 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Name from the definition. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.part = None """ Named part of a multi-part parameter. List of `ParametersParameter` items (represented as `dict` in JSON). """ + self._part = None + """ Primitive extension for part. List of `FHIRPrimitiveExtension` """ self.resource = None """ If parameter is a whole resource. Type `Resource` (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.valueAddress = None """ If parameter is a data type. Type `Address` (represented as `dict` in JSON). """ + self._valueAddress = None + """ Primitive extension for valueAddress. Type `FHIRPrimitiveExtension` """ self.valueAge = None """ If parameter is a data type. Type `Age` (represented as `dict` in JSON). """ + self._valueAge = None + """ Primitive extension for valueAge. Type `FHIRPrimitiveExtension` """ self.valueAnnotation = None """ If parameter is a data type. Type `Annotation` (represented as `dict` in JSON). """ + self._valueAnnotation = None + """ Primitive extension for valueAnnotation. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ If parameter is a data type. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ If parameter is a data type. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ If parameter is a data type. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCanonical = None """ If parameter is a data type. Type `str`. """ + self._valueCanonical = None + """ Primitive extension for valueCanonical. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ If parameter is a data type. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ If parameter is a data type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ If parameter is a data type. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueContactDetail = None """ If parameter is a data type. Type `ContactDetail` (represented as `dict` in JSON). """ + self._valueContactDetail = None + """ Primitive extension for valueContactDetail. Type `FHIRPrimitiveExtension` """ self.valueContactPoint = None """ If parameter is a data type. Type `ContactPoint` (represented as `dict` in JSON). """ + self._valueContactPoint = None + """ Primitive extension for valueContactPoint. Type `FHIRPrimitiveExtension` """ self.valueContributor = None """ If parameter is a data type. Type `Contributor` (represented as `dict` in JSON). """ + self._valueContributor = None + """ Primitive extension for valueContributor. Type `FHIRPrimitiveExtension` """ self.valueCount = None """ If parameter is a data type. Type `Count` (represented as `dict` in JSON). """ + self._valueCount = None + """ Primitive extension for valueCount. Type `FHIRPrimitiveExtension` """ self.valueDataRequirement = None """ If parameter is a data type. Type `DataRequirement` (represented as `dict` in JSON). """ + self._valueDataRequirement = None + """ Primitive extension for valueDataRequirement. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ If parameter is a data type. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ If parameter is a data type. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ If parameter is a data type. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueDistance = None """ If parameter is a data type. Type `Distance` (represented as `dict` in JSON). """ + self._valueDistance = None + """ Primitive extension for valueDistance. Type `FHIRPrimitiveExtension` """ self.valueDosage = None """ If parameter is a data type. Type `Dosage` (represented as `dict` in JSON). """ + self._valueDosage = None + """ Primitive extension for valueDosage. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ If parameter is a data type. Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valueExpression = None """ If parameter is a data type. Type `Expression` (represented as `dict` in JSON). """ + self._valueExpression = None + """ Primitive extension for valueExpression. Type `FHIRPrimitiveExtension` """ self.valueHumanName = None """ If parameter is a data type. Type `HumanName` (represented as `dict` in JSON). """ + self._valueHumanName = None + """ Primitive extension for valueHumanName. Type `FHIRPrimitiveExtension` """ self.valueId = None """ If parameter is a data type. Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueIdentifier = None """ If parameter is a data type. Type `Identifier` (represented as `dict` in JSON). """ + self._valueIdentifier = None + """ Primitive extension for valueIdentifier. Type `FHIRPrimitiveExtension` """ self.valueInstant = None """ If parameter is a data type. Type `FHIRInstant` (represented as `str` in JSON). """ + self._valueInstant = None + """ Primitive extension for valueInstant. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ If parameter is a data type. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueMarkdown = None """ If parameter is a data type. Type `str`. """ + self._valueMarkdown = None + """ Primitive extension for valueMarkdown. Type `FHIRPrimitiveExtension` """ self.valueMeta = None """ If parameter is a data type. Type `Meta` (represented as `dict` in JSON). """ + self._valueMeta = None + """ Primitive extension for valueMeta. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ If parameter is a data type. Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueOid = None """ If parameter is a data type. Type `str`. """ + self._valueOid = None + """ Primitive extension for valueOid. Type `FHIRPrimitiveExtension` """ self.valueParameterDefinition = None """ If parameter is a data type. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._valueParameterDefinition = None + """ Primitive extension for valueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ If parameter is a data type. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valuePositiveInt = None """ If parameter is a data type. Type `int`. """ + self._valuePositiveInt = None + """ Primitive extension for valuePositiveInt. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ If parameter is a data type. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ If parameter is a data type. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ If parameter is a data type. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ If parameter is a data type. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueRelatedArtifact = None """ If parameter is a data type. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._valueRelatedArtifact = None + """ Primitive extension for valueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ If parameter is a data type. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueSignature = None """ If parameter is a data type. Type `Signature` (represented as `dict` in JSON). """ + self._valueSignature = None + """ Primitive extension for valueSignature. Type `FHIRPrimitiveExtension` """ self.valueString = None """ If parameter is a data type. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ If parameter is a data type. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueTiming = None """ If parameter is a data type. Type `Timing` (represented as `dict` in JSON). """ + self._valueTiming = None + """ Primitive extension for valueTiming. Type `FHIRPrimitiveExtension` """ self.valueTriggerDefinition = None """ If parameter is a data type. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._valueTriggerDefinition = None + """ Primitive extension for valueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.valueUnsignedInt = None """ If parameter is a data type. Type `int`. """ + self._valueUnsignedInt = None + """ Primitive extension for valueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ If parameter is a data type. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ self.valueUrl = None """ If parameter is a data type. Type `str`. """ + self._valueUrl = None + """ Primitive extension for valueUrl. Type `FHIRPrimitiveExtension` """ self.valueUsageContext = None """ If parameter is a data type. Type `UsageContext` (represented as `dict` in JSON). """ + self._valueUsageContext = None + """ Primitive extension for valueUsageContext. Type `FHIRPrimitiveExtension` """ self.valueUuid = None """ If parameter is a data type. Type `str`. """ + self._valueUuid = None + """ Primitive extension for valueUuid. Type `FHIRPrimitiveExtension` """ super(ParametersParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -272,61 +381,115 @@ def elementProperties(self): js = super(ParametersParameter, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("part", "part", ParametersParameter, True, None, False), + ("_part", "_part", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("resource", "resource", resource.Resource, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAddress", "valueAddress", address.Address, False, "value", False), + ("_valueAddress", "_valueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAge", "valueAge", age.Age, False, "value", False), + ("_valueAge", "_valueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAnnotation", "valueAnnotation", annotation.Annotation, False, "value", False), + ("_valueAnnotation", "_valueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", False), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", False), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCanonical", "valueCanonical", str, False, "value", False), + ("_valueCanonical", "_valueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", False), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", False), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactDetail", "valueContactDetail", contactdetail.ContactDetail, False, "value", False), + ("_valueContactDetail", "_valueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactPoint", "valueContactPoint", contactpoint.ContactPoint, False, "value", False), + ("_valueContactPoint", "_valueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContributor", "valueContributor", contributor.Contributor, False, "value", False), + ("_valueContributor", "_valueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCount", "valueCount", count.Count, False, "value", False), + ("_valueCount", "_valueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDataRequirement", "valueDataRequirement", datarequirement.DataRequirement, False, "value", False), + ("_valueDataRequirement", "_valueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", False), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", False), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDistance", "valueDistance", distance.Distance, False, "value", False), + ("_valueDistance", "_valueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDosage", "valueDosage", dosage.Dosage, False, "value", False), + ("_valueDosage", "_valueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", False), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueExpression", "valueExpression", expression.Expression, False, "value", False), + ("_valueExpression", "_valueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueHumanName", "valueHumanName", humanname.HumanName, False, "value", False), + ("_valueHumanName", "_valueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", False), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueIdentifier", "valueIdentifier", identifier.Identifier, False, "value", False), + ("_valueIdentifier", "_valueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInstant", "valueInstant", fhirinstant.FHIRInstant, False, "value", False), + ("_valueInstant", "_valueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMarkdown", "valueMarkdown", str, False, "value", False), + ("_valueMarkdown", "_valueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMeta", "valueMeta", meta.Meta, False, "value", False), + ("_valueMeta", "_valueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", False), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueOid", "valueOid", str, False, "value", False), + ("_valueOid", "_valueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueParameterDefinition", "valueParameterDefinition", parameterdefinition.ParameterDefinition, False, "value", False), + ("_valueParameterDefinition", "_valueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", False), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePositiveInt", "valuePositiveInt", int, False, "value", False), + ("_valuePositiveInt", "_valuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", False), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", False), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRelatedArtifact", "valueRelatedArtifact", relatedartifact.RelatedArtifact, False, "value", False), + ("_valueRelatedArtifact", "_valueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", False), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSignature", "valueSignature", signature.Signature, False, "value", False), + ("_valueSignature", "_valueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", False), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTiming", "valueTiming", timing.Timing, False, "value", False), + ("_valueTiming", "_valueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTriggerDefinition", "valueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "value", False), + ("_valueTriggerDefinition", "_valueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUnsignedInt", "valueUnsignedInt", int, False, "value", False), + ("_valueUnsignedInt", "_valueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", False), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUrl", "valueUrl", str, False, "value", False), + ("_valueUrl", "_valueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUsageContext", "valueUsageContext", usagecontext.UsageContext, False, "value", False), + ("_valueUsageContext", "_valueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUuid", "valueUuid", str, False, "value", False), + ("_valueUuid", "_valueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import age @@ -362,4 +525,4 @@ def elementProperties(self): from . import signature from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/patient.py b/fhirclient/models/patient.py index 6686ba06..22a03367 100644 --- a/fhirclient/models/patient.py +++ b/fhirclient/models/patient.py @@ -24,76 +24,112 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this patient's record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.address = None """ An address for the individual. List of `Address` items (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. List of `FHIRPrimitiveExtension` """ self.birthDate = None """ The date of birth for the individual. Type `FHIRDate` (represented as `str` in JSON). """ + self._birthDate = None + """ Primitive extension for birthDate. Type `FHIRPrimitiveExtension` """ self.communication = None """ A language which may be used to communicate with the patient about his or her health. List of `PatientCommunication` items (represented as `dict` in JSON). """ + self._communication = None + """ Primitive extension for communication. List of `FHIRPrimitiveExtension` """ self.contact = None """ A contact party (e.g. guardian, partner, friend) for the patient. List of `PatientContact` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.deceasedBoolean = None """ Indicates if the individual is deceased or not. Type `bool`. """ + self._deceasedBoolean = None + """ Primitive extension for deceasedBoolean. Type `FHIRPrimitiveExtension` """ self.deceasedDateTime = None """ Indicates if the individual is deceased or not. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._deceasedDateTime = None + """ Primitive extension for deceasedDateTime. Type `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.generalPractitioner = None """ Patient's nominated primary care provider. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._generalPractitioner = None + """ Primitive extension for generalPractitioner. List of `FHIRPrimitiveExtension` """ self.identifier = None """ An identifier for this patient. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.link = None """ Link to another patient resource that concerns the same actual person. List of `PatientLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ Organization that is the custodian of the patient record. Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. Type `FHIRPrimitiveExtension` """ self.maritalStatus = None """ Marital (civil) status of a patient. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._maritalStatus = None + """ Primitive extension for maritalStatus. Type `FHIRPrimitiveExtension` """ self.multipleBirthBoolean = None """ Whether patient is part of a multiple birth. Type `bool`. """ + self._multipleBirthBoolean = None + """ Primitive extension for multipleBirthBoolean. Type `FHIRPrimitiveExtension` """ self.multipleBirthInteger = None """ Whether patient is part of a multiple birth. Type `int`. """ + self._multipleBirthInteger = None + """ Primitive extension for multipleBirthInteger. Type `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the patient. List of `HumanName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.photo = None """ Image of the patient. List of `Attachment` items (represented as `dict` in JSON). """ + self._photo = None + """ Primitive extension for photo. List of `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the individual. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(Patient, self).__init__(jsondict=jsondict, strict=strict) @@ -101,23 +137,41 @@ def elementProperties(self): js = super(Patient, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("address", "address", address.Address, True, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("birthDate", "birthDate", fhirdate.FHIRDate, False, None, False), + ("_birthDate", "_birthDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("communication", "communication", PatientCommunication, True, None, False), + ("_communication", "_communication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", PatientContact, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("deceasedBoolean", "deceasedBoolean", bool, False, "deceased", False), + ("_deceasedBoolean", "_deceasedBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deceasedDateTime", "deceasedDateTime", fhirdatetime.FHIRDateTime, False, "deceased", False), + ("_deceasedDateTime", "_deceasedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("generalPractitioner", "generalPractitioner", fhirreference.FHIRReference, True, None, False), + ("_generalPractitioner", "_generalPractitioner", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("link", "link", PatientLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, False, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maritalStatus", "maritalStatus", codeableconcept.CodeableConcept, False, None, False), + ("_maritalStatus", "_maritalStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("multipleBirthBoolean", "multipleBirthBoolean", bool, False, "multipleBirth", False), + ("_multipleBirthBoolean", "_multipleBirthBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("multipleBirthInteger", "multipleBirthInteger", int, False, "multipleBirth", False), + ("_multipleBirthInteger", "_multipleBirthInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", humanname.HumanName, True, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("photo", "photo", attachment.Attachment, True, None, False), + ("_photo", "_photo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -143,10 +197,14 @@ def __init__(self, jsondict=None, strict=True): """ The language which can be used to communicate with the patient about his or her health. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.preferred = None """ Language preference indicator. Type `bool`. """ + self._preferred = None + """ Primitive extension for preferred. Type `FHIRPrimitiveExtension` """ super(PatientCommunication, self).__init__(jsondict=jsondict, strict=strict) @@ -154,7 +212,9 @@ def elementProperties(self): js = super(PatientCommunication, self).elementProperties() js.extend([ ("language", "language", codeableconcept.CodeableConcept, False, None, True), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preferred", "preferred", bool, False, None, False), + ("_preferred", "_preferred", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -176,31 +236,45 @@ def __init__(self, jsondict=None, strict=True): self.address = None """ Address for the contact person. Type `Address` (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. Type `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the contact person. Type `HumanName` (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.organization = None """ Organization that is associated with the contact. Type `FHIRReference` (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. Type `FHIRPrimitiveExtension` """ self.period = None """ The period during which this contact person or organization is valid to be contacted relating to this patient. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.relationship = None """ The kind of relationship. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. List of `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the person. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(PatientContact, self).__init__(jsondict=jsondict, strict=strict) @@ -208,12 +282,19 @@ def elementProperties(self): js = super(PatientContact, self).elementProperties() js.extend([ ("address", "address", address.Address, False, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", humanname.HumanName, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organization", "organization", fhirreference.FHIRReference, False, None, False), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, True, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -238,10 +319,14 @@ def __init__(self, jsondict=None, strict=True): """ The other patient or related person resource that the link refers to. Type `FHIRReference` (represented as `dict` in JSON). """ + self._other = None + """ Primitive extension for other. Type `FHIRPrimitiveExtension` """ self.type = None """ replaced-by | replaces | refer | seealso. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(PatientLink, self).__init__(jsondict=jsondict, strict=strict) @@ -249,10 +334,13 @@ def elementProperties(self): js = super(PatientLink, self).elementProperties() js.extend([ ("other", "other", fhirreference.FHIRReference, False, None, True), + ("_other", "_other", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -263,4 +351,4 @@ def elementProperties(self): from . import fhirreference from . import humanname from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/paymentnotice.py b/fhirclient/models/paymentnotice.py index 04de5412..e32fc002 100644 --- a/fhirclient/models/paymentnotice.py +++ b/fhirclient/models/paymentnotice.py @@ -24,50 +24,74 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Monetary amount of the payment. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.created = None """ Creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for the payment noctice. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.payee = None """ Party being paid. Type `FHIRReference` (represented as `dict` in JSON). """ + self._payee = None + """ Primitive extension for payee. Type `FHIRPrimitiveExtension` """ self.payment = None """ Payment reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._payment = None + """ Primitive extension for payment. Type `FHIRPrimitiveExtension` """ self.paymentDate = None """ Payment or clearing date. Type `FHIRDate` (represented as `str` in JSON). """ + self._paymentDate = None + """ Primitive extension for paymentDate. Type `FHIRPrimitiveExtension` """ self.paymentStatus = None """ Issued or cleared Status of the payment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._paymentStatus = None + """ Primitive extension for paymentStatus. Type `FHIRPrimitiveExtension` """ self.provider = None """ Responsible practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._provider = None + """ Primitive extension for provider. Type `FHIRPrimitiveExtension` """ self.recipient = None """ Party being notified. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. Type `FHIRPrimitiveExtension` """ self.request = None """ Request reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.response = None """ Response reference. Type `FHIRReference` (represented as `dict` in JSON). """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(PaymentNotice, self).__init__(jsondict=jsondict, strict=strict) @@ -75,24 +99,37 @@ def elementProperties(self): js = super(PaymentNotice, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, True), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("payee", "payee", fhirreference.FHIRReference, False, None, False), + ("_payee", "_payee", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payment", "payment", fhirreference.FHIRReference, False, None, True), + ("_payment", "_payment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentDate", "paymentDate", fhirdate.FHIRDate, False, None, False), + ("_paymentDate", "_paymentDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentStatus", "paymentStatus", codeableconcept.CodeableConcept, False, None, False), + ("_paymentStatus", "_paymentStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("provider", "provider", fhirreference.FHIRReference, False, None, False), + ("_provider", "_provider", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, False, None, True), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", fhirreference.FHIRReference, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate from . import fhirdatetime from . import fhirreference from . import identifier -from . import money +from . import money \ No newline at end of file diff --git a/fhirclient/models/paymentreconciliation.py b/fhirclient/models/paymentreconciliation.py index 48eeb7ce..4e486846 100644 --- a/fhirclient/models/paymentreconciliation.py +++ b/fhirclient/models/paymentreconciliation.py @@ -24,62 +24,92 @@ def __init__(self, jsondict=None, strict=True): self.created = None """ Creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.detail = None """ Settlement particulars. List of `PaymentReconciliationDetail` items (represented as `dict` in JSON). """ + self._detail = None + """ Primitive extension for detail. List of `FHIRPrimitiveExtension` """ self.disposition = None """ Disposition message. Type `str`. """ + self._disposition = None + """ Primitive extension for disposition. Type `FHIRPrimitiveExtension` """ self.formCode = None """ Printed form identifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._formCode = None + """ Primitive extension for formCode. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for a payment reconciliation. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.outcome = None """ queued | complete | error | partial. Type `str`. """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.paymentAmount = None """ Total amount of Payment. Type `Money` (represented as `dict` in JSON). """ + self._paymentAmount = None + """ Primitive extension for paymentAmount. Type `FHIRPrimitiveExtension` """ self.paymentDate = None """ When payment issued. Type `FHIRDate` (represented as `str` in JSON). """ + self._paymentDate = None + """ Primitive extension for paymentDate. Type `FHIRPrimitiveExtension` """ self.paymentIdentifier = None """ Business identifier for the payment. Type `Identifier` (represented as `dict` in JSON). """ + self._paymentIdentifier = None + """ Primitive extension for paymentIdentifier. Type `FHIRPrimitiveExtension` """ self.paymentIssuer = None """ Party generating payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._paymentIssuer = None + """ Primitive extension for paymentIssuer. Type `FHIRPrimitiveExtension` """ self.period = None """ Period covered. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.processNote = None """ Note concerning processing. List of `PaymentReconciliationProcessNote` items (represented as `dict` in JSON). """ + self._processNote = None + """ Primitive extension for processNote. List of `FHIRPrimitiveExtension` """ self.request = None """ Reference to requesting resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.requestor = None """ Responsible practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requestor = None + """ Primitive extension for requestor. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(PaymentReconciliation, self).__init__(jsondict=jsondict, strict=strict) @@ -87,20 +117,35 @@ def elementProperties(self): js = super(PaymentReconciliation, self).elementProperties() js.extend([ ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detail", "detail", PaymentReconciliationDetail, True, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("disposition", "disposition", str, False, None, False), + ("_disposition", "_disposition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("formCode", "formCode", codeableconcept.CodeableConcept, False, None, False), + ("_formCode", "_formCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", str, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentAmount", "paymentAmount", money.Money, False, None, True), + ("_paymentAmount", "_paymentAmount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentDate", "paymentDate", fhirdate.FHIRDate, False, None, True), + ("_paymentDate", "_paymentDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentIdentifier", "paymentIdentifier", identifier.Identifier, False, None, False), + ("_paymentIdentifier", "_paymentIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paymentIssuer", "paymentIssuer", fhirreference.FHIRReference, False, None, False), + ("_paymentIssuer", "_paymentIssuer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("processNote", "processNote", PaymentReconciliationProcessNote, True, None, False), + ("_processNote", "_processNote", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestor", "requestor", fhirreference.FHIRReference, False, None, False), + ("_requestor", "_requestor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -126,42 +171,62 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Amount allocated to this payable. Type `Money` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.date = None """ Date of commitment to pay. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier of the payment detail. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.payee = None """ Recipient of the payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._payee = None + """ Primitive extension for payee. Type `FHIRPrimitiveExtension` """ self.predecessor = None """ Business identifier of the prior payment detail. Type `Identifier` (represented as `dict` in JSON). """ + self._predecessor = None + """ Primitive extension for predecessor. Type `FHIRPrimitiveExtension` """ self.request = None """ Request giving rise to the payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. Type `FHIRPrimitiveExtension` """ self.response = None """ Response committing to a payment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.responsible = None """ Contact for the response. Type `FHIRReference` (represented as `dict` in JSON). """ + self._responsible = None + """ Primitive extension for responsible. Type `FHIRPrimitiveExtension` """ self.submitter = None """ Submitter of the request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._submitter = None + """ Primitive extension for submitter. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of payment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(PaymentReconciliationDetail, self).__init__(jsondict=jsondict, strict=strict) @@ -169,15 +234,25 @@ def elementProperties(self): js = super(PaymentReconciliationDetail, self).elementProperties() js.extend([ ("amount", "amount", money.Money, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdate.FHIRDate, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("payee", "payee", fhirreference.FHIRReference, False, None, False), + ("_payee", "_payee", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("predecessor", "predecessor", identifier.Identifier, False, None, False), + ("_predecessor", "_predecessor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", fhirreference.FHIRReference, False, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", fhirreference.FHIRReference, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responsible", "responsible", fhirreference.FHIRReference, False, None, False), + ("_responsible", "_responsible", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("submitter", "submitter", fhirreference.FHIRReference, False, None, False), + ("_submitter", "_submitter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -201,10 +276,14 @@ def __init__(self, jsondict=None, strict=True): self.text = None """ Note explanatory text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ display | print | printoper. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(PaymentReconciliationProcessNote, self).__init__(jsondict=jsondict, strict=strict) @@ -212,10 +291,13 @@ def elementProperties(self): js = super(PaymentReconciliationProcessNote, self).elementProperties() js.extend([ ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate @@ -223,4 +305,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import money -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/period.py b/fhirclient/models/period.py index e2f49f26..291f4434 100644 --- a/fhirclient/models/period.py +++ b/fhirclient/models/period.py @@ -23,10 +23,14 @@ def __init__(self, jsondict=None, strict=True): self.end = None """ End time with inclusive boundary, if not ongoing. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.start = None """ Starting time with inclusive boundary. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ super(Period, self).__init__(jsondict=jsondict, strict=strict) @@ -34,9 +38,12 @@ def elementProperties(self): js = super(Period, self).elementProperties() js.extend([ ("end", "end", fhirdatetime.FHIRDateTime, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", fhirdatetime.FHIRDateTime, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import fhirdatetime +from . import fhirdatetime \ No newline at end of file diff --git a/fhirclient/models/person.py b/fhirclient/models/person.py index 103b459b..af193066 100644 --- a/fhirclient/models/person.py +++ b/fhirclient/models/person.py @@ -24,42 +24,62 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ This person's record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.address = None """ One or more addresses for the person. List of `Address` items (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. List of `FHIRPrimitiveExtension` """ self.birthDate = None """ The date on which the person was born. Type `FHIRDate` (represented as `str` in JSON). """ + self._birthDate = None + """ Primitive extension for birthDate. Type `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.identifier = None """ A human identifier for this person. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.link = None """ Link to a resource that concerns the same actual person. List of `PersonLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.managingOrganization = None """ The organization that is the custodian of the person record. Type `FHIRReference` (represented as `dict` in JSON). """ + self._managingOrganization = None + """ Primitive extension for managingOrganization. Type `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the person. List of `HumanName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.photo = None """ Image of the person. Type `Attachment` (represented as `dict` in JSON). """ + self._photo = None + """ Primitive extension for photo. Type `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the person. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(Person, self).__init__(jsondict=jsondict, strict=strict) @@ -67,15 +87,25 @@ def elementProperties(self): js = super(Person, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("address", "address", address.Address, True, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("birthDate", "birthDate", fhirdate.FHIRDate, False, None, False), + ("_birthDate", "_birthDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("link", "link", PersonLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("managingOrganization", "managingOrganization", fhirreference.FHIRReference, False, None, False), + ("_managingOrganization", "_managingOrganization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", humanname.HumanName, True, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("photo", "photo", attachment.Attachment, False, None, False), + ("_photo", "_photo", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -99,10 +129,14 @@ def __init__(self, jsondict=None, strict=True): self.assurance = None """ level1 | level2 | level3 | level4. Type `str`. """ + self._assurance = None + """ Primitive extension for assurance. Type `FHIRPrimitiveExtension` """ self.target = None """ The resource to which this actual person is associated. Type `FHIRReference` (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. Type `FHIRPrimitiveExtension` """ super(PersonLink, self).__init__(jsondict=jsondict, strict=strict) @@ -110,10 +144,13 @@ def elementProperties(self): js = super(PersonLink, self).elementProperties() js.extend([ ("assurance", "assurance", str, False, None, False), + ("_assurance", "_assurance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", fhirreference.FHIRReference, False, None, True), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -121,4 +158,4 @@ def elementProperties(self): from . import fhirdate from . import fhirreference from . import humanname -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/plandefinition.py b/fhirclient/models/plandefinition.py index 65c5e9d4..b8baaf2a 100644 --- a/fhirclient/models/plandefinition.py +++ b/fhirclient/models/plandefinition.py @@ -27,131 +27,195 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Action defined by the plan. List of `PlanDefinitionAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.approvalDate = None """ When the plan definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the plan definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the plan definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.goal = None """ What the plan is trying to accomplish. List of `PlanDefinitionGoal` items (represented as `dict` in JSON). """ + self._goal = None + """ Primitive extension for goal. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the plan definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for plan definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the plan definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.library = None """ Logic used by the plan definition. List of `str` items. """ + self._library = None + """ Primitive extension for library. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this plan definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this plan definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ Type of individual the plan definition is focused on. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ Type of individual the plan definition is focused on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the plan definition. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this plan definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ E.g. Education, Treatment, Assessment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.type = None """ order-set | clinical-protocol | eca-rule | workflow-definition. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this plan definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the plan. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the plan definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(PlanDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -159,37 +223,69 @@ def elementProperties(self): js = super(PlanDefinition, self).elementProperties() js.extend([ ("action", "action", PlanDefinitionAction, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("goal", "goal", PlanDefinitionGoal, True, None, False), + ("_goal", "_goal", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("library", "library", str, True, None, False), + ("_library", "_library", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -215,139 +311,207 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ A sub-action. List of `PlanDefinitionAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.cardinalityBehavior = None """ single | multiple. Type `str`. """ + self._cardinalityBehavior = None + """ Primitive extension for cardinalityBehavior. Type `FHIRPrimitiveExtension` """ self.code = None """ Code representing the meaning of the action or sub-actions. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.condition = None """ Whether or not the action is applicable. List of `PlanDefinitionActionCondition` items (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.definitionCanonical = None """ Description of the activity to be performed. Type `str`. """ + self._definitionCanonical = None + """ Primitive extension for definitionCanonical. Type `FHIRPrimitiveExtension` """ self.definitionUri = None """ Description of the activity to be performed. Type `str`. """ + self._definitionUri = None + """ Primitive extension for definitionUri. Type `FHIRPrimitiveExtension` """ self.description = None """ Brief description of the action. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Supporting documentation for the intended performer of the action. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._documentation = None + """ Primitive extension for documentation. List of `FHIRPrimitiveExtension` """ self.dynamicValue = None """ Dynamic aspects of the definition. List of `PlanDefinitionActionDynamicValue` items (represented as `dict` in JSON). """ + self._dynamicValue = None + """ Primitive extension for dynamicValue. List of `FHIRPrimitiveExtension` """ self.goalId = None """ What goals this action supports. List of `str` items. """ + self._goalId = None + """ Primitive extension for goalId. List of `FHIRPrimitiveExtension` """ self.groupingBehavior = None """ visual-group | logical-group | sentence-group. Type `str`. """ + self._groupingBehavior = None + """ Primitive extension for groupingBehavior. Type `FHIRPrimitiveExtension` """ self.input = None """ Input data requirements. List of `DataRequirement` items (represented as `dict` in JSON). """ + self._input = None + """ Primitive extension for input. List of `FHIRPrimitiveExtension` """ self.output = None """ Output data definition. List of `DataRequirement` items (represented as `dict` in JSON). """ + self._output = None + """ Primitive extension for output. List of `FHIRPrimitiveExtension` """ self.participant = None """ Who should participate in the action. List of `PlanDefinitionActionParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.precheckBehavior = None """ yes | no. Type `str`. """ + self._precheckBehavior = None + """ Primitive extension for precheckBehavior. Type `FHIRPrimitiveExtension` """ self.prefix = None """ User-visible prefix for the action (e.g. 1. or A.). Type `str`. """ + self._prefix = None + """ Primitive extension for prefix. Type `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reason = None """ Why the action should be performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. List of `FHIRPrimitiveExtension` """ self.relatedAction = None """ Relationship to another action. List of `PlanDefinitionActionRelatedAction` items (represented as `dict` in JSON). """ + self._relatedAction = None + """ Primitive extension for relatedAction. List of `FHIRPrimitiveExtension` """ self.requiredBehavior = None """ must | could | must-unless-documented. Type `str`. """ + self._requiredBehavior = None + """ Primitive extension for requiredBehavior. Type `FHIRPrimitiveExtension` """ self.selectionBehavior = None """ any | all | all-or-none | exactly-one | at-most-one | one-or-more. Type `str`. """ + self._selectionBehavior = None + """ Primitive extension for selectionBehavior. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ Type of individual the action is focused on. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ Type of individual the action is focused on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.textEquivalent = None """ Static text equivalent of the action, used if the dynamic aspects cannot be interpreted by the receiving system. Type `str`. """ + self._textEquivalent = None + """ Primitive extension for textEquivalent. Type `FHIRPrimitiveExtension` """ self.timingAge = None """ When the action should take place. Type `Age` (represented as `dict` in JSON). """ + self._timingAge = None + """ Primitive extension for timingAge. Type `FHIRPrimitiveExtension` """ self.timingDateTime = None """ When the action should take place. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timingDateTime = None + """ Primitive extension for timingDateTime. Type `FHIRPrimitiveExtension` """ self.timingDuration = None """ When the action should take place. Type `Duration` (represented as `dict` in JSON). """ + self._timingDuration = None + """ Primitive extension for timingDuration. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ When the action should take place. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.timingRange = None """ When the action should take place. Type `Range` (represented as `dict` in JSON). """ + self._timingRange = None + """ Primitive extension for timingRange. Type `FHIRPrimitiveExtension` """ self.timingTiming = None """ When the action should take place. Type `Timing` (represented as `dict` in JSON). """ + self._timingTiming = None + """ Primitive extension for timingTiming. Type `FHIRPrimitiveExtension` """ self.title = None """ User-visible title. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.transform = None """ Transform to apply the template. Type `str`. """ + self._transform = None + """ Primitive extension for transform. Type `FHIRPrimitiveExtension` """ self.trigger = None """ When the action should be triggered. List of `TriggerDefinition` items (represented as `dict` in JSON). """ + self._trigger = None + """ Primitive extension for trigger. List of `FHIRPrimitiveExtension` """ self.type = None """ create | update | remove | fire-event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionAction, self).__init__(jsondict=jsondict, strict=strict) @@ -355,39 +519,73 @@ def elementProperties(self): js = super(PlanDefinitionAction, self).elementProperties() js.extend([ ("action", "action", PlanDefinitionAction, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("cardinalityBehavior", "cardinalityBehavior", str, False, None, False), + ("_cardinalityBehavior", "_cardinalityBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("condition", "condition", PlanDefinitionActionCondition, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definitionCanonical", "definitionCanonical", str, False, "definition", False), + ("_definitionCanonical", "_definitionCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionUri", "definitionUri", str, False, "definition", False), + ("_definitionUri", "_definitionUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", relatedartifact.RelatedArtifact, True, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("dynamicValue", "dynamicValue", PlanDefinitionActionDynamicValue, True, None, False), + ("_dynamicValue", "_dynamicValue", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("goalId", "goalId", str, True, None, False), + ("_goalId", "_goalId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("groupingBehavior", "groupingBehavior", str, False, None, False), + ("_groupingBehavior", "_groupingBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("input", "input", datarequirement.DataRequirement, True, None, False), + ("_input", "_input", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("output", "output", datarequirement.DataRequirement, True, None, False), + ("_output", "_output", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("participant", "participant", PlanDefinitionActionParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("precheckBehavior", "precheckBehavior", str, False, None, False), + ("_precheckBehavior", "_precheckBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prefix", "prefix", str, False, None, False), + ("_prefix", "_prefix", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", codeableconcept.CodeableConcept, True, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relatedAction", "relatedAction", PlanDefinitionActionRelatedAction, True, None, False), + ("_relatedAction", "_relatedAction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requiredBehavior", "requiredBehavior", str, False, None, False), + ("_requiredBehavior", "_requiredBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("selectionBehavior", "selectionBehavior", str, False, None, False), + ("_selectionBehavior", "_selectionBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("textEquivalent", "textEquivalent", str, False, None, False), + ("_textEquivalent", "_textEquivalent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingAge", "timingAge", age.Age, False, "timing", False), + ("_timingAge", "_timingAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDateTime", "timingDateTime", fhirdatetime.FHIRDateTime, False, "timing", False), + ("_timingDateTime", "_timingDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDuration", "timingDuration", duration.Duration, False, "timing", False), + ("_timingDuration", "_timingDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingRange", "timingRange", range.Range, False, "timing", False), + ("_timingRange", "_timingRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingTiming", "timingTiming", timing.Timing, False, "timing", False), + ("_timingTiming", "_timingTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("transform", "transform", str, False, None, False), + ("_transform", "_transform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("trigger", "trigger", triggerdefinition.TriggerDefinition, True, None, False), + ("_trigger", "_trigger", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -412,10 +610,14 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ Boolean-valued expression. Type `Expression` (represented as `dict` in JSON). """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.kind = None """ applicability | start | stop. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionActionCondition, self).__init__(jsondict=jsondict, strict=strict) @@ -423,7 +625,9 @@ def elementProperties(self): js = super(PlanDefinitionActionCondition, self).elementProperties() js.extend([ ("expression", "expression", expression.Expression, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -451,10 +655,14 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ An expression that provides the dynamic value for the customization. Type `Expression` (represented as `dict` in JSON). """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.path = None """ The path to the element to be set dynamically. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionActionDynamicValue, self).__init__(jsondict=jsondict, strict=strict) @@ -462,7 +670,9 @@ def elementProperties(self): js = super(PlanDefinitionActionDynamicValue, self).elementProperties() js.extend([ ("expression", "expression", expression.Expression, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -486,10 +696,14 @@ def __init__(self, jsondict=None, strict=True): self.role = None """ E.g. Nurse, Surgeon, Parent. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.type = None """ patient | practitioner | related-person | device. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionActionParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -497,7 +711,9 @@ def elementProperties(self): js = super(PlanDefinitionActionParticipant, self).elementProperties() js.extend([ ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -522,19 +738,27 @@ def __init__(self, jsondict=None, strict=True): self.actionId = None """ What action is this related to. Type `str`. """ + self._actionId = None + """ Primitive extension for actionId. Type `FHIRPrimitiveExtension` """ self.offsetDuration = None """ Time offset for the relationship. Type `Duration` (represented as `dict` in JSON). """ + self._offsetDuration = None + """ Primitive extension for offsetDuration. Type `FHIRPrimitiveExtension` """ self.offsetRange = None """ Time offset for the relationship. Type `Range` (represented as `dict` in JSON). """ + self._offsetRange = None + """ Primitive extension for offsetRange. Type `FHIRPrimitiveExtension` """ self.relationship = None """ before-start | before | before-end | concurrent-with-start | concurrent | concurrent-with-end | after-start | after | after-end. Type `str`. """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionActionRelatedAction, self).__init__(jsondict=jsondict, strict=strict) @@ -542,9 +766,13 @@ def elementProperties(self): js = super(PlanDefinitionActionRelatedAction, self).elementProperties() js.extend([ ("actionId", "actionId", str, False, None, True), + ("_actionId", "_actionId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offsetDuration", "offsetDuration", duration.Duration, False, "offset", False), + ("_offsetDuration", "_offsetDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offsetRange", "offsetRange", range.Range, False, "offset", False), + ("_offsetRange", "_offsetRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", str, False, None, True), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -571,30 +799,44 @@ def __init__(self, jsondict=None, strict=True): self.addresses = None """ What does the goal address. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._addresses = None + """ Primitive extension for addresses. List of `FHIRPrimitiveExtension` """ self.category = None """ E.g. Treatment, dietary, behavioral. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.description = None """ Code or text describing the goal. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Supporting documentation for the goal. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._documentation = None + """ Primitive extension for documentation. List of `FHIRPrimitiveExtension` """ self.priority = None """ high-priority | medium-priority | low-priority. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.start = None """ When goal pursuit begins. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.target = None """ Target outcome for the goal. List of `PlanDefinitionGoalTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(PlanDefinitionGoal, self).__init__(jsondict=jsondict, strict=strict) @@ -602,12 +844,19 @@ def elementProperties(self): js = super(PlanDefinitionGoal, self).elementProperties() js.extend([ ("addresses", "addresses", codeableconcept.CodeableConcept, True, None, False), + ("_addresses", "_addresses", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", codeableconcept.CodeableConcept, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", relatedartifact.RelatedArtifact, True, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", codeableconcept.CodeableConcept, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("start", "start", codeableconcept.CodeableConcept, False, None, False), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", PlanDefinitionGoalTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -631,22 +880,32 @@ def __init__(self, jsondict=None, strict=True): self.detailCodeableConcept = None """ The target value to be achieved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._detailCodeableConcept = None + """ Primitive extension for detailCodeableConcept. Type `FHIRPrimitiveExtension` """ self.detailQuantity = None """ The target value to be achieved. Type `Quantity` (represented as `dict` in JSON). """ + self._detailQuantity = None + """ Primitive extension for detailQuantity. Type `FHIRPrimitiveExtension` """ self.detailRange = None """ The target value to be achieved. Type `Range` (represented as `dict` in JSON). """ + self._detailRange = None + """ Primitive extension for detailRange. Type `FHIRPrimitiveExtension` """ self.due = None """ Reach goal within. Type `Duration` (represented as `dict` in JSON). """ + self._due = None + """ Primitive extension for due. Type `FHIRPrimitiveExtension` """ self.measure = None """ The parameter whose value is to be tracked. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._measure = None + """ Primitive extension for measure. Type `FHIRPrimitiveExtension` """ super(PlanDefinitionGoalTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -654,13 +913,19 @@ def elementProperties(self): js = super(PlanDefinitionGoalTarget, self).elementProperties() js.extend([ ("detailCodeableConcept", "detailCodeableConcept", codeableconcept.CodeableConcept, False, "detail", False), + ("_detailCodeableConcept", "_detailCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailQuantity", "detailQuantity", quantity.Quantity, False, "detail", False), + ("_detailQuantity", "_detailQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("detailRange", "detailRange", range.Range, False, "detail", False), + ("_detailRange", "_detailRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("due", "due", duration.Duration, False, None, False), + ("_due", "_due", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("measure", "measure", codeableconcept.CodeableConcept, False, None, False), + ("_measure", "_measure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import codeableconcept @@ -678,4 +943,4 @@ def elementProperties(self): from . import relatedartifact from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/population.py b/fhirclient/models/population.py index 07769f84..3fb1e700 100644 --- a/fhirclient/models/population.py +++ b/fhirclient/models/population.py @@ -24,23 +24,33 @@ def __init__(self, jsondict=None, strict=True): self.ageCodeableConcept = None """ The age of the specific population. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._ageCodeableConcept = None + """ Primitive extension for ageCodeableConcept. Type `FHIRPrimitiveExtension` """ self.ageRange = None """ The age of the specific population. Type `Range` (represented as `dict` in JSON). """ + self._ageRange = None + """ Primitive extension for ageRange. Type `FHIRPrimitiveExtension` """ self.gender = None """ The gender of the specific population. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.physiologicalCondition = None """ The existing physiological conditions of the specific population to which this applies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._physiologicalCondition = None + """ Primitive extension for physiologicalCondition. Type `FHIRPrimitiveExtension` """ self.race = None """ Race of the specific population. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._race = None + """ Primitive extension for race. Type `FHIRPrimitiveExtension` """ super(Population, self).__init__(jsondict=jsondict, strict=strict) @@ -48,13 +58,19 @@ def elementProperties(self): js = super(Population, self).elementProperties() js.extend([ ("ageCodeableConcept", "ageCodeableConcept", codeableconcept.CodeableConcept, False, "age", False), + ("_ageCodeableConcept", "_ageCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("ageRange", "ageRange", range.Range, False, "age", False), + ("_ageRange", "_ageRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gender", "gender", codeableconcept.CodeableConcept, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("physiologicalCondition", "physiologicalCondition", codeableconcept.CodeableConcept, False, None, False), + ("_physiologicalCondition", "_physiologicalCondition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("race", "race", codeableconcept.CodeableConcept, False, None, False), + ("_race", "_race", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/practitioner.py b/fhirclient/models/practitioner.py index 7f03cc72..64a7848f 100644 --- a/fhirclient/models/practitioner.py +++ b/fhirclient/models/practitioner.py @@ -25,44 +25,64 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this practitioner's record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.address = None """ Address(es) of the practitioner that are not role specific (typically home address). List of `Address` items (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. List of `FHIRPrimitiveExtension` """ self.birthDate = None """ The date on which the practitioner was born. Type `FHIRDate` (represented as `str` in JSON). """ + self._birthDate = None + """ Primitive extension for birthDate. Type `FHIRPrimitiveExtension` """ self.communication = None """ A language the practitioner can use in patient communication. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._communication = None + """ Primitive extension for communication. List of `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.identifier = None """ An identifier for the person as this agent. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.name = None """ The name(s) associated with the practitioner. List of `HumanName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.photo = None """ Image of the person. List of `Attachment` items (represented as `dict` in JSON). """ + self._photo = None + """ Primitive extension for photo. List of `FHIRPrimitiveExtension` """ self.qualification = None """ Certification, licenses, or training pertaining to the provision of care. List of `PractitionerQualification` items (represented as `dict` in JSON). """ + self._qualification = None + """ Primitive extension for qualification. List of `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the practitioner (that apply to all roles). List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(Practitioner, self).__init__(jsondict=jsondict, strict=strict) @@ -70,15 +90,25 @@ def elementProperties(self): js = super(Practitioner, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("address", "address", address.Address, True, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("birthDate", "birthDate", fhirdate.FHIRDate, False, None, False), + ("_birthDate", "_birthDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("communication", "communication", codeableconcept.CodeableConcept, True, None, False), + ("_communication", "_communication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", humanname.HumanName, True, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("photo", "photo", attachment.Attachment, True, None, False), + ("_photo", "_photo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("qualification", "qualification", PractitionerQualification, True, None, False), + ("_qualification", "_qualification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -107,18 +137,26 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Coded representation of the qualification. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.identifier = None """ An identifier for this qualification for the practitioner. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.issuer = None """ Organization that regulates and issues the qualification. Type `FHIRReference` (represented as `dict` in JSON). """ + self._issuer = None + """ Primitive extension for issuer. Type `FHIRPrimitiveExtension` """ self.period = None """ Period during which the qualification is valid. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ super(PractitionerQualification, self).__init__(jsondict=jsondict, strict=strict) @@ -126,12 +164,17 @@ def elementProperties(self): js = super(PractitionerQualification, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("issuer", "issuer", fhirreference.FHIRReference, False, None, False), + ("_issuer", "_issuer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -141,4 +184,4 @@ def elementProperties(self): from . import fhirreference from . import humanname from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/practitionerrole.py b/fhirclient/models/practitionerrole.py index f4dc0a14..e92e67f3 100644 --- a/fhirclient/models/practitionerrole.py +++ b/fhirclient/models/practitionerrole.py @@ -24,62 +24,90 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this practitioner role record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.availabilityExceptions = None """ Description of availability exceptions. Type `str`. """ + self._availabilityExceptions = None + """ Primitive extension for availabilityExceptions. Type `FHIRPrimitiveExtension` """ self.availableTime = None """ Times the Service Site is available. List of `PractitionerRoleAvailableTime` items (represented as `dict` in JSON). """ + self._availableTime = None + """ Primitive extension for availableTime. List of `FHIRPrimitiveExtension` """ self.code = None """ Roles which this practitioner may perform. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.endpoint = None """ Technical endpoints providing access to services operated for the practitioner with this role. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._endpoint = None + """ Primitive extension for endpoint. List of `FHIRPrimitiveExtension` """ self.healthcareService = None """ The list of healthcare services that this worker provides for this role's Organization/Location(s). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._healthcareService = None + """ Primitive extension for healthcareService. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifiers that are specific to a role/location. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.location = None """ The location(s) at which this practitioner provides care. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.notAvailable = None """ Not available during this time due to provided reason. List of `PractitionerRoleNotAvailable` items (represented as `dict` in JSON). """ + self._notAvailable = None + """ Primitive extension for notAvailable. List of `FHIRPrimitiveExtension` """ self.organization = None """ Organization where the roles are available. Type `FHIRReference` (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. Type `FHIRPrimitiveExtension` """ self.period = None """ The period during which the practitioner is authorized to perform in these role(s). Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.practitioner = None """ Practitioner that is able to provide the defined services for the organization. Type `FHIRReference` (represented as `dict` in JSON). """ + self._practitioner = None + """ Primitive extension for practitioner. Type `FHIRPrimitiveExtension` """ self.specialty = None """ Specific specialty of the practitioner. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ self.telecom = None """ Contact details that are specific to the role/location/service. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(PractitionerRole, self).__init__(jsondict=jsondict, strict=strict) @@ -87,19 +115,33 @@ def elementProperties(self): js = super(PractitionerRole, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availabilityExceptions", "availabilityExceptions", str, False, None, False), + ("_availabilityExceptions", "_availabilityExceptions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableTime", "availableTime", PractitionerRoleAvailableTime, True, None, False), + ("_availableTime", "_availableTime", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("endpoint", "endpoint", fhirreference.FHIRReference, True, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("healthcareService", "healthcareService", fhirreference.FHIRReference, True, None, False), + ("_healthcareService", "_healthcareService", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("notAvailable", "notAvailable", PractitionerRoleNotAvailable, True, None, False), + ("_notAvailable", "_notAvailable", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("organization", "organization", fhirreference.FHIRReference, False, None, False), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("practitioner", "practitioner", fhirreference.FHIRReference, False, None, False), + ("_practitioner", "_practitioner", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -126,18 +168,26 @@ def __init__(self, jsondict=None, strict=True): self.allDay = None """ Always available? e.g. 24 hour service. Type `bool`. """ + self._allDay = None + """ Primitive extension for allDay. Type `FHIRPrimitiveExtension` """ self.availableEndTime = None """ Closing time of day (ignored if allDay = true). Type `FHIRTime` (represented as `str` in JSON). """ + self._availableEndTime = None + """ Primitive extension for availableEndTime. Type `FHIRPrimitiveExtension` """ self.availableStartTime = None """ Opening time of day (ignored if allDay = true). Type `FHIRTime` (represented as `str` in JSON). """ + self._availableStartTime = None + """ Primitive extension for availableStartTime. Type `FHIRPrimitiveExtension` """ self.daysOfWeek = None """ mon | tue | wed | thu | fri | sat | sun. List of `str` items. """ + self._daysOfWeek = None + """ Primitive extension for daysOfWeek. List of `FHIRPrimitiveExtension` """ super(PractitionerRoleAvailableTime, self).__init__(jsondict=jsondict, strict=strict) @@ -145,9 +195,13 @@ def elementProperties(self): js = super(PractitionerRoleAvailableTime, self).elementProperties() js.extend([ ("allDay", "allDay", bool, False, None, False), + ("_allDay", "_allDay", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableEndTime", "availableEndTime", fhirtime.FHIRTime, False, None, False), + ("_availableEndTime", "_availableEndTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("availableStartTime", "availableStartTime", fhirtime.FHIRTime, False, None, False), + ("_availableStartTime", "_availableStartTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("daysOfWeek", "daysOfWeek", str, True, None, False), + ("_daysOfWeek", "_daysOfWeek", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -172,10 +226,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Reason presented to the user explaining why time not available. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.during = None """ Service not available from this date. Type `Period` (represented as `dict` in JSON). """ + self._during = None + """ Primitive extension for during. Type `FHIRPrimitiveExtension` """ super(PractitionerRoleNotAvailable, self).__init__(jsondict=jsondict, strict=strict) @@ -183,14 +241,17 @@ def elementProperties(self): js = super(PractitionerRoleNotAvailable, self).elementProperties() js.extend([ ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("during", "during", period.Period, False, None, False), + ("_during", "_during", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactpoint from . import fhirreference from . import fhirtime from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/procedure.py b/fhirclient/models/procedure.py index 179b69e5..b1dd2db4 100644 --- a/fhirclient/models/procedure.py +++ b/fhirclient/models/procedure.py @@ -25,131 +25,195 @@ def __init__(self, jsondict=None, strict=True): self.asserter = None """ Person who asserts this procedure. Type `FHIRReference` (represented as `dict` in JSON). """ + self._asserter = None + """ Primitive extension for asserter. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ A request for this procedure. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Target body sites. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. List of `FHIRPrimitiveExtension` """ self.category = None """ Classification of the procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.code = None """ Identification of the procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.complication = None """ Complication following the procedure. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._complication = None + """ Primitive extension for complication. List of `FHIRPrimitiveExtension` """ self.complicationDetail = None """ A condition that is a result of the procedure. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._complicationDetail = None + """ Primitive extension for complicationDetail. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.focalDevice = None """ Manipulated, implanted, or removed device. List of `ProcedureFocalDevice` items (represented as `dict` in JSON). """ + self._focalDevice = None + """ Primitive extension for focalDevice. List of `FHIRPrimitiveExtension` """ self.followUp = None """ Instructions for follow up. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._followUp = None + """ Primitive extension for followUp. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External Identifiers for this procedure. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.location = None """ Where the procedure happened. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.note = None """ Additional information about the procedure. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.outcome = None """ The result of procedure. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performedAge = None """ When the procedure was performed. Type `Age` (represented as `dict` in JSON). """ + self._performedAge = None + """ Primitive extension for performedAge. Type `FHIRPrimitiveExtension` """ self.performedDateTime = None """ When the procedure was performed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._performedDateTime = None + """ Primitive extension for performedDateTime. Type `FHIRPrimitiveExtension` """ self.performedPeriod = None """ When the procedure was performed. Type `Period` (represented as `dict` in JSON). """ + self._performedPeriod = None + """ Primitive extension for performedPeriod. Type `FHIRPrimitiveExtension` """ self.performedRange = None """ When the procedure was performed. Type `Range` (represented as `dict` in JSON). """ + self._performedRange = None + """ Primitive extension for performedRange. Type `FHIRPrimitiveExtension` """ self.performedString = None """ When the procedure was performed. Type `str`. """ + self._performedString = None + """ Primitive extension for performedString. Type `FHIRPrimitiveExtension` """ self.performer = None """ The people who performed the procedure. List of `ProcedurePerformer` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Coded reason procedure performed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ The justification that the procedure was performed. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.recorder = None """ Who recorded the procedure. Type `FHIRReference` (represented as `dict` in JSON). """ + self._recorder = None + """ Primitive extension for recorder. Type `FHIRPrimitiveExtension` """ self.report = None """ Any report resulting from the procedure. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._report = None + """ Primitive extension for report. List of `FHIRPrimitiveExtension` """ self.status = None """ preparation | in-progress | not-done | on-hold | stopped | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who the procedure was performed on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.usedCode = None """ Coded items used during the procedure. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._usedCode = None + """ Primitive extension for usedCode. List of `FHIRPrimitiveExtension` """ self.usedReference = None """ Items used during procedure. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._usedReference = None + """ Primitive extension for usedReference. List of `FHIRPrimitiveExtension` """ super(Procedure, self).__init__(jsondict=jsondict, strict=strict) @@ -157,37 +221,69 @@ def elementProperties(self): js = super(Procedure, self).elementProperties() js.extend([ ("asserter", "asserter", fhirreference.FHIRReference, False, None, False), + ("_asserter", "_asserter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, True, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("complication", "complication", codeableconcept.CodeableConcept, True, None, False), + ("_complication", "_complication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("complicationDetail", "complicationDetail", fhirreference.FHIRReference, True, None, False), + ("_complicationDetail", "_complicationDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focalDevice", "focalDevice", ProcedureFocalDevice, True, None, False), + ("_focalDevice", "_focalDevice", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("followUp", "followUp", codeableconcept.CodeableConcept, True, None, False), + ("_followUp", "_followUp", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", codeableconcept.CodeableConcept, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performedAge", "performedAge", age.Age, False, "performed", False), + ("_performedAge", "_performedAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performedDateTime", "performedDateTime", fhirdatetime.FHIRDateTime, False, "performed", False), + ("_performedDateTime", "_performedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performedPeriod", "performedPeriod", period.Period, False, "performed", False), + ("_performedPeriod", "_performedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performedRange", "performedRange", range.Range, False, "performed", False), + ("_performedRange", "_performedRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performedString", "performedString", str, False, "performed", False), + ("_performedString", "_performedString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", ProcedurePerformer, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recorder", "recorder", fhirreference.FHIRReference, False, None, False), + ("_recorder", "_recorder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("report", "report", fhirreference.FHIRReference, True, None, False), + ("_report", "_report", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usedCode", "usedCode", codeableconcept.CodeableConcept, True, None, False), + ("_usedCode", "_usedCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("usedReference", "usedReference", fhirreference.FHIRReference, True, None, False), + ("_usedReference", "_usedReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -215,10 +311,14 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Kind of change to device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. Type `FHIRPrimitiveExtension` """ self.manipulated = None """ Device that was changed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._manipulated = None + """ Primitive extension for manipulated. Type `FHIRPrimitiveExtension` """ super(ProcedureFocalDevice, self).__init__(jsondict=jsondict, strict=strict) @@ -226,7 +326,9 @@ def elementProperties(self): js = super(ProcedureFocalDevice, self).elementProperties() js.extend([ ("action", "action", codeableconcept.CodeableConcept, False, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("manipulated", "manipulated", fhirreference.FHIRReference, False, None, True), + ("_manipulated", "_manipulated", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -250,14 +352,20 @@ def __init__(self, jsondict=None, strict=True): self.actor = None """ The reference to the practitioner. Type `FHIRReference` (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. Type `FHIRPrimitiveExtension` """ self.function = None """ Type of performance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._function = None + """ Primitive extension for function. Type `FHIRPrimitiveExtension` """ self.onBehalfOf = None """ Organization the device or practitioner was acting for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._onBehalfOf = None + """ Primitive extension for onBehalfOf. Type `FHIRPrimitiveExtension` """ super(ProcedurePerformer, self).__init__(jsondict=jsondict, strict=strict) @@ -265,11 +373,15 @@ def elementProperties(self): js = super(ProcedurePerformer, self).elementProperties() js.extend([ ("actor", "actor", fhirreference.FHIRReference, False, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("function", "function", codeableconcept.CodeableConcept, False, None, False), + ("_function", "_function", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onBehalfOf", "onBehalfOf", fhirreference.FHIRReference, False, None, False), + ("_onBehalfOf", "_onBehalfOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import annotation @@ -278,4 +390,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/prodcharacteristic.py b/fhirclient/models/prodcharacteristic.py index 65545467..c723cf28 100644 --- a/fhirclient/models/prodcharacteristic.py +++ b/fhirclient/models/prodcharacteristic.py @@ -25,6 +25,8 @@ def __init__(self, jsondict=None, strict=True): controlled vocabulary shall be used The term and the term identifier shall be used. List of `str` items. """ + self._color = None + """ Primitive extension for color. List of `FHIRPrimitiveExtension` """ self.depth = None """ Where applicable, the depth can be specified using a numerical @@ -32,6 +34,8 @@ def __init__(self, jsondict=None, strict=True): specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._depth = None + """ Primitive extension for depth. Type `FHIRPrimitiveExtension` """ self.externalDiameter = None """ Where applicable, the external diameter can be specified using a @@ -39,6 +43,8 @@ def __init__(self, jsondict=None, strict=True): shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._externalDiameter = None + """ Primitive extension for externalDiameter. Type `FHIRPrimitiveExtension` """ self.height = None """ Where applicable, the height can be specified using a numerical @@ -46,15 +52,21 @@ def __init__(self, jsondict=None, strict=True): specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._height = None + """ Primitive extension for height. Type `FHIRPrimitiveExtension` """ self.image = None """ Where applicable, the image can be provided The format of the image attachment shall be specified by regional implementations. List of `Attachment` items (represented as `dict` in JSON). """ + self._image = None + """ Primitive extension for image. List of `FHIRPrimitiveExtension` """ self.imprint = None """ Where applicable, the imprint can be specified as text. List of `str` items. """ + self._imprint = None + """ Primitive extension for imprint. List of `FHIRPrimitiveExtension` """ self.nominalVolume = None """ Where applicable, the nominal volume can be specified using a @@ -62,18 +74,24 @@ def __init__(self, jsondict=None, strict=True): shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._nominalVolume = None + """ Primitive extension for nominalVolume. Type `FHIRPrimitiveExtension` """ self.scoring = None """ Where applicable, the scoring can be specified An appropriate controlled vocabulary shall be used The term and the term identifier shall be used. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._scoring = None + """ Primitive extension for scoring. Type `FHIRPrimitiveExtension` """ self.shape = None """ Where applicable, the shape can be specified An appropriate controlled vocabulary shall be used The term and the term identifier shall be used. Type `str`. """ + self._shape = None + """ Primitive extension for shape. Type `FHIRPrimitiveExtension` """ self.weight = None """ Where applicable, the weight can be specified using a numerical @@ -81,6 +99,8 @@ def __init__(self, jsondict=None, strict=True): specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._weight = None + """ Primitive extension for weight. Type `FHIRPrimitiveExtension` """ self.width = None """ Where applicable, the width can be specified using a numerical @@ -88,6 +108,8 @@ def __init__(self, jsondict=None, strict=True): specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._width = None + """ Primitive extension for width. Type `FHIRPrimitiveExtension` """ super(ProdCharacteristic, self).__init__(jsondict=jsondict, strict=strict) @@ -95,20 +117,32 @@ def elementProperties(self): js = super(ProdCharacteristic, self).elementProperties() js.extend([ ("color", "color", str, True, None, False), + ("_color", "_color", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("depth", "depth", quantity.Quantity, False, None, False), + ("_depth", "_depth", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("externalDiameter", "externalDiameter", quantity.Quantity, False, None, False), + ("_externalDiameter", "_externalDiameter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("height", "height", quantity.Quantity, False, None, False), + ("_height", "_height", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("image", "image", attachment.Attachment, True, None, False), + ("_image", "_image", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("imprint", "imprint", str, True, None, False), + ("_imprint", "_imprint", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("nominalVolume", "nominalVolume", quantity.Quantity, False, None, False), + ("_nominalVolume", "_nominalVolume", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("scoring", "scoring", codeableconcept.CodeableConcept, False, None, False), + ("_scoring", "_scoring", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("shape", "shape", str, False, None, False), + ("_shape", "_shape", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("weight", "weight", quantity.Quantity, False, None, False), + ("_weight", "_weight", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("width", "width", quantity.Quantity, False, None, False), + ("_width", "_width", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/productshelflife.py b/fhirclient/models/productshelflife.py index ef45d859..58c8b7c8 100644 --- a/fhirclient/models/productshelflife.py +++ b/fhirclient/models/productshelflife.py @@ -22,6 +22,8 @@ def __init__(self, jsondict=None, strict=True): self.identifier = None """ Unique identifier for the packaged Medicinal Product. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.period = None """ The shelf life time period can be specified using a numerical value @@ -30,12 +32,16 @@ def __init__(self, jsondict=None, strict=True): resulting terminology The symbol and the symbol identifier shall be used. Type `Quantity` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.specialPrecautionsForStorage = None """ Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialPrecautionsForStorage = None + """ Primitive extension for specialPrecautionsForStorage. List of `FHIRPrimitiveExtension` """ self.type = None """ This describes the shelf life, taking into account various @@ -46,6 +52,8 @@ def __init__(self, jsondict=None, strict=True): controlled term and the controlled term identifier shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ProductShelfLife, self).__init__(jsondict=jsondict, strict=strict) @@ -53,13 +61,18 @@ def elementProperties(self): js = super(ProductShelfLife, self).elementProperties() js.extend([ ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", quantity.Quantity, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specialPrecautionsForStorage", "specialPrecautionsForStorage", codeableconcept.CodeableConcept, True, None, False), + ("_specialPrecautionsForStorage", "_specialPrecautionsForStorage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/provenance.py b/fhirclient/models/provenance.py index 8b841dbb..c1099edd 100644 --- a/fhirclient/models/provenance.py +++ b/fhirclient/models/provenance.py @@ -32,46 +32,68 @@ def __init__(self, jsondict=None, strict=True): self.activity = None """ Activity that occurred. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._activity = None + """ Primitive extension for activity. Type `FHIRPrimitiveExtension` """ self.agent = None """ Actor involved. List of `ProvenanceAgent` items (represented as `dict` in JSON). """ + self._agent = None + """ Primitive extension for agent. List of `FHIRPrimitiveExtension` """ self.entity = None """ An entity used in this activity. List of `ProvenanceEntity` items (represented as `dict` in JSON). """ + self._entity = None + """ Primitive extension for entity. List of `FHIRPrimitiveExtension` """ self.location = None """ Where the activity occurred, if relevant. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.occurredDateTime = None """ When the activity occurred. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurredDateTime = None + """ Primitive extension for occurredDateTime. Type `FHIRPrimitiveExtension` """ self.occurredPeriod = None """ When the activity occurred. Type `Period` (represented as `dict` in JSON). """ + self._occurredPeriod = None + """ Primitive extension for occurredPeriod. Type `FHIRPrimitiveExtension` """ self.policy = None """ Policy or plan the activity was defined by. List of `str` items. """ + self._policy = None + """ Primitive extension for policy. List of `FHIRPrimitiveExtension` """ self.reason = None """ Reason the activity is occurring. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reason = None + """ Primitive extension for reason. List of `FHIRPrimitiveExtension` """ self.recorded = None """ When the activity was recorded / updated. Type `FHIRInstant` (represented as `str` in JSON). """ + self._recorded = None + """ Primitive extension for recorded. Type `FHIRPrimitiveExtension` """ self.signature = None """ Signature on target. List of `Signature` items (represented as `dict` in JSON). """ + self._signature = None + """ Primitive extension for signature. List of `FHIRPrimitiveExtension` """ self.target = None """ Target Reference(s) (usually version specific). List of `FHIRReference` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(Provenance, self).__init__(jsondict=jsondict, strict=strict) @@ -79,16 +101,27 @@ def elementProperties(self): js = super(Provenance, self).elementProperties() js.extend([ ("activity", "activity", codeableconcept.CodeableConcept, False, None, False), + ("_activity", "_activity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("agent", "agent", ProvenanceAgent, True, None, True), + ("_agent", "_agent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("entity", "entity", ProvenanceEntity, True, None, False), + ("_entity", "_entity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurredDateTime", "occurredDateTime", fhirdatetime.FHIRDateTime, False, "occurred", False), + ("_occurredDateTime", "_occurredDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurredPeriod", "occurredPeriod", period.Period, False, "occurred", False), + ("_occurredPeriod", "_occurredPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("policy", "policy", str, True, None, False), + ("_policy", "_policy", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reason", "reason", codeableconcept.CodeableConcept, True, None, False), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("recorded", "recorded", fhirinstant.FHIRInstant, False, None, True), + ("_recorded", "_recorded", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("signature", "signature", signature.Signature, True, None, False), + ("_signature", "_signature", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("target", "target", fhirreference.FHIRReference, True, None, True), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -115,18 +148,26 @@ def __init__(self, jsondict=None, strict=True): self.onBehalfOf = None """ Who the agent is representing. Type `FHIRReference` (represented as `dict` in JSON). """ + self._onBehalfOf = None + """ Primitive extension for onBehalfOf. Type `FHIRPrimitiveExtension` """ self.role = None """ What the agents role was. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. List of `FHIRPrimitiveExtension` """ self.type = None """ How the agent participated. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.who = None """ Who participated. Type `FHIRReference` (represented as `dict` in JSON). """ + self._who = None + """ Primitive extension for who. Type `FHIRPrimitiveExtension` """ super(ProvenanceAgent, self).__init__(jsondict=jsondict, strict=strict) @@ -134,9 +175,13 @@ def elementProperties(self): js = super(ProvenanceAgent, self).elementProperties() js.extend([ ("onBehalfOf", "onBehalfOf", fhirreference.FHIRReference, False, None, False), + ("_onBehalfOf", "_onBehalfOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, True, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("who", "who", fhirreference.FHIRReference, False, None, True), + ("_who", "_who", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -158,14 +203,20 @@ def __init__(self, jsondict=None, strict=True): self.agent = None """ Entity is attributed to this agent. List of `ProvenanceAgent` items (represented as `dict` in JSON). """ + self._agent = None + """ Primitive extension for agent. List of `FHIRPrimitiveExtension` """ self.role = None """ derivation | revision | quotation | source | removal. Type `str`. """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.what = None """ Identity of entity. Type `FHIRReference` (represented as `dict` in JSON). """ + self._what = None + """ Primitive extension for what. Type `FHIRPrimitiveExtension` """ super(ProvenanceEntity, self).__init__(jsondict=jsondict, strict=strict) @@ -173,15 +224,19 @@ def elementProperties(self): js = super(ProvenanceEntity, self).elementProperties() js.extend([ ("agent", "agent", ProvenanceAgent, True, None, False), + ("_agent", "_agent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("role", "role", str, False, None, True), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("what", "what", fhirreference.FHIRReference, False, None, True), + ("_what", "_what", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirinstant from . import fhirreference from . import period -from . import signature +from . import signature \ No newline at end of file diff --git a/fhirclient/models/quantity.py b/fhirclient/models/quantity.py index 2ea786f1..43cb6493 100644 --- a/fhirclient/models/quantity.py +++ b/fhirclient/models/quantity.py @@ -25,22 +25,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Coded form of the unit. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comparator = None """ < | <= | >= | > - how to understand the value. Type `str`. """ + self._comparator = None + """ Primitive extension for comparator. Type `FHIRPrimitiveExtension` """ self.system = None """ System that defines coded unit form. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.unit = None """ Unit representation. Type `str`. """ + self._unit = None + """ Primitive extension for unit. Type `FHIRPrimitiveExtension` """ self.value = None """ Numerical value (with implicit precision). Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(Quantity, self).__init__(jsondict=jsondict, strict=strict) @@ -48,11 +58,16 @@ def elementProperties(self): js = super(Quantity, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comparator", "comparator", str, False, None, False), + ("_comparator", "_comparator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unit", "unit", str, False, None, False), + ("_unit", "_unit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js - +from . import fhirprimitiveextension diff --git a/fhirclient/models/questionnaire.py b/fhirclient/models/questionnaire.py index e24d4c7d..40213592 100644 --- a/fhirclient/models/questionnaire.py +++ b/fhirclient/models/questionnaire.py @@ -26,91 +26,135 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the questionnaire was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.code = None """ Concept that represents the overall questionnaire. List of `Coding` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.derivedFrom = None """ Instantiates protocol or definition. List of `str` items. """ + self._derivedFrom = None + """ Primitive extension for derivedFrom. List of `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the questionnaire. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the questionnaire is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the questionnaire. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.item = None """ Questions and sections within the Questionnaire. List of `QuestionnaireItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for questionnaire (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the questionnaire was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this questionnaire (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this questionnaire is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectType = None """ Resource that can be subject of QuestionnaireResponse. List of `str` items. """ + self._subjectType = None + """ Primitive extension for subjectType. List of `FHIRPrimitiveExtension` """ self.title = None """ Name for this questionnaire (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this questionnaire, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the questionnaire. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(Questionnaire, self).__init__(jsondict=jsondict, strict=strict) @@ -118,27 +162,49 @@ def elementProperties(self): js = super(Questionnaire, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", coding.Coding, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFrom", "derivedFrom", str, True, None, False), + ("_derivedFrom", "_derivedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("item", "item", QuestionnaireItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectType", "subjectType", str, True, None, False), + ("_subjectType", "_subjectType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -165,66 +231,98 @@ def __init__(self, jsondict=None, strict=True): self.answerOption = None """ Permitted answer. List of `QuestionnaireItemAnswerOption` items (represented as `dict` in JSON). """ + self._answerOption = None + """ Primitive extension for answerOption. List of `FHIRPrimitiveExtension` """ self.answerValueSet = None """ Valueset containing permitted answers. Type `str`. """ + self._answerValueSet = None + """ Primitive extension for answerValueSet. Type `FHIRPrimitiveExtension` """ self.code = None """ Corresponding concept for this item in a terminology. List of `Coding` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.definition = None """ ElementDefinition - details for the item. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.enableBehavior = None """ all | any. Type `str`. """ + self._enableBehavior = None + """ Primitive extension for enableBehavior. Type `FHIRPrimitiveExtension` """ self.enableWhen = None """ Only allow data when. List of `QuestionnaireItemEnableWhen` items (represented as `dict` in JSON). """ + self._enableWhen = None + """ Primitive extension for enableWhen. List of `FHIRPrimitiveExtension` """ self.initial = None """ Initial value(s) when item is first rendered. List of `QuestionnaireItemInitial` items (represented as `dict` in JSON). """ + self._initial = None + """ Primitive extension for initial. List of `FHIRPrimitiveExtension` """ self.item = None """ Nested questionnaire items. List of `QuestionnaireItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.linkId = None """ Unique id for item in questionnaire. Type `str`. """ + self._linkId = None + """ Primitive extension for linkId. Type `FHIRPrimitiveExtension` """ self.maxLength = None """ No more than this many characters. Type `int`. """ + self._maxLength = None + """ Primitive extension for maxLength. Type `FHIRPrimitiveExtension` """ self.prefix = None """ E.g. "1(a)", "2.5.3". Type `str`. """ + self._prefix = None + """ Primitive extension for prefix. Type `FHIRPrimitiveExtension` """ self.readOnly = None """ Don't allow human editing. Type `bool`. """ + self._readOnly = None + """ Primitive extension for readOnly. Type `FHIRPrimitiveExtension` """ self.repeats = None """ Whether the item may repeat. Type `bool`. """ + self._repeats = None + """ Primitive extension for repeats. Type `FHIRPrimitiveExtension` """ self.required = None """ Whether the item must be included in data results. Type `bool`. """ + self._required = None + """ Primitive extension for required. Type `FHIRPrimitiveExtension` """ self.text = None """ Primary text for the item. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ self.type = None """ group | display | boolean | decimal | integer | date | dateTime +. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(QuestionnaireItem, self).__init__(jsondict=jsondict, strict=strict) @@ -232,21 +330,37 @@ def elementProperties(self): js = super(QuestionnaireItem, self).elementProperties() js.extend([ ("answerOption", "answerOption", QuestionnaireItemAnswerOption, True, None, False), + ("_answerOption", "_answerOption", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("answerValueSet", "answerValueSet", str, False, None, False), + ("_answerValueSet", "_answerValueSet", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", coding.Coding, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enableBehavior", "enableBehavior", str, False, None, False), + ("_enableBehavior", "_enableBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enableWhen", "enableWhen", QuestionnaireItemEnableWhen, True, None, False), + ("_enableWhen", "_enableWhen", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("initial", "initial", QuestionnaireItemInitial, True, None, False), + ("_initial", "_initial", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("item", "item", QuestionnaireItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("linkId", "linkId", str, False, None, True), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxLength", "maxLength", int, False, None, False), + ("_maxLength", "_maxLength", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prefix", "prefix", str, False, None, False), + ("_prefix", "_prefix", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("readOnly", "readOnly", bool, False, None, False), + ("_readOnly", "_readOnly", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("repeats", "repeats", bool, False, None, False), + ("_repeats", "_repeats", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("required", "required", bool, False, None, False), + ("_required", "_required", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -270,30 +384,44 @@ def __init__(self, jsondict=None, strict=True): self.initialSelected = None """ Whether option is selected by default. Type `bool`. """ + self._initialSelected = None + """ Primitive extension for initialSelected. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Answer value. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Answer value. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Answer value. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Answer value. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Answer value. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Answer value. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ super(QuestionnaireItemAnswerOption, self).__init__(jsondict=jsondict, strict=strict) @@ -301,12 +429,19 @@ def elementProperties(self): js = super(QuestionnaireItemAnswerOption, self).elementProperties() js.extend([ ("initialSelected", "initialSelected", bool, False, None, False), + ("_initialSelected", "_initialSelected", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -332,50 +467,74 @@ def __init__(self, jsondict=None, strict=True): self.answerBoolean = None """ Value for question comparison based on operator. Type `bool`. """ + self._answerBoolean = None + """ Primitive extension for answerBoolean. Type `FHIRPrimitiveExtension` """ self.answerCoding = None """ Value for question comparison based on operator. Type `Coding` (represented as `dict` in JSON). """ + self._answerCoding = None + """ Primitive extension for answerCoding. Type `FHIRPrimitiveExtension` """ self.answerDate = None """ Value for question comparison based on operator. Type `FHIRDate` (represented as `str` in JSON). """ + self._answerDate = None + """ Primitive extension for answerDate. Type `FHIRPrimitiveExtension` """ self.answerDateTime = None """ Value for question comparison based on operator. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._answerDateTime = None + """ Primitive extension for answerDateTime. Type `FHIRPrimitiveExtension` """ self.answerDecimal = None """ Value for question comparison based on operator. Type `float`. """ + self._answerDecimal = None + """ Primitive extension for answerDecimal. Type `FHIRPrimitiveExtension` """ self.answerInteger = None """ Value for question comparison based on operator. Type `int`. """ + self._answerInteger = None + """ Primitive extension for answerInteger. Type `FHIRPrimitiveExtension` """ self.answerQuantity = None """ Value for question comparison based on operator. Type `Quantity` (represented as `dict` in JSON). """ + self._answerQuantity = None + """ Primitive extension for answerQuantity. Type `FHIRPrimitiveExtension` """ self.answerReference = None """ Value for question comparison based on operator. Type `FHIRReference` (represented as `dict` in JSON). """ + self._answerReference = None + """ Primitive extension for answerReference. Type `FHIRPrimitiveExtension` """ self.answerString = None """ Value for question comparison based on operator. Type `str`. """ + self._answerString = None + """ Primitive extension for answerString. Type `FHIRPrimitiveExtension` """ self.answerTime = None """ Value for question comparison based on operator. Type `FHIRTime` (represented as `str` in JSON). """ + self._answerTime = None + """ Primitive extension for answerTime. Type `FHIRPrimitiveExtension` """ self.operator = None """ exists | = | != | > | < | >= | <=. Type `str`. """ + self._operator = None + """ Primitive extension for operator. Type `FHIRPrimitiveExtension` """ self.question = None """ Question that determines whether item is enabled. Type `str`. """ + self._question = None + """ Primitive extension for question. Type `FHIRPrimitiveExtension` """ super(QuestionnaireItemEnableWhen, self).__init__(jsondict=jsondict, strict=strict) @@ -383,17 +542,29 @@ def elementProperties(self): js = super(QuestionnaireItemEnableWhen, self).elementProperties() js.extend([ ("answerBoolean", "answerBoolean", bool, False, "answer", True), + ("_answerBoolean", "_answerBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerCoding", "answerCoding", coding.Coding, False, "answer", True), + ("_answerCoding", "_answerCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerDate", "answerDate", fhirdate.FHIRDate, False, "answer", True), + ("_answerDate", "_answerDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerDateTime", "answerDateTime", fhirdatetime.FHIRDateTime, False, "answer", True), + ("_answerDateTime", "_answerDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerDecimal", "answerDecimal", float, False, "answer", True), + ("_answerDecimal", "_answerDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerInteger", "answerInteger", int, False, "answer", True), + ("_answerInteger", "_answerInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerQuantity", "answerQuantity", quantity.Quantity, False, "answer", True), + ("_answerQuantity", "_answerQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerReference", "answerReference", fhirreference.FHIRReference, False, "answer", True), + ("_answerReference", "_answerReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerString", "answerString", str, False, "answer", True), + ("_answerString", "_answerString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("answerTime", "answerTime", fhirtime.FHIRTime, False, "answer", True), + ("_answerTime", "_answerTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operator", "operator", str, False, None, True), + ("_operator", "_operator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("question", "question", str, False, None, True), + ("_question", "_question", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -418,50 +589,74 @@ def __init__(self, jsondict=None, strict=True): self.valueAttachment = None """ Actual value for initializing the question. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Actual value for initializing the question. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Actual value for initializing the question. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Actual value for initializing the question. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Actual value for initializing the question. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Actual value for initializing the question. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Actual value for initializing the question. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Actual value for initializing the question. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Actual value for initializing the question. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Actual value for initializing the question. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Actual value for initializing the question. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Actual value for initializing the question. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ super(QuestionnaireItemInitial, self).__init__(jsondict=jsondict, strict=strict) @@ -469,20 +664,33 @@ def elementProperties(self): js = super(QuestionnaireItemInitial, self).elementProperties() js.extend([ ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", True), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", True), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -495,4 +703,4 @@ def elementProperties(self): from . import identifier from . import period from . import quantity -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/questionnaireresponse.py b/fhirclient/models/questionnaireresponse.py index 6e7e93b0..bf9a27ee 100644 --- a/fhirclient/models/questionnaireresponse.py +++ b/fhirclient/models/questionnaireresponse.py @@ -25,46 +25,68 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ Person who received and recorded the answers. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.authored = None """ Date the answers were gathered. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authored = None + """ Primitive extension for authored. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ Request fulfilled by this QuestionnaireResponse. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique id for this set of answers. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.item = None """ Groups and questions. List of `QuestionnaireResponseItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of this action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.questionnaire = None """ Form being answered. Type `str`. """ + self._questionnaire = None + """ Primitive extension for questionnaire. Type `FHIRPrimitiveExtension` """ self.source = None """ The person who answered the questions. Type `FHIRReference` (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. Type `FHIRPrimitiveExtension` """ self.status = None """ in-progress | completed | amended | entered-in-error | stopped. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ The subject of the questions. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(QuestionnaireResponse, self).__init__(jsondict=jsondict, strict=strict) @@ -72,16 +94,27 @@ def elementProperties(self): js = super(QuestionnaireResponse, self).elementProperties() js.extend([ ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authored", "authored", fhirdatetime.FHIRDateTime, False, None, False), + ("_authored", "_authored", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", QuestionnaireResponseItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("questionnaire", "questionnaire", str, False, None, False), + ("_questionnaire", "_questionnaire", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, False, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -108,22 +141,32 @@ def __init__(self, jsondict=None, strict=True): self.answer = None """ The response(s) to the question. List of `QuestionnaireResponseItemAnswer` items (represented as `dict` in JSON). """ + self._answer = None + """ Primitive extension for answer. List of `FHIRPrimitiveExtension` """ self.definition = None """ ElementDefinition - details for the item. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.item = None """ Nested questionnaire response items. List of `QuestionnaireResponseItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.linkId = None """ Pointer to specific item from Questionnaire. Type `str`. """ + self._linkId = None + """ Primitive extension for linkId. Type `FHIRPrimitiveExtension` """ self.text = None """ Name for group or question text. Type `str`. """ + self._text = None + """ Primitive extension for text. Type `FHIRPrimitiveExtension` """ super(QuestionnaireResponseItem, self).__init__(jsondict=jsondict, strict=strict) @@ -131,10 +174,15 @@ def elementProperties(self): js = super(QuestionnaireResponseItem, self).elementProperties() js.extend([ ("answer", "answer", QuestionnaireResponseItemAnswer, True, None, False), + ("_answer", "_answer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("definition", "definition", str, False, None, False), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("item", "item", QuestionnaireResponseItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("linkId", "linkId", str, False, None, True), + ("_linkId", "_linkId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("text", "text", str, False, None, False), + ("_text", "_text", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -158,54 +206,80 @@ def __init__(self, jsondict=None, strict=True): self.item = None """ Nested groups and questions. List of `QuestionnaireResponseItem` items (represented as `dict` in JSON). """ + self._item = None + """ Primitive extension for item. List of `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Single-valued answer to the question. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Single-valued answer to the question. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Single-valued answer to the question. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Single-valued answer to the question. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Single-valued answer to the question. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Single-valued answer to the question. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Single-valued answer to the question. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Single-valued answer to the question. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Single-valued answer to the question. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Single-valued answer to the question. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Single-valued answer to the question. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Single-valued answer to the question. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ super(QuestionnaireResponseItemAnswer, self).__init__(jsondict=jsondict, strict=strict) @@ -213,21 +287,35 @@ def elementProperties(self): js = super(QuestionnaireResponseItemAnswer, self).elementProperties() js.extend([ ("item", "item", QuestionnaireResponseItem, True, None, False), + ("_item", "_item", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", False), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", False), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", False), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", False), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", False), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", False), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", False), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import coding @@ -236,4 +324,4 @@ def elementProperties(self): from . import fhirreference from . import fhirtime from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/range.py b/fhirclient/models/range.py index 04c8f055..17c8c412 100644 --- a/fhirclient/models/range.py +++ b/fhirclient/models/range.py @@ -23,10 +23,14 @@ def __init__(self, jsondict=None, strict=True): self.high = None """ High limit. Type `Quantity` (represented as `dict` in JSON). """ + self._high = None + """ Primitive extension for high. Type `FHIRPrimitiveExtension` """ self.low = None """ Low limit. Type `Quantity` (represented as `dict` in JSON). """ + self._low = None + """ Primitive extension for low. Type `FHIRPrimitiveExtension` """ super(Range, self).__init__(jsondict=jsondict, strict=strict) @@ -34,9 +38,12 @@ def elementProperties(self): js = super(Range, self).elementProperties() js.extend([ ("high", "high", quantity.Quantity, False, None, False), + ("_high", "_high", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("low", "low", quantity.Quantity, False, None, False), + ("_low", "_low", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/ratio.py b/fhirclient/models/ratio.py index 7f4d6c4a..b445a2e6 100644 --- a/fhirclient/models/ratio.py +++ b/fhirclient/models/ratio.py @@ -24,10 +24,14 @@ def __init__(self, jsondict=None, strict=True): self.denominator = None """ Denominator value. Type `Quantity` (represented as `dict` in JSON). """ + self._denominator = None + """ Primitive extension for denominator. Type `FHIRPrimitiveExtension` """ self.numerator = None """ Numerator value. Type `Quantity` (represented as `dict` in JSON). """ + self._numerator = None + """ Primitive extension for numerator. Type `FHIRPrimitiveExtension` """ super(Ratio, self).__init__(jsondict=jsondict, strict=strict) @@ -35,9 +39,12 @@ def elementProperties(self): js = super(Ratio, self).elementProperties() js.extend([ ("denominator", "denominator", quantity.Quantity, False, None, False), + ("_denominator", "_denominator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numerator", "numerator", quantity.Quantity, False, None, False), + ("_numerator", "_numerator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/reference.py b/fhirclient/models/reference.py index 9297ddf6..9aba38e3 100644 --- a/fhirclient/models/reference.py +++ b/fhirclient/models/reference.py @@ -21,18 +21,26 @@ def __init__(self, jsondict=None, strict=True): self.display = None """ Text alternative for the resource. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Logical reference, when literal reference is not known. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.reference = None """ Literal reference, Relative, internal or absolute URL. Type `str`. """ + self._reference = None + """ Primitive extension for reference. Type `FHIRPrimitiveExtension` """ self.type = None """ Type the reference refers to (e.g. "Patient"). Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Reference, self).__init__(jsondict=jsondict, strict=strict) @@ -40,11 +48,16 @@ def elementProperties(self): js = super(Reference, self).elementProperties() js.extend([ ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reference", "reference", str, False, None, False), + ("_reference", "_reference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/relatedartifact.py b/fhirclient/models/relatedartifact.py index e42b57fe..e931e983 100644 --- a/fhirclient/models/relatedartifact.py +++ b/fhirclient/models/relatedartifact.py @@ -24,31 +24,45 @@ def __init__(self, jsondict=None, strict=True): self.citation = None """ Bibliographic citation for the artifact. Type `str`. """ + self._citation = None + """ Primitive extension for citation. Type `FHIRPrimitiveExtension` """ self.display = None """ Brief description of the related artifact. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.document = None """ What document is being referenced. Type `Attachment` (represented as `dict` in JSON). """ + self._document = None + """ Primitive extension for document. Type `FHIRPrimitiveExtension` """ self.label = None """ Short label. Type `str`. """ + self._label = None + """ Primitive extension for label. Type `FHIRPrimitiveExtension` """ self.resource = None """ What resource is being referenced. Type `str`. """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.type = None """ documentation | justification | citation | predecessor | successor | derived-from | depends-on | composed-of. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Where the artifact can be accessed. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(RelatedArtifact, self).__init__(jsondict=jsondict, strict=strict) @@ -56,14 +70,22 @@ def elementProperties(self): js = super(RelatedArtifact, self).elementProperties() js.extend([ ("citation", "citation", str, False, None, False), + ("_citation", "_citation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("document", "document", attachment.Attachment, False, None, False), + ("_document", "_document", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("label", "label", str, False, None, False), + ("_label", "_label", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", str, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import attachment +from . import attachment \ No newline at end of file diff --git a/fhirclient/models/relatedperson.py b/fhirclient/models/relatedperson.py index e3abf39d..c8257667 100644 --- a/fhirclient/models/relatedperson.py +++ b/fhirclient/models/relatedperson.py @@ -26,51 +26,75 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this related person's record is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.address = None """ Address where the related person can be contacted or visited. List of `Address` items (represented as `dict` in JSON). """ + self._address = None + """ Primitive extension for address. List of `FHIRPrimitiveExtension` """ self.birthDate = None """ The date on which the related person was born. Type `FHIRDate` (represented as `str` in JSON). """ + self._birthDate = None + """ Primitive extension for birthDate. Type `FHIRPrimitiveExtension` """ self.communication = None """ A language which may be used to communicate with about the patient's health. List of `RelatedPersonCommunication` items (represented as `dict` in JSON). """ + self._communication = None + """ Primitive extension for communication. List of `FHIRPrimitiveExtension` """ self.gender = None """ male | female | other | unknown. Type `str`. """ + self._gender = None + """ Primitive extension for gender. Type `FHIRPrimitiveExtension` """ self.identifier = None """ A human identifier for this person. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.name = None """ A name associated with the person. List of `HumanName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.patient = None """ The patient this person is related to. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.period = None """ Period of time that this relationship is considered valid. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.photo = None """ Image of the person. List of `Attachment` items (represented as `dict` in JSON). """ + self._photo = None + """ Primitive extension for photo. List of `FHIRPrimitiveExtension` """ self.relationship = None """ The nature of the relationship. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. List of `FHIRPrimitiveExtension` """ self.telecom = None """ A contact detail for the person. List of `ContactPoint` items (represented as `dict` in JSON). """ + self._telecom = None + """ Primitive extension for telecom. List of `FHIRPrimitiveExtension` """ super(RelatedPerson, self).__init__(jsondict=jsondict, strict=strict) @@ -78,17 +102,29 @@ def elementProperties(self): js = super(RelatedPerson, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("address", "address", address.Address, True, None, False), + ("_address", "_address", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("birthDate", "birthDate", fhirdate.FHIRDate, False, None, False), + ("_birthDate", "_birthDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("communication", "communication", RelatedPersonCommunication, True, None, False), + ("_communication", "_communication", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("gender", "gender", str, False, None, False), + ("_gender", "_gender", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", humanname.HumanName, True, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("photo", "photo", attachment.Attachment, True, None, False), + ("_photo", "_photo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, True, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("telecom", "telecom", contactpoint.ContactPoint, True, None, False), + ("_telecom", "_telecom", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -113,10 +149,14 @@ def __init__(self, jsondict=None, strict=True): """ The language which can be used to communicate with the patient about his or her health. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.preferred = None """ Language preference indicator. Type `bool`. """ + self._preferred = None + """ Primitive extension for preferred. Type `FHIRPrimitiveExtension` """ super(RelatedPersonCommunication, self).__init__(jsondict=jsondict, strict=strict) @@ -124,10 +164,13 @@ def elementProperties(self): js = super(RelatedPersonCommunication, self).elementProperties() js.extend([ ("language", "language", codeableconcept.CodeableConcept, False, None, True), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preferred", "preferred", bool, False, None, False), + ("_preferred", "_preferred", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import attachment @@ -137,4 +180,4 @@ def elementProperties(self): from . import fhirreference from . import humanname from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/requestgroup.py b/fhirclient/models/requestgroup.py index 0d8ce7f4..f93db8dd 100644 --- a/fhirclient/models/requestgroup.py +++ b/fhirclient/models/requestgroup.py @@ -24,76 +24,112 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Proposed actions, if any. List of `RequestGroupAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.author = None """ Device or practitioner that authored the request group. Type `FHIRReference` (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. Type `FHIRPrimitiveExtension` """ self.authoredOn = None """ When the request group was authored. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ Fulfills plan, proposal, or order. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.code = None """ What's being requested/ordered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Created as part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.groupIdentifier = None """ Composite request this is part of. Type `Identifier` (represented as `dict` in JSON). """ + self._groupIdentifier = None + """ Primitive extension for groupIdentifier. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.note = None """ Additional notes about the response. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why the request group is needed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why the request group is needed. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.replaces = None """ Request(s) replaced by this request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who the request group is about. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(RequestGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -101,23 +137,41 @@ def elementProperties(self): js = super(RequestGroup, self).elementProperties() js.extend([ ("action", "action", RequestGroupAction, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("author", "author", fhirreference.FHIRReference, False, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupIdentifier", "groupIdentifier", identifier.Identifier, False, None, False), + ("_groupIdentifier", "_groupIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("replaces", "replaces", fhirreference.FHIRReference, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -143,99 +197,147 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ Sub action. List of `RequestGroupAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.cardinalityBehavior = None """ single | multiple. Type `str`. """ + self._cardinalityBehavior = None + """ Primitive extension for cardinalityBehavior. Type `FHIRPrimitiveExtension` """ self.code = None """ Code representing the meaning of the action or sub-actions. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.condition = None """ Whether or not the action is applicable. List of `RequestGroupActionCondition` items (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.description = None """ Short description of the action. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Supporting documentation for the intended performer of the action. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._documentation = None + """ Primitive extension for documentation. List of `FHIRPrimitiveExtension` """ self.groupingBehavior = None """ visual-group | logical-group | sentence-group. Type `str`. """ + self._groupingBehavior = None + """ Primitive extension for groupingBehavior. Type `FHIRPrimitiveExtension` """ self.participant = None """ Who should perform the action. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.precheckBehavior = None """ yes | no. Type `str`. """ + self._precheckBehavior = None + """ Primitive extension for precheckBehavior. Type `FHIRPrimitiveExtension` """ self.prefix = None """ User-visible prefix for the action (e.g. 1. or A.). Type `str`. """ + self._prefix = None + """ Primitive extension for prefix. Type `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.relatedAction = None """ Relationship to another action. List of `RequestGroupActionRelatedAction` items (represented as `dict` in JSON). """ + self._relatedAction = None + """ Primitive extension for relatedAction. List of `FHIRPrimitiveExtension` """ self.requiredBehavior = None """ must | could | must-unless-documented. Type `str`. """ + self._requiredBehavior = None + """ Primitive extension for requiredBehavior. Type `FHIRPrimitiveExtension` """ self.resource = None """ The target of the action. Type `FHIRReference` (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.selectionBehavior = None """ any | all | all-or-none | exactly-one | at-most-one | one-or-more. Type `str`. """ + self._selectionBehavior = None + """ Primitive extension for selectionBehavior. Type `FHIRPrimitiveExtension` """ self.textEquivalent = None """ Static text equivalent of the action, used if the dynamic aspects cannot be interpreted by the receiving system. Type `str`. """ + self._textEquivalent = None + """ Primitive extension for textEquivalent. Type `FHIRPrimitiveExtension` """ self.timingAge = None """ When the action should take place. Type `Age` (represented as `dict` in JSON). """ + self._timingAge = None + """ Primitive extension for timingAge. Type `FHIRPrimitiveExtension` """ self.timingDateTime = None """ When the action should take place. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timingDateTime = None + """ Primitive extension for timingDateTime. Type `FHIRPrimitiveExtension` """ self.timingDuration = None """ When the action should take place. Type `Duration` (represented as `dict` in JSON). """ + self._timingDuration = None + """ Primitive extension for timingDuration. Type `FHIRPrimitiveExtension` """ self.timingPeriod = None """ When the action should take place. Type `Period` (represented as `dict` in JSON). """ + self._timingPeriod = None + """ Primitive extension for timingPeriod. Type `FHIRPrimitiveExtension` """ self.timingRange = None """ When the action should take place. Type `Range` (represented as `dict` in JSON). """ + self._timingRange = None + """ Primitive extension for timingRange. Type `FHIRPrimitiveExtension` """ self.timingTiming = None """ When the action should take place. Type `Timing` (represented as `dict` in JSON). """ + self._timingTiming = None + """ Primitive extension for timingTiming. Type `FHIRPrimitiveExtension` """ self.title = None """ User-visible title. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.type = None """ create | update | remove | fire-event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(RequestGroupAction, self).__init__(jsondict=jsondict, strict=strict) @@ -243,29 +345,53 @@ def elementProperties(self): js = super(RequestGroupAction, self).elementProperties() js.extend([ ("action", "action", RequestGroupAction, True, None, False), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("cardinalityBehavior", "cardinalityBehavior", str, False, None, False), + ("_cardinalityBehavior", "_cardinalityBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("condition", "condition", RequestGroupActionCondition, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", relatedartifact.RelatedArtifact, True, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("groupingBehavior", "groupingBehavior", str, False, None, False), + ("_groupingBehavior", "_groupingBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participant", "participant", fhirreference.FHIRReference, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("precheckBehavior", "precheckBehavior", str, False, None, False), + ("_precheckBehavior", "_precheckBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prefix", "prefix", str, False, None, False), + ("_prefix", "_prefix", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedAction", "relatedAction", RequestGroupActionRelatedAction, True, None, False), + ("_relatedAction", "_relatedAction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requiredBehavior", "requiredBehavior", str, False, None, False), + ("_requiredBehavior", "_requiredBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", fhirreference.FHIRReference, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("selectionBehavior", "selectionBehavior", str, False, None, False), + ("_selectionBehavior", "_selectionBehavior", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("textEquivalent", "textEquivalent", str, False, None, False), + ("_textEquivalent", "_textEquivalent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingAge", "timingAge", age.Age, False, "timing", False), + ("_timingAge", "_timingAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDateTime", "timingDateTime", fhirdatetime.FHIRDateTime, False, "timing", False), + ("_timingDateTime", "_timingDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDuration", "timingDuration", duration.Duration, False, "timing", False), + ("_timingDuration", "_timingDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingPeriod", "timingPeriod", period.Period, False, "timing", False), + ("_timingPeriod", "_timingPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingRange", "timingRange", range.Range, False, "timing", False), + ("_timingRange", "_timingRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingTiming", "timingTiming", timing.Timing, False, "timing", False), + ("_timingTiming", "_timingTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -290,10 +416,14 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ Boolean-valued expression. Type `Expression` (represented as `dict` in JSON). """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.kind = None """ applicability | start | stop. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ super(RequestGroupActionCondition, self).__init__(jsondict=jsondict, strict=strict) @@ -301,7 +431,9 @@ def elementProperties(self): js = super(RequestGroupActionCondition, self).elementProperties() js.extend([ ("expression", "expression", expression.Expression, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -326,19 +458,27 @@ def __init__(self, jsondict=None, strict=True): self.actionId = None """ What action this is related to. Type `str`. """ + self._actionId = None + """ Primitive extension for actionId. Type `FHIRPrimitiveExtension` """ self.offsetDuration = None """ Time offset for the relationship. Type `Duration` (represented as `dict` in JSON). """ + self._offsetDuration = None + """ Primitive extension for offsetDuration. Type `FHIRPrimitiveExtension` """ self.offsetRange = None """ Time offset for the relationship. Type `Range` (represented as `dict` in JSON). """ + self._offsetRange = None + """ Primitive extension for offsetRange. Type `FHIRPrimitiveExtension` """ self.relationship = None """ before-start | before | before-end | concurrent-with-start | concurrent | concurrent-with-end | after-start | after | after-end. Type `str`. """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ super(RequestGroupActionRelatedAction, self).__init__(jsondict=jsondict, strict=strict) @@ -346,12 +486,17 @@ def elementProperties(self): js = super(RequestGroupActionRelatedAction, self).elementProperties() js.extend([ ("actionId", "actionId", str, False, None, True), + ("_actionId", "_actionId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offsetDuration", "offsetDuration", duration.Duration, False, "offset", False), + ("_offsetDuration", "_offsetDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offsetRange", "offsetRange", range.Range, False, "offset", False), + ("_offsetRange", "_offsetRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", str, False, None, True), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import age from . import annotation @@ -364,4 +509,4 @@ def elementProperties(self): from . import period from . import range from . import relatedartifact -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/researchdefinition.py b/fhirclient/models/researchdefinition.py index d4153daf..c0aa644f 100644 --- a/fhirclient/models/researchdefinition.py +++ b/fhirclient/models/researchdefinition.py @@ -26,146 +26,216 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the research definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.comment = None """ Used for footnotes or explanatory notes. List of `str` items. """ + self._comment = None + """ Primitive extension for comment. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the research definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the research definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.exposure = None """ What exposure?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposure = None + """ Primitive extension for exposure. Type `FHIRPrimitiveExtension` """ self.exposureAlternative = None """ What alternative exposure state?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposureAlternative = None + """ Primitive extension for exposureAlternative. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the research definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for research definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the research definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.library = None """ Logic used by the ResearchDefinition. List of `str` items. """ + self._library = None + """ Primitive extension for library. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this research definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.outcome = None """ What outcome?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.population = None """ What population?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this research definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.shortTitle = None """ Title for use in informal contexts. Type `str`. """ + self._shortTitle = None + """ Primitive extension for shortTitle. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the ResearchDefinition. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this research definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the ResearchDefinition, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this research definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the ResearchDefinition. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the research definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ResearchDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -173,43 +243,79 @@ def elementProperties(self): js = super(ResearchDefinition, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, True, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposure", "exposure", fhirreference.FHIRReference, False, None, False), + ("_exposure", "_exposure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exposureAlternative", "exposureAlternative", fhirreference.FHIRReference, False, None, False), + ("_exposureAlternative", "_exposureAlternative", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("library", "library", str, True, None, False), + ("_library", "_library", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("outcome", "outcome", fhirreference.FHIRReference, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", fhirreference.FHIRReference, False, None, True), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("shortTitle", "shortTitle", str, False, None, False), + ("_shortTitle", "_shortTitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail @@ -219,4 +325,4 @@ def elementProperties(self): from . import identifier from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/researchelementdefinition.py b/fhirclient/models/researchelementdefinition.py index 94a198a3..6c2421b2 100644 --- a/fhirclient/models/researchelementdefinition.py +++ b/fhirclient/models/researchelementdefinition.py @@ -24,143 +24,211 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the research element definition was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.characteristic = None """ What defines the members of the research element. List of `ResearchElementDefinitionCharacteristic` items (represented as `dict` in JSON). """ + self._characteristic = None + """ Primitive extension for characteristic. List of `FHIRPrimitiveExtension` """ self.comment = None """ Used for footnotes or explanatory notes. List of `str` items. """ + self._comment = None + """ Primitive extension for comment. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the research element definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the research element definition is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the research element definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for research element definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the research element definition was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.library = None """ Logic used by the ResearchElementDefinition. List of `str` items. """ + self._library = None + """ Primitive extension for library. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this research element definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this research element definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.shortTitle = None """ Title for use in informal contexts. Type `str`. """ + self._shortTitle = None + """ Primitive extension for shortTitle. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subjectCodeableConcept = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._subjectCodeableConcept = None + """ Primitive extension for subjectCodeableConcept. Type `FHIRPrimitiveExtension` """ self.subjectReference = None """ E.g. Patient, Practitioner, RelatedPerson, Organization, Location, Device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subjectReference = None + """ Primitive extension for subjectReference. Type `FHIRPrimitiveExtension` """ self.subtitle = None """ Subordinate title of the ResearchElementDefinition. Type `str`. """ + self._subtitle = None + """ Primitive extension for subtitle. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this research element definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the ResearchElementDefinition, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.type = None """ population | exposure | outcome. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this research element definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.usage = None """ Describes the clinical usage of the ResearchElementDefinition. Type `str`. """ + self._usage = None + """ Primitive extension for usage. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.variableType = None """ dichotomous | continuous | descriptive. Type `str`. """ + self._variableType = None + """ Primitive extension for variableType. Type `FHIRPrimitiveExtension` """ self.version = None """ Business version of the research element definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ResearchElementDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -168,39 +236,73 @@ def elementProperties(self): js = super(ResearchElementDefinition, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("characteristic", "characteristic", ResearchElementDefinitionCharacteristic, True, None, True), + ("_characteristic", "_characteristic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, True, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("library", "library", str, True, None, False), + ("_library", "_library", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("shortTitle", "shortTitle", str, False, None, False), + ("_shortTitle", "_shortTitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectCodeableConcept", "subjectCodeableConcept", codeableconcept.CodeableConcept, False, "subject", False), + ("_subjectCodeableConcept", "_subjectCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subjectReference", "subjectReference", fhirreference.FHIRReference, False, "subject", False), + ("_subjectReference", "_subjectReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subtitle", "subtitle", str, False, None, False), + ("_subtitle", "_subtitle", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usage", "usage", str, False, None, False), + ("_usage", "_usage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("variableType", "variableType", str, False, None, False), + ("_variableType", "_variableType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -227,88 +329,130 @@ def __init__(self, jsondict=None, strict=True): self.definitionCanonical = None """ What code or expression defines members?. Type `str`. """ + self._definitionCanonical = None + """ Primitive extension for definitionCanonical. Type `FHIRPrimitiveExtension` """ self.definitionCodeableConcept = None """ What code or expression defines members?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._definitionCodeableConcept = None + """ Primitive extension for definitionCodeableConcept. Type `FHIRPrimitiveExtension` """ self.definitionDataRequirement = None """ What code or expression defines members?. Type `DataRequirement` (represented as `dict` in JSON). """ + self._definitionDataRequirement = None + """ Primitive extension for definitionDataRequirement. Type `FHIRPrimitiveExtension` """ self.definitionExpression = None """ What code or expression defines members?. Type `Expression` (represented as `dict` in JSON). """ + self._definitionExpression = None + """ Primitive extension for definitionExpression. Type `FHIRPrimitiveExtension` """ self.exclude = None """ Whether the characteristic includes or excludes members. Type `bool`. """ + self._exclude = None + """ Primitive extension for exclude. Type `FHIRPrimitiveExtension` """ self.participantEffectiveDateTime = None """ What time period do participants cover. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._participantEffectiveDateTime = None + """ Primitive extension for participantEffectiveDateTime. Type `FHIRPrimitiveExtension` """ self.participantEffectiveDescription = None """ What time period do participants cover. Type `str`. """ + self._participantEffectiveDescription = None + """ Primitive extension for participantEffectiveDescription. Type `FHIRPrimitiveExtension` """ self.participantEffectiveDuration = None """ What time period do participants cover. Type `Duration` (represented as `dict` in JSON). """ + self._participantEffectiveDuration = None + """ Primitive extension for participantEffectiveDuration. Type `FHIRPrimitiveExtension` """ self.participantEffectiveGroupMeasure = None """ mean | median | mean-of-mean | mean-of-median | median-of-mean | median-of-median. Type `str`. """ + self._participantEffectiveGroupMeasure = None + """ Primitive extension for participantEffectiveGroupMeasure. Type `FHIRPrimitiveExtension` """ self.participantEffectivePeriod = None """ What time period do participants cover. Type `Period` (represented as `dict` in JSON). """ + self._participantEffectivePeriod = None + """ Primitive extension for participantEffectivePeriod. Type `FHIRPrimitiveExtension` """ self.participantEffectiveTimeFromStart = None """ Observation time from study start. Type `Duration` (represented as `dict` in JSON). """ + self._participantEffectiveTimeFromStart = None + """ Primitive extension for participantEffectiveTimeFromStart. Type `FHIRPrimitiveExtension` """ self.participantEffectiveTiming = None """ What time period do participants cover. Type `Timing` (represented as `dict` in JSON). """ + self._participantEffectiveTiming = None + """ Primitive extension for participantEffectiveTiming. Type `FHIRPrimitiveExtension` """ self.studyEffectiveDateTime = None """ What time period does the study cover. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._studyEffectiveDateTime = None + """ Primitive extension for studyEffectiveDateTime. Type `FHIRPrimitiveExtension` """ self.studyEffectiveDescription = None """ What time period does the study cover. Type `str`. """ + self._studyEffectiveDescription = None + """ Primitive extension for studyEffectiveDescription. Type `FHIRPrimitiveExtension` """ self.studyEffectiveDuration = None """ What time period does the study cover. Type `Duration` (represented as `dict` in JSON). """ + self._studyEffectiveDuration = None + """ Primitive extension for studyEffectiveDuration. Type `FHIRPrimitiveExtension` """ self.studyEffectiveGroupMeasure = None """ mean | median | mean-of-mean | mean-of-median | median-of-mean | median-of-median. Type `str`. """ + self._studyEffectiveGroupMeasure = None + """ Primitive extension for studyEffectiveGroupMeasure. Type `FHIRPrimitiveExtension` """ self.studyEffectivePeriod = None """ What time period does the study cover. Type `Period` (represented as `dict` in JSON). """ + self._studyEffectivePeriod = None + """ Primitive extension for studyEffectivePeriod. Type `FHIRPrimitiveExtension` """ self.studyEffectiveTimeFromStart = None """ Observation time from study start. Type `Duration` (represented as `dict` in JSON). """ + self._studyEffectiveTimeFromStart = None + """ Primitive extension for studyEffectiveTimeFromStart. Type `FHIRPrimitiveExtension` """ self.studyEffectiveTiming = None """ What time period does the study cover. Type `Timing` (represented as `dict` in JSON). """ + self._studyEffectiveTiming = None + """ Primitive extension for studyEffectiveTiming. Type `FHIRPrimitiveExtension` """ self.unitOfMeasure = None """ What unit is the outcome described in?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unitOfMeasure = None + """ Primitive extension for unitOfMeasure. Type `FHIRPrimitiveExtension` """ self.usageContext = None """ What code/value pairs define members?. List of `UsageContext` items (represented as `dict` in JSON). """ + self._usageContext = None + """ Primitive extension for usageContext. List of `FHIRPrimitiveExtension` """ super(ResearchElementDefinitionCharacteristic, self).__init__(jsondict=jsondict, strict=strict) @@ -316,29 +460,51 @@ def elementProperties(self): js = super(ResearchElementDefinitionCharacteristic, self).elementProperties() js.extend([ ("definitionCanonical", "definitionCanonical", str, False, "definition", True), + ("_definitionCanonical", "_definitionCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionCodeableConcept", "definitionCodeableConcept", codeableconcept.CodeableConcept, False, "definition", True), + ("_definitionCodeableConcept", "_definitionCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionDataRequirement", "definitionDataRequirement", datarequirement.DataRequirement, False, "definition", True), + ("_definitionDataRequirement", "_definitionDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definitionExpression", "definitionExpression", expression.Expression, False, "definition", True), + ("_definitionExpression", "_definitionExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("exclude", "exclude", bool, False, None, False), + ("_exclude", "_exclude", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveDateTime", "participantEffectiveDateTime", fhirdatetime.FHIRDateTime, False, "participantEffective", False), + ("_participantEffectiveDateTime", "_participantEffectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveDescription", "participantEffectiveDescription", str, False, None, False), + ("_participantEffectiveDescription", "_participantEffectiveDescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveDuration", "participantEffectiveDuration", duration.Duration, False, "participantEffective", False), + ("_participantEffectiveDuration", "_participantEffectiveDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveGroupMeasure", "participantEffectiveGroupMeasure", str, False, None, False), + ("_participantEffectiveGroupMeasure", "_participantEffectiveGroupMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectivePeriod", "participantEffectivePeriod", period.Period, False, "participantEffective", False), + ("_participantEffectivePeriod", "_participantEffectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveTimeFromStart", "participantEffectiveTimeFromStart", duration.Duration, False, None, False), + ("_participantEffectiveTimeFromStart", "_participantEffectiveTimeFromStart", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participantEffectiveTiming", "participantEffectiveTiming", timing.Timing, False, "participantEffective", False), + ("_participantEffectiveTiming", "_participantEffectiveTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveDateTime", "studyEffectiveDateTime", fhirdatetime.FHIRDateTime, False, "studyEffective", False), + ("_studyEffectiveDateTime", "_studyEffectiveDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveDescription", "studyEffectiveDescription", str, False, None, False), + ("_studyEffectiveDescription", "_studyEffectiveDescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveDuration", "studyEffectiveDuration", duration.Duration, False, "studyEffective", False), + ("_studyEffectiveDuration", "_studyEffectiveDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveGroupMeasure", "studyEffectiveGroupMeasure", str, False, None, False), + ("_studyEffectiveGroupMeasure", "_studyEffectiveGroupMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectivePeriod", "studyEffectivePeriod", period.Period, False, "studyEffective", False), + ("_studyEffectivePeriod", "_studyEffectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveTimeFromStart", "studyEffectiveTimeFromStart", duration.Duration, False, None, False), + ("_studyEffectiveTimeFromStart", "_studyEffectiveTimeFromStart", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyEffectiveTiming", "studyEffectiveTiming", timing.Timing, False, "studyEffective", False), + ("_studyEffectiveTiming", "_studyEffectiveTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitOfMeasure", "unitOfMeasure", codeableconcept.CodeableConcept, False, None, False), + ("_unitOfMeasure", "_unitOfMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("usageContext", "usageContext", usagecontext.UsageContext, True, None, False), + ("_usageContext", "_usageContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail @@ -352,4 +518,4 @@ def elementProperties(self): from . import period from . import relatedartifact from . import timing -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/researchstudy.py b/fhirclient/models/researchstudy.py index 7f97827d..1f67acd8 100644 --- a/fhirclient/models/researchstudy.py +++ b/fhirclient/models/researchstudy.py @@ -28,94 +28,138 @@ def __init__(self, jsondict=None, strict=True): self.arm = None """ Defined path through the study for a subject. List of `ResearchStudyArm` items (represented as `dict` in JSON). """ + self._arm = None + """ Primitive extension for arm. List of `FHIRPrimitiveExtension` """ self.category = None """ Classifications for the study. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.condition = None """ Condition being studied. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the study. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.description = None """ What this is study doing. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.enrollment = None """ Inclusion & exclusion criteria. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._enrollment = None + """ Primitive extension for enrollment. List of `FHIRPrimitiveExtension` """ self.focus = None """ Drugs, devices, etc. under study. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for study. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.keyword = None """ Used to search for the study. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._keyword = None + """ Primitive extension for keyword. List of `FHIRPrimitiveExtension` """ self.location = None """ Geographic region(s) for study. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the study. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.objective = None """ A goal for the study. List of `ResearchStudyObjective` items (represented as `dict` in JSON). """ + self._objective = None + """ Primitive extension for objective. List of `FHIRPrimitiveExtension` """ self.partOf = None """ Part of larger study. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.period = None """ When the study began and ended. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.phase = None """ n-a | early-phase-1 | phase-1 | phase-1-phase-2 | phase-2 | phase-2-phase-3 | phase-3 | phase-4. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._phase = None + """ Primitive extension for phase. Type `FHIRPrimitiveExtension` """ self.primaryPurposeType = None """ treatment | prevention | diagnostic | supportive-care | screening | health-services-research | basic-science | device-feasibility. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._primaryPurposeType = None + """ Primitive extension for primaryPurposeType. Type `FHIRPrimitiveExtension` """ self.principalInvestigator = None """ Researcher who oversees multiple aspects of the study. Type `FHIRReference` (represented as `dict` in JSON). """ + self._principalInvestigator = None + """ Primitive extension for principalInvestigator. Type `FHIRPrimitiveExtension` """ self.protocol = None """ Steps followed in executing study. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._protocol = None + """ Primitive extension for protocol. List of `FHIRPrimitiveExtension` """ self.reasonStopped = None """ accrual-goal-met | closed-due-to-toxicity | closed-due-to-lack-of- study-progress | temporarily-closed-per-study-design. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reasonStopped = None + """ Primitive extension for reasonStopped. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ References and dependencies. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.site = None """ Facility where study activities are conducted. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._site = None + """ Primitive extension for site. List of `FHIRPrimitiveExtension` """ self.sponsor = None """ Organization that initiates and is legally responsible for the study. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sponsor = None + """ Primitive extension for sponsor. Type `FHIRPrimitiveExtension` """ self.status = None """ active | administratively-completed | approved | closed-to-accrual @@ -123,10 +167,14 @@ def __init__(self, jsondict=None, strict=True): in-review | temporarily-closed-to-accrual | temporarily-closed-to- accrual-and-intervention | withdrawn. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this study. Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ super(ResearchStudy, self).__init__(jsondict=jsondict, strict=strict) @@ -134,29 +182,53 @@ def elementProperties(self): js = super(ResearchStudy, self).elementProperties() js.extend([ ("arm", "arm", ResearchStudyArm, True, None, False), + ("_arm", "_arm", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("condition", "condition", codeableconcept.CodeableConcept, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("enrollment", "enrollment", fhirreference.FHIRReference, True, None, False), + ("_enrollment", "_enrollment", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("focus", "focus", codeableconcept.CodeableConcept, True, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("keyword", "keyword", codeableconcept.CodeableConcept, True, None, False), + ("_keyword", "_keyword", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("location", "location", codeableconcept.CodeableConcept, True, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("objective", "objective", ResearchStudyObjective, True, None, False), + ("_objective", "_objective", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("phase", "phase", codeableconcept.CodeableConcept, False, None, False), + ("_phase", "_phase", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("primaryPurposeType", "primaryPurposeType", codeableconcept.CodeableConcept, False, None, False), + ("_primaryPurposeType", "_primaryPurposeType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("principalInvestigator", "principalInvestigator", fhirreference.FHIRReference, False, None, False), + ("_principalInvestigator", "_principalInvestigator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("protocol", "protocol", fhirreference.FHIRReference, True, None, False), + ("_protocol", "_protocol", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonStopped", "reasonStopped", codeableconcept.CodeableConcept, False, None, False), + ("_reasonStopped", "_reasonStopped", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("site", "site", fhirreference.FHIRReference, True, None, False), + ("_site", "_site", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sponsor", "sponsor", fhirreference.FHIRReference, False, None, False), + ("_sponsor", "_sponsor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -184,14 +256,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Short explanation of study path. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ Label for study arm. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ Categorization of study arm. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ResearchStudyArm, self).__init__(jsondict=jsondict, strict=strict) @@ -199,8 +277,11 @@ def elementProperties(self): js = super(ResearchStudyArm, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -225,10 +306,14 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Label for the objective. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ primary | secondary | exploratory. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(ResearchStudyObjective, self).__init__(jsondict=jsondict, strict=strict) @@ -236,10 +321,13 @@ def elementProperties(self): js = super(ResearchStudyObjective, self).elementProperties() js.extend([ ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -247,4 +335,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import relatedartifact +from . import relatedartifact \ No newline at end of file diff --git a/fhirclient/models/researchsubject.py b/fhirclient/models/researchsubject.py index e20e34f7..770f5f5d 100644 --- a/fhirclient/models/researchsubject.py +++ b/fhirclient/models/researchsubject.py @@ -24,36 +24,52 @@ def __init__(self, jsondict=None, strict=True): self.actualArm = None """ What path was followed. Type `str`. """ + self._actualArm = None + """ Primitive extension for actualArm. Type `FHIRPrimitiveExtension` """ self.assignedArm = None """ What path should be followed. Type `str`. """ + self._assignedArm = None + """ Primitive extension for assignedArm. Type `FHIRPrimitiveExtension` """ self.consent = None """ Agreement to participate in study. Type `FHIRReference` (represented as `dict` in JSON). """ + self._consent = None + """ Primitive extension for consent. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for research subject in a study. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.individual = None """ Who is part of study. Type `FHIRReference` (represented as `dict` in JSON). """ + self._individual = None + """ Primitive extension for individual. Type `FHIRPrimitiveExtension` """ self.period = None """ Start and end of participation. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.status = None """ candidate | eligible | follow-up | ineligible | not-registered | off-study | on-study | on-study-intervention | on-study-observation | pending-on-study | potential-candidate | screening | withdrawn. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.study = None """ Study subject is part of. Type `FHIRReference` (represented as `dict` in JSON). """ + self._study = None + """ Primitive extension for study. Type `FHIRPrimitiveExtension` """ super(ResearchSubject, self).__init__(jsondict=jsondict, strict=strict) @@ -61,17 +77,26 @@ def elementProperties(self): js = super(ResearchSubject, self).elementProperties() js.extend([ ("actualArm", "actualArm", str, False, None, False), + ("_actualArm", "_actualArm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("assignedArm", "assignedArm", str, False, None, False), + ("_assignedArm", "_assignedArm", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("consent", "consent", fhirreference.FHIRReference, False, None, False), + ("_consent", "_consent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("individual", "individual", fhirreference.FHIRReference, False, None, True), + ("_individual", "_individual", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("study", "study", fhirreference.FHIRReference, False, None, True), + ("_study", "_study", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/resource.py b/fhirclient/models/resource.py index 00f19310..b7af2898 100644 --- a/fhirclient/models/resource.py +++ b/fhirclient/models/resource.py @@ -23,18 +23,26 @@ def __init__(self, jsondict=None, strict=True): self.id = None """ Logical id of this artifact. Type `str`. """ + self._id = None + """ Primitive extension for id. Type `FHIRPrimitiveExtension` """ self.implicitRules = None """ A set of rules under which this content was created. Type `str`. """ + self._implicitRules = None + """ Primitive extension for implicitRules. Type `FHIRPrimitiveExtension` """ self.language = None """ Language of the resource content. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.meta = None """ Metadata about the resource. Type `Meta` (represented as `dict` in JSON). """ + self._meta = None + """ Primitive extension for meta. Type `FHIRPrimitiveExtension` """ super(Resource, self).__init__(jsondict=jsondict, strict=strict) @@ -42,11 +50,16 @@ def elementProperties(self): js = super(Resource, self).elementProperties() js.extend([ ("id", "id", str, False, None, False), + ("_id", "_id", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("implicitRules", "implicitRules", str, False, None, False), + ("_implicitRules", "_implicitRules", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("meta", "meta", meta.Meta, False, None, False), + ("_meta", "_meta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import meta +from . import meta \ No newline at end of file diff --git a/fhirclient/models/riskassessment.py b/fhirclient/models/riskassessment.py index d291c3b8..32ded977 100644 --- a/fhirclient/models/riskassessment.py +++ b/fhirclient/models/riskassessment.py @@ -24,74 +24,110 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Request fulfilled by this assessment. Type `FHIRReference` (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. Type `FHIRPrimitiveExtension` """ self.basis = None """ Information used in assessment. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basis = None + """ Primitive extension for basis. List of `FHIRPrimitiveExtension` """ self.code = None """ Type of assessment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.condition = None """ Condition assessed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Where was assessment performed?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier for the assessment. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.method = None """ Evaluation mechanism. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.mitigation = None """ How to reduce risk. Type `str`. """ + self._mitigation = None + """ Primitive extension for mitigation. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments on the risk assessment. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When was assessment made?. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When was assessment made?. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.parent = None """ Part of this occurrence. Type `FHIRReference` (represented as `dict` in JSON). """ + self._parent = None + """ Primitive extension for parent. Type `FHIRPrimitiveExtension` """ self.performer = None """ Who did assessment?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. Type `FHIRPrimitiveExtension` """ self.prediction = None """ Outcome predicted. List of `RiskAssessmentPrediction` items (represented as `dict` in JSON). """ + self._prediction = None + """ Primitive extension for prediction. List of `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why the assessment was necessary?. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why the assessment was necessary?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.status = None """ registered | preliminary | final | amended +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Who/what does assessment apply to?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ super(RiskAssessment, self).__init__(jsondict=jsondict, strict=strict) @@ -99,23 +135,41 @@ def elementProperties(self): js = super(RiskAssessment, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, False, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basis", "basis", fhirreference.FHIRReference, True, None, False), + ("_basis", "_basis", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", fhirreference.FHIRReference, False, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mitigation", "mitigation", str, False, None, False), + ("_mitigation", "_mitigation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parent", "parent", fhirreference.FHIRReference, False, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, False, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prediction", "prediction", RiskAssessmentPrediction, True, None, False), + ("_prediction", "_prediction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -141,34 +195,50 @@ def __init__(self, jsondict=None, strict=True): self.outcome = None """ Possible outcome for the subject. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.probabilityDecimal = None """ Likelihood of specified outcome. Type `float`. """ + self._probabilityDecimal = None + """ Primitive extension for probabilityDecimal. Type `FHIRPrimitiveExtension` """ self.probabilityRange = None """ Likelihood of specified outcome. Type `Range` (represented as `dict` in JSON). """ + self._probabilityRange = None + """ Primitive extension for probabilityRange. Type `FHIRPrimitiveExtension` """ self.qualitativeRisk = None """ Likelihood of specified outcome as a qualitative value. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._qualitativeRisk = None + """ Primitive extension for qualitativeRisk. Type `FHIRPrimitiveExtension` """ self.rationale = None """ Explanation of prediction. Type `str`. """ + self._rationale = None + """ Primitive extension for rationale. Type `FHIRPrimitiveExtension` """ self.relativeRisk = None """ Relative likelihood. Type `float`. """ + self._relativeRisk = None + """ Primitive extension for relativeRisk. Type `FHIRPrimitiveExtension` """ self.whenPeriod = None """ Timeframe or age range. Type `Period` (represented as `dict` in JSON). """ + self._whenPeriod = None + """ Primitive extension for whenPeriod. Type `FHIRPrimitiveExtension` """ self.whenRange = None """ Timeframe or age range. Type `Range` (represented as `dict` in JSON). """ + self._whenRange = None + """ Primitive extension for whenRange. Type `FHIRPrimitiveExtension` """ super(RiskAssessmentPrediction, self).__init__(jsondict=jsondict, strict=strict) @@ -176,16 +246,25 @@ def elementProperties(self): js = super(RiskAssessmentPrediction, self).elementProperties() js.extend([ ("outcome", "outcome", codeableconcept.CodeableConcept, False, None, False), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("probabilityDecimal", "probabilityDecimal", float, False, "probability", False), + ("_probabilityDecimal", "_probabilityDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("probabilityRange", "probabilityRange", range.Range, False, "probability", False), + ("_probabilityRange", "_probabilityRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("qualitativeRisk", "qualitativeRisk", codeableconcept.CodeableConcept, False, None, False), + ("_qualitativeRisk", "_qualitativeRisk", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rationale", "rationale", str, False, None, False), + ("_rationale", "_rationale", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relativeRisk", "relativeRisk", float, False, None, False), + ("_relativeRisk", "_relativeRisk", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("whenPeriod", "whenPeriod", period.Period, False, "when", False), + ("_whenPeriod", "_whenPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("whenRange", "whenRange", range.Range, False, "when", False), + ("_whenRange", "_whenRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -193,4 +272,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/riskevidencesynthesis.py b/fhirclient/models/riskevidencesynthesis.py index 02568c8a..fdc9cd51 100644 --- a/fhirclient/models/riskevidencesynthesis.py +++ b/fhirclient/models/riskevidencesynthesis.py @@ -25,128 +25,190 @@ def __init__(self, jsondict=None, strict=True): self.approvalDate = None """ When the risk evidence synthesis was approved by publisher. Type `FHIRDate` (represented as `str` in JSON). """ + self._approvalDate = None + """ Primitive extension for approvalDate. Type `FHIRPrimitiveExtension` """ self.author = None """ Who authored the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.certainty = None """ How certain is the risk. List of `RiskEvidenceSynthesisCertainty` items (represented as `dict` in JSON). """ + self._certainty = None + """ Primitive extension for certainty. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the risk evidence synthesis. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.editor = None """ Who edited the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._editor = None + """ Primitive extension for editor. List of `FHIRPrimitiveExtension` """ self.effectivePeriod = None """ When the risk evidence synthesis is expected to be used. Type `Period` (represented as `dict` in JSON). """ + self._effectivePeriod = None + """ Primitive extension for effectivePeriod. Type `FHIRPrimitiveExtension` """ self.endorser = None """ Who endorsed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._endorser = None + """ Primitive extension for endorser. List of `FHIRPrimitiveExtension` """ self.exposure = None """ What exposure?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._exposure = None + """ Primitive extension for exposure. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the risk evidence synthesis. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for risk evidence synthesis (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.lastReviewDate = None """ When the risk evidence synthesis was last reviewed. Type `FHIRDate` (represented as `str` in JSON). """ + self._lastReviewDate = None + """ Primitive extension for lastReviewDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this risk evidence synthesis (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.outcome = None """ What outcome?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._outcome = None + """ Primitive extension for outcome. Type `FHIRPrimitiveExtension` """ self.population = None """ What population?. Type `FHIRReference` (represented as `dict` in JSON). """ + self._population = None + """ Primitive extension for population. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.relatedArtifact = None """ Additional documentation, citations, etc.. List of `RelatedArtifact` items (represented as `dict` in JSON). """ + self._relatedArtifact = None + """ Primitive extension for relatedArtifact. List of `FHIRPrimitiveExtension` """ self.reviewer = None """ Who reviewed the content. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._reviewer = None + """ Primitive extension for reviewer. List of `FHIRPrimitiveExtension` """ self.riskEstimate = None """ What was the estimated risk. Type `RiskEvidenceSynthesisRiskEstimate` (represented as `dict` in JSON). """ + self._riskEstimate = None + """ Primitive extension for riskEstimate. Type `FHIRPrimitiveExtension` """ self.sampleSize = None """ What sample size was involved?. Type `RiskEvidenceSynthesisSampleSize` (represented as `dict` in JSON). """ + self._sampleSize = None + """ Primitive extension for sampleSize. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.studyType = None """ Type of study. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._studyType = None + """ Primitive extension for studyType. Type `FHIRPrimitiveExtension` """ self.synthesisType = None """ Type of synthesis. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._synthesisType = None + """ Primitive extension for synthesisType. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this risk evidence synthesis (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.topic = None """ The category of the EffectEvidenceSynthesis, such as Education, Treatment, Assessment, etc.. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._topic = None + """ Primitive extension for topic. List of `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this risk evidence synthesis, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the risk evidence synthesis. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesis, self).__init__(jsondict=jsondict, strict=strict) @@ -154,36 +216,67 @@ def elementProperties(self): js = super(RiskEvidenceSynthesis, self).elementProperties() js.extend([ ("approvalDate", "approvalDate", fhirdate.FHIRDate, False, None, False), + ("_approvalDate", "_approvalDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("author", "author", contactdetail.ContactDetail, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("certainty", "certainty", RiskEvidenceSynthesisCertainty, True, None, False), + ("_certainty", "_certainty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("editor", "editor", contactdetail.ContactDetail, True, None, False), + ("_editor", "_editor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("effectivePeriod", "effectivePeriod", period.Period, False, None, False), + ("_effectivePeriod", "_effectivePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("endorser", "endorser", contactdetail.ContactDetail, True, None, False), + ("_endorser", "_endorser", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("exposure", "exposure", fhirreference.FHIRReference, False, None, False), + ("_exposure", "_exposure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lastReviewDate", "lastReviewDate", fhirdate.FHIRDate, False, None, False), + ("_lastReviewDate", "_lastReviewDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("outcome", "outcome", fhirreference.FHIRReference, False, None, True), + ("_outcome", "_outcome", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("population", "population", fhirreference.FHIRReference, False, None, True), + ("_population", "_population", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relatedArtifact", "relatedArtifact", relatedartifact.RelatedArtifact, True, None, False), + ("_relatedArtifact", "_relatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reviewer", "reviewer", contactdetail.ContactDetail, True, None, False), + ("_reviewer", "_reviewer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("riskEstimate", "riskEstimate", RiskEvidenceSynthesisRiskEstimate, False, None, False), + ("_riskEstimate", "_riskEstimate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sampleSize", "sampleSize", RiskEvidenceSynthesisSampleSize, False, None, False), + ("_sampleSize", "_sampleSize", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("studyType", "studyType", codeableconcept.CodeableConcept, False, None, False), + ("_studyType", "_studyType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("synthesisType", "synthesisType", codeableconcept.CodeableConcept, False, None, False), + ("_synthesisType", "_synthesisType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("topic", "topic", codeableconcept.CodeableConcept, True, None, False), + ("_topic", "_topic", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -209,14 +302,20 @@ def __init__(self, jsondict=None, strict=True): self.certaintySubcomponent = None """ A component that contributes to the overall certainty. List of `RiskEvidenceSynthesisCertaintyCertaintySubcomponent` items (represented as `dict` in JSON). """ + self._certaintySubcomponent = None + """ Primitive extension for certaintySubcomponent. List of `FHIRPrimitiveExtension` """ self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.rating = None """ Certainty rating. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._rating = None + """ Primitive extension for rating. List of `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesisCertainty, self).__init__(jsondict=jsondict, strict=strict) @@ -224,8 +323,11 @@ def elementProperties(self): js = super(RiskEvidenceSynthesisCertainty, self).elementProperties() js.extend([ ("certaintySubcomponent", "certaintySubcomponent", RiskEvidenceSynthesisCertaintyCertaintySubcomponent, True, None, False), + ("_certaintySubcomponent", "_certaintySubcomponent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rating", "rating", codeableconcept.CodeableConcept, True, None, False), + ("_rating", "_rating", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -249,14 +351,20 @@ def __init__(self, jsondict=None, strict=True): self.note = None """ Used for footnotes or explanatory notes. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.rating = None """ Subcomponent certainty rating. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._rating = None + """ Primitive extension for rating. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of subcomponent of certainty rating. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesisCertaintyCertaintySubcomponent, self).__init__(jsondict=jsondict, strict=strict) @@ -264,8 +372,11 @@ def elementProperties(self): js = super(RiskEvidenceSynthesisCertaintyCertaintySubcomponent, self).elementProperties() js.extend([ ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("rating", "rating", codeableconcept.CodeableConcept, True, None, False), + ("_rating", "_rating", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -289,30 +400,44 @@ def __init__(self, jsondict=None, strict=True): self.denominatorCount = None """ Sample size for group measured. Type `int`. """ + self._denominatorCount = None + """ Primitive extension for denominatorCount. Type `FHIRPrimitiveExtension` """ self.description = None """ Description of risk estimate. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.numeratorCount = None """ Number with the outcome. Type `int`. """ + self._numeratorCount = None + """ Primitive extension for numeratorCount. Type `FHIRPrimitiveExtension` """ self.precisionEstimate = None """ How precise the estimate is. List of `RiskEvidenceSynthesisRiskEstimatePrecisionEstimate` items (represented as `dict` in JSON). """ + self._precisionEstimate = None + """ Primitive extension for precisionEstimate. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of risk estimate. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.unitOfMeasure = None """ What unit is the outcome described in?. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._unitOfMeasure = None + """ Primitive extension for unitOfMeasure. Type `FHIRPrimitiveExtension` """ self.value = None """ Point estimate. Type `float`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesisRiskEstimate, self).__init__(jsondict=jsondict, strict=strict) @@ -320,12 +445,19 @@ def elementProperties(self): js = super(RiskEvidenceSynthesisRiskEstimate, self).elementProperties() js.extend([ ("denominatorCount", "denominatorCount", int, False, None, False), + ("_denominatorCount", "_denominatorCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numeratorCount", "numeratorCount", int, False, None, False), + ("_numeratorCount", "_numeratorCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("precisionEstimate", "precisionEstimate", RiskEvidenceSynthesisRiskEstimatePrecisionEstimate, True, None, False), + ("_precisionEstimate", "_precisionEstimate", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("unitOfMeasure", "unitOfMeasure", codeableconcept.CodeableConcept, False, None, False), + ("_unitOfMeasure", "_unitOfMeasure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", float, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -349,18 +481,26 @@ def __init__(self, jsondict=None, strict=True): self.from_fhir = None """ Lower bound. Type `float`. """ + self._from_fhir = None + """ Primitive extension for from_fhir. Type `FHIRPrimitiveExtension` """ self.level = None """ Level of confidence interval. Type `float`. """ + self._level = None + """ Primitive extension for level. Type `FHIRPrimitiveExtension` """ self.to = None """ Upper bound. Type `float`. """ + self._to = None + """ Primitive extension for to. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of precision estimate. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesisRiskEstimatePrecisionEstimate, self).__init__(jsondict=jsondict, strict=strict) @@ -368,9 +508,13 @@ def elementProperties(self): js = super(RiskEvidenceSynthesisRiskEstimatePrecisionEstimate, self).elementProperties() js.extend([ ("from_fhir", "from", float, False, None, False), + ("_from_fhir", "_from_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("level", "level", float, False, None, False), + ("_level", "_level", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("to", "to", float, False, None, False), + ("_to", "_to", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -394,14 +538,20 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Description of sample size. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.numberOfParticipants = None """ How many participants?. Type `int`. """ + self._numberOfParticipants = None + """ Primitive extension for numberOfParticipants. Type `FHIRPrimitiveExtension` """ self.numberOfStudies = None """ How many studies?. Type `int`. """ + self._numberOfStudies = None + """ Primitive extension for numberOfStudies. Type `FHIRPrimitiveExtension` """ super(RiskEvidenceSynthesisSampleSize, self).__init__(jsondict=jsondict, strict=strict) @@ -409,11 +559,15 @@ def elementProperties(self): js = super(RiskEvidenceSynthesisSampleSize, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfParticipants", "numberOfParticipants", int, False, None, False), + ("_numberOfParticipants", "_numberOfParticipants", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfStudies", "numberOfStudies", int, False, None, False), + ("_numberOfStudies", "_numberOfStudies", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -424,4 +578,4 @@ def elementProperties(self): from . import identifier from . import period from . import relatedartifact -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/sampleddata.py b/fhirclient/models/sampleddata.py index cbd177be..1f0a2f33 100644 --- a/fhirclient/models/sampleddata.py +++ b/fhirclient/models/sampleddata.py @@ -24,30 +24,44 @@ def __init__(self, jsondict=None, strict=True): self.data = None """ Decimal values with spaces, or "E" | "U" | "L". Type `str`. """ + self._data = None + """ Primitive extension for data. Type `FHIRPrimitiveExtension` """ self.dimensions = None """ Number of sample points at each time point. Type `int`. """ + self._dimensions = None + """ Primitive extension for dimensions. Type `FHIRPrimitiveExtension` """ self.factor = None """ Multiply data by this before adding to origin. Type `float`. """ + self._factor = None + """ Primitive extension for factor. Type `FHIRPrimitiveExtension` """ self.lowerLimit = None """ Lower limit of detection. Type `float`. """ + self._lowerLimit = None + """ Primitive extension for lowerLimit. Type `FHIRPrimitiveExtension` """ self.origin = None """ Zero value and units. Type `Quantity` (represented as `dict` in JSON). """ + self._origin = None + """ Primitive extension for origin. Type `FHIRPrimitiveExtension` """ self.period = None """ Number of milliseconds between samples. Type `float`. """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.upperLimit = None """ Upper limit of detection. Type `float`. """ + self._upperLimit = None + """ Primitive extension for upperLimit. Type `FHIRPrimitiveExtension` """ super(SampledData, self).__init__(jsondict=jsondict, strict=strict) @@ -55,14 +69,22 @@ def elementProperties(self): js = super(SampledData, self).elementProperties() js.extend([ ("data", "data", str, False, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dimensions", "dimensions", int, False, None, True), + ("_dimensions", "_dimensions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("factor", "factor", float, False, None, False), + ("_factor", "_factor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lowerLimit", "lowerLimit", float, False, None, False), + ("_lowerLimit", "_lowerLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("origin", "origin", quantity.Quantity, False, None, True), + ("_origin", "_origin", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", float, False, None, True), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("upperLimit", "upperLimit", float, False, None, False), + ("_upperLimit", "_upperLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/schedule.py b/fhirclient/models/schedule.py index 21d03b50..3a186554 100644 --- a/fhirclient/models/schedule.py +++ b/fhirclient/models/schedule.py @@ -22,34 +22,50 @@ def __init__(self, jsondict=None, strict=True): self.active = None """ Whether this schedule is in active use. Type `bool`. """ + self._active = None + """ Primitive extension for active. Type `FHIRPrimitiveExtension` """ self.actor = None """ Resource(s) that availability information is being provided for. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._actor = None + """ Primitive extension for actor. List of `FHIRPrimitiveExtension` """ self.comment = None """ Comments on availability. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.planningHorizon = None """ Period of time covered by schedule. Type `Period` (represented as `dict` in JSON). """ + self._planningHorizon = None + """ Primitive extension for planningHorizon. Type `FHIRPrimitiveExtension` """ self.serviceCategory = None """ High-level category. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceCategory = None + """ Primitive extension for serviceCategory. List of `FHIRPrimitiveExtension` """ self.serviceType = None """ Specific service. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceType = None + """ Primitive extension for serviceType. List of `FHIRPrimitiveExtension` """ self.specialty = None """ Type of specialty needed. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ super(Schedule, self).__init__(jsondict=jsondict, strict=strict) @@ -57,18 +73,27 @@ def elementProperties(self): js = super(Schedule, self).elementProperties() js.extend([ ("active", "active", bool, False, None, False), + ("_active", "_active", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("actor", "actor", fhirreference.FHIRReference, True, None, True), + ("_actor", "_actor", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("planningHorizon", "planningHorizon", period.Period, False, None, False), + ("_planningHorizon", "_planningHorizon", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("serviceCategory", "serviceCategory", codeableconcept.CodeableConcept, True, None, False), + ("_serviceCategory", "_serviceCategory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceType", "serviceType", codeableconcept.CodeableConcept, True, None, False), + ("_serviceType", "_serviceType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier -from . import period +from . import period \ No newline at end of file diff --git a/fhirclient/models/searchparameter.py b/fhirclient/models/searchparameter.py index 105b42be..46ef274f 100644 --- a/fhirclient/models/searchparameter.py +++ b/fhirclient/models/searchparameter.py @@ -24,109 +24,161 @@ def __init__(self, jsondict=None, strict=True): self.base = None """ The resource type(s) this search parameter applies to. List of `str` items. """ + self._base = None + """ Primitive extension for base. List of `FHIRPrimitiveExtension` """ self.chain = None """ Chained names supported. List of `str` items. """ + self._chain = None + """ Primitive extension for chain. List of `FHIRPrimitiveExtension` """ self.code = None """ Code used in URL. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comparator = None """ eq | ne | gt | lt | ge | le | sa | eb | ap. List of `str` items. """ + self._comparator = None + """ Primitive extension for comparator. List of `FHIRPrimitiveExtension` """ self.component = None """ For Composite resources to define the parts. List of `SearchParameterComponent` items (represented as `dict` in JSON). """ + self._component = None + """ Primitive extension for component. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.derivedFrom = None """ Original definition for the search parameter. Type `str`. """ + self._derivedFrom = None + """ Primitive extension for derivedFrom. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the search parameter. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.expression = None """ FHIRPath expression that extracts the values. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for search parameter (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.modifier = None """ missing | exact | contains | not | text | in | not-in | below | above | type | identifier | ofType. List of `str` items. """ + self._modifier = None + """ Primitive extension for modifier. List of `FHIRPrimitiveExtension` """ self.multipleAnd = None """ Allow multiple parameters (and). Type `bool`. """ + self._multipleAnd = None + """ Primitive extension for multipleAnd. Type `FHIRPrimitiveExtension` """ self.multipleOr = None """ Allow multiple values per parameter (or). Type `bool`. """ + self._multipleOr = None + """ Primitive extension for multipleOr. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this search parameter (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this search parameter is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.target = None """ Types of resource (if a resource reference). List of `str` items. """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ self.type = None """ number | date | string | token | reference | composite | quantity | uri | special. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this search parameter, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the search parameter. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ self.xpath = None """ XPath that extracts the values. Type `str`. """ + self._xpath = None + """ Primitive extension for xpath. Type `FHIRPrimitiveExtension` """ self.xpathUsage = None """ normal | phonetic | nearby | distance | other. Type `str`. """ + self._xpathUsage = None + """ Primitive extension for xpathUsage. Type `FHIRPrimitiveExtension` """ super(SearchParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -134,31 +186,57 @@ def elementProperties(self): js = super(SearchParameter, self).elementProperties() js.extend([ ("base", "base", str, True, None, True), + ("_base", "_base", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("chain", "chain", str, True, None, False), + ("_chain", "_chain", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comparator", "comparator", str, True, None, False), + ("_comparator", "_comparator", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("component", "component", SearchParameterComponent, True, None, False), + ("_component", "_component", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivedFrom", "derivedFrom", str, False, None, False), + ("_derivedFrom", "_derivedFrom", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("modifier", "modifier", str, True, None, False), + ("_modifier", "_modifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("multipleAnd", "multipleAnd", bool, False, None, False), + ("_multipleAnd", "_multipleAnd", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("multipleOr", "multipleOr", bool, False, None, False), + ("_multipleOr", "_multipleOr", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", str, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("xpath", "xpath", str, False, None, False), + ("_xpath", "_xpath", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("xpathUsage", "xpathUsage", str, False, None, False), + ("_xpathUsage", "_xpathUsage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -184,10 +262,14 @@ def __init__(self, jsondict=None, strict=True): self.definition = None """ Defines how the part works. Type `str`. """ + self._definition = None + """ Primitive extension for definition. Type `FHIRPrimitiveExtension` """ self.expression = None """ Subexpression relative to main expression. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ super(SearchParameterComponent, self).__init__(jsondict=jsondict, strict=strict) @@ -195,12 +277,15 @@ def elementProperties(self): js = super(SearchParameterComponent, self).elementProperties() js.extend([ ("definition", "definition", str, False, None, True), + ("_definition", "_definition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, True), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/servicerequest.py b/fhirclient/models/servicerequest.py index 4dd1ec70..cb1fee79 100644 --- a/fhirclient/models/servicerequest.py +++ b/fhirclient/models/servicerequest.py @@ -24,156 +24,232 @@ def __init__(self, jsondict=None, strict=True): self.asNeededBoolean = None """ Preconditions for service. Type `bool`. """ + self._asNeededBoolean = None + """ Primitive extension for asNeededBoolean. Type `FHIRPrimitiveExtension` """ self.asNeededCodeableConcept = None """ Preconditions for service. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._asNeededCodeableConcept = None + """ Primitive extension for asNeededCodeableConcept. Type `FHIRPrimitiveExtension` """ self.authoredOn = None """ Date request signed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ What request fulfills. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.bodySite = None """ Location on Body. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. List of `FHIRPrimitiveExtension` """ self.category = None """ Classification of service. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ What is being requested/ordered. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.doNotPerform = None """ True if service/procedure should not be performed. Type `bool`. """ + self._doNotPerform = None + """ Primitive extension for doNotPerform. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Encounter in which the request was created. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifiers assigned to this order. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Instantiates FHIR protocol or definition. List of `str` items. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. List of `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Instantiates external protocol or definition. List of `str` items. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. List of `FHIRPrimitiveExtension` """ self.insurance = None """ Associated insurance coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.intent = None """ proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.locationCode = None """ Requested location. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._locationCode = None + """ Primitive extension for locationCode. List of `FHIRPrimitiveExtension` """ self.locationReference = None """ Requested location. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._locationReference = None + """ Primitive extension for locationReference. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When service should occur. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When service should occur. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ When service should occur. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.orderDetail = None """ Additional order information. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._orderDetail = None + """ Primitive extension for orderDetail. List of `FHIRPrimitiveExtension` """ self.patientInstruction = None """ Patient or consumer-oriented instructions. Type `str`. """ + self._patientInstruction = None + """ Primitive extension for patientInstruction. Type `FHIRPrimitiveExtension` """ self.performer = None """ Requested performer. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._performer = None + """ Primitive extension for performer. List of `FHIRPrimitiveExtension` """ self.performerType = None """ Performer role. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._performerType = None + """ Primitive extension for performerType. Type `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.quantityQuantity = None """ Service amount. Type `Quantity` (represented as `dict` in JSON). """ + self._quantityQuantity = None + """ Primitive extension for quantityQuantity. Type `FHIRPrimitiveExtension` """ self.quantityRange = None """ Service amount. Type `Range` (represented as `dict` in JSON). """ + self._quantityRange = None + """ Primitive extension for quantityRange. Type `FHIRPrimitiveExtension` """ self.quantityRatio = None """ Service amount. Type `Ratio` (represented as `dict` in JSON). """ + self._quantityRatio = None + """ Primitive extension for quantityRatio. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Explanation/Justification for procedure or service. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ Explanation/Justification for service or service. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.relevantHistory = None """ Request provenance. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._relevantHistory = None + """ Primitive extension for relevantHistory. List of `FHIRPrimitiveExtension` """ self.replaces = None """ What request replaces. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._replaces = None + """ Primitive extension for replaces. List of `FHIRPrimitiveExtension` """ self.requester = None """ Who/what is requesting service. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.requisition = None """ Composite Request ID. Type `Identifier` (represented as `dict` in JSON). """ + self._requisition = None + """ Primitive extension for requisition. Type `FHIRPrimitiveExtension` """ self.specimen = None """ Procedure Samples. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._specimen = None + """ Primitive extension for specimen. List of `FHIRPrimitiveExtension` """ self.status = None """ draft | active | on-hold | revoked | completed | entered-in-error | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Individual or Entity the service is ordered for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.supportingInfo = None """ Additional clinical information. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supportingInfo = None + """ Primitive extension for supportingInfo. List of `FHIRPrimitiveExtension` """ super(ServiceRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -181,46 +257,85 @@ def elementProperties(self): js = super(ServiceRequest, self).elementProperties() js.extend([ ("asNeededBoolean", "asNeededBoolean", bool, False, "asNeeded", False), + ("_asNeededBoolean", "_asNeededBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("asNeededCodeableConcept", "asNeededCodeableConcept", codeableconcept.CodeableConcept, False, "asNeeded", False), + ("_asNeededCodeableConcept", "_asNeededCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("bodySite", "bodySite", codeableconcept.CodeableConcept, True, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("doNotPerform", "doNotPerform", bool, False, None, False), + ("_doNotPerform", "_doNotPerform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, True, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesUri", "instantiatesUri", str, True, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("insurance", "insurance", fhirreference.FHIRReference, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("locationCode", "locationCode", codeableconcept.CodeableConcept, True, None, False), + ("_locationCode", "_locationCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("locationReference", "locationReference", fhirreference.FHIRReference, True, None, False), + ("_locationReference", "_locationReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("orderDetail", "orderDetail", codeableconcept.CodeableConcept, True, None, False), + ("_orderDetail", "_orderDetail", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patientInstruction", "patientInstruction", str, False, None, False), + ("_patientInstruction", "_patientInstruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("performer", "performer", fhirreference.FHIRReference, True, None, False), + ("_performer", "_performer", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performerType", "performerType", codeableconcept.CodeableConcept, False, None, False), + ("_performerType", "_performerType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantityQuantity", "quantityQuantity", quantity.Quantity, False, "quantity", False), + ("_quantityQuantity", "_quantityQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantityRange", "quantityRange", range.Range, False, "quantity", False), + ("_quantityRange", "_quantityRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantityRatio", "quantityRatio", ratio.Ratio, False, "quantity", False), + ("_quantityRatio", "_quantityRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("relevantHistory", "relevantHistory", fhirreference.FHIRReference, True, None, False), + ("_relevantHistory", "_relevantHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("replaces", "replaces", fhirreference.FHIRReference, True, None, False), + ("_replaces", "_replaces", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requisition", "requisition", identifier.Identifier, False, None, False), + ("_requisition", "_requisition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("specimen", "specimen", fhirreference.FHIRReference, True, None, False), + ("_specimen", "_specimen", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, True), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supportingInfo", "supportingInfo", fhirreference.FHIRReference, True, None, False), + ("_supportingInfo", "_supportingInfo", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -231,4 +346,4 @@ def elementProperties(self): from . import quantity from . import range from . import ratio -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/signature.py b/fhirclient/models/signature.py index bdf9710c..3e5038e2 100644 --- a/fhirclient/models/signature.py +++ b/fhirclient/models/signature.py @@ -27,30 +27,44 @@ def __init__(self, jsondict=None, strict=True): self.data = None """ The actual signature content (XML DigSig. JWS, picture, etc.). Type `str`. """ + self._data = None + """ Primitive extension for data. Type `FHIRPrimitiveExtension` """ self.onBehalfOf = None """ The party represented. Type `FHIRReference` (represented as `dict` in JSON). """ + self._onBehalfOf = None + """ Primitive extension for onBehalfOf. Type `FHIRPrimitiveExtension` """ self.sigFormat = None """ The technical format of the signature. Type `str`. """ + self._sigFormat = None + """ Primitive extension for sigFormat. Type `FHIRPrimitiveExtension` """ self.targetFormat = None """ The technical format of the signed resources. Type `str`. """ + self._targetFormat = None + """ Primitive extension for targetFormat. Type `FHIRPrimitiveExtension` """ self.type = None """ Indication of the reason the entity signed the object(s). List of `Coding` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.when = None """ When the signature was created. Type `FHIRInstant` (represented as `str` in JSON). """ + self._when = None + """ Primitive extension for when. Type `FHIRPrimitiveExtension` """ self.who = None """ Who signed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._who = None + """ Primitive extension for who. Type `FHIRPrimitiveExtension` """ super(Signature, self).__init__(jsondict=jsondict, strict=strict) @@ -58,16 +72,24 @@ def elementProperties(self): js = super(Signature, self).elementProperties() js.extend([ ("data", "data", str, False, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onBehalfOf", "onBehalfOf", fhirreference.FHIRReference, False, None, False), + ("_onBehalfOf", "_onBehalfOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sigFormat", "sigFormat", str, False, None, False), + ("_sigFormat", "_sigFormat", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetFormat", "targetFormat", str, False, None, False), + ("_targetFormat", "_targetFormat", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", coding.Coding, True, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("when", "when", fhirinstant.FHIRInstant, False, None, True), + ("_when", "_when", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("who", "who", fhirreference.FHIRReference, False, None, True), + ("_who", "_who", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import coding from . import fhirinstant -from . import fhirreference +from . import fhirreference \ No newline at end of file diff --git a/fhirclient/models/slot.py b/fhirclient/models/slot.py index eda37f99..7ada9412 100644 --- a/fhirclient/models/slot.py +++ b/fhirclient/models/slot.py @@ -22,34 +22,48 @@ def __init__(self, jsondict=None, strict=True): """ The style of appointment or patient that may be booked in the slot (not service type). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._appointmentType = None + """ Primitive extension for appointmentType. Type `FHIRPrimitiveExtension` """ self.comment = None """ Comments on the slot to describe any extended information. Such as custom constraints on the slot. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.end = None """ Date/Time that the slot is to conclude. Type `FHIRInstant` (represented as `str` in JSON). """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External Ids for this item. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.overbooked = None """ This slot has already been overbooked, appointments are unlikely to be accepted for this time. Type `bool`. """ + self._overbooked = None + """ Primitive extension for overbooked. Type `FHIRPrimitiveExtension` """ self.schedule = None """ The schedule resource that this slot defines an interval of status information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._schedule = None + """ Primitive extension for schedule. Type `FHIRPrimitiveExtension` """ self.serviceCategory = None """ A broad categorization of the service that is to be performed during this appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceCategory = None + """ Primitive extension for serviceCategory. List of `FHIRPrimitiveExtension` """ self.serviceType = None """ The type of appointments that can be booked into this slot (ideally @@ -57,19 +71,27 @@ def __init__(self, jsondict=None, strict=True): rather than the location itself). If provided then this overrides the value provided on the availability resource. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._serviceType = None + """ Primitive extension for serviceType. List of `FHIRPrimitiveExtension` """ self.specialty = None """ The specialty of a practitioner that would be required to perform the service requested in this appointment. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._specialty = None + """ Primitive extension for specialty. List of `FHIRPrimitiveExtension` """ self.start = None """ Date/Time that the slot is to begin. Type `FHIRInstant` (represented as `str` in JSON). """ + self._start = None + """ Primitive extension for start. Type `FHIRPrimitiveExtension` """ self.status = None """ busy | free | busy-unavailable | busy-tentative | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Slot, self).__init__(jsondict=jsondict, strict=strict) @@ -77,21 +99,33 @@ def elementProperties(self): js = super(Slot, self).elementProperties() js.extend([ ("appointmentType", "appointmentType", codeableconcept.CodeableConcept, False, None, False), + ("_appointmentType", "_appointmentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("end", "end", fhirinstant.FHIRInstant, False, None, True), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("overbooked", "overbooked", bool, False, None, False), + ("_overbooked", "_overbooked", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("schedule", "schedule", fhirreference.FHIRReference, False, None, True), + ("_schedule", "_schedule", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("serviceCategory", "serviceCategory", codeableconcept.CodeableConcept, True, None, False), + ("_serviceCategory", "_serviceCategory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("serviceType", "serviceType", codeableconcept.CodeableConcept, True, None, False), + ("_serviceType", "_serviceType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specialty", "specialty", codeableconcept.CodeableConcept, True, None, False), + ("_specialty", "_specialty", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("start", "start", fhirinstant.FHIRInstant, False, None, True), + ("_start", "_start", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirinstant from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/specimen.py b/fhirclient/models/specimen.py index 7105bfed..132f2748 100644 --- a/fhirclient/models/specimen.py +++ b/fhirclient/models/specimen.py @@ -23,56 +23,82 @@ def __init__(self, jsondict=None, strict=True): self.accessionIdentifier = None """ Identifier assigned by the lab. Type `Identifier` (represented as `dict` in JSON). """ + self._accessionIdentifier = None + """ Primitive extension for accessionIdentifier. Type `FHIRPrimitiveExtension` """ self.collection = None """ Collection details. Type `SpecimenCollection` (represented as `dict` in JSON). """ + self._collection = None + """ Primitive extension for collection. Type `FHIRPrimitiveExtension` """ self.condition = None """ State of the specimen. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. List of `FHIRPrimitiveExtension` """ self.container = None """ Direct container of specimen (tube/slide, etc.). List of `SpecimenContainer` items (represented as `dict` in JSON). """ + self._container = None + """ Primitive extension for container. List of `FHIRPrimitiveExtension` """ self.identifier = None """ External Identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.note = None """ Comments. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.parent = None """ Specimen from which this specimen originated. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._parent = None + """ Primitive extension for parent. List of `FHIRPrimitiveExtension` """ self.processing = None """ Processing and processing step details. List of `SpecimenProcessing` items (represented as `dict` in JSON). """ + self._processing = None + """ Primitive extension for processing. List of `FHIRPrimitiveExtension` """ self.receivedTime = None """ The time when specimen was received for processing. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._receivedTime = None + """ Primitive extension for receivedTime. Type `FHIRPrimitiveExtension` """ self.request = None """ Why the specimen was collected. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._request = None + """ Primitive extension for request. List of `FHIRPrimitiveExtension` """ self.status = None """ available | unavailable | unsatisfactory | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.subject = None """ Where the specimen came from. This may be from patient(s), from a location (e.g., the source of an environmental sample), or a sampling of a substance or a device. Type `FHIRReference` (represented as `dict` in JSON). """ + self._subject = None + """ Primitive extension for subject. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of material that forms the specimen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(Specimen, self).__init__(jsondict=jsondict, strict=strict) @@ -80,18 +106,31 @@ def elementProperties(self): js = super(Specimen, self).elementProperties() js.extend([ ("accessionIdentifier", "accessionIdentifier", identifier.Identifier, False, None, False), + ("_accessionIdentifier", "_accessionIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collection", "collection", SpecimenCollection, False, None, False), + ("_collection", "_collection", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", codeableconcept.CodeableConcept, True, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("container", "container", SpecimenContainer, True, None, False), + ("_container", "_container", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("parent", "parent", fhirreference.FHIRReference, True, None, False), + ("_parent", "_parent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("processing", "processing", SpecimenProcessing, True, None, False), + ("_processing", "_processing", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("receivedTime", "receivedTime", fhirdatetime.FHIRDateTime, False, None, False), + ("_receivedTime", "_receivedTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("request", "request", fhirreference.FHIRReference, True, None, False), + ("_request", "_request", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subject", "subject", fhirreference.FHIRReference, False, None, False), + ("_subject", "_subject", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -117,38 +156,56 @@ def __init__(self, jsondict=None, strict=True): self.bodySite = None """ Anatomical collection site. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._bodySite = None + """ Primitive extension for bodySite. Type `FHIRPrimitiveExtension` """ self.collectedDateTime = None """ Collection time. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._collectedDateTime = None + """ Primitive extension for collectedDateTime. Type `FHIRPrimitiveExtension` """ self.collectedPeriod = None """ Collection time. Type `Period` (represented as `dict` in JSON). """ + self._collectedPeriod = None + """ Primitive extension for collectedPeriod. Type `FHIRPrimitiveExtension` """ self.collector = None """ Who collected the specimen. Type `FHIRReference` (represented as `dict` in JSON). """ + self._collector = None + """ Primitive extension for collector. Type `FHIRPrimitiveExtension` """ self.duration = None """ How long it took to collect specimen. Type `Duration` (represented as `dict` in JSON). """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.fastingStatusCodeableConcept = None """ Whether or how long patient abstained from food and/or drink. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fastingStatusCodeableConcept = None + """ Primitive extension for fastingStatusCodeableConcept. Type `FHIRPrimitiveExtension` """ self.fastingStatusDuration = None """ Whether or how long patient abstained from food and/or drink. Type `Duration` (represented as `dict` in JSON). """ + self._fastingStatusDuration = None + """ Primitive extension for fastingStatusDuration. Type `FHIRPrimitiveExtension` """ self.method = None """ Technique used to perform collection. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The quantity of specimen collected. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ super(SpecimenCollection, self).__init__(jsondict=jsondict, strict=strict) @@ -156,14 +213,23 @@ def elementProperties(self): js = super(SpecimenCollection, self).elementProperties() js.extend([ ("bodySite", "bodySite", codeableconcept.CodeableConcept, False, None, False), + ("_bodySite", "_bodySite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collectedDateTime", "collectedDateTime", fhirdatetime.FHIRDateTime, False, "collected", False), + ("_collectedDateTime", "_collectedDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collectedPeriod", "collectedPeriod", period.Period, False, "collected", False), + ("_collectedPeriod", "_collectedPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("collector", "collector", fhirreference.FHIRReference, False, None, False), + ("_collector", "_collector", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("duration", "duration", duration.Duration, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fastingStatusCodeableConcept", "fastingStatusCodeableConcept", codeableconcept.CodeableConcept, False, "fastingStatus", False), + ("_fastingStatusCodeableConcept", "_fastingStatusCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fastingStatusDuration", "fastingStatusDuration", duration.Duration, False, "fastingStatus", False), + ("_fastingStatusDuration", "_fastingStatusDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -188,30 +254,44 @@ def __init__(self, jsondict=None, strict=True): self.additiveCodeableConcept = None """ Additive associated with container. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._additiveCodeableConcept = None + """ Primitive extension for additiveCodeableConcept. Type `FHIRPrimitiveExtension` """ self.additiveReference = None """ Additive associated with container. Type `FHIRReference` (represented as `dict` in JSON). """ + self._additiveReference = None + """ Primitive extension for additiveReference. Type `FHIRPrimitiveExtension` """ self.capacity = None """ Container volume or size. Type `Quantity` (represented as `dict` in JSON). """ + self._capacity = None + """ Primitive extension for capacity. Type `FHIRPrimitiveExtension` """ self.description = None """ Textual description of the container. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Id for the container. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.specimenQuantity = None """ Quantity of specimen within container. Type `Quantity` (represented as `dict` in JSON). """ + self._specimenQuantity = None + """ Primitive extension for specimenQuantity. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of container directly associated with specimen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SpecimenContainer, self).__init__(jsondict=jsondict, strict=strict) @@ -219,12 +299,19 @@ def elementProperties(self): js = super(SpecimenContainer, self).elementProperties() js.extend([ ("additiveCodeableConcept", "additiveCodeableConcept", codeableconcept.CodeableConcept, False, "additive", False), + ("_additiveCodeableConcept", "_additiveCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("additiveReference", "additiveReference", fhirreference.FHIRReference, False, "additive", False), + ("_additiveReference", "_additiveReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("capacity", "capacity", quantity.Quantity, False, None, False), + ("_capacity", "_capacity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("specimenQuantity", "specimenQuantity", quantity.Quantity, False, None, False), + ("_specimenQuantity", "_specimenQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -248,22 +335,32 @@ def __init__(self, jsondict=None, strict=True): self.additive = None """ Material used in the processing step. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._additive = None + """ Primitive extension for additive. List of `FHIRPrimitiveExtension` """ self.description = None """ Textual description of procedure. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.procedure = None """ Indicates the treatment step applied to the specimen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._procedure = None + """ Primitive extension for procedure. Type `FHIRPrimitiveExtension` """ self.timeDateTime = None """ Date and time of specimen processing. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timeDateTime = None + """ Primitive extension for timeDateTime. Type `FHIRPrimitiveExtension` """ self.timePeriod = None """ Date and time of specimen processing. Type `Period` (represented as `dict` in JSON). """ + self._timePeriod = None + """ Primitive extension for timePeriod. Type `FHIRPrimitiveExtension` """ super(SpecimenProcessing, self).__init__(jsondict=jsondict, strict=strict) @@ -271,13 +368,19 @@ def elementProperties(self): js = super(SpecimenProcessing, self).elementProperties() js.extend([ ("additive", "additive", fhirreference.FHIRReference, True, None, False), + ("_additive", "_additive", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("procedure", "procedure", codeableconcept.CodeableConcept, False, None, False), + ("_procedure", "_procedure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timeDateTime", "timeDateTime", fhirdatetime.FHIRDateTime, False, "time", False), + ("_timeDateTime", "_timeDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timePeriod", "timePeriod", period.Period, False, "time", False), + ("_timePeriod", "_timePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept @@ -286,4 +389,4 @@ def elementProperties(self): from . import fhirreference from . import identifier from . import period -from . import quantity +from . import quantity \ No newline at end of file diff --git a/fhirclient/models/specimendefinition.py b/fhirclient/models/specimendefinition.py index 540fb228..fbc1bb84 100644 --- a/fhirclient/models/specimendefinition.py +++ b/fhirclient/models/specimendefinition.py @@ -23,26 +23,38 @@ def __init__(self, jsondict=None, strict=True): self.collection = None """ Specimen collection procedure. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._collection = None + """ Primitive extension for collection. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Business identifier of a kind of specimen. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.patientPreparation = None """ Patient preparation for collection. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._patientPreparation = None + """ Primitive extension for patientPreparation. List of `FHIRPrimitiveExtension` """ self.timeAspect = None """ Time aspect for collection. Type `str`. """ + self._timeAspect = None + """ Primitive extension for timeAspect. Type `FHIRPrimitiveExtension` """ self.typeCollected = None """ Kind of material to collect. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._typeCollected = None + """ Primitive extension for typeCollected. Type `FHIRPrimitiveExtension` """ self.typeTested = None """ Specimen in container intended for testing by lab. List of `SpecimenDefinitionTypeTested` items (represented as `dict` in JSON). """ + self._typeTested = None + """ Primitive extension for typeTested. List of `FHIRPrimitiveExtension` """ super(SpecimenDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -50,11 +62,17 @@ def elementProperties(self): js = super(SpecimenDefinition, self).elementProperties() js.extend([ ("collection", "collection", codeableconcept.CodeableConcept, True, None, False), + ("_collection", "_collection", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("patientPreparation", "patientPreparation", codeableconcept.CodeableConcept, True, None, False), + ("_patientPreparation", "_patientPreparation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("timeAspect", "timeAspect", str, False, None, False), + ("_timeAspect", "_timeAspect", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("typeCollected", "typeCollected", codeableconcept.CodeableConcept, False, None, False), + ("_typeCollected", "_typeCollected", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("typeTested", "typeTested", SpecimenDefinitionTypeTested, True, None, False), + ("_typeTested", "_typeTested", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -80,34 +98,50 @@ def __init__(self, jsondict=None, strict=True): self.container = None """ The specimen's container. Type `SpecimenDefinitionTypeTestedContainer` (represented as `dict` in JSON). """ + self._container = None + """ Primitive extension for container. Type `FHIRPrimitiveExtension` """ self.handling = None """ Specimen handling before testing. List of `SpecimenDefinitionTypeTestedHandling` items (represented as `dict` in JSON). """ + self._handling = None + """ Primitive extension for handling. List of `FHIRPrimitiveExtension` """ self.isDerived = None """ Primary or secondary specimen. Type `bool`. """ + self._isDerived = None + """ Primitive extension for isDerived. Type `FHIRPrimitiveExtension` """ self.preference = None """ preferred | alternate. Type `str`. """ + self._preference = None + """ Primitive extension for preference. Type `FHIRPrimitiveExtension` """ self.rejectionCriterion = None """ Rejection criterion. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._rejectionCriterion = None + """ Primitive extension for rejectionCriterion. List of `FHIRPrimitiveExtension` """ self.requirement = None """ Specimen requirements. Type `str`. """ + self._requirement = None + """ Primitive extension for requirement. Type `FHIRPrimitiveExtension` """ self.retentionTime = None """ Specimen retention time. Type `Duration` (represented as `dict` in JSON). """ + self._retentionTime = None + """ Primitive extension for retentionTime. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of intended specimen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SpecimenDefinitionTypeTested, self).__init__(jsondict=jsondict, strict=strict) @@ -115,13 +149,21 @@ def elementProperties(self): js = super(SpecimenDefinitionTypeTested, self).elementProperties() js.extend([ ("container", "container", SpecimenDefinitionTypeTestedContainer, False, None, False), + ("_container", "_container", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("handling", "handling", SpecimenDefinitionTypeTestedHandling, True, None, False), + ("_handling", "_handling", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("isDerived", "isDerived", bool, False, None, False), + ("_isDerived", "_isDerived", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preference", "preference", str, False, None, True), + ("_preference", "_preference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rejectionCriterion", "rejectionCriterion", codeableconcept.CodeableConcept, True, None, False), + ("_rejectionCriterion", "_rejectionCriterion", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requirement", "requirement", str, False, None, False), + ("_requirement", "_requirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("retentionTime", "retentionTime", duration.Duration, False, None, False), + ("_retentionTime", "_retentionTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -143,38 +185,56 @@ def __init__(self, jsondict=None, strict=True): self.additive = None """ Additive associated with container. List of `SpecimenDefinitionTypeTestedContainerAdditive` items (represented as `dict` in JSON). """ + self._additive = None + """ Primitive extension for additive. List of `FHIRPrimitiveExtension` """ self.cap = None """ Color of container cap. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._cap = None + """ Primitive extension for cap. Type `FHIRPrimitiveExtension` """ self.capacity = None """ Container capacity. Type `Quantity` (represented as `dict` in JSON). """ + self._capacity = None + """ Primitive extension for capacity. Type `FHIRPrimitiveExtension` """ self.description = None """ Container description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.material = None """ Container material. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._material = None + """ Primitive extension for material. Type `FHIRPrimitiveExtension` """ self.minimumVolumeQuantity = None """ Minimum volume. Type `Quantity` (represented as `dict` in JSON). """ + self._minimumVolumeQuantity = None + """ Primitive extension for minimumVolumeQuantity. Type `FHIRPrimitiveExtension` """ self.minimumVolumeString = None """ Minimum volume. Type `str`. """ + self._minimumVolumeString = None + """ Primitive extension for minimumVolumeString. Type `FHIRPrimitiveExtension` """ self.preparation = None """ Specimen container preparation. Type `str`. """ + self._preparation = None + """ Primitive extension for preparation. Type `FHIRPrimitiveExtension` """ self.type = None """ Kind of container associated with the kind of specimen. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SpecimenDefinitionTypeTestedContainer, self).__init__(jsondict=jsondict, strict=strict) @@ -182,14 +242,23 @@ def elementProperties(self): js = super(SpecimenDefinitionTypeTestedContainer, self).elementProperties() js.extend([ ("additive", "additive", SpecimenDefinitionTypeTestedContainerAdditive, True, None, False), + ("_additive", "_additive", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("cap", "cap", codeableconcept.CodeableConcept, False, None, False), + ("_cap", "_cap", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("capacity", "capacity", quantity.Quantity, False, None, False), + ("_capacity", "_capacity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("material", "material", codeableconcept.CodeableConcept, False, None, False), + ("_material", "_material", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minimumVolumeQuantity", "minimumVolumeQuantity", quantity.Quantity, False, "minimumVolume", False), + ("_minimumVolumeQuantity", "_minimumVolumeQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minimumVolumeString", "minimumVolumeString", str, False, "minimumVolume", False), + ("_minimumVolumeString", "_minimumVolumeString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("preparation", "preparation", str, False, None, False), + ("_preparation", "_preparation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -214,10 +283,14 @@ def __init__(self, jsondict=None, strict=True): self.additiveCodeableConcept = None """ Additive associated with container. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._additiveCodeableConcept = None + """ Primitive extension for additiveCodeableConcept. Type `FHIRPrimitiveExtension` """ self.additiveReference = None """ Additive associated with container. Type `FHIRReference` (represented as `dict` in JSON). """ + self._additiveReference = None + """ Primitive extension for additiveReference. Type `FHIRPrimitiveExtension` """ super(SpecimenDefinitionTypeTestedContainerAdditive, self).__init__(jsondict=jsondict, strict=strict) @@ -225,7 +298,9 @@ def elementProperties(self): js = super(SpecimenDefinitionTypeTestedContainerAdditive, self).elementProperties() js.extend([ ("additiveCodeableConcept", "additiveCodeableConcept", codeableconcept.CodeableConcept, False, "additive", True), + ("_additiveCodeableConcept", "_additiveCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("additiveReference", "additiveReference", fhirreference.FHIRReference, False, "additive", True), + ("_additiveReference", "_additiveReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -250,18 +325,26 @@ def __init__(self, jsondict=None, strict=True): self.instruction = None """ Preservation instruction. Type `str`. """ + self._instruction = None + """ Primitive extension for instruction. Type `FHIRPrimitiveExtension` """ self.maxDuration = None """ Maximum preservation time. Type `Duration` (represented as `dict` in JSON). """ + self._maxDuration = None + """ Primitive extension for maxDuration. Type `FHIRPrimitiveExtension` """ self.temperatureQualifier = None """ Temperature qualifier. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._temperatureQualifier = None + """ Primitive extension for temperatureQualifier. Type `FHIRPrimitiveExtension` """ self.temperatureRange = None """ Temperature range. Type `Range` (represented as `dict` in JSON). """ + self._temperatureRange = None + """ Primitive extension for temperatureRange. Type `FHIRPrimitiveExtension` """ super(SpecimenDefinitionTypeTestedHandling, self).__init__(jsondict=jsondict, strict=strict) @@ -269,16 +352,21 @@ def elementProperties(self): js = super(SpecimenDefinitionTypeTestedHandling, self).elementProperties() js.extend([ ("instruction", "instruction", str, False, None, False), + ("_instruction", "_instruction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maxDuration", "maxDuration", duration.Duration, False, None, False), + ("_maxDuration", "_maxDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("temperatureQualifier", "temperatureQualifier", codeableconcept.CodeableConcept, False, None, False), + ("_temperatureQualifier", "_temperatureQualifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("temperatureRange", "temperatureRange", range.Range, False, None, False), + ("_temperatureRange", "_temperatureRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import duration from . import fhirreference from . import identifier from . import quantity -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/structuredefinition.py b/fhirclient/models/structuredefinition.py index c0a49d4e..bfab67af 100644 --- a/fhirclient/models/structuredefinition.py +++ b/fhirclient/models/structuredefinition.py @@ -25,111 +25,165 @@ def __init__(self, jsondict=None, strict=True): self.abstract = None """ Whether the structure is abstract. Type `bool`. """ + self._abstract = None + """ Primitive extension for abstract. Type `FHIRPrimitiveExtension` """ self.baseDefinition = None """ Definition that this type is constrained/specialized from. Type `str`. """ + self._baseDefinition = None + """ Primitive extension for baseDefinition. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.context = None """ If an extension, where it can be used in instances. List of `StructureDefinitionContext` items (represented as `dict` in JSON). """ + self._context = None + """ Primitive extension for context. List of `FHIRPrimitiveExtension` """ self.contextInvariant = None """ FHIRPath invariants - when the extension can be used. List of `str` items. """ + self._contextInvariant = None + """ Primitive extension for contextInvariant. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.derivation = None """ specialization | constraint - How relates to base definition. Type `str`. """ + self._derivation = None + """ Primitive extension for derivation. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the structure definition. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.differential = None """ Differential view of the structure. Type `StructureDefinitionDifferential` (represented as `dict` in JSON). """ + self._differential = None + """ Primitive extension for differential. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.fhirVersion = None """ FHIR Version this StructureDefinition targets. Type `str`. """ + self._fhirVersion = None + """ Primitive extension for fhirVersion. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the structure definition. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for structure definition (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.keyword = None """ Assist with indexing and finding. List of `Coding` items (represented as `dict` in JSON). """ + self._keyword = None + """ Primitive extension for keyword. List of `FHIRPrimitiveExtension` """ self.kind = None """ primitive-type | complex-type | resource | logical. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.mapping = None """ External specification that the content is mapped to. List of `StructureDefinitionMapping` items (represented as `dict` in JSON). """ + self._mapping = None + """ Primitive extension for mapping. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this structure definition (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this structure definition is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.snapshot = None """ Snapshot view of the structure. Type `StructureDefinitionSnapshot` (represented as `dict` in JSON). """ + self._snapshot = None + """ Primitive extension for snapshot. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this structure definition (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.type = None """ Type defined or constrained by this structure. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this structure definition, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the structure definition. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(StructureDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -137,32 +191,59 @@ def elementProperties(self): js = super(StructureDefinition, self).elementProperties() js.extend([ ("abstract", "abstract", bool, False, None, True), + ("_abstract", "_abstract", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("baseDefinition", "baseDefinition", str, False, None, False), + ("_baseDefinition", "_baseDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("context", "context", StructureDefinitionContext, True, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contextInvariant", "contextInvariant", str, True, None, False), + ("_contextInvariant", "_contextInvariant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("derivation", "derivation", str, False, None, False), + ("_derivation", "_derivation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("differential", "differential", StructureDefinitionDifferential, False, None, False), + ("_differential", "_differential", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fhirVersion", "fhirVersion", str, False, None, False), + ("_fhirVersion", "_fhirVersion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("keyword", "keyword", coding.Coding, True, None, False), + ("_keyword", "_keyword", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mapping", "mapping", StructureDefinitionMapping, True, None, False), + ("_mapping", "_mapping", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("snapshot", "snapshot", StructureDefinitionSnapshot, False, None, False), + ("_snapshot", "_snapshot", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -189,10 +270,14 @@ def __init__(self, jsondict=None, strict=True): self.expression = None """ Where the extension can be used in instances. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.type = None """ fhirpath | element | extension. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(StructureDefinitionContext, self).__init__(jsondict=jsondict, strict=strict) @@ -200,7 +285,9 @@ def elementProperties(self): js = super(StructureDefinitionContext, self).elementProperties() js.extend([ ("expression", "expression", str, False, None, True), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -225,6 +312,8 @@ def __init__(self, jsondict=None, strict=True): self.element = None """ Definition of elements in the resource (if no StructureDefinition). List of `ElementDefinition` items (represented as `dict` in JSON). """ + self._element = None + """ Primitive extension for element. List of `FHIRPrimitiveExtension` """ super(StructureDefinitionDifferential, self).__init__(jsondict=jsondict, strict=strict) @@ -232,6 +321,7 @@ def elementProperties(self): js = super(StructureDefinitionDifferential, self).elementProperties() js.extend([ ("element", "element", elementdefinition.ElementDefinition, True, None, True), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -255,18 +345,26 @@ def __init__(self, jsondict=None, strict=True): self.comment = None """ Versions, Issues, Scope limitations etc.. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.identity = None """ Internal id when this mapping is used. Type `str`. """ + self._identity = None + """ Primitive extension for identity. Type `FHIRPrimitiveExtension` """ self.name = None """ Names what this mapping refers to. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.uri = None """ Identifies what this mapping refers to. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ super(StructureDefinitionMapping, self).__init__(jsondict=jsondict, strict=strict) @@ -274,9 +372,13 @@ def elementProperties(self): js = super(StructureDefinitionMapping, self).elementProperties() js.extend([ ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identity", "identity", str, False, None, True), + ("_identity", "_identity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, False), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -301,6 +403,8 @@ def __init__(self, jsondict=None, strict=True): self.element = None """ Definition of elements in the resource (if no StructureDefinition). List of `ElementDefinition` items (represented as `dict` in JSON). """ + self._element = None + """ Primitive extension for element. List of `FHIRPrimitiveExtension` """ super(StructureDefinitionSnapshot, self).__init__(jsondict=jsondict, strict=strict) @@ -308,9 +412,11 @@ def elementProperties(self): js = super(StructureDefinitionSnapshot, self).elementProperties() js.extend([ ("element", "element", elementdefinition.ElementDefinition, True, None, True), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding @@ -318,4 +424,4 @@ def elementProperties(self): from . import elementdefinition from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/structuremap.py b/fhirclient/models/structuremap.py index 9c06562a..e3e96e5c 100644 --- a/fhirclient/models/structuremap.py +++ b/fhirclient/models/structuremap.py @@ -22,75 +22,111 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the structure map. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.group = None """ Named sections for reader convenience. List of `StructureMapGroup` items (represented as `dict` in JSON). """ + self._group = None + """ Primitive extension for group. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the structure map. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.import_fhir = None """ Other maps used by this map (canonical URLs). List of `str` items. """ + self._import_fhir = None + """ Primitive extension for import_fhir. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for structure map (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this structure map (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this structure map is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.structure = None """ Structure Definition used by this map. List of `StructureMapStructure` items (represented as `dict` in JSON). """ + self._structure = None + """ Primitive extension for structure. List of `FHIRPrimitiveExtension` """ self.title = None """ Name for this structure map (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this structure map, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the structure map. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(StructureMap, self).__init__(jsondict=jsondict, strict=strict) @@ -98,23 +134,41 @@ def elementProperties(self): js = super(StructureMap, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("group", "group", StructureMapGroup, True, None, True), + ("_group", "_group", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("import_fhir", "import", str, True, None, False), + ("_import_fhir", "_import_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("structure", "structure", StructureMapStructure, True, None, False), + ("_structure", "_structure", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -141,26 +195,38 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ Additional description/explanation for group. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.extends = None """ Another group that this group adds rules to. Type `str`. """ + self._extends = None + """ Primitive extension for extends. Type `FHIRPrimitiveExtension` """ self.input = None """ Named instance provided when invoking the map. List of `StructureMapGroupInput` items (represented as `dict` in JSON). """ + self._input = None + """ Primitive extension for input. List of `FHIRPrimitiveExtension` """ self.name = None """ Human-readable label. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.rule = None """ Transform Rule from source to target. List of `StructureMapGroupRule` items (represented as `dict` in JSON). """ + self._rule = None + """ Primitive extension for rule. List of `FHIRPrimitiveExtension` """ self.typeMode = None """ none | types | type-and-types. Type `str`. """ + self._typeMode = None + """ Primitive extension for typeMode. Type `FHIRPrimitiveExtension` """ super(StructureMapGroup, self).__init__(jsondict=jsondict, strict=strict) @@ -168,11 +234,17 @@ def elementProperties(self): js = super(StructureMapGroup, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("extends", "extends", str, False, None, False), + ("_extends", "_extends", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("input", "input", StructureMapGroupInput, True, None, True), + ("_input", "_input", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rule", "rule", StructureMapGroupRule, True, None, True), + ("_rule", "_rule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("typeMode", "typeMode", str, False, None, True), + ("_typeMode", "_typeMode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -197,18 +269,26 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ Documentation for this instance of data. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.mode = None """ source | target. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this instance of data. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.type = None """ Type for this instance of data. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(StructureMapGroupInput, self).__init__(jsondict=jsondict, strict=strict) @@ -216,9 +296,13 @@ def elementProperties(self): js = super(StructureMapGroupInput, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -240,26 +324,38 @@ def __init__(self, jsondict=None, strict=True): self.dependent = None """ Which other rules to apply in the context of this rule. List of `StructureMapGroupRuleDependent` items (represented as `dict` in JSON). """ + self._dependent = None + """ Primitive extension for dependent. List of `FHIRPrimitiveExtension` """ self.documentation = None """ Documentation for this instance of data. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.name = None """ Name of the rule for internal references. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.rule = None """ Rules contained in this rule. List of `StructureMapGroupRule` items (represented as `dict` in JSON). """ + self._rule = None + """ Primitive extension for rule. List of `FHIRPrimitiveExtension` """ self.source = None """ Source inputs to the mapping. List of `StructureMapGroupRuleSource` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.target = None """ Content to create because of this mapping rule. List of `StructureMapGroupRuleTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(StructureMapGroupRule, self).__init__(jsondict=jsondict, strict=strict) @@ -267,11 +363,17 @@ def elementProperties(self): js = super(StructureMapGroupRule, self).elementProperties() js.extend([ ("dependent", "dependent", StructureMapGroupRuleDependent, True, None, False), + ("_dependent", "_dependent", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("rule", "rule", StructureMapGroupRule, True, None, False), + ("_rule", "_rule", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", StructureMapGroupRuleSource, True, None, True), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("target", "target", StructureMapGroupRuleTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -293,10 +395,14 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Name of a rule or group to apply. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.variable = None """ Variable to pass to the rule or group. List of `str` items. """ + self._variable = None + """ Primitive extension for variable. List of `FHIRPrimitiveExtension` """ super(StructureMapGroupRuleDependent, self).__init__(jsondict=jsondict, strict=strict) @@ -304,7 +410,9 @@ def elementProperties(self): js = super(StructureMapGroupRuleDependent, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variable", "variable", str, True, None, True), + ("_variable", "_variable", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -327,242 +435,362 @@ def __init__(self, jsondict=None, strict=True): """ FHIRPath expression - must be true or the mapping engine throws an error instead of completing. Type `str`. """ + self._check = None + """ Primitive extension for check. Type `FHIRPrimitiveExtension` """ self.condition = None """ FHIRPath expression - must be true or the rule does not apply. Type `str`. """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.context = None """ Type or variable this rule applies to. Type `str`. """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.defaultValueAddress = None """ Default value if no value exists. Type `Address` (represented as `dict` in JSON). """ + self._defaultValueAddress = None + """ Primitive extension for defaultValueAddress. Type `FHIRPrimitiveExtension` """ self.defaultValueAge = None """ Default value if no value exists. Type `Age` (represented as `dict` in JSON). """ + self._defaultValueAge = None + """ Primitive extension for defaultValueAge. Type `FHIRPrimitiveExtension` """ self.defaultValueAnnotation = None """ Default value if no value exists. Type `Annotation` (represented as `dict` in JSON). """ + self._defaultValueAnnotation = None + """ Primitive extension for defaultValueAnnotation. Type `FHIRPrimitiveExtension` """ self.defaultValueAttachment = None """ Default value if no value exists. Type `Attachment` (represented as `dict` in JSON). """ + self._defaultValueAttachment = None + """ Primitive extension for defaultValueAttachment. Type `FHIRPrimitiveExtension` """ self.defaultValueBase64Binary = None """ Default value if no value exists. Type `str`. """ + self._defaultValueBase64Binary = None + """ Primitive extension for defaultValueBase64Binary. Type `FHIRPrimitiveExtension` """ self.defaultValueBoolean = None """ Default value if no value exists. Type `bool`. """ + self._defaultValueBoolean = None + """ Primitive extension for defaultValueBoolean. Type `FHIRPrimitiveExtension` """ self.defaultValueCanonical = None """ Default value if no value exists. Type `str`. """ + self._defaultValueCanonical = None + """ Primitive extension for defaultValueCanonical. Type `FHIRPrimitiveExtension` """ self.defaultValueCode = None """ Default value if no value exists. Type `str`. """ + self._defaultValueCode = None + """ Primitive extension for defaultValueCode. Type `FHIRPrimitiveExtension` """ self.defaultValueCodeableConcept = None """ Default value if no value exists. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._defaultValueCodeableConcept = None + """ Primitive extension for defaultValueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.defaultValueCoding = None """ Default value if no value exists. Type `Coding` (represented as `dict` in JSON). """ + self._defaultValueCoding = None + """ Primitive extension for defaultValueCoding. Type `FHIRPrimitiveExtension` """ self.defaultValueContactDetail = None """ Default value if no value exists. Type `ContactDetail` (represented as `dict` in JSON). """ + self._defaultValueContactDetail = None + """ Primitive extension for defaultValueContactDetail. Type `FHIRPrimitiveExtension` """ self.defaultValueContactPoint = None """ Default value if no value exists. Type `ContactPoint` (represented as `dict` in JSON). """ + self._defaultValueContactPoint = None + """ Primitive extension for defaultValueContactPoint. Type `FHIRPrimitiveExtension` """ self.defaultValueContributor = None """ Default value if no value exists. Type `Contributor` (represented as `dict` in JSON). """ + self._defaultValueContributor = None + """ Primitive extension for defaultValueContributor. Type `FHIRPrimitiveExtension` """ self.defaultValueCount = None """ Default value if no value exists. Type `Count` (represented as `dict` in JSON). """ + self._defaultValueCount = None + """ Primitive extension for defaultValueCount. Type `FHIRPrimitiveExtension` """ self.defaultValueDataRequirement = None """ Default value if no value exists. Type `DataRequirement` (represented as `dict` in JSON). """ + self._defaultValueDataRequirement = None + """ Primitive extension for defaultValueDataRequirement. Type `FHIRPrimitiveExtension` """ self.defaultValueDate = None """ Default value if no value exists. Type `FHIRDate` (represented as `str` in JSON). """ + self._defaultValueDate = None + """ Primitive extension for defaultValueDate. Type `FHIRPrimitiveExtension` """ self.defaultValueDateTime = None """ Default value if no value exists. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._defaultValueDateTime = None + """ Primitive extension for defaultValueDateTime. Type `FHIRPrimitiveExtension` """ self.defaultValueDecimal = None """ Default value if no value exists. Type `float`. """ + self._defaultValueDecimal = None + """ Primitive extension for defaultValueDecimal. Type `FHIRPrimitiveExtension` """ self.defaultValueDistance = None """ Default value if no value exists. Type `Distance` (represented as `dict` in JSON). """ + self._defaultValueDistance = None + """ Primitive extension for defaultValueDistance. Type `FHIRPrimitiveExtension` """ self.defaultValueDosage = None """ Default value if no value exists. Type `Dosage` (represented as `dict` in JSON). """ + self._defaultValueDosage = None + """ Primitive extension for defaultValueDosage. Type `FHIRPrimitiveExtension` """ self.defaultValueDuration = None """ Default value if no value exists. Type `Duration` (represented as `dict` in JSON). """ + self._defaultValueDuration = None + """ Primitive extension for defaultValueDuration. Type `FHIRPrimitiveExtension` """ self.defaultValueExpression = None """ Default value if no value exists. Type `Expression` (represented as `dict` in JSON). """ + self._defaultValueExpression = None + """ Primitive extension for defaultValueExpression. Type `FHIRPrimitiveExtension` """ self.defaultValueHumanName = None """ Default value if no value exists. Type `HumanName` (represented as `dict` in JSON). """ + self._defaultValueHumanName = None + """ Primitive extension for defaultValueHumanName. Type `FHIRPrimitiveExtension` """ self.defaultValueId = None """ Default value if no value exists. Type `str`. """ + self._defaultValueId = None + """ Primitive extension for defaultValueId. Type `FHIRPrimitiveExtension` """ self.defaultValueIdentifier = None """ Default value if no value exists. Type `Identifier` (represented as `dict` in JSON). """ + self._defaultValueIdentifier = None + """ Primitive extension for defaultValueIdentifier. Type `FHIRPrimitiveExtension` """ self.defaultValueInstant = None """ Default value if no value exists. Type `FHIRInstant` (represented as `str` in JSON). """ + self._defaultValueInstant = None + """ Primitive extension for defaultValueInstant. Type `FHIRPrimitiveExtension` """ self.defaultValueInteger = None """ Default value if no value exists. Type `int`. """ + self._defaultValueInteger = None + """ Primitive extension for defaultValueInteger. Type `FHIRPrimitiveExtension` """ self.defaultValueMarkdown = None """ Default value if no value exists. Type `str`. """ + self._defaultValueMarkdown = None + """ Primitive extension for defaultValueMarkdown. Type `FHIRPrimitiveExtension` """ self.defaultValueMeta = None """ Default value if no value exists. Type `Meta` (represented as `dict` in JSON). """ + self._defaultValueMeta = None + """ Primitive extension for defaultValueMeta. Type `FHIRPrimitiveExtension` """ self.defaultValueMoney = None """ Default value if no value exists. Type `Money` (represented as `dict` in JSON). """ + self._defaultValueMoney = None + """ Primitive extension for defaultValueMoney. Type `FHIRPrimitiveExtension` """ self.defaultValueOid = None """ Default value if no value exists. Type `str`. """ + self._defaultValueOid = None + """ Primitive extension for defaultValueOid. Type `FHIRPrimitiveExtension` """ self.defaultValueParameterDefinition = None """ Default value if no value exists. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._defaultValueParameterDefinition = None + """ Primitive extension for defaultValueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.defaultValuePeriod = None """ Default value if no value exists. Type `Period` (represented as `dict` in JSON). """ + self._defaultValuePeriod = None + """ Primitive extension for defaultValuePeriod. Type `FHIRPrimitiveExtension` """ self.defaultValuePositiveInt = None """ Default value if no value exists. Type `int`. """ + self._defaultValuePositiveInt = None + """ Primitive extension for defaultValuePositiveInt. Type `FHIRPrimitiveExtension` """ self.defaultValueQuantity = None """ Default value if no value exists. Type `Quantity` (represented as `dict` in JSON). """ + self._defaultValueQuantity = None + """ Primitive extension for defaultValueQuantity. Type `FHIRPrimitiveExtension` """ self.defaultValueRange = None """ Default value if no value exists. Type `Range` (represented as `dict` in JSON). """ + self._defaultValueRange = None + """ Primitive extension for defaultValueRange. Type `FHIRPrimitiveExtension` """ self.defaultValueRatio = None """ Default value if no value exists. Type `Ratio` (represented as `dict` in JSON). """ + self._defaultValueRatio = None + """ Primitive extension for defaultValueRatio. Type `FHIRPrimitiveExtension` """ self.defaultValueReference = None """ Default value if no value exists. Type `FHIRReference` (represented as `dict` in JSON). """ + self._defaultValueReference = None + """ Primitive extension for defaultValueReference. Type `FHIRPrimitiveExtension` """ self.defaultValueRelatedArtifact = None """ Default value if no value exists. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._defaultValueRelatedArtifact = None + """ Primitive extension for defaultValueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.defaultValueSampledData = None """ Default value if no value exists. Type `SampledData` (represented as `dict` in JSON). """ + self._defaultValueSampledData = None + """ Primitive extension for defaultValueSampledData. Type `FHIRPrimitiveExtension` """ self.defaultValueSignature = None """ Default value if no value exists. Type `Signature` (represented as `dict` in JSON). """ + self._defaultValueSignature = None + """ Primitive extension for defaultValueSignature. Type `FHIRPrimitiveExtension` """ self.defaultValueString = None """ Default value if no value exists. Type `str`. """ + self._defaultValueString = None + """ Primitive extension for defaultValueString. Type `FHIRPrimitiveExtension` """ self.defaultValueTime = None """ Default value if no value exists. Type `FHIRTime` (represented as `str` in JSON). """ + self._defaultValueTime = None + """ Primitive extension for defaultValueTime. Type `FHIRPrimitiveExtension` """ self.defaultValueTiming = None """ Default value if no value exists. Type `Timing` (represented as `dict` in JSON). """ + self._defaultValueTiming = None + """ Primitive extension for defaultValueTiming. Type `FHIRPrimitiveExtension` """ self.defaultValueTriggerDefinition = None """ Default value if no value exists. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._defaultValueTriggerDefinition = None + """ Primitive extension for defaultValueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.defaultValueUnsignedInt = None """ Default value if no value exists. Type `int`. """ + self._defaultValueUnsignedInt = None + """ Primitive extension for defaultValueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.defaultValueUri = None """ Default value if no value exists. Type `str`. """ + self._defaultValueUri = None + """ Primitive extension for defaultValueUri. Type `FHIRPrimitiveExtension` """ self.defaultValueUrl = None """ Default value if no value exists. Type `str`. """ + self._defaultValueUrl = None + """ Primitive extension for defaultValueUrl. Type `FHIRPrimitiveExtension` """ self.defaultValueUsageContext = None """ Default value if no value exists. Type `UsageContext` (represented as `dict` in JSON). """ + self._defaultValueUsageContext = None + """ Primitive extension for defaultValueUsageContext. Type `FHIRPrimitiveExtension` """ self.defaultValueUuid = None """ Default value if no value exists. Type `str`. """ + self._defaultValueUuid = None + """ Primitive extension for defaultValueUuid. Type `FHIRPrimitiveExtension` """ self.element = None """ Optional field for this source. Type `str`. """ + self._element = None + """ Primitive extension for element. Type `FHIRPrimitiveExtension` """ self.listMode = None """ first | not_first | last | not_last | only_one. Type `str`. """ + self._listMode = None + """ Primitive extension for listMode. Type `FHIRPrimitiveExtension` """ self.logMessage = None """ Message to put in log if source exists (FHIRPath). Type `str`. """ + self._logMessage = None + """ Primitive extension for logMessage. Type `FHIRPrimitiveExtension` """ self.max = None """ Specified maximum cardinality (number or *). Type `str`. """ + self._max = None + """ Primitive extension for max. Type `FHIRPrimitiveExtension` """ self.min = None """ Specified minimum cardinality. Type `int`. """ + self._min = None + """ Primitive extension for min. Type `FHIRPrimitiveExtension` """ self.type = None """ Rule only applies if source has this type. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.variable = None """ Named context for field, if a field is specified. Type `str`. """ + self._variable = None + """ Primitive extension for variable. Type `FHIRPrimitiveExtension` """ super(StructureMapGroupRuleSource, self).__init__(jsondict=jsondict, strict=strict) @@ -570,65 +798,125 @@ def elementProperties(self): js = super(StructureMapGroupRuleSource, self).elementProperties() js.extend([ ("check", "check", str, False, None, False), + ("_check", "_check", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("condition", "condition", str, False, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("context", "context", str, False, None, True), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAddress", "defaultValueAddress", address.Address, False, "defaultValue", False), + ("_defaultValueAddress", "_defaultValueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAge", "defaultValueAge", age.Age, False, "defaultValue", False), + ("_defaultValueAge", "_defaultValueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAnnotation", "defaultValueAnnotation", annotation.Annotation, False, "defaultValue", False), + ("_defaultValueAnnotation", "_defaultValueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueAttachment", "defaultValueAttachment", attachment.Attachment, False, "defaultValue", False), + ("_defaultValueAttachment", "_defaultValueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueBase64Binary", "defaultValueBase64Binary", str, False, "defaultValue", False), + ("_defaultValueBase64Binary", "_defaultValueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueBoolean", "defaultValueBoolean", bool, False, "defaultValue", False), + ("_defaultValueBoolean", "_defaultValueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCanonical", "defaultValueCanonical", str, False, "defaultValue", False), + ("_defaultValueCanonical", "_defaultValueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCode", "defaultValueCode", str, False, "defaultValue", False), + ("_defaultValueCode", "_defaultValueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCodeableConcept", "defaultValueCodeableConcept", codeableconcept.CodeableConcept, False, "defaultValue", False), + ("_defaultValueCodeableConcept", "_defaultValueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCoding", "defaultValueCoding", coding.Coding, False, "defaultValue", False), + ("_defaultValueCoding", "_defaultValueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContactDetail", "defaultValueContactDetail", contactdetail.ContactDetail, False, "defaultValue", False), + ("_defaultValueContactDetail", "_defaultValueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContactPoint", "defaultValueContactPoint", contactpoint.ContactPoint, False, "defaultValue", False), + ("_defaultValueContactPoint", "_defaultValueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueContributor", "defaultValueContributor", contributor.Contributor, False, "defaultValue", False), + ("_defaultValueContributor", "_defaultValueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueCount", "defaultValueCount", count.Count, False, "defaultValue", False), + ("_defaultValueCount", "_defaultValueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDataRequirement", "defaultValueDataRequirement", datarequirement.DataRequirement, False, "defaultValue", False), + ("_defaultValueDataRequirement", "_defaultValueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDate", "defaultValueDate", fhirdate.FHIRDate, False, "defaultValue", False), + ("_defaultValueDate", "_defaultValueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDateTime", "defaultValueDateTime", fhirdatetime.FHIRDateTime, False, "defaultValue", False), + ("_defaultValueDateTime", "_defaultValueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDecimal", "defaultValueDecimal", float, False, "defaultValue", False), + ("_defaultValueDecimal", "_defaultValueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDistance", "defaultValueDistance", distance.Distance, False, "defaultValue", False), + ("_defaultValueDistance", "_defaultValueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDosage", "defaultValueDosage", dosage.Dosage, False, "defaultValue", False), + ("_defaultValueDosage", "_defaultValueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueDuration", "defaultValueDuration", duration.Duration, False, "defaultValue", False), + ("_defaultValueDuration", "_defaultValueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueExpression", "defaultValueExpression", expression.Expression, False, "defaultValue", False), + ("_defaultValueExpression", "_defaultValueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueHumanName", "defaultValueHumanName", humanname.HumanName, False, "defaultValue", False), + ("_defaultValueHumanName", "_defaultValueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueId", "defaultValueId", str, False, "defaultValue", False), + ("_defaultValueId", "_defaultValueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueIdentifier", "defaultValueIdentifier", identifier.Identifier, False, "defaultValue", False), + ("_defaultValueIdentifier", "_defaultValueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueInstant", "defaultValueInstant", fhirinstant.FHIRInstant, False, "defaultValue", False), + ("_defaultValueInstant", "_defaultValueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueInteger", "defaultValueInteger", int, False, "defaultValue", False), + ("_defaultValueInteger", "_defaultValueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMarkdown", "defaultValueMarkdown", str, False, "defaultValue", False), + ("_defaultValueMarkdown", "_defaultValueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMeta", "defaultValueMeta", meta.Meta, False, "defaultValue", False), + ("_defaultValueMeta", "_defaultValueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueMoney", "defaultValueMoney", money.Money, False, "defaultValue", False), + ("_defaultValueMoney", "_defaultValueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueOid", "defaultValueOid", str, False, "defaultValue", False), + ("_defaultValueOid", "_defaultValueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueParameterDefinition", "defaultValueParameterDefinition", parameterdefinition.ParameterDefinition, False, "defaultValue", False), + ("_defaultValueParameterDefinition", "_defaultValueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValuePeriod", "defaultValuePeriod", period.Period, False, "defaultValue", False), + ("_defaultValuePeriod", "_defaultValuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValuePositiveInt", "defaultValuePositiveInt", int, False, "defaultValue", False), + ("_defaultValuePositiveInt", "_defaultValuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueQuantity", "defaultValueQuantity", quantity.Quantity, False, "defaultValue", False), + ("_defaultValueQuantity", "_defaultValueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRange", "defaultValueRange", range.Range, False, "defaultValue", False), + ("_defaultValueRange", "_defaultValueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRatio", "defaultValueRatio", ratio.Ratio, False, "defaultValue", False), + ("_defaultValueRatio", "_defaultValueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueReference", "defaultValueReference", fhirreference.FHIRReference, False, "defaultValue", False), + ("_defaultValueReference", "_defaultValueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueRelatedArtifact", "defaultValueRelatedArtifact", relatedartifact.RelatedArtifact, False, "defaultValue", False), + ("_defaultValueRelatedArtifact", "_defaultValueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueSampledData", "defaultValueSampledData", sampleddata.SampledData, False, "defaultValue", False), + ("_defaultValueSampledData", "_defaultValueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueSignature", "defaultValueSignature", signature.Signature, False, "defaultValue", False), + ("_defaultValueSignature", "_defaultValueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueString", "defaultValueString", str, False, "defaultValue", False), + ("_defaultValueString", "_defaultValueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTime", "defaultValueTime", fhirtime.FHIRTime, False, "defaultValue", False), + ("_defaultValueTime", "_defaultValueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTiming", "defaultValueTiming", timing.Timing, False, "defaultValue", False), + ("_defaultValueTiming", "_defaultValueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueTriggerDefinition", "defaultValueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "defaultValue", False), + ("_defaultValueTriggerDefinition", "_defaultValueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUnsignedInt", "defaultValueUnsignedInt", int, False, "defaultValue", False), + ("_defaultValueUnsignedInt", "_defaultValueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUri", "defaultValueUri", str, False, "defaultValue", False), + ("_defaultValueUri", "_defaultValueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUrl", "defaultValueUrl", str, False, "defaultValue", False), + ("_defaultValueUrl", "_defaultValueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUsageContext", "defaultValueUsageContext", usagecontext.UsageContext, False, "defaultValue", False), + ("_defaultValueUsageContext", "_defaultValueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("defaultValueUuid", "defaultValueUuid", str, False, "defaultValue", False), + ("_defaultValueUuid", "_defaultValueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("element", "element", str, False, None, False), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("listMode", "listMode", str, False, None, False), + ("_listMode", "_listMode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("logMessage", "logMessage", str, False, None, False), + ("_logMessage", "_logMessage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("max", "max", str, False, None, False), + ("_max", "_max", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("min", "min", int, False, None, False), + ("_min", "_min", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variable", "variable", str, False, None, False), + ("_variable", "_variable", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -650,34 +938,50 @@ def __init__(self, jsondict=None, strict=True): self.context = None """ Type or variable this rule applies to. Type `str`. """ + self._context = None + """ Primitive extension for context. Type `FHIRPrimitiveExtension` """ self.contextType = None """ type | variable. Type `str`. """ + self._contextType = None + """ Primitive extension for contextType. Type `FHIRPrimitiveExtension` """ self.element = None """ Field to create in the context. Type `str`. """ + self._element = None + """ Primitive extension for element. Type `FHIRPrimitiveExtension` """ self.listMode = None """ first | share | last | collate. List of `str` items. """ + self._listMode = None + """ Primitive extension for listMode. List of `FHIRPrimitiveExtension` """ self.listRuleId = None """ Internal rule reference for shared list items. Type `str`. """ + self._listRuleId = None + """ Primitive extension for listRuleId. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Parameters to the transform. List of `StructureMapGroupRuleTargetParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.transform = None """ create | copy +. Type `str`. """ + self._transform = None + """ Primitive extension for transform. Type `FHIRPrimitiveExtension` """ self.variable = None """ Named context for field, if desired, and a field is specified. Type `str`. """ + self._variable = None + """ Primitive extension for variable. Type `FHIRPrimitiveExtension` """ super(StructureMapGroupRuleTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -685,13 +989,21 @@ def elementProperties(self): js = super(StructureMapGroupRuleTarget, self).elementProperties() js.extend([ ("context", "context", str, False, None, False), + ("_context", "_context", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contextType", "contextType", str, False, None, False), + ("_contextType", "_contextType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("element", "element", str, False, None, False), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("listMode", "listMode", str, True, None, False), + ("_listMode", "_listMode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("listRuleId", "listRuleId", str, False, None, False), + ("_listRuleId", "_listRuleId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", StructureMapGroupRuleTargetParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("transform", "transform", str, False, None, False), + ("_transform", "_transform", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("variable", "variable", str, False, None, False), + ("_variable", "_variable", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -713,22 +1025,32 @@ def __init__(self, jsondict=None, strict=True): self.valueBoolean = None """ Parameter value - variable or literal. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Parameter value - variable or literal. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueId = None """ Parameter value - variable or literal. Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Parameter value - variable or literal. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Parameter value - variable or literal. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ super(StructureMapGroupRuleTargetParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -736,10 +1058,15 @@ def elementProperties(self): js = super(StructureMapGroupRuleTargetParameter, self).elementProperties() js.extend([ ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", True), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -764,18 +1091,26 @@ def __init__(self, jsondict=None, strict=True): self.alias = None """ Name for type in this map. Type `str`. """ + self._alias = None + """ Primitive extension for alias. Type `FHIRPrimitiveExtension` """ self.documentation = None """ Documentation on use of structure. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.mode = None """ source | queried | target | produced. Type `str`. """ + self._mode = None + """ Primitive extension for mode. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical reference to structure definition. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(StructureMapStructure, self).__init__(jsondict=jsondict, strict=strict) @@ -783,12 +1118,17 @@ def elementProperties(self): js = super(StructureMapStructure, self).elementProperties() js.extend([ ("alias", "alias", str, False, None, False), + ("_alias", "_alias", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("mode", "mode", str, False, None, True), + ("_mode", "_mode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import age @@ -824,4 +1164,4 @@ def elementProperties(self): from . import signature from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/subscription.py b/fhirclient/models/subscription.py index e3d1e14c..21234fb7 100644 --- a/fhirclient/models/subscription.py +++ b/fhirclient/models/subscription.py @@ -27,30 +27,44 @@ def __init__(self, jsondict=None, strict=True): self.channel = None """ The channel on which to report matches to the criteria. Type `SubscriptionChannel` (represented as `dict` in JSON). """ + self._channel = None + """ Primitive extension for channel. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for source (e.g. troubleshooting). List of `ContactPoint` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.criteria = None """ Rule for server push. Type `str`. """ + self._criteria = None + """ Primitive extension for criteria. Type `FHIRPrimitiveExtension` """ self.end = None """ When to automatically delete the subscription. Type `FHIRInstant` (represented as `str` in JSON). """ + self._end = None + """ Primitive extension for end. Type `FHIRPrimitiveExtension` """ self.error = None """ Latest error note. Type `str`. """ + self._error = None + """ Primitive extension for error. Type `FHIRPrimitiveExtension` """ self.reason = None """ Description of why this subscription was created. Type `str`. """ + self._reason = None + """ Primitive extension for reason. Type `FHIRPrimitiveExtension` """ self.status = None """ requested | active | error | off. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Subscription, self).__init__(jsondict=jsondict, strict=strict) @@ -58,12 +72,19 @@ def elementProperties(self): js = super(Subscription, self).elementProperties() js.extend([ ("channel", "channel", SubscriptionChannel, False, None, True), + ("_channel", "_channel", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactpoint.ContactPoint, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("criteria", "criteria", str, False, None, True), + ("_criteria", "_criteria", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("end", "end", fhirinstant.FHIRInstant, False, None, False), + ("_end", "_end", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("error", "error", str, False, None, False), + ("_error", "_error", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reason", "reason", str, False, None, True), + ("_reason", "_reason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -90,18 +111,26 @@ def __init__(self, jsondict=None, strict=True): self.endpoint = None """ Where the channel points to. Type `str`. """ + self._endpoint = None + """ Primitive extension for endpoint. Type `FHIRPrimitiveExtension` """ self.header = None """ Usage depends on the channel type. List of `str` items. """ + self._header = None + """ Primitive extension for header. List of `FHIRPrimitiveExtension` """ self.payload = None """ MIME type to send, or omit for no payload. Type `str`. """ + self._payload = None + """ Primitive extension for payload. Type `FHIRPrimitiveExtension` """ self.type = None """ rest-hook | websocket | email | sms | message. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubscriptionChannel, self).__init__(jsondict=jsondict, strict=strict) @@ -109,12 +138,17 @@ def elementProperties(self): js = super(SubscriptionChannel, self).elementProperties() js.extend([ ("endpoint", "endpoint", str, False, None, False), + ("_endpoint", "_endpoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("header", "header", str, True, None, False), + ("_header", "_header", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("payload", "payload", str, False, None, False), + ("_payload", "_payload", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import contactpoint -from . import fhirinstant +from . import fhirinstant \ No newline at end of file diff --git a/fhirclient/models/substance.py b/fhirclient/models/substance.py index 9e5d9884..e1e8ba27 100644 --- a/fhirclient/models/substance.py +++ b/fhirclient/models/substance.py @@ -21,30 +21,44 @@ def __init__(self, jsondict=None, strict=True): self.category = None """ What class/type of substance this is. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. List of `FHIRPrimitiveExtension` """ self.code = None """ What substance this is. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ Textual description of the substance, comments. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Unique identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.ingredient = None """ Composition information about the substance. List of `SubstanceIngredient` items (represented as `dict` in JSON). """ + self._ingredient = None + """ Primitive extension for ingredient. List of `FHIRPrimitiveExtension` """ self.instance = None """ If this describes a specific package/container of the substance. List of `SubstanceInstance` items (represented as `dict` in JSON). """ + self._instance = None + """ Primitive extension for instance. List of `FHIRPrimitiveExtension` """ self.status = None """ active | inactive | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(Substance, self).__init__(jsondict=jsondict, strict=strict) @@ -52,12 +66,19 @@ def elementProperties(self): js = super(Substance, self).elementProperties() js.extend([ ("category", "category", codeableconcept.CodeableConcept, True, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("ingredient", "ingredient", SubstanceIngredient, True, None, False), + ("_ingredient", "_ingredient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instance", "instance", SubstanceInstance, True, None, False), + ("_instance", "_instance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -83,14 +104,20 @@ def __init__(self, jsondict=None, strict=True): self.quantity = None """ Optional amount (concentration). Type `Ratio` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.substanceCodeableConcept = None """ A component of the substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substanceCodeableConcept = None + """ Primitive extension for substanceCodeableConcept. Type `FHIRPrimitiveExtension` """ self.substanceReference = None """ A component of the substance. Type `FHIRReference` (represented as `dict` in JSON). """ + self._substanceReference = None + """ Primitive extension for substanceReference. Type `FHIRPrimitiveExtension` """ super(SubstanceIngredient, self).__init__(jsondict=jsondict, strict=strict) @@ -98,8 +125,11 @@ def elementProperties(self): js = super(SubstanceIngredient, self).elementProperties() js.extend([ ("quantity", "quantity", ratio.Ratio, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substanceCodeableConcept", "substanceCodeableConcept", codeableconcept.CodeableConcept, False, "substance", True), + ("_substanceCodeableConcept", "_substanceCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substanceReference", "substanceReference", fhirreference.FHIRReference, False, "substance", True), + ("_substanceReference", "_substanceReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -124,14 +154,20 @@ def __init__(self, jsondict=None, strict=True): self.expiry = None """ When no longer valid to use. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._expiry = None + """ Primitive extension for expiry. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier of the package/container. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Amount of substance in the package. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ super(SubstanceInstance, self).__init__(jsondict=jsondict, strict=strict) @@ -139,15 +175,19 @@ def elementProperties(self): js = super(SubstanceInstance, self).elementProperties() js.extend([ ("expiry", "expiry", fhirdatetime.FHIRDateTime, False, None, False), + ("_expiry", "_expiry", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier from . import quantity -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/substanceamount.py b/fhirclient/models/substanceamount.py index be47f26b..732fc05c 100644 --- a/fhirclient/models/substanceamount.py +++ b/fhirclient/models/substanceamount.py @@ -30,6 +30,8 @@ def __init__(self, jsondict=None, strict=True): only a single definite value for a given element is given, it would be captured in this field. Type `Quantity` (represented as `dict` in JSON). """ + self._amountQuantity = None + """ Primitive extension for amountQuantity. Type `FHIRPrimitiveExtension` """ self.amountRange = None """ Used to capture quantitative values for a variety of elements. If @@ -37,6 +39,8 @@ def __init__(self, jsondict=None, strict=True): only a single definite value for a given element is given, it would be captured in this field. Type `Range` (represented as `dict` in JSON). """ + self._amountRange = None + """ Primitive extension for amountRange. Type `FHIRPrimitiveExtension` """ self.amountString = None """ Used to capture quantitative values for a variety of elements. If @@ -44,10 +48,14 @@ def __init__(self, jsondict=None, strict=True): only a single definite value for a given element is given, it would be captured in this field. Type `str`. """ + self._amountString = None + """ Primitive extension for amountString. Type `FHIRPrimitiveExtension` """ self.amountText = None """ A textual comment on a numeric value. Type `str`. """ + self._amountText = None + """ Primitive extension for amountText. Type `FHIRPrimitiveExtension` """ self.amountType = None """ Most elements that require a quantitative value will also have a @@ -59,10 +67,14 @@ def __init__(self, jsondict=None, strict=True): effort should be made to use same the amount type for all related definitional elements. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._amountType = None + """ Primitive extension for amountType. Type `FHIRPrimitiveExtension` """ self.referenceRange = None """ Reference range of possible or expected values. Type `SubstanceAmountReferenceRange` (represented as `dict` in JSON). """ + self._referenceRange = None + """ Primitive extension for referenceRange. Type `FHIRPrimitiveExtension` """ super(SubstanceAmount, self).__init__(jsondict=jsondict, strict=strict) @@ -70,11 +82,17 @@ def elementProperties(self): js = super(SubstanceAmount, self).elementProperties() js.extend([ ("amountQuantity", "amountQuantity", quantity.Quantity, False, "amount", False), + ("_amountQuantity", "_amountQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountRange", "amountRange", range.Range, False, "amount", False), + ("_amountRange", "_amountRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountString", "amountString", str, False, "amount", False), + ("_amountString", "_amountString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountText", "amountText", str, False, None, False), + ("_amountText", "_amountText", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountType", "amountType", codeableconcept.CodeableConcept, False, None, False), + ("_amountType", "_amountType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceRange", "referenceRange", SubstanceAmountReferenceRange, False, None, False), + ("_referenceRange", "_referenceRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -98,10 +116,14 @@ def __init__(self, jsondict=None, strict=True): self.highLimit = None """ Upper limit possible or expected. Type `Quantity` (represented as `dict` in JSON). """ + self._highLimit = None + """ Primitive extension for highLimit. Type `FHIRPrimitiveExtension` """ self.lowLimit = None """ Lower limit possible or expected. Type `Quantity` (represented as `dict` in JSON). """ + self._lowLimit = None + """ Primitive extension for lowLimit. Type `FHIRPrimitiveExtension` """ super(SubstanceAmountReferenceRange, self).__init__(jsondict=jsondict, strict=strict) @@ -109,11 +131,14 @@ def elementProperties(self): js = super(SubstanceAmountReferenceRange, self).elementProperties() js.extend([ ("highLimit", "highLimit", quantity.Quantity, False, None, False), + ("_highLimit", "_highLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lowLimit", "lowLimit", quantity.Quantity, False, None, False), + ("_lowLimit", "_lowLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import quantity -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/substancenucleicacid.py b/fhirclient/models/substancenucleicacid.py index 1dde5920..ac82faaf 100644 --- a/fhirclient/models/substancenucleicacid.py +++ b/fhirclient/models/substancenucleicacid.py @@ -28,6 +28,8 @@ def __init__(self, jsondict=None, strict=True): in increasing order. The underscore “” shall be used as separator as follows: “Subunitnumber Residue”. Type `str`. """ + self._areaOfHybridisation = None + """ Primitive extension for areaOfHybridisation. Type `FHIRPrimitiveExtension` """ self.numberOfSubunits = None """ The number of linear sequences of nucleotides linked through @@ -36,21 +38,29 @@ def __init__(self, jsondict=None, strict=True): Watson-Crick base pairing. NOTE: If not specified in the reference source, the assumption is that there is 1 subunit. Type `int`. """ + self._numberOfSubunits = None + """ Primitive extension for numberOfSubunits. Type `FHIRPrimitiveExtension` """ self.oligoNucleotideType = None """ (TBC). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._oligoNucleotideType = None + """ Primitive extension for oligoNucleotideType. Type `FHIRPrimitiveExtension` """ self.sequenceType = None """ The type of the sequence shall be specified based on a controlled vocabulary. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sequenceType = None + """ Primitive extension for sequenceType. Type `FHIRPrimitiveExtension` """ self.subunit = None """ Subunits are listed in order of decreasing length; sequences of the same length will be ordered by molecular weight; subunits that have identical sequences will be repeated multiple times. List of `SubstanceNucleicAcidSubunit` items (represented as `dict` in JSON). """ + self._subunit = None + """ Primitive extension for subunit. List of `FHIRPrimitiveExtension` """ super(SubstanceNucleicAcid, self).__init__(jsondict=jsondict, strict=strict) @@ -58,10 +68,15 @@ def elementProperties(self): js = super(SubstanceNucleicAcid, self).elementProperties() js.extend([ ("areaOfHybridisation", "areaOfHybridisation", str, False, None, False), + ("_areaOfHybridisation", "_areaOfHybridisation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfSubunits", "numberOfSubunits", int, False, None, False), + ("_numberOfSubunits", "_numberOfSubunits", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("oligoNucleotideType", "oligoNucleotideType", codeableconcept.CodeableConcept, False, None, False), + ("_oligoNucleotideType", "_oligoNucleotideType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequenceType", "sequenceType", codeableconcept.CodeableConcept, False, None, False), + ("_sequenceType", "_sequenceType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subunit", "subunit", SubstanceNucleicAcidSubunit, True, None, False), + ("_subunit", "_subunit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -91,14 +106,20 @@ def __init__(self, jsondict=None, strict=True): first position in the sequence. A separate representation would be redundant. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._fivePrime = None + """ Primitive extension for fivePrime. Type `FHIRPrimitiveExtension` """ self.length = None """ The length of the sequence shall be captured. Type `int`. """ + self._length = None + """ Primitive extension for length. Type `FHIRPrimitiveExtension` """ self.linkage = None """ The linkages between sugar residues will also be captured. List of `SubstanceNucleicAcidSubunitLinkage` items (represented as `dict` in JSON). """ + self._linkage = None + """ Primitive extension for linkage. List of `FHIRPrimitiveExtension` """ self.sequence = None """ Actual nucleotide sequence notation from 5' to 3' end using @@ -106,10 +127,14 @@ def __init__(self, jsondict=None, strict=True): sugar and type of phosphate or non-phosphate linkage should also be captured. Type `str`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.sequenceAttachment = None """ (TBC). Type `Attachment` (represented as `dict` in JSON). """ + self._sequenceAttachment = None + """ Primitive extension for sequenceAttachment. Type `FHIRPrimitiveExtension` """ self.subunit = None """ Index of linear sequences of nucleic acids in order of decreasing @@ -117,10 +142,14 @@ def __init__(self, jsondict=None, strict=True): weight. Subunits that have identical sequences will be repeated and have sequential subscripts. Type `int`. """ + self._subunit = None + """ Primitive extension for subunit. Type `FHIRPrimitiveExtension` """ self.sugar = None """ 5.3.6.8.1 Sugar ID (Mandatory). List of `SubstanceNucleicAcidSubunitSugar` items (represented as `dict` in JSON). """ + self._sugar = None + """ Primitive extension for sugar. List of `FHIRPrimitiveExtension` """ self.threePrime = None """ The nucleotide present at the 3’ terminal shall be specified based @@ -129,6 +158,8 @@ def __init__(self, jsondict=None, strict=True): last position in the sequence. A separate representation would be redundant. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._threePrime = None + """ Primitive extension for threePrime. Type `FHIRPrimitiveExtension` """ super(SubstanceNucleicAcidSubunit, self).__init__(jsondict=jsondict, strict=strict) @@ -136,13 +167,21 @@ def elementProperties(self): js = super(SubstanceNucleicAcidSubunit, self).elementProperties() js.extend([ ("fivePrime", "fivePrime", codeableconcept.CodeableConcept, False, None, False), + ("_fivePrime", "_fivePrime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("length", "length", int, False, None, False), + ("_length", "_length", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("linkage", "linkage", SubstanceNucleicAcidSubunitLinkage, True, None, False), + ("_linkage", "_linkage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sequence", "sequence", str, False, None, False), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequenceAttachment", "sequenceAttachment", attachment.Attachment, False, None, False), + ("_sequenceAttachment", "_sequenceAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subunit", "subunit", int, False, None, False), + ("_subunit", "_subunit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sugar", "sugar", SubstanceNucleicAcidSubunitSugar, True, None, False), + ("_sugar", "_sugar", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("threePrime", "threePrime", codeableconcept.CodeableConcept, False, None, False), + ("_threePrime", "_threePrime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -169,19 +208,27 @@ def __init__(self, jsondict=None, strict=True): assumed to be 3’-5’. If the linkage is either 3’-3’ or 5’-5’ this should be specified. Type `str`. """ + self._connectivity = None + """ Primitive extension for connectivity. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Each linkage will be registered as a fragment and have an ID. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.name = None """ Each linkage will be registered as a fragment and have at least one name. A single name shall be assigned to each linkage. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.residueSite = None """ Residues shall be captured as described in 5.3.6.8.3. Type `str`. """ + self._residueSite = None + """ Primitive extension for residueSite. Type `FHIRPrimitiveExtension` """ super(SubstanceNucleicAcidSubunitLinkage, self).__init__(jsondict=jsondict, strict=strict) @@ -189,9 +236,13 @@ def elementProperties(self): js = super(SubstanceNucleicAcidSubunitLinkage, self).elementProperties() js.extend([ ("connectivity", "connectivity", str, False, None, False), + ("_connectivity", "_connectivity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("residueSite", "residueSite", str, False, None, False), + ("_residueSite", "_residueSite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -214,17 +265,23 @@ def __init__(self, jsondict=None, strict=True): """ The Substance ID of the sugar or sugar-like component that make up the nucleotide. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.name = None """ The name of the sugar or sugar-like component that make up the nucleotide. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.residueSite = None """ The residues that contain a given sugar will be captured. The order of given residues will be captured in the 5‘-3‘direction consistent with the base sequences listed above. Type `str`. """ + self._residueSite = None + """ Primitive extension for residueSite. Type `FHIRPrimitiveExtension` """ super(SubstanceNucleicAcidSubunitSugar, self).__init__(jsondict=jsondict, strict=strict) @@ -232,12 +289,16 @@ def elementProperties(self): js = super(SubstanceNucleicAcidSubunitSugar, self).elementProperties() js.extend([ ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("residueSite", "residueSite", str, False, None, False), + ("_residueSite", "_residueSite", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/substancepolymer.py b/fhirclient/models/substancepolymer.py index 9707bf3a..cb99b7e8 100644 --- a/fhirclient/models/substancepolymer.py +++ b/fhirclient/models/substancepolymer.py @@ -21,26 +21,38 @@ def __init__(self, jsondict=None, strict=True): self.class_fhir = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. Type `FHIRPrimitiveExtension` """ self.copolymerConnectivity = None """ Todo. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._copolymerConnectivity = None + """ Primitive extension for copolymerConnectivity. List of `FHIRPrimitiveExtension` """ self.geometry = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._geometry = None + """ Primitive extension for geometry. Type `FHIRPrimitiveExtension` """ self.modification = None """ Todo. List of `str` items. """ + self._modification = None + """ Primitive extension for modification. List of `FHIRPrimitiveExtension` """ self.monomerSet = None """ Todo. List of `SubstancePolymerMonomerSet` items (represented as `dict` in JSON). """ + self._monomerSet = None + """ Primitive extension for monomerSet. List of `FHIRPrimitiveExtension` """ self.repeat = None """ Todo. List of `SubstancePolymerRepeat` items (represented as `dict` in JSON). """ + self._repeat = None + """ Primitive extension for repeat. List of `FHIRPrimitiveExtension` """ super(SubstancePolymer, self).__init__(jsondict=jsondict, strict=strict) @@ -48,11 +60,17 @@ def elementProperties(self): js = super(SubstancePolymer, self).elementProperties() js.extend([ ("class_fhir", "class", codeableconcept.CodeableConcept, False, None, False), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("copolymerConnectivity", "copolymerConnectivity", codeableconcept.CodeableConcept, True, None, False), + ("_copolymerConnectivity", "_copolymerConnectivity", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("geometry", "geometry", codeableconcept.CodeableConcept, False, None, False), + ("_geometry", "_geometry", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("modification", "modification", str, True, None, False), + ("_modification", "_modification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("monomerSet", "monomerSet", SubstancePolymerMonomerSet, True, None, False), + ("_monomerSet", "_monomerSet", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("repeat", "repeat", SubstancePolymerRepeat, True, None, False), + ("_repeat", "_repeat", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -76,10 +94,14 @@ def __init__(self, jsondict=None, strict=True): self.ratioType = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._ratioType = None + """ Primitive extension for ratioType. Type `FHIRPrimitiveExtension` """ self.startingMaterial = None """ Todo. List of `SubstancePolymerMonomerSetStartingMaterial` items (represented as `dict` in JSON). """ + self._startingMaterial = None + """ Primitive extension for startingMaterial. List of `FHIRPrimitiveExtension` """ super(SubstancePolymerMonomerSet, self).__init__(jsondict=jsondict, strict=strict) @@ -87,7 +109,9 @@ def elementProperties(self): js = super(SubstancePolymerMonomerSet, self).elementProperties() js.extend([ ("ratioType", "ratioType", codeableconcept.CodeableConcept, False, None, False), + ("_ratioType", "_ratioType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("startingMaterial", "startingMaterial", SubstancePolymerMonomerSetStartingMaterial, True, None, False), + ("_startingMaterial", "_startingMaterial", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -109,18 +133,26 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Todo. Type `SubstanceAmount` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.isDefining = None """ Todo. Type `bool`. """ + self._isDefining = None + """ Primitive extension for isDefining. Type `FHIRPrimitiveExtension` """ self.material = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._material = None + """ Primitive extension for material. Type `FHIRPrimitiveExtension` """ self.type = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstancePolymerMonomerSetStartingMaterial, self).__init__(jsondict=jsondict, strict=strict) @@ -128,9 +160,13 @@ def elementProperties(self): js = super(SubstancePolymerMonomerSetStartingMaterial, self).elementProperties() js.extend([ ("amount", "amount", substanceamount.SubstanceAmount, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("isDefining", "isDefining", bool, False, None, False), + ("_isDefining", "_isDefining", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("material", "material", codeableconcept.CodeableConcept, False, None, False), + ("_material", "_material", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -152,18 +188,26 @@ def __init__(self, jsondict=None, strict=True): self.averageMolecularFormula = None """ Todo. Type `str`. """ + self._averageMolecularFormula = None + """ Primitive extension for averageMolecularFormula. Type `FHIRPrimitiveExtension` """ self.numberOfUnits = None """ Todo. Type `int`. """ + self._numberOfUnits = None + """ Primitive extension for numberOfUnits. Type `FHIRPrimitiveExtension` """ self.repeatUnit = None """ Todo. List of `SubstancePolymerRepeatRepeatUnit` items (represented as `dict` in JSON). """ + self._repeatUnit = None + """ Primitive extension for repeatUnit. List of `FHIRPrimitiveExtension` """ self.repeatUnitAmountType = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._repeatUnitAmountType = None + """ Primitive extension for repeatUnitAmountType. Type `FHIRPrimitiveExtension` """ super(SubstancePolymerRepeat, self).__init__(jsondict=jsondict, strict=strict) @@ -171,9 +215,13 @@ def elementProperties(self): js = super(SubstancePolymerRepeat, self).elementProperties() js.extend([ ("averageMolecularFormula", "averageMolecularFormula", str, False, None, False), + ("_averageMolecularFormula", "_averageMolecularFormula", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("numberOfUnits", "numberOfUnits", int, False, None, False), + ("_numberOfUnits", "_numberOfUnits", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("repeatUnit", "repeatUnit", SubstancePolymerRepeatRepeatUnit, True, None, False), + ("_repeatUnit", "_repeatUnit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("repeatUnitAmountType", "repeatUnitAmountType", codeableconcept.CodeableConcept, False, None, False), + ("_repeatUnitAmountType", "_repeatUnitAmountType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -195,22 +243,32 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Todo. Type `SubstanceAmount` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.degreeOfPolymerisation = None """ Todo. List of `SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisation` items (represented as `dict` in JSON). """ + self._degreeOfPolymerisation = None + """ Primitive extension for degreeOfPolymerisation. List of `FHIRPrimitiveExtension` """ self.orientationOfPolymerisation = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._orientationOfPolymerisation = None + """ Primitive extension for orientationOfPolymerisation. Type `FHIRPrimitiveExtension` """ self.repeatUnit = None """ Todo. Type `str`. """ + self._repeatUnit = None + """ Primitive extension for repeatUnit. Type `FHIRPrimitiveExtension` """ self.structuralRepresentation = None """ Todo. List of `SubstancePolymerRepeatRepeatUnitStructuralRepresentation` items (represented as `dict` in JSON). """ + self._structuralRepresentation = None + """ Primitive extension for structuralRepresentation. List of `FHIRPrimitiveExtension` """ super(SubstancePolymerRepeatRepeatUnit, self).__init__(jsondict=jsondict, strict=strict) @@ -218,10 +276,15 @@ def elementProperties(self): js = super(SubstancePolymerRepeatRepeatUnit, self).elementProperties() js.extend([ ("amount", "amount", substanceamount.SubstanceAmount, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("degreeOfPolymerisation", "degreeOfPolymerisation", SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisation, True, None, False), + ("_degreeOfPolymerisation", "_degreeOfPolymerisation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("orientationOfPolymerisation", "orientationOfPolymerisation", codeableconcept.CodeableConcept, False, None, False), + ("_orientationOfPolymerisation", "_orientationOfPolymerisation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("repeatUnit", "repeatUnit", str, False, None, False), + ("_repeatUnit", "_repeatUnit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("structuralRepresentation", "structuralRepresentation", SubstancePolymerRepeatRepeatUnitStructuralRepresentation, True, None, False), + ("_structuralRepresentation", "_structuralRepresentation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -243,10 +306,14 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Todo. Type `SubstanceAmount` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.degree = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._degree = None + """ Primitive extension for degree. Type `FHIRPrimitiveExtension` """ super(SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisation, self).__init__(jsondict=jsondict, strict=strict) @@ -254,7 +321,9 @@ def elementProperties(self): js = super(SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisation, self).elementProperties() js.extend([ ("amount", "amount", substanceamount.SubstanceAmount, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("degree", "degree", codeableconcept.CodeableConcept, False, None, False), + ("_degree", "_degree", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -276,14 +345,20 @@ def __init__(self, jsondict=None, strict=True): self.attachment = None """ Todo. Type `Attachment` (represented as `dict` in JSON). """ + self._attachment = None + """ Primitive extension for attachment. Type `FHIRPrimitiveExtension` """ self.representation = None """ Todo. Type `str`. """ + self._representation = None + """ Primitive extension for representation. Type `FHIRPrimitiveExtension` """ self.type = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstancePolymerRepeatRepeatUnitStructuralRepresentation, self).__init__(jsondict=jsondict, strict=strict) @@ -291,12 +366,16 @@ def elementProperties(self): js = super(SubstancePolymerRepeatRepeatUnitStructuralRepresentation, self).elementProperties() js.extend([ ("attachment", "attachment", attachment.Attachment, False, None, False), + ("_attachment", "_attachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("representation", "representation", str, False, None, False), + ("_representation", "_representation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept -from . import substanceamount +from . import substanceamount \ No newline at end of file diff --git a/fhirclient/models/substanceprotein.py b/fhirclient/models/substanceprotein.py index 90c4bc8d..632e9cad 100644 --- a/fhirclient/models/substanceprotein.py +++ b/fhirclient/models/substanceprotein.py @@ -34,6 +34,8 @@ def __init__(self, jsondict=None, strict=True): The disulfide linkage positions shall actually contain the amino acid Cysteine at the respective positions. List of `str` items. """ + self._disulfideLinkage = None + """ Primitive extension for disulfideLinkage. List of `FHIRPrimitiveExtension` """ self.numberOfSubunits = None """ Number of linear sequences of amino acids linked through peptide @@ -41,12 +43,16 @@ def __init__(self, jsondict=None, strict=True): shall be described. It is possible that the number of subunits can be variable. Type `int`. """ + self._numberOfSubunits = None + """ Primitive extension for numberOfSubunits. Type `FHIRPrimitiveExtension` """ self.sequenceType = None """ The SubstanceProtein descriptive elements will only be used when a complete or partial amino acid sequence is available or derivable from a nucleic acid sequence. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sequenceType = None + """ Primitive extension for sequenceType. Type `FHIRPrimitiveExtension` """ self.subunit = None """ This subclause refers to the description of each subunit @@ -59,6 +65,8 @@ def __init__(self, jsondict=None, strict=True): decreasing molecular weight; subunits that have identical sequences will be repeated multiple times. List of `SubstanceProteinSubunit` items (represented as `dict` in JSON). """ + self._subunit = None + """ Primitive extension for subunit. List of `FHIRPrimitiveExtension` """ super(SubstanceProtein, self).__init__(jsondict=jsondict, strict=strict) @@ -66,9 +74,13 @@ def elementProperties(self): js = super(SubstanceProtein, self).elementProperties() js.extend([ ("disulfideLinkage", "disulfideLinkage", str, True, None, False), + ("_disulfideLinkage", "_disulfideLinkage", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("numberOfSubunits", "numberOfSubunits", int, False, None, False), + ("_numberOfSubunits", "_numberOfSubunits", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequenceType", "sequenceType", codeableconcept.CodeableConcept, False, None, False), + ("_sequenceType", "_sequenceType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subunit", "subunit", SubstanceProteinSubunit, True, None, False), + ("_subunit", "_subunit", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -99,25 +111,35 @@ def __init__(self, jsondict=None, strict=True): self.cTerminalModification = None """ The modification at the C-terminal shall be specified. Type `str`. """ + self._cTerminalModification = None + """ Primitive extension for cTerminalModification. Type `FHIRPrimitiveExtension` """ self.cTerminalModificationId = None """ Unique identifier for molecular fragment modification based on the ISO 11238 Substance ID. Type `Identifier` (represented as `dict` in JSON). """ + self._cTerminalModificationId = None + """ Primitive extension for cTerminalModificationId. Type `FHIRPrimitiveExtension` """ self.length = None """ Length of linear sequences of amino acids contained in the subunit. Type `int`. """ + self._length = None + """ Primitive extension for length. Type `FHIRPrimitiveExtension` """ self.nTerminalModification = None """ The name of the fragment modified at the N-terminal of the SubstanceProtein shall be specified. Type `str`. """ + self._nTerminalModification = None + """ Primitive extension for nTerminalModification. Type `FHIRPrimitiveExtension` """ self.nTerminalModificationId = None """ Unique identifier for molecular fragment modification based on the ISO 11238 Substance ID. Type `Identifier` (represented as `dict` in JSON). """ + self._nTerminalModificationId = None + """ Primitive extension for nTerminalModificationId. Type `FHIRPrimitiveExtension` """ self.sequence = None """ The sequence information shall be provided enumerating the amino @@ -129,6 +151,8 @@ def __init__(self, jsondict=None, strict=True): letter code an X should be used within the sequence. The modified amino acids will be distinguished by their position in the sequence. Type `str`. """ + self._sequence = None + """ Primitive extension for sequence. Type `FHIRPrimitiveExtension` """ self.sequenceAttachment = None """ The sequence information shall be provided enumerating the amino @@ -140,6 +164,8 @@ def __init__(self, jsondict=None, strict=True): letter code an X should be used within the sequence. The modified amino acids will be distinguished by their position in the sequence. Type `Attachment` (represented as `dict` in JSON). """ + self._sequenceAttachment = None + """ Primitive extension for sequenceAttachment. Type `FHIRPrimitiveExtension` """ self.subunit = None """ Index of primary sequences of amino acids linked through peptide @@ -147,6 +173,8 @@ def __init__(self, jsondict=None, strict=True): will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts. Type `int`. """ + self._subunit = None + """ Primitive extension for subunit. Type `FHIRPrimitiveExtension` """ super(SubstanceProteinSubunit, self).__init__(jsondict=jsondict, strict=strict) @@ -154,17 +182,26 @@ def elementProperties(self): js = super(SubstanceProteinSubunit, self).elementProperties() js.extend([ ("cTerminalModification", "cTerminalModification", str, False, None, False), + ("_cTerminalModification", "_cTerminalModification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("cTerminalModificationId", "cTerminalModificationId", identifier.Identifier, False, None, False), + ("_cTerminalModificationId", "_cTerminalModificationId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("length", "length", int, False, None, False), + ("_length", "_length", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nTerminalModification", "nTerminalModification", str, False, None, False), + ("_nTerminalModification", "_nTerminalModification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nTerminalModificationId", "nTerminalModificationId", identifier.Identifier, False, None, False), + ("_nTerminalModificationId", "_nTerminalModificationId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequence", "sequence", str, False, None, False), + ("_sequence", "_sequence", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sequenceAttachment", "sequenceAttachment", attachment.Attachment, False, None, False), + ("_sequenceAttachment", "_sequenceAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("subunit", "subunit", int, False, None, False), + ("_subunit", "_subunit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/substancereferenceinformation.py b/fhirclient/models/substancereferenceinformation.py index abd3c7fd..11245888 100644 --- a/fhirclient/models/substancereferenceinformation.py +++ b/fhirclient/models/substancereferenceinformation.py @@ -21,22 +21,32 @@ def __init__(self, jsondict=None, strict=True): self.classification = None """ Todo. List of `SubstanceReferenceInformationClassification` items (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. List of `FHIRPrimitiveExtension` """ self.comment = None """ Todo. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.gene = None """ Todo. List of `SubstanceReferenceInformationGene` items (represented as `dict` in JSON). """ + self._gene = None + """ Primitive extension for gene. List of `FHIRPrimitiveExtension` """ self.geneElement = None """ Todo. List of `SubstanceReferenceInformationGeneElement` items (represented as `dict` in JSON). """ + self._geneElement = None + """ Primitive extension for geneElement. List of `FHIRPrimitiveExtension` """ self.target = None """ Todo. List of `SubstanceReferenceInformationTarget` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ super(SubstanceReferenceInformation, self).__init__(jsondict=jsondict, strict=strict) @@ -44,10 +54,15 @@ def elementProperties(self): js = super(SubstanceReferenceInformation, self).elementProperties() js.extend([ ("classification", "classification", SubstanceReferenceInformationClassification, True, None, False), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("gene", "gene", SubstanceReferenceInformationGene, True, None, False), + ("_gene", "_gene", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("geneElement", "geneElement", SubstanceReferenceInformationGeneElement, True, None, False), + ("_geneElement", "_geneElement", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("target", "target", SubstanceReferenceInformationTarget, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -71,18 +86,26 @@ def __init__(self, jsondict=None, strict=True): self.classification = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._classification = None + """ Primitive extension for classification. Type `FHIRPrimitiveExtension` """ self.domain = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._domain = None + """ Primitive extension for domain. Type `FHIRPrimitiveExtension` """ self.source = None """ Todo. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.subtype = None """ Todo. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._subtype = None + """ Primitive extension for subtype. List of `FHIRPrimitiveExtension` """ super(SubstanceReferenceInformationClassification, self).__init__(jsondict=jsondict, strict=strict) @@ -90,9 +113,13 @@ def elementProperties(self): js = super(SubstanceReferenceInformationClassification, self).elementProperties() js.extend([ ("classification", "classification", codeableconcept.CodeableConcept, False, None, False), + ("_classification", "_classification", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("domain", "domain", codeableconcept.CodeableConcept, False, None, False), + ("_domain", "_domain", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("subtype", "subtype", codeableconcept.CodeableConcept, True, None, False), + ("_subtype", "_subtype", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -114,14 +141,20 @@ def __init__(self, jsondict=None, strict=True): self.gene = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._gene = None + """ Primitive extension for gene. Type `FHIRPrimitiveExtension` """ self.geneSequenceOrigin = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._geneSequenceOrigin = None + """ Primitive extension for geneSequenceOrigin. Type `FHIRPrimitiveExtension` """ self.source = None """ Todo. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ super(SubstanceReferenceInformationGene, self).__init__(jsondict=jsondict, strict=strict) @@ -129,8 +162,11 @@ def elementProperties(self): js = super(SubstanceReferenceInformationGene, self).elementProperties() js.extend([ ("gene", "gene", codeableconcept.CodeableConcept, False, None, False), + ("_gene", "_gene", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("geneSequenceOrigin", "geneSequenceOrigin", codeableconcept.CodeableConcept, False, None, False), + ("_geneSequenceOrigin", "_geneSequenceOrigin", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -152,14 +188,20 @@ def __init__(self, jsondict=None, strict=True): self.element = None """ Todo. Type `Identifier` (represented as `dict` in JSON). """ + self._element = None + """ Primitive extension for element. Type `FHIRPrimitiveExtension` """ self.source = None """ Todo. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.type = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceReferenceInformationGeneElement, self).__init__(jsondict=jsondict, strict=strict) @@ -167,8 +209,11 @@ def elementProperties(self): js = super(SubstanceReferenceInformationGeneElement, self).elementProperties() js.extend([ ("element", "element", identifier.Identifier, False, None, False), + ("_element", "_element", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -190,42 +235,62 @@ def __init__(self, jsondict=None, strict=True): self.amountQuantity = None """ Todo. Type `Quantity` (represented as `dict` in JSON). """ + self._amountQuantity = None + """ Primitive extension for amountQuantity. Type `FHIRPrimitiveExtension` """ self.amountRange = None """ Todo. Type `Range` (represented as `dict` in JSON). """ + self._amountRange = None + """ Primitive extension for amountRange. Type `FHIRPrimitiveExtension` """ self.amountString = None """ Todo. Type `str`. """ + self._amountString = None + """ Primitive extension for amountString. Type `FHIRPrimitiveExtension` """ self.amountType = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._amountType = None + """ Primitive extension for amountType. Type `FHIRPrimitiveExtension` """ self.interaction = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._interaction = None + """ Primitive extension for interaction. Type `FHIRPrimitiveExtension` """ self.organism = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._organism = None + """ Primitive extension for organism. Type `FHIRPrimitiveExtension` """ self.organismType = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._organismType = None + """ Primitive extension for organismType. Type `FHIRPrimitiveExtension` """ self.source = None """ Todo. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.target = None """ Todo. Type `Identifier` (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. Type `FHIRPrimitiveExtension` """ self.type = None """ Todo. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceReferenceInformationTarget, self).__init__(jsondict=jsondict, strict=strict) @@ -233,21 +298,32 @@ def elementProperties(self): js = super(SubstanceReferenceInformationTarget, self).elementProperties() js.extend([ ("amountQuantity", "amountQuantity", quantity.Quantity, False, "amount", False), + ("_amountQuantity", "_amountQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountRange", "amountRange", range.Range, False, "amount", False), + ("_amountRange", "_amountRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountString", "amountString", str, False, "amount", False), + ("_amountString", "_amountString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountType", "amountType", codeableconcept.CodeableConcept, False, None, False), + ("_amountType", "_amountType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("interaction", "interaction", codeableconcept.CodeableConcept, False, None, False), + ("_interaction", "_interaction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organism", "organism", codeableconcept.CodeableConcept, False, None, False), + ("_organism", "_organism", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organismType", "organismType", codeableconcept.CodeableConcept, False, None, False), + ("_organismType", "_organismType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("target", "target", identifier.Identifier, False, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirreference from . import identifier from . import quantity -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/substancesourcematerial.py b/fhirclient/models/substancesourcematerial.py index 79d936da..6ed4fb3a 100644 --- a/fhirclient/models/substancesourcematerial.py +++ b/fhirclient/models/substancesourcematerial.py @@ -39,12 +39,16 @@ def __init__(self, jsondict=None, strict=True): countries used for the manufacturing of the Cryopoor plama or Crioprecipitate. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._countryOfOrigin = None + """ Primitive extension for countryOfOrigin. List of `FHIRPrimitiveExtension` """ self.developmentStage = None """ Stage of life for animals, plants, insects and microorganisms. This information shall be provided only when the substance is significantly different in these stages (e.g. foetal bovine serum). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._developmentStage = None + """ Primitive extension for developmentStage. Type `FHIRPrimitiveExtension` """ self.fractionDescription = None """ Many complex materials are fractions of parts of plants, animals, @@ -58,11 +62,15 @@ def __init__(self, jsondict=None, strict=True): captured at the Substance and the Specified Substance Group 1 levels. List of `SubstanceSourceMaterialFractionDescription` items (represented as `dict` in JSON). """ + self._fractionDescription = None + """ Primitive extension for fractionDescription. List of `FHIRPrimitiveExtension` """ self.geographicalLocation = None """ The place/region where the plant is harvested or the places/regions where the animal source material has its habitat. List of `str` items. """ + self._geographicalLocation = None + """ Primitive extension for geographicalLocation. List of `FHIRPrimitiveExtension` """ self.organism = None """ This subclause describes the organism which the substance is @@ -70,45 +78,63 @@ def __init__(self, jsondict=None, strict=True): based on these subclause elements. As an example, full taxonomy will be described for the Substance Name: ., Leaf. Type `SubstanceSourceMaterialOrganism` (represented as `dict` in JSON). """ + self._organism = None + """ Primitive extension for organism. Type `FHIRPrimitiveExtension` """ self.organismId = None """ The unique identifier associated with the source material parent organism shall be specified. Type `Identifier` (represented as `dict` in JSON). """ + self._organismId = None + """ Primitive extension for organismId. Type `FHIRPrimitiveExtension` """ self.organismName = None """ The organism accepted Scientific name shall be provided based on the organism taxonomy. Type `str`. """ + self._organismName = None + """ Primitive extension for organismName. Type `FHIRPrimitiveExtension` """ self.parentSubstanceId = None """ The parent of the herbal drug Ginkgo biloba, Leaf is the substance ID of the substance (fresh) of Ginkgo biloba L. or Ginkgo biloba L. (Whole plant). List of `Identifier` items (represented as `dict` in JSON). """ + self._parentSubstanceId = None + """ Primitive extension for parentSubstanceId. List of `FHIRPrimitiveExtension` """ self.parentSubstanceName = None """ The parent substance of the Herbal Drug, or Herbal preparation. List of `str` items. """ + self._parentSubstanceName = None + """ Primitive extension for parentSubstanceName. List of `FHIRPrimitiveExtension` """ self.partDescription = None """ To do. List of `SubstanceSourceMaterialPartDescription` items (represented as `dict` in JSON). """ + self._partDescription = None + """ Primitive extension for partDescription. List of `FHIRPrimitiveExtension` """ self.sourceMaterialClass = None """ General high level classification of the source material specific to the origin of the material. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sourceMaterialClass = None + """ Primitive extension for sourceMaterialClass. Type `FHIRPrimitiveExtension` """ self.sourceMaterialState = None """ The state of the source material when extracted. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sourceMaterialState = None + """ Primitive extension for sourceMaterialState. Type `FHIRPrimitiveExtension` """ self.sourceMaterialType = None """ The type of the source material shall be specified based on a controlled vocabulary. For vaccines, this subclause refers to the class of infectious agent. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._sourceMaterialType = None + """ Primitive extension for sourceMaterialType. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterial, self).__init__(jsondict=jsondict, strict=strict) @@ -116,18 +142,31 @@ def elementProperties(self): js = super(SubstanceSourceMaterial, self).elementProperties() js.extend([ ("countryOfOrigin", "countryOfOrigin", codeableconcept.CodeableConcept, True, None, False), + ("_countryOfOrigin", "_countryOfOrigin", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("developmentStage", "developmentStage", codeableconcept.CodeableConcept, False, None, False), + ("_developmentStage", "_developmentStage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fractionDescription", "fractionDescription", SubstanceSourceMaterialFractionDescription, True, None, False), + ("_fractionDescription", "_fractionDescription", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("geographicalLocation", "geographicalLocation", str, True, None, False), + ("_geographicalLocation", "_geographicalLocation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("organism", "organism", SubstanceSourceMaterialOrganism, False, None, False), + ("_organism", "_organism", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organismId", "organismId", identifier.Identifier, False, None, False), + ("_organismId", "_organismId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organismName", "organismName", str, False, None, False), + ("_organismName", "_organismName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parentSubstanceId", "parentSubstanceId", identifier.Identifier, True, None, False), + ("_parentSubstanceId", "_parentSubstanceId", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("parentSubstanceName", "parentSubstanceName", str, True, None, False), + ("_parentSubstanceName", "_parentSubstanceName", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("partDescription", "partDescription", SubstanceSourceMaterialPartDescription, True, None, False), + ("_partDescription", "_partDescription", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sourceMaterialClass", "sourceMaterialClass", codeableconcept.CodeableConcept, False, None, False), + ("_sourceMaterialClass", "_sourceMaterialClass", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceMaterialState", "sourceMaterialState", codeableconcept.CodeableConcept, False, None, False), + ("_sourceMaterialState", "_sourceMaterialState", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceMaterialType", "sourceMaterialType", codeableconcept.CodeableConcept, False, None, False), + ("_sourceMaterialType", "_sourceMaterialType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -160,12 +199,16 @@ def __init__(self, jsondict=None, strict=True): """ This element is capturing information about the fraction of a plant part, or human plasma for fractionation. Type `str`. """ + self._fraction = None + """ Primitive extension for fraction. Type `FHIRPrimitiveExtension` """ self.materialType = None """ The specific type of the material constituting the component. For Herbal preparations the particulars of the extracts (liquid/dry) is described in Specified Substance Group 1. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._materialType = None + """ Primitive extension for materialType. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialFractionDescription, self).__init__(jsondict=jsondict, strict=strict) @@ -173,7 +216,9 @@ def elementProperties(self): js = super(SubstanceSourceMaterialFractionDescription, self).elementProperties() js.extend([ ("fraction", "fraction", str, False, None, False), + ("_fraction", "_fraction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("materialType", "materialType", codeableconcept.CodeableConcept, False, None, False), + ("_materialType", "_materialType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -198,20 +243,28 @@ def __init__(self, jsondict=None, strict=True): self.author = None """ 4.9.13.6.1 Author type (Conditional). List of `SubstanceSourceMaterialOrganismAuthor` items (represented as `dict` in JSON). """ + self._author = None + """ Primitive extension for author. List of `FHIRPrimitiveExtension` """ self.family = None """ The family of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._family = None + """ Primitive extension for family. Type `FHIRPrimitiveExtension` """ self.genus = None """ The genus of an organism shall be specified; refers to the Latin epithet of the genus element of the plant/animal scientific name; it is present in names for genera, species and infraspecies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._genus = None + """ Primitive extension for genus. Type `FHIRPrimitiveExtension` """ self.hybrid = None """ 4.9.13.8.1 Hybrid species maternal organism ID (Optional). Type `SubstanceSourceMaterialOrganismHybrid` (represented as `dict` in JSON). """ + self._hybrid = None + """ Primitive extension for hybrid. Type `FHIRPrimitiveExtension` """ self.intraspecificDescription = None """ The intraspecific description of an organism shall be specified @@ -219,20 +272,28 @@ def __init__(self, jsondict=None, strict=True): intraspecific description shall contain the syntax of the antigen in line with the WHO convention. Type `str`. """ + self._intraspecificDescription = None + """ Primitive extension for intraspecificDescription. Type `FHIRPrimitiveExtension` """ self.intraspecificType = None """ The Intraspecific type of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._intraspecificType = None + """ Primitive extension for intraspecificType. Type `FHIRPrimitiveExtension` """ self.organismGeneral = None """ 4.9.13.7.1 Kingdom (Conditional). Type `SubstanceSourceMaterialOrganismOrganismGeneral` (represented as `dict` in JSON). """ + self._organismGeneral = None + """ Primitive extension for organismGeneral. Type `FHIRPrimitiveExtension` """ self.species = None """ The species of an organism shall be specified; refers to the Latin epithet of the species of the plant/animal; it is present in names for species and infraspecies. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._species = None + """ Primitive extension for species. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialOrganism, self).__init__(jsondict=jsondict, strict=strict) @@ -240,13 +301,21 @@ def elementProperties(self): js = super(SubstanceSourceMaterialOrganism, self).elementProperties() js.extend([ ("author", "author", SubstanceSourceMaterialOrganismAuthor, True, None, False), + ("_author", "_author", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("family", "family", codeableconcept.CodeableConcept, False, None, False), + ("_family", "_family", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("genus", "genus", codeableconcept.CodeableConcept, False, None, False), + ("_genus", "_genus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("hybrid", "hybrid", SubstanceSourceMaterialOrganismHybrid, False, None, False), + ("_hybrid", "_hybrid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("intraspecificDescription", "intraspecificDescription", str, False, None, False), + ("_intraspecificDescription", "_intraspecificDescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("intraspecificType", "intraspecificType", codeableconcept.CodeableConcept, False, None, False), + ("_intraspecificType", "_intraspecificType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organismGeneral", "organismGeneral", SubstanceSourceMaterialOrganismOrganismGeneral, False, None, False), + ("_organismGeneral", "_organismGeneral", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("species", "species", codeableconcept.CodeableConcept, False, None, False), + ("_species", "_species", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -271,6 +340,8 @@ def __init__(self, jsondict=None, strict=True): to the year in which the first author(s) published the infraspecific plant/animal name (of any rank). Type `str`. """ + self._authorDescription = None + """ Primitive extension for authorDescription. Type `FHIRPrimitiveExtension` """ self.authorType = None """ The type of author of an organism species shall be specified. The @@ -279,6 +350,8 @@ def __init__(self, jsondict=None, strict=True): primary author of an organism species refers to the first author(s), who validly published the plant/animal name. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._authorType = None + """ Primitive extension for authorType. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialOrganismAuthor, self).__init__(jsondict=jsondict, strict=strict) @@ -286,7 +359,9 @@ def elementProperties(self): js = super(SubstanceSourceMaterialOrganismAuthor, self).elementProperties() js.extend([ ("authorDescription", "authorDescription", str, False, None, False), + ("_authorDescription", "_authorDescription", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("authorType", "authorType", codeableconcept.CodeableConcept, False, None, False), + ("_authorType", "_authorType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -308,6 +383,8 @@ def __init__(self, jsondict=None, strict=True): self.hybridType = None """ The hybrid type of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._hybridType = None + """ Primitive extension for hybridType. Type `FHIRPrimitiveExtension` """ self.maternalOrganismId = None """ The identifier of the maternal species constituting the hybrid @@ -315,6 +392,8 @@ def __init__(self, jsondict=None, strict=True): plants, the parents aren’t always known, and it is unlikely that it will be known which is maternal and which is paternal. Type `str`. """ + self._maternalOrganismId = None + """ Primitive extension for maternalOrganismId. Type `FHIRPrimitiveExtension` """ self.maternalOrganismName = None """ The name of the maternal species constituting the hybrid organism @@ -322,16 +401,22 @@ def __init__(self, jsondict=None, strict=True): and it is unlikely that it will be known which is maternal and which is paternal. Type `str`. """ + self._maternalOrganismName = None + """ Primitive extension for maternalOrganismName. Type `FHIRPrimitiveExtension` """ self.paternalOrganismId = None """ The identifier of the paternal species constituting the hybrid organism shall be specified based on a controlled vocabulary. Type `str`. """ + self._paternalOrganismId = None + """ Primitive extension for paternalOrganismId. Type `FHIRPrimitiveExtension` """ self.paternalOrganismName = None """ The name of the paternal species constituting the hybrid organism shall be specified. Type `str`. """ + self._paternalOrganismName = None + """ Primitive extension for paternalOrganismName. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialOrganismHybrid, self).__init__(jsondict=jsondict, strict=strict) @@ -339,10 +424,15 @@ def elementProperties(self): js = super(SubstanceSourceMaterialOrganismHybrid, self).elementProperties() js.extend([ ("hybridType", "hybridType", codeableconcept.CodeableConcept, False, None, False), + ("_hybridType", "_hybridType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maternalOrganismId", "maternalOrganismId", str, False, None, False), + ("_maternalOrganismId", "_maternalOrganismId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("maternalOrganismName", "maternalOrganismName", str, False, None, False), + ("_maternalOrganismName", "_maternalOrganismName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paternalOrganismId", "paternalOrganismId", str, False, None, False), + ("_paternalOrganismId", "_paternalOrganismId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paternalOrganismName", "paternalOrganismName", str, False, None, False), + ("_paternalOrganismName", "_paternalOrganismName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -364,18 +454,26 @@ def __init__(self, jsondict=None, strict=True): self.class_fhir = None """ The class of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._class_fhir = None + """ Primitive extension for class_fhir. Type `FHIRPrimitiveExtension` """ self.kingdom = None """ The kingdom of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._kingdom = None + """ Primitive extension for kingdom. Type `FHIRPrimitiveExtension` """ self.order = None """ The order of an organism shall be specified,. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._order = None + """ Primitive extension for order. Type `FHIRPrimitiveExtension` """ self.phylum = None """ The phylum of an organism shall be specified. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._phylum = None + """ Primitive extension for phylum. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialOrganismOrganismGeneral, self).__init__(jsondict=jsondict, strict=strict) @@ -383,9 +481,13 @@ def elementProperties(self): js = super(SubstanceSourceMaterialOrganismOrganismGeneral, self).elementProperties() js.extend([ ("class_fhir", "class", codeableconcept.CodeableConcept, False, None, False), + ("_class_fhir", "_class_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("kingdom", "kingdom", codeableconcept.CodeableConcept, False, None, False), + ("_kingdom", "_kingdom", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("order", "order", codeableconcept.CodeableConcept, False, None, False), + ("_order", "_order", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("phylum", "phylum", codeableconcept.CodeableConcept, False, None, False), + ("_phylum", "_phylum", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -407,12 +509,16 @@ def __init__(self, jsondict=None, strict=True): self.part = None """ Entity of anatomical origin of source material within an organism. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._part = None + """ Primitive extension for part. Type `FHIRPrimitiveExtension` """ self.partLocation = None """ The detailed anatomic location when the part can be extracted from different anatomical locations of the organism. Multiple alternative locations may apply. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._partLocation = None + """ Primitive extension for partLocation. Type `FHIRPrimitiveExtension` """ super(SubstanceSourceMaterialPartDescription, self).__init__(jsondict=jsondict, strict=strict) @@ -420,10 +526,13 @@ def elementProperties(self): js = super(SubstanceSourceMaterialPartDescription, self).elementProperties() js.extend([ ("part", "part", codeableconcept.CodeableConcept, False, None, False), + ("_part", "_part", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partLocation", "partLocation", codeableconcept.CodeableConcept, False, None, False), + ("_partLocation", "_partLocation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/substancespecification.py b/fhirclient/models/substancespecification.py index 136fb2ba..8b13884d 100644 --- a/fhirclient/models/substancespecification.py +++ b/fhirclient/models/substancespecification.py @@ -22,81 +22,119 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Codes associated with the substance. List of `SubstanceSpecificationstr` items (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. List of `FHIRPrimitiveExtension` """ self.comment = None """ Textual comment about this record of a substance. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.description = None """ Textual description of the substance. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.domain = None """ If the substance applies to only human or veterinary use. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._domain = None + """ Primitive extension for domain. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier by which this substance is known. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.moiety = None """ Moiety, for structural modifications. List of `SubstanceSpecificationMoiety` items (represented as `dict` in JSON). """ + self._moiety = None + """ Primitive extension for moiety. List of `FHIRPrimitiveExtension` """ self.molecularWeight = None """ The molecular weight or weight range (for proteins, polymers or nucleic acids). List of `SubstanceSpecificationStructureIsotopeMolecularWeight` items (represented as `dict` in JSON). """ + self._molecularWeight = None + """ Primitive extension for molecularWeight. List of `FHIRPrimitiveExtension` """ self.name = None """ Names applicable to this substance. List of `SubstanceSpecificationName` items (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. List of `FHIRPrimitiveExtension` """ self.nucleicAcid = None """ Data items specific to nucleic acids. Type `FHIRReference` (represented as `dict` in JSON). """ + self._nucleicAcid = None + """ Primitive extension for nucleicAcid. Type `FHIRPrimitiveExtension` """ self.polymer = None """ Data items specific to polymers. Type `FHIRReference` (represented as `dict` in JSON). """ + self._polymer = None + """ Primitive extension for polymer. Type `FHIRPrimitiveExtension` """ self.property = None """ General specifications for this substance, including how it is related to other substances. List of `SubstanceSpecificationProperty` items (represented as `dict` in JSON). """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ self.protein = None """ Data items specific to proteins. Type `FHIRReference` (represented as `dict` in JSON). """ + self._protein = None + """ Primitive extension for protein. Type `FHIRPrimitiveExtension` """ self.referenceInformation = None """ General information detailing this substance. Type `FHIRReference` (represented as `dict` in JSON). """ + self._referenceInformation = None + """ Primitive extension for referenceInformation. Type `FHIRPrimitiveExtension` """ self.relationship = None """ A link between this substance and another, with details of the relationship. List of `SubstanceSpecificationRelationship` items (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. List of `FHIRPrimitiveExtension` """ self.source = None """ Supporting literature. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.sourceMaterial = None """ Material or taxonomic/anatomical source for the substance. Type `FHIRReference` (represented as `dict` in JSON). """ + self._sourceMaterial = None + """ Primitive extension for sourceMaterial. Type `FHIRPrimitiveExtension` """ self.status = None """ Status of substance within the catalogue e.g. approved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.structure = None """ Structural information. Type `SubstanceSpecificationStructure` (represented as `dict` in JSON). """ + self._structure = None + """ Primitive extension for structure. Type `FHIRPrimitiveExtension` """ self.type = None """ High level categorization, e.g. polymer or nucleic acid. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecification, self).__init__(jsondict=jsondict, strict=strict) @@ -104,24 +142,43 @@ def elementProperties(self): js = super(SubstanceSpecification, self).elementProperties() js.extend([ ("code", "code", SubstanceSpecificationstr, True, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("domain", "domain", codeableconcept.CodeableConcept, False, None, False), + ("_domain", "_domain", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("moiety", "moiety", SubstanceSpecificationMoiety, True, None, False), + ("_moiety", "_moiety", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("molecularWeight", "molecularWeight", SubstanceSpecificationStructureIsotopeMolecularWeight, True, None, False), + ("_molecularWeight", "_molecularWeight", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", SubstanceSpecificationName, True, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("nucleicAcid", "nucleicAcid", fhirreference.FHIRReference, False, None, False), + ("_nucleicAcid", "_nucleicAcid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("polymer", "polymer", fhirreference.FHIRReference, False, None, False), + ("_polymer", "_polymer", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", SubstanceSpecificationProperty, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("protein", "protein", fhirreference.FHIRReference, False, None, False), + ("_protein", "_protein", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("referenceInformation", "referenceInformation", fhirreference.FHIRReference, False, None, False), + ("_referenceInformation", "_referenceInformation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", SubstanceSpecificationRelationship, True, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("sourceMaterial", "sourceMaterial", fhirreference.FHIRReference, False, None, False), + ("_sourceMaterial", "_sourceMaterial", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("structure", "structure", SubstanceSpecificationStructure, False, None, False), + ("_structure", "_structure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -145,34 +202,50 @@ def __init__(self, jsondict=None, strict=True): self.amountQuantity = None """ Quantitative value for this moiety. Type `Quantity` (represented as `dict` in JSON). """ + self._amountQuantity = None + """ Primitive extension for amountQuantity. Type `FHIRPrimitiveExtension` """ self.amountString = None """ Quantitative value for this moiety. Type `str`. """ + self._amountString = None + """ Primitive extension for amountString. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Identifier by which this moiety substance is known. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.molecularFormula = None """ Molecular formula. Type `str`. """ + self._molecularFormula = None + """ Primitive extension for molecularFormula. Type `FHIRPrimitiveExtension` """ self.name = None """ Textual name for this moiety substance. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.opticalActivity = None """ Optical activity type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._opticalActivity = None + """ Primitive extension for opticalActivity. Type `FHIRPrimitiveExtension` """ self.role = None """ Role that the moiety is playing. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._role = None + """ Primitive extension for role. Type `FHIRPrimitiveExtension` """ self.stereochemistry = None """ Stereochemistry type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._stereochemistry = None + """ Primitive extension for stereochemistry. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationMoiety, self).__init__(jsondict=jsondict, strict=strict) @@ -180,13 +253,21 @@ def elementProperties(self): js = super(SubstanceSpecificationMoiety, self).elementProperties() js.extend([ ("amountQuantity", "amountQuantity", quantity.Quantity, False, "amount", False), + ("_amountQuantity", "_amountQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountString", "amountString", str, False, "amount", False), + ("_amountString", "_amountString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("molecularFormula", "molecularFormula", str, False, None, False), + ("_molecularFormula", "_molecularFormula", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("opticalActivity", "opticalActivity", codeableconcept.CodeableConcept, False, None, False), + ("_opticalActivity", "_opticalActivity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("role", "role", codeableconcept.CodeableConcept, False, None, False), + ("_role", "_role", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("stereochemistry", "stereochemistry", codeableconcept.CodeableConcept, False, None, False), + ("_stereochemistry", "_stereochemistry", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -209,46 +290,68 @@ def __init__(self, jsondict=None, strict=True): """ The use context of this name for example if there is a different name a drug active ingredient as opposed to a food colour additive. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._domain = None + """ Primitive extension for domain. List of `FHIRPrimitiveExtension` """ self.jurisdiction = None """ The jurisdiction where this name applies. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.language = None """ Language of the name. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._language = None + """ Primitive extension for language. List of `FHIRPrimitiveExtension` """ self.name = None """ The actual name. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.official = None """ Details of the official nature of this name. List of `SubstanceSpecificationNameOfficial` items (represented as `dict` in JSON). """ + self._official = None + """ Primitive extension for official. List of `FHIRPrimitiveExtension` """ self.preferred = None """ If this is the preferred name for this substance. Type `bool`. """ + self._preferred = None + """ Primitive extension for preferred. Type `FHIRPrimitiveExtension` """ self.source = None """ Supporting literature. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.status = None """ The status of the name. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.synonym = None """ A synonym of this name. List of `SubstanceSpecificationName` items (represented as `dict` in JSON). """ + self._synonym = None + """ Primitive extension for synonym. List of `FHIRPrimitiveExtension` """ self.translation = None """ A translation for this name. List of `SubstanceSpecificationName` items (represented as `dict` in JSON). """ + self._translation = None + """ Primitive extension for translation. List of `FHIRPrimitiveExtension` """ self.type = None """ Name type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationName, self).__init__(jsondict=jsondict, strict=strict) @@ -256,16 +359,27 @@ def elementProperties(self): js = super(SubstanceSpecificationName, self).elementProperties() js.extend([ ("domain", "domain", codeableconcept.CodeableConcept, True, None, False), + ("_domain", "_domain", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("language", "language", codeableconcept.CodeableConcept, True, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("official", "official", SubstanceSpecificationNameOfficial, True, None, False), + ("_official", "_official", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("preferred", "preferred", bool, False, None, False), + ("_preferred", "_preferred", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("synonym", "synonym", SubstanceSpecificationName, True, None, False), + ("_synonym", "_synonym", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("translation", "translation", SubstanceSpecificationName, True, None, False), + ("_translation", "_translation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -287,14 +401,20 @@ def __init__(self, jsondict=None, strict=True): self.authority = None """ Which authority uses this official name. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._authority = None + """ Primitive extension for authority. Type `FHIRPrimitiveExtension` """ self.date = None """ Date of official name change. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.status = None """ The status of the official name. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationNameOfficial, self).__init__(jsondict=jsondict, strict=strict) @@ -302,8 +422,11 @@ def elementProperties(self): js = super(SubstanceSpecificationNameOfficial, self).elementProperties() js.extend([ ("authority", "authority", codeableconcept.CodeableConcept, False, None, False), + ("_authority", "_authority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -326,33 +449,47 @@ def __init__(self, jsondict=None, strict=True): self.amountQuantity = None """ Quantitative value for this property. Type `Quantity` (represented as `dict` in JSON). """ + self._amountQuantity = None + """ Primitive extension for amountQuantity. Type `FHIRPrimitiveExtension` """ self.amountString = None """ Quantitative value for this property. Type `str`. """ + self._amountString = None + """ Primitive extension for amountString. Type `FHIRPrimitiveExtension` """ self.category = None """ A category for this property, e.g. Physical, Chemical, Enzymatic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.code = None """ Property type e.g. viscosity, pH, isoelectric point. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.definingSubstanceCodeableConcept = None """ A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._definingSubstanceCodeableConcept = None + """ Primitive extension for definingSubstanceCodeableConcept. Type `FHIRPrimitiveExtension` """ self.definingSubstanceReference = None """ A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol). Type `FHIRReference` (represented as `dict` in JSON). """ + self._definingSubstanceReference = None + """ Primitive extension for definingSubstanceReference. Type `FHIRPrimitiveExtension` """ self.parameters = None """ Parameters that were used in the measurement of a property (e.g. for viscosity: measured at 20C with a pH of 7.1). Type `str`. """ + self._parameters = None + """ Primitive extension for parameters. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationProperty, self).__init__(jsondict=jsondict, strict=strict) @@ -360,12 +497,19 @@ def elementProperties(self): js = super(SubstanceSpecificationProperty, self).elementProperties() js.extend([ ("amountQuantity", "amountQuantity", quantity.Quantity, False, "amount", False), + ("_amountQuantity", "_amountQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountString", "amountString", str, False, "amount", False), + ("_amountString", "_amountString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definingSubstanceCodeableConcept", "definingSubstanceCodeableConcept", codeableconcept.CodeableConcept, False, "definingSubstance", False), + ("_definingSubstanceCodeableConcept", "_definingSubstanceCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("definingSubstanceReference", "definingSubstanceReference", fhirreference.FHIRReference, False, "definingSubstance", False), + ("_definingSubstanceReference", "_definingSubstanceReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameters", "parameters", str, False, None, False), + ("_parameters", "_parameters", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -389,57 +533,79 @@ def __init__(self, jsondict=None, strict=True): the salt of a substance has some percentage of the active substance in relation to some other. Type `Quantity` (represented as `dict` in JSON). """ + self._amountQuantity = None + """ Primitive extension for amountQuantity. Type `FHIRPrimitiveExtension` """ self.amountRange = None """ A numeric factor for the relationship, for instance to express that the salt of a substance has some percentage of the active substance in relation to some other. Type `Range` (represented as `dict` in JSON). """ + self._amountRange = None + """ Primitive extension for amountRange. Type `FHIRPrimitiveExtension` """ self.amountRatio = None """ A numeric factor for the relationship, for instance to express that the salt of a substance has some percentage of the active substance in relation to some other. Type `Ratio` (represented as `dict` in JSON). """ + self._amountRatio = None + """ Primitive extension for amountRatio. Type `FHIRPrimitiveExtension` """ self.amountRatioLowLimit = None """ For use when the numeric. Type `Ratio` (represented as `dict` in JSON). """ + self._amountRatioLowLimit = None + """ Primitive extension for amountRatioLowLimit. Type `FHIRPrimitiveExtension` """ self.amountString = None """ A numeric factor for the relationship, for instance to express that the salt of a substance has some percentage of the active substance in relation to some other. Type `str`. """ + self._amountString = None + """ Primitive extension for amountString. Type `FHIRPrimitiveExtension` """ self.amountType = None """ An operator for the amount, for example "average", "approximately", "less than". Type `CodeableConcept` (represented as `dict` in JSON). """ + self._amountType = None + """ Primitive extension for amountType. Type `FHIRPrimitiveExtension` """ self.isDefining = None """ For example where an enzyme strongly bonds with a particular substance, this is a defining relationship for that enzyme, out of several possible substance relationships. Type `bool`. """ + self._isDefining = None + """ Primitive extension for isDefining. Type `FHIRPrimitiveExtension` """ self.relationship = None """ For example "salt to parent", "active moiety", "starting material". Type `CodeableConcept` (represented as `dict` in JSON). """ + self._relationship = None + """ Primitive extension for relationship. Type `FHIRPrimitiveExtension` """ self.source = None """ Supporting literature. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.substanceCodeableConcept = None """ A pointer to another substance, as a resource or just a representational code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substanceCodeableConcept = None + """ Primitive extension for substanceCodeableConcept. Type `FHIRPrimitiveExtension` """ self.substanceReference = None """ A pointer to another substance, as a resource or just a representational code. Type `FHIRReference` (represented as `dict` in JSON). """ + self._substanceReference = None + """ Primitive extension for substanceReference. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationRelationship, self).__init__(jsondict=jsondict, strict=strict) @@ -447,16 +613,27 @@ def elementProperties(self): js = super(SubstanceSpecificationRelationship, self).elementProperties() js.extend([ ("amountQuantity", "amountQuantity", quantity.Quantity, False, "amount", False), + ("_amountQuantity", "_amountQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountRange", "amountRange", range.Range, False, "amount", False), + ("_amountRange", "_amountRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountRatio", "amountRatio", ratio.Ratio, False, "amount", False), + ("_amountRatio", "_amountRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountRatioLowLimit", "amountRatioLowLimit", ratio.Ratio, False, None, False), + ("_amountRatioLowLimit", "_amountRatioLowLimit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountString", "amountString", str, False, "amount", False), + ("_amountString", "_amountString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("amountType", "amountType", codeableconcept.CodeableConcept, False, None, False), + ("_amountType", "_amountType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("isDefining", "isDefining", bool, False, None, False), + ("_isDefining", "_isDefining", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relationship", "relationship", codeableconcept.CodeableConcept, False, None, False), + ("_relationship", "_relationship", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("substanceCodeableConcept", "substanceCodeableConcept", codeableconcept.CodeableConcept, False, "substance", False), + ("_substanceCodeableConcept", "_substanceCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substanceReference", "substanceReference", fhirreference.FHIRReference, False, "substance", False), + ("_substanceReference", "_substanceReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -479,36 +656,52 @@ def __init__(self, jsondict=None, strict=True): """ Applicable for single substances that contain a radionuclide or a non-natural isotopic ratio. List of `SubstanceSpecificationStructureIsotope` items (represented as `dict` in JSON). """ + self._isotope = None + """ Primitive extension for isotope. List of `FHIRPrimitiveExtension` """ self.molecularFormula = None """ Molecular formula. Type `str`. """ + self._molecularFormula = None + """ Primitive extension for molecularFormula. Type `FHIRPrimitiveExtension` """ self.molecularFormulaByMoiety = None """ Specified per moiety according to the Hill system, i.e. first C, then H, then alphabetical, each moiety separated by a dot. Type `str`. """ + self._molecularFormulaByMoiety = None + """ Primitive extension for molecularFormulaByMoiety. Type `FHIRPrimitiveExtension` """ self.molecularWeight = None """ The molecular weight or weight range (for proteins, polymers or nucleic acids). Type `SubstanceSpecificationStructureIsotopeMolecularWeight` (represented as `dict` in JSON). """ + self._molecularWeight = None + """ Primitive extension for molecularWeight. Type `FHIRPrimitiveExtension` """ self.opticalActivity = None """ Optical activity type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._opticalActivity = None + """ Primitive extension for opticalActivity. Type `FHIRPrimitiveExtension` """ self.representation = None """ Molecular structural representation. List of `SubstanceSpecificationStructureRepresentation` items (represented as `dict` in JSON). """ + self._representation = None + """ Primitive extension for representation. List of `FHIRPrimitiveExtension` """ self.source = None """ Supporting literature. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.stereochemistry = None """ Stereochemistry type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._stereochemistry = None + """ Primitive extension for stereochemistry. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationStructure, self).__init__(jsondict=jsondict, strict=strict) @@ -516,13 +709,21 @@ def elementProperties(self): js = super(SubstanceSpecificationStructure, self).elementProperties() js.extend([ ("isotope", "isotope", SubstanceSpecificationStructureIsotope, True, None, False), + ("_isotope", "_isotope", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("molecularFormula", "molecularFormula", str, False, None, False), + ("_molecularFormula", "_molecularFormula", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("molecularFormulaByMoiety", "molecularFormulaByMoiety", str, False, None, False), + ("_molecularFormulaByMoiety", "_molecularFormulaByMoiety", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("molecularWeight", "molecularWeight", SubstanceSpecificationStructureIsotopeMolecularWeight, False, None, False), + ("_molecularWeight", "_molecularWeight", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("opticalActivity", "opticalActivity", codeableconcept.CodeableConcept, False, None, False), + ("_opticalActivity", "_opticalActivity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("representation", "representation", SubstanceSpecificationStructureRepresentation, True, None, False), + ("_representation", "_representation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("stereochemistry", "stereochemistry", codeableconcept.CodeableConcept, False, None, False), + ("_stereochemistry", "_stereochemistry", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -545,23 +746,33 @@ def __init__(self, jsondict=None, strict=True): self.halfLife = None """ Half life - for a non-natural nuclide. Type `Quantity` (represented as `dict` in JSON). """ + self._halfLife = None + """ Primitive extension for halfLife. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Substance identifier for each non-natural or radioisotope. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.molecularWeight = None """ The molecular weight or weight range (for proteins, polymers or nucleic acids). Type `SubstanceSpecificationStructureIsotopeMolecularWeight` (represented as `dict` in JSON). """ + self._molecularWeight = None + """ Primitive extension for molecularWeight. Type `FHIRPrimitiveExtension` """ self.name = None """ Substance name for each non-natural or radioisotope. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.substitution = None """ The type of isotopic substitution present in a single substance. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._substitution = None + """ Primitive extension for substitution. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationStructureIsotope, self).__init__(jsondict=jsondict, strict=strict) @@ -569,10 +780,15 @@ def elementProperties(self): js = super(SubstanceSpecificationStructureIsotope, self).elementProperties() js.extend([ ("halfLife", "halfLife", quantity.Quantity, False, None, False), + ("_halfLife", "_halfLife", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("molecularWeight", "molecularWeight", SubstanceSpecificationStructureIsotopeMolecularWeight, False, None, False), + ("_molecularWeight", "_molecularWeight", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", codeableconcept.CodeableConcept, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("substitution", "substitution", codeableconcept.CodeableConcept, False, None, False), + ("_substitution", "_substitution", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -598,15 +814,21 @@ def __init__(self, jsondict=None, strict=True): only a single definite value for a given element is given, it would be captured in this field. Type `Quantity` (represented as `dict` in JSON). """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.method = None """ The method by which the molecular weight was determined. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.type = None """ Type of molecular weight such as exact, average (also known as. number average), weight average. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationStructureIsotopeMolecularWeight, self).__init__(jsondict=jsondict, strict=strict) @@ -614,8 +836,11 @@ def elementProperties(self): js = super(SubstanceSpecificationStructureIsotopeMolecularWeight, self).elementProperties() js.extend([ ("amount", "amount", quantity.Quantity, False, None, False), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", codeableconcept.CodeableConcept, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -637,15 +862,21 @@ def __init__(self, jsondict=None, strict=True): self.attachment = None """ An attached file with the structural representation. Type `Attachment` (represented as `dict` in JSON). """ + self._attachment = None + """ Primitive extension for attachment. Type `FHIRPrimitiveExtension` """ self.representation = None """ The structural representation as text string in a format e.g. InChI, SMILES, MOLFILE, CDX. Type `str`. """ + self._representation = None + """ Primitive extension for representation. Type `FHIRPrimitiveExtension` """ self.type = None """ The type of structure (e.g. Full, Partial, Representative). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationStructureRepresentation, self).__init__(jsondict=jsondict, strict=strict) @@ -653,8 +884,11 @@ def elementProperties(self): js = super(SubstanceSpecificationStructureRepresentation, self).elementProperties() js.extend([ ("attachment", "attachment", attachment.Attachment, False, None, False), + ("_attachment", "_attachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("representation", "representation", str, False, None, False), + ("_representation", "_representation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -676,23 +910,33 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ The specific code. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.comment = None """ Any comment can be provided in this field, if necessary. Type `str`. """ + self._comment = None + """ Primitive extension for comment. Type `FHIRPrimitiveExtension` """ self.source = None """ Supporting literature. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._source = None + """ Primitive extension for source. List of `FHIRPrimitiveExtension` """ self.status = None """ Status of the code assignment. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusDate = None """ The date at which the code status is changed as part of the terminology maintenance. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._statusDate = None + """ Primitive extension for statusDate. Type `FHIRPrimitiveExtension` """ super(SubstanceSpecificationstr, self).__init__(jsondict=jsondict, strict=strict) @@ -700,13 +944,19 @@ def elementProperties(self): js = super(SubstanceSpecificationstr, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("comment", "comment", str, False, None, False), + ("_comment", "_comment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("source", "source", fhirreference.FHIRReference, True, None, False), + ("_source", "_source", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", codeableconcept.CodeableConcept, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusDate", "statusDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_statusDate", "_statusDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import attachment from . import codeableconcept @@ -715,4 +965,4 @@ def elementProperties(self): from . import identifier from . import quantity from . import range -from . import ratio +from . import ratio \ No newline at end of file diff --git a/fhirclient/models/supplydelivery.py b/fhirclient/models/supplydelivery.py index 09eb585a..c44f9a38 100644 --- a/fhirclient/models/supplydelivery.py +++ b/fhirclient/models/supplydelivery.py @@ -23,54 +23,80 @@ def __init__(self, jsondict=None, strict=True): self.basedOn = None """ Fulfills plan, proposal or order. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.destination = None """ Where the Supply was sent. Type `FHIRReference` (represented as `dict` in JSON). """ + self._destination = None + """ Primitive extension for destination. Type `FHIRPrimitiveExtension` """ self.identifier = None """ External identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When event occurred. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When event occurred. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ When event occurred. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.partOf = None """ Part of referenced event. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.patient = None """ Patient for whom the item is supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.receiver = None """ Who collected the Supply. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._receiver = None + """ Primitive extension for receiver. List of `FHIRPrimitiveExtension` """ self.status = None """ in-progress | completed | abandoned | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.suppliedItem = None """ The item that is delivered or supplied. Type `SupplyDeliverySuppliedItem` (represented as `dict` in JSON). """ + self._suppliedItem = None + """ Primitive extension for suppliedItem. Type `FHIRPrimitiveExtension` """ self.supplier = None """ Dispenser. Type `FHIRReference` (represented as `dict` in JSON). """ + self._supplier = None + """ Primitive extension for supplier. Type `FHIRPrimitiveExtension` """ self.type = None """ Category of dispense event. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(SupplyDelivery, self).__init__(jsondict=jsondict, strict=strict) @@ -78,18 +104,31 @@ def elementProperties(self): js = super(SupplyDelivery, self).elementProperties() js.extend([ ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("destination", "destination", fhirreference.FHIRReference, False, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, False), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("receiver", "receiver", fhirreference.FHIRReference, True, None, False), + ("_receiver", "_receiver", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("suppliedItem", "suppliedItem", SupplyDeliverySuppliedItem, False, None, False), + ("_suppliedItem", "_suppliedItem", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supplier", "supplier", fhirreference.FHIRReference, False, None, False), + ("_supplier", "_supplier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", codeableconcept.CodeableConcept, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -115,14 +154,20 @@ def __init__(self, jsondict=None, strict=True): self.itemCodeableConcept = None """ Medication, Substance, or Device supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ Medication, Substance, or Device supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ self.quantity = None """ Amount dispensed. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ super(SupplyDeliverySuppliedItem, self).__init__(jsondict=jsondict, strict=strict) @@ -130,11 +175,15 @@ def elementProperties(self): js = super(SupplyDeliverySuppliedItem, self).elementProperties() js.extend([ ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, "item", False), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, "item", False), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, False), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime @@ -142,4 +191,4 @@ def elementProperties(self): from . import identifier from . import period from . import quantity -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/supplyrequest.py b/fhirclient/models/supplyrequest.py index 9c70d5c8..f5d4a129 100644 --- a/fhirclient/models/supplyrequest.py +++ b/fhirclient/models/supplyrequest.py @@ -24,74 +24,110 @@ def __init__(self, jsondict=None, strict=True): self.authoredOn = None """ When the request was made. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.category = None """ The kind of supply (central, non-stock, etc.). Type `CodeableConcept` (represented as `dict` in JSON). """ + self._category = None + """ Primitive extension for category. Type `FHIRPrimitiveExtension` """ self.deliverFrom = None """ The origin of the supply. Type `FHIRReference` (represented as `dict` in JSON). """ + self._deliverFrom = None + """ Primitive extension for deliverFrom. Type `FHIRPrimitiveExtension` """ self.deliverTo = None """ The destination of the supply. Type `FHIRReference` (represented as `dict` in JSON). """ + self._deliverTo = None + """ Primitive extension for deliverTo. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for SupplyRequest. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.itemCodeableConcept = None """ Medication, Substance, or Device requested to be supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._itemCodeableConcept = None + """ Primitive extension for itemCodeableConcept. Type `FHIRPrimitiveExtension` """ self.itemReference = None """ Medication, Substance, or Device requested to be supplied. Type `FHIRReference` (represented as `dict` in JSON). """ + self._itemReference = None + """ Primitive extension for itemReference. Type `FHIRPrimitiveExtension` """ self.occurrenceDateTime = None """ When the request should be fulfilled. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._occurrenceDateTime = None + """ Primitive extension for occurrenceDateTime. Type `FHIRPrimitiveExtension` """ self.occurrencePeriod = None """ When the request should be fulfilled. Type `Period` (represented as `dict` in JSON). """ + self._occurrencePeriod = None + """ Primitive extension for occurrencePeriod. Type `FHIRPrimitiveExtension` """ self.occurrenceTiming = None """ When the request should be fulfilled. Type `Timing` (represented as `dict` in JSON). """ + self._occurrenceTiming = None + """ Primitive extension for occurrenceTiming. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Ordered item details. List of `SupplyRequestParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.quantity = None """ The requested amount of the item indicated. Type `Quantity` (represented as `dict` in JSON). """ + self._quantity = None + """ Primitive extension for quantity. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ The reason why the supply item was requested. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. List of `FHIRPrimitiveExtension` """ self.reasonReference = None """ The reason why the supply item was requested. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. List of `FHIRPrimitiveExtension` """ self.requester = None """ Individual making the request. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | suspended +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.supplier = None """ Who is intended to fulfill the request. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._supplier = None + """ Primitive extension for supplier. List of `FHIRPrimitiveExtension` """ super(SupplyRequest, self).__init__(jsondict=jsondict, strict=strict) @@ -99,23 +135,41 @@ def elementProperties(self): js = super(SupplyRequest, self).elementProperties() js.extend([ ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("category", "category", codeableconcept.CodeableConcept, False, None, False), + ("_category", "_category", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deliverFrom", "deliverFrom", fhirreference.FHIRReference, False, None, False), + ("_deliverFrom", "_deliverFrom", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("deliverTo", "deliverTo", fhirreference.FHIRReference, False, None, False), + ("_deliverTo", "_deliverTo", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("itemCodeableConcept", "itemCodeableConcept", codeableconcept.CodeableConcept, False, "item", True), + ("_itemCodeableConcept", "_itemCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("itemReference", "itemReference", fhirreference.FHIRReference, False, "item", True), + ("_itemReference", "_itemReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceDateTime", "occurrenceDateTime", fhirdatetime.FHIRDateTime, False, "occurrence", False), + ("_occurrenceDateTime", "_occurrenceDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrencePeriod", "occurrencePeriod", period.Period, False, "occurrence", False), + ("_occurrencePeriod", "_occurrencePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("occurrenceTiming", "occurrenceTiming", timing.Timing, False, "occurrence", False), + ("_occurrenceTiming", "_occurrenceTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", SupplyRequestParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("quantity", "quantity", quantity.Quantity, False, None, True), + ("_quantity", "_quantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, True, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, True, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, False), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("supplier", "supplier", fhirreference.FHIRReference, True, None, False), + ("_supplier", "_supplier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -142,22 +196,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Item detail. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of detail. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value of detail. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value of detail. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value of detail. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ super(SupplyRequestParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -165,13 +229,19 @@ def elementProperties(self): js = super(SupplyRequestParameter, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", False), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", False), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", False), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdatetime @@ -180,4 +250,4 @@ def elementProperties(self): from . import period from . import quantity from . import range -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/task.py b/fhirclient/models/task.py index 6a69bc2d..7f05d67a 100644 --- a/fhirclient/models/task.py +++ b/fhirclient/models/task.py @@ -21,83 +21,123 @@ def __init__(self, jsondict=None, strict=True): self.authoredOn = None """ Task Creation Date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._authoredOn = None + """ Primitive extension for authoredOn. Type `FHIRPrimitiveExtension` """ self.basedOn = None """ Request fulfilled by this task. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._basedOn = None + """ Primitive extension for basedOn. List of `FHIRPrimitiveExtension` """ self.businessStatus = None """ E.g. "Specimen collected", "IV prepped". Type `CodeableConcept` (represented as `dict` in JSON). """ + self._businessStatus = None + """ Primitive extension for businessStatus. Type `FHIRPrimitiveExtension` """ self.code = None """ Task Type. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.description = None """ Human-readable explanation of task. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Healthcare event during which this task originated. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.executionPeriod = None """ Start and end time of execution. Type `Period` (represented as `dict` in JSON). """ + self._executionPeriod = None + """ Primitive extension for executionPeriod. Type `FHIRPrimitiveExtension` """ self.focus = None """ What task is acting on. Type `FHIRReference` (represented as `dict` in JSON). """ + self._focus = None + """ Primitive extension for focus. Type `FHIRPrimitiveExtension` """ self.for_fhir = None """ Beneficiary of the Task. Type `FHIRReference` (represented as `dict` in JSON). """ + self._for_fhir = None + """ Primitive extension for for_fhir. Type `FHIRPrimitiveExtension` """ self.groupIdentifier = None """ Requisition or grouper id. Type `Identifier` (represented as `dict` in JSON). """ + self._groupIdentifier = None + """ Primitive extension for groupIdentifier. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Task Instance Identifier. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.input = None """ Information used to perform task. List of `TaskInput` items (represented as `dict` in JSON). """ + self._input = None + """ Primitive extension for input. List of `FHIRPrimitiveExtension` """ self.instantiatesCanonical = None """ Formal definition of task. Type `str`. """ + self._instantiatesCanonical = None + """ Primitive extension for instantiatesCanonical. Type `FHIRPrimitiveExtension` """ self.instantiatesUri = None """ Formal definition of task. Type `str`. """ + self._instantiatesUri = None + """ Primitive extension for instantiatesUri. Type `FHIRPrimitiveExtension` """ self.insurance = None """ Associated insurance coverage. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._insurance = None + """ Primitive extension for insurance. List of `FHIRPrimitiveExtension` """ self.intent = None """ unknown | proposal | plan | order | original-order | reflex-order | filler-order | instance-order | option. Type `str`. """ + self._intent = None + """ Primitive extension for intent. Type `FHIRPrimitiveExtension` """ self.lastModified = None """ Task Last Modified Date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._lastModified = None + """ Primitive extension for lastModified. Type `FHIRPrimitiveExtension` """ self.location = None """ Where task occurs. Type `FHIRReference` (represented as `dict` in JSON). """ + self._location = None + """ Primitive extension for location. Type `FHIRPrimitiveExtension` """ self.note = None """ Comments made about the task. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.output = None """ Information produced as part of task. List of `TaskOutput` items (represented as `dict` in JSON). """ + self._output = None + """ Primitive extension for output. List of `FHIRPrimitiveExtension` """ self.owner = None """ Responsible individual. @@ -106,42 +146,62 @@ def __init__(self, jsondict=None, strict=True): self.partOf = None """ Composite task. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._partOf = None + """ Primitive extension for partOf. List of `FHIRPrimitiveExtension` """ self.performerType = None """ Requested performer. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._performerType = None + """ Primitive extension for performerType. List of `FHIRPrimitiveExtension` """ self.priority = None """ routine | urgent | asap | stat. Type `str`. """ + self._priority = None + """ Primitive extension for priority. Type `FHIRPrimitiveExtension` """ self.reasonCode = None """ Why task is needed. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._reasonCode = None + """ Primitive extension for reasonCode. Type `FHIRPrimitiveExtension` """ self.reasonReference = None """ Why task is needed. Type `FHIRReference` (represented as `dict` in JSON). """ + self._reasonReference = None + """ Primitive extension for reasonReference. Type `FHIRPrimitiveExtension` """ self.relevantHistory = None """ Key events in history of the Task. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._relevantHistory = None + """ Primitive extension for relevantHistory. List of `FHIRPrimitiveExtension` """ self.requester = None """ Who is asking for task to be done. Type `FHIRReference` (represented as `dict` in JSON). """ + self._requester = None + """ Primitive extension for requester. Type `FHIRPrimitiveExtension` """ self.restriction = None """ Constraints on fulfillment tasks. Type `TaskRestriction` (represented as `dict` in JSON). """ + self._restriction = None + """ Primitive extension for restriction. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | requested | received | accepted | +. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusReason = None """ Reason for current status. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._statusReason = None + """ Primitive extension for statusReason. Type `FHIRPrimitiveExtension` """ super(Task, self).__init__(jsondict=jsondict, strict=strict) @@ -149,36 +209,66 @@ def elementProperties(self): js = super(Task, self).elementProperties() js.extend([ ("authoredOn", "authoredOn", fhirdatetime.FHIRDateTime, False, None, False), + ("_authoredOn", "_authoredOn", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("basedOn", "basedOn", fhirreference.FHIRReference, True, None, False), + ("_basedOn", "_basedOn", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("businessStatus", "businessStatus", codeableconcept.CodeableConcept, False, None, False), + ("_businessStatus", "_businessStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("executionPeriod", "executionPeriod", period.Period, False, None, False), + ("_executionPeriod", "_executionPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("focus", "focus", fhirreference.FHIRReference, False, None, False), + ("_focus", "_focus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("for_fhir", "for", fhirreference.FHIRReference, False, None, False), + ("_for_fhir", "_for_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("groupIdentifier", "groupIdentifier", identifier.Identifier, False, None, False), + ("_groupIdentifier", "_groupIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("input", "input", TaskInput, True, None, False), + ("_input", "_input", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("instantiatesCanonical", "instantiatesCanonical", str, False, None, False), + ("_instantiatesCanonical", "_instantiatesCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("instantiatesUri", "instantiatesUri", str, False, None, False), + ("_instantiatesUri", "_instantiatesUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("insurance", "insurance", fhirreference.FHIRReference, True, None, False), + ("_insurance", "_insurance", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("intent", "intent", str, False, None, True), + ("_intent", "_intent", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lastModified", "lastModified", fhirdatetime.FHIRDateTime, False, None, False), + ("_lastModified", "_lastModified", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("location", "location", fhirreference.FHIRReference, False, None, False), + ("_location", "_location", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("output", "output", TaskOutput, True, None, False), + ("_output", "_output", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("owner", "owner", fhirreference.FHIRReference, False, None, False), ("partOf", "partOf", fhirreference.FHIRReference, True, None, False), + ("_partOf", "_partOf", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("performerType", "performerType", codeableconcept.CodeableConcept, True, None, False), + ("_performerType", "_performerType", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("priority", "priority", str, False, None, False), + ("_priority", "_priority", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonCode", "reasonCode", codeableconcept.CodeableConcept, False, None, False), + ("_reasonCode", "_reasonCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("reasonReference", "reasonReference", fhirreference.FHIRReference, False, None, False), + ("_reasonReference", "_reasonReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("relevantHistory", "relevantHistory", fhirreference.FHIRReference, True, None, False), + ("_relevantHistory", "_relevantHistory", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requester", "requester", fhirreference.FHIRReference, False, None, False), + ("_requester", "_requester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("restriction", "restriction", TaskRestriction, False, None, False), + ("_restriction", "_restriction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusReason", "statusReason", codeableconcept.CodeableConcept, False, None, False), + ("_statusReason", "_statusReason", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -204,206 +294,308 @@ def __init__(self, jsondict=None, strict=True): self.type = None """ Label for the input. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueAddress = None """ Content to use in performing the task. Type `Address` (represented as `dict` in JSON). """ + self._valueAddress = None + """ Primitive extension for valueAddress. Type `FHIRPrimitiveExtension` """ self.valueAge = None """ Content to use in performing the task. Type `Age` (represented as `dict` in JSON). """ + self._valueAge = None + """ Primitive extension for valueAge. Type `FHIRPrimitiveExtension` """ self.valueAnnotation = None """ Content to use in performing the task. Type `Annotation` (represented as `dict` in JSON). """ + self._valueAnnotation = None + """ Primitive extension for valueAnnotation. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Content to use in performing the task. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Content to use in performing the task. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Content to use in performing the task. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCanonical = None """ Content to use in performing the task. Type `str`. """ + self._valueCanonical = None + """ Primitive extension for valueCanonical. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Content to use in performing the task. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Content to use in performing the task. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Content to use in performing the task. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueContactDetail = None """ Content to use in performing the task. Type `ContactDetail` (represented as `dict` in JSON). """ + self._valueContactDetail = None + """ Primitive extension for valueContactDetail. Type `FHIRPrimitiveExtension` """ self.valueContactPoint = None """ Content to use in performing the task. Type `ContactPoint` (represented as `dict` in JSON). """ + self._valueContactPoint = None + """ Primitive extension for valueContactPoint. Type `FHIRPrimitiveExtension` """ self.valueContributor = None """ Content to use in performing the task. Type `Contributor` (represented as `dict` in JSON). """ + self._valueContributor = None + """ Primitive extension for valueContributor. Type `FHIRPrimitiveExtension` """ self.valueCount = None """ Content to use in performing the task. Type `Count` (represented as `dict` in JSON). """ + self._valueCount = None + """ Primitive extension for valueCount. Type `FHIRPrimitiveExtension` """ self.valueDataRequirement = None """ Content to use in performing the task. Type `DataRequirement` (represented as `dict` in JSON). """ + self._valueDataRequirement = None + """ Primitive extension for valueDataRequirement. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Content to use in performing the task. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Content to use in performing the task. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Content to use in performing the task. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueDistance = None """ Content to use in performing the task. Type `Distance` (represented as `dict` in JSON). """ + self._valueDistance = None + """ Primitive extension for valueDistance. Type `FHIRPrimitiveExtension` """ self.valueDosage = None """ Content to use in performing the task. Type `Dosage` (represented as `dict` in JSON). """ + self._valueDosage = None + """ Primitive extension for valueDosage. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ Content to use in performing the task. Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valueExpression = None """ Content to use in performing the task. Type `Expression` (represented as `dict` in JSON). """ + self._valueExpression = None + """ Primitive extension for valueExpression. Type `FHIRPrimitiveExtension` """ self.valueHumanName = None """ Content to use in performing the task. Type `HumanName` (represented as `dict` in JSON). """ + self._valueHumanName = None + """ Primitive extension for valueHumanName. Type `FHIRPrimitiveExtension` """ self.valueId = None """ Content to use in performing the task. Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueIdentifier = None """ Content to use in performing the task. Type `Identifier` (represented as `dict` in JSON). """ + self._valueIdentifier = None + """ Primitive extension for valueIdentifier. Type `FHIRPrimitiveExtension` """ self.valueInstant = None """ Content to use in performing the task. Type `FHIRInstant` (represented as `str` in JSON). """ + self._valueInstant = None + """ Primitive extension for valueInstant. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Content to use in performing the task. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueMarkdown = None """ Content to use in performing the task. Type `str`. """ + self._valueMarkdown = None + """ Primitive extension for valueMarkdown. Type `FHIRPrimitiveExtension` """ self.valueMeta = None """ Content to use in performing the task. Type `Meta` (represented as `dict` in JSON). """ + self._valueMeta = None + """ Primitive extension for valueMeta. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ Content to use in performing the task. Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueOid = None """ Content to use in performing the task. Type `str`. """ + self._valueOid = None + """ Primitive extension for valueOid. Type `FHIRPrimitiveExtension` """ self.valueParameterDefinition = None """ Content to use in performing the task. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._valueParameterDefinition = None + """ Primitive extension for valueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Content to use in performing the task. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valuePositiveInt = None """ Content to use in performing the task. Type `int`. """ + self._valuePositiveInt = None + """ Primitive extension for valuePositiveInt. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Content to use in performing the task. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Content to use in performing the task. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Content to use in performing the task. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Content to use in performing the task. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueRelatedArtifact = None """ Content to use in performing the task. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._valueRelatedArtifact = None + """ Primitive extension for valueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Content to use in performing the task. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueSignature = None """ Content to use in performing the task. Type `Signature` (represented as `dict` in JSON). """ + self._valueSignature = None + """ Primitive extension for valueSignature. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Content to use in performing the task. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Content to use in performing the task. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueTiming = None """ Content to use in performing the task. Type `Timing` (represented as `dict` in JSON). """ + self._valueTiming = None + """ Primitive extension for valueTiming. Type `FHIRPrimitiveExtension` """ self.valueTriggerDefinition = None """ Content to use in performing the task. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._valueTriggerDefinition = None + """ Primitive extension for valueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.valueUnsignedInt = None """ Content to use in performing the task. Type `int`. """ + self._valueUnsignedInt = None + """ Primitive extension for valueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Content to use in performing the task. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ self.valueUrl = None """ Content to use in performing the task. Type `str`. """ + self._valueUrl = None + """ Primitive extension for valueUrl. Type `FHIRPrimitiveExtension` """ self.valueUsageContext = None """ Content to use in performing the task. Type `UsageContext` (represented as `dict` in JSON). """ + self._valueUsageContext = None + """ Primitive extension for valueUsageContext. Type `FHIRPrimitiveExtension` """ self.valueUuid = None """ Content to use in performing the task. Type `str`. """ + self._valueUuid = None + """ Primitive extension for valueUuid. Type `FHIRPrimitiveExtension` """ super(TaskInput, self).__init__(jsondict=jsondict, strict=strict) @@ -411,56 +603,107 @@ def elementProperties(self): js = super(TaskInput, self).elementProperties() js.extend([ ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAddress", "valueAddress", address.Address, False, "value", True), + ("_valueAddress", "_valueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAge", "valueAge", age.Age, False, "value", True), + ("_valueAge", "_valueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAnnotation", "valueAnnotation", annotation.Annotation, False, "value", True), + ("_valueAnnotation", "_valueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", True), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", True), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCanonical", "valueCanonical", str, False, "value", True), + ("_valueCanonical", "_valueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", True), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", True), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactDetail", "valueContactDetail", contactdetail.ContactDetail, False, "value", True), + ("_valueContactDetail", "_valueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactPoint", "valueContactPoint", contactpoint.ContactPoint, False, "value", True), + ("_valueContactPoint", "_valueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContributor", "valueContributor", contributor.Contributor, False, "value", True), + ("_valueContributor", "_valueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCount", "valueCount", count.Count, False, "value", True), + ("_valueCount", "_valueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDataRequirement", "valueDataRequirement", datarequirement.DataRequirement, False, "value", True), + ("_valueDataRequirement", "_valueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDistance", "valueDistance", distance.Distance, False, "value", True), + ("_valueDistance", "_valueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDosage", "valueDosage", dosage.Dosage, False, "value", True), + ("_valueDosage", "_valueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", True), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueExpression", "valueExpression", expression.Expression, False, "value", True), + ("_valueExpression", "_valueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueHumanName", "valueHumanName", humanname.HumanName, False, "value", True), + ("_valueHumanName", "_valueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", True), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueIdentifier", "valueIdentifier", identifier.Identifier, False, "value", True), + ("_valueIdentifier", "_valueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInstant", "valueInstant", fhirinstant.FHIRInstant, False, "value", True), + ("_valueInstant", "_valueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMarkdown", "valueMarkdown", str, False, "value", True), + ("_valueMarkdown", "_valueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMeta", "valueMeta", meta.Meta, False, "value", True), + ("_valueMeta", "_valueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", True), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueOid", "valueOid", str, False, "value", True), + ("_valueOid", "_valueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueParameterDefinition", "valueParameterDefinition", parameterdefinition.ParameterDefinition, False, "value", True), + ("_valueParameterDefinition", "_valueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", True), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePositiveInt", "valuePositiveInt", int, False, "value", True), + ("_valuePositiveInt", "_valuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", True), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", True), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRelatedArtifact", "valueRelatedArtifact", relatedartifact.RelatedArtifact, False, "value", True), + ("_valueRelatedArtifact", "_valueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", True), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSignature", "valueSignature", signature.Signature, False, "value", True), + ("_valueSignature", "_valueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTiming", "valueTiming", timing.Timing, False, "value", True), + ("_valueTiming", "_valueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTriggerDefinition", "valueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "value", True), + ("_valueTriggerDefinition", "_valueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUnsignedInt", "valueUnsignedInt", int, False, "value", True), + ("_valueUnsignedInt", "_valueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", True), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUrl", "valueUrl", str, False, "value", True), + ("_valueUrl", "_valueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUsageContext", "valueUsageContext", usagecontext.UsageContext, False, "value", True), + ("_valueUsageContext", "_valueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUuid", "valueUuid", str, False, "value", True), + ("_valueUuid", "_valueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -484,206 +727,308 @@ def __init__(self, jsondict=None, strict=True): self.type = None """ Label for output. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.valueAddress = None """ Result of output. Type `Address` (represented as `dict` in JSON). """ + self._valueAddress = None + """ Primitive extension for valueAddress. Type `FHIRPrimitiveExtension` """ self.valueAge = None """ Result of output. Type `Age` (represented as `dict` in JSON). """ + self._valueAge = None + """ Primitive extension for valueAge. Type `FHIRPrimitiveExtension` """ self.valueAnnotation = None """ Result of output. Type `Annotation` (represented as `dict` in JSON). """ + self._valueAnnotation = None + """ Primitive extension for valueAnnotation. Type `FHIRPrimitiveExtension` """ self.valueAttachment = None """ Result of output. Type `Attachment` (represented as `dict` in JSON). """ + self._valueAttachment = None + """ Primitive extension for valueAttachment. Type `FHIRPrimitiveExtension` """ self.valueBase64Binary = None """ Result of output. Type `str`. """ + self._valueBase64Binary = None + """ Primitive extension for valueBase64Binary. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Result of output. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCanonical = None """ Result of output. Type `str`. """ + self._valueCanonical = None + """ Primitive extension for valueCanonical. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Result of output. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Result of output. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueCoding = None """ Result of output. Type `Coding` (represented as `dict` in JSON). """ + self._valueCoding = None + """ Primitive extension for valueCoding. Type `FHIRPrimitiveExtension` """ self.valueContactDetail = None """ Result of output. Type `ContactDetail` (represented as `dict` in JSON). """ + self._valueContactDetail = None + """ Primitive extension for valueContactDetail. Type `FHIRPrimitiveExtension` """ self.valueContactPoint = None """ Result of output. Type `ContactPoint` (represented as `dict` in JSON). """ + self._valueContactPoint = None + """ Primitive extension for valueContactPoint. Type `FHIRPrimitiveExtension` """ self.valueContributor = None """ Result of output. Type `Contributor` (represented as `dict` in JSON). """ + self._valueContributor = None + """ Primitive extension for valueContributor. Type `FHIRPrimitiveExtension` """ self.valueCount = None """ Result of output. Type `Count` (represented as `dict` in JSON). """ + self._valueCount = None + """ Primitive extension for valueCount. Type `FHIRPrimitiveExtension` """ self.valueDataRequirement = None """ Result of output. Type `DataRequirement` (represented as `dict` in JSON). """ + self._valueDataRequirement = None + """ Primitive extension for valueDataRequirement. Type `FHIRPrimitiveExtension` """ self.valueDate = None """ Result of output. Type `FHIRDate` (represented as `str` in JSON). """ + self._valueDate = None + """ Primitive extension for valueDate. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Result of output. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Result of output. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueDistance = None """ Result of output. Type `Distance` (represented as `dict` in JSON). """ + self._valueDistance = None + """ Primitive extension for valueDistance. Type `FHIRPrimitiveExtension` """ self.valueDosage = None """ Result of output. Type `Dosage` (represented as `dict` in JSON). """ + self._valueDosage = None + """ Primitive extension for valueDosage. Type `FHIRPrimitiveExtension` """ self.valueDuration = None """ Result of output. Type `Duration` (represented as `dict` in JSON). """ + self._valueDuration = None + """ Primitive extension for valueDuration. Type `FHIRPrimitiveExtension` """ self.valueExpression = None """ Result of output. Type `Expression` (represented as `dict` in JSON). """ + self._valueExpression = None + """ Primitive extension for valueExpression. Type `FHIRPrimitiveExtension` """ self.valueHumanName = None """ Result of output. Type `HumanName` (represented as `dict` in JSON). """ + self._valueHumanName = None + """ Primitive extension for valueHumanName. Type `FHIRPrimitiveExtension` """ self.valueId = None """ Result of output. Type `str`. """ + self._valueId = None + """ Primitive extension for valueId. Type `FHIRPrimitiveExtension` """ self.valueIdentifier = None """ Result of output. Type `Identifier` (represented as `dict` in JSON). """ + self._valueIdentifier = None + """ Primitive extension for valueIdentifier. Type `FHIRPrimitiveExtension` """ self.valueInstant = None """ Result of output. Type `FHIRInstant` (represented as `str` in JSON). """ + self._valueInstant = None + """ Primitive extension for valueInstant. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Result of output. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueMarkdown = None """ Result of output. Type `str`. """ + self._valueMarkdown = None + """ Primitive extension for valueMarkdown. Type `FHIRPrimitiveExtension` """ self.valueMeta = None """ Result of output. Type `Meta` (represented as `dict` in JSON). """ + self._valueMeta = None + """ Primitive extension for valueMeta. Type `FHIRPrimitiveExtension` """ self.valueMoney = None """ Result of output. Type `Money` (represented as `dict` in JSON). """ + self._valueMoney = None + """ Primitive extension for valueMoney. Type `FHIRPrimitiveExtension` """ self.valueOid = None """ Result of output. Type `str`. """ + self._valueOid = None + """ Primitive extension for valueOid. Type `FHIRPrimitiveExtension` """ self.valueParameterDefinition = None """ Result of output. Type `ParameterDefinition` (represented as `dict` in JSON). """ + self._valueParameterDefinition = None + """ Primitive extension for valueParameterDefinition. Type `FHIRPrimitiveExtension` """ self.valuePeriod = None """ Result of output. Type `Period` (represented as `dict` in JSON). """ + self._valuePeriod = None + """ Primitive extension for valuePeriod. Type `FHIRPrimitiveExtension` """ self.valuePositiveInt = None """ Result of output. Type `int`. """ + self._valuePositiveInt = None + """ Primitive extension for valuePositiveInt. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Result of output. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Result of output. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueRatio = None """ Result of output. Type `Ratio` (represented as `dict` in JSON). """ + self._valueRatio = None + """ Primitive extension for valueRatio. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Result of output. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ self.valueRelatedArtifact = None """ Result of output. Type `RelatedArtifact` (represented as `dict` in JSON). """ + self._valueRelatedArtifact = None + """ Primitive extension for valueRelatedArtifact. Type `FHIRPrimitiveExtension` """ self.valueSampledData = None """ Result of output. Type `SampledData` (represented as `dict` in JSON). """ + self._valueSampledData = None + """ Primitive extension for valueSampledData. Type `FHIRPrimitiveExtension` """ self.valueSignature = None """ Result of output. Type `Signature` (represented as `dict` in JSON). """ + self._valueSignature = None + """ Primitive extension for valueSignature. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Result of output. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueTime = None """ Result of output. Type `FHIRTime` (represented as `str` in JSON). """ + self._valueTime = None + """ Primitive extension for valueTime. Type `FHIRPrimitiveExtension` """ self.valueTiming = None """ Result of output. Type `Timing` (represented as `dict` in JSON). """ + self._valueTiming = None + """ Primitive extension for valueTiming. Type `FHIRPrimitiveExtension` """ self.valueTriggerDefinition = None """ Result of output. Type `TriggerDefinition` (represented as `dict` in JSON). """ + self._valueTriggerDefinition = None + """ Primitive extension for valueTriggerDefinition. Type `FHIRPrimitiveExtension` """ self.valueUnsignedInt = None """ Result of output. Type `int`. """ + self._valueUnsignedInt = None + """ Primitive extension for valueUnsignedInt. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Result of output. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ self.valueUrl = None """ Result of output. Type `str`. """ + self._valueUrl = None + """ Primitive extension for valueUrl. Type `FHIRPrimitiveExtension` """ self.valueUsageContext = None """ Result of output. Type `UsageContext` (represented as `dict` in JSON). """ + self._valueUsageContext = None + """ Primitive extension for valueUsageContext. Type `FHIRPrimitiveExtension` """ self.valueUuid = None """ Result of output. Type `str`. """ + self._valueUuid = None + """ Primitive extension for valueUuid. Type `FHIRPrimitiveExtension` """ super(TaskOutput, self).__init__(jsondict=jsondict, strict=strict) @@ -691,56 +1036,107 @@ def elementProperties(self): js = super(TaskOutput, self).elementProperties() js.extend([ ("type", "type", codeableconcept.CodeableConcept, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAddress", "valueAddress", address.Address, False, "value", True), + ("_valueAddress", "_valueAddress", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAge", "valueAge", age.Age, False, "value", True), + ("_valueAge", "_valueAge", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAnnotation", "valueAnnotation", annotation.Annotation, False, "value", True), + ("_valueAnnotation", "_valueAnnotation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueAttachment", "valueAttachment", attachment.Attachment, False, "value", True), + ("_valueAttachment", "_valueAttachment", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBase64Binary", "valueBase64Binary", str, False, "value", True), + ("_valueBase64Binary", "_valueBase64Binary", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", True), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCanonical", "valueCanonical", str, False, "value", True), + ("_valueCanonical", "_valueCanonical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", True), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", True), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCoding", "valueCoding", coding.Coding, False, "value", True), + ("_valueCoding", "_valueCoding", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactDetail", "valueContactDetail", contactdetail.ContactDetail, False, "value", True), + ("_valueContactDetail", "_valueContactDetail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContactPoint", "valueContactPoint", contactpoint.ContactPoint, False, "value", True), + ("_valueContactPoint", "_valueContactPoint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueContributor", "valueContributor", contributor.Contributor, False, "value", True), + ("_valueContributor", "_valueContributor", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCount", "valueCount", count.Count, False, "value", True), + ("_valueCount", "_valueCount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDataRequirement", "valueDataRequirement", datarequirement.DataRequirement, False, "value", True), + ("_valueDataRequirement", "_valueDataRequirement", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDate", "valueDate", fhirdate.FHIRDate, False, "value", True), + ("_valueDate", "_valueDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", True), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", True), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDistance", "valueDistance", distance.Distance, False, "value", True), + ("_valueDistance", "_valueDistance", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDosage", "valueDosage", dosage.Dosage, False, "value", True), + ("_valueDosage", "_valueDosage", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDuration", "valueDuration", duration.Duration, False, "value", True), + ("_valueDuration", "_valueDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueExpression", "valueExpression", expression.Expression, False, "value", True), + ("_valueExpression", "_valueExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueHumanName", "valueHumanName", humanname.HumanName, False, "value", True), + ("_valueHumanName", "_valueHumanName", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueId", "valueId", str, False, "value", True), + ("_valueId", "_valueId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueIdentifier", "valueIdentifier", identifier.Identifier, False, "value", True), + ("_valueIdentifier", "_valueIdentifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInstant", "valueInstant", fhirinstant.FHIRInstant, False, "value", True), + ("_valueInstant", "_valueInstant", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", True), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMarkdown", "valueMarkdown", str, False, "value", True), + ("_valueMarkdown", "_valueMarkdown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMeta", "valueMeta", meta.Meta, False, "value", True), + ("_valueMeta", "_valueMeta", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueMoney", "valueMoney", money.Money, False, "value", True), + ("_valueMoney", "_valueMoney", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueOid", "valueOid", str, False, "value", True), + ("_valueOid", "_valueOid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueParameterDefinition", "valueParameterDefinition", parameterdefinition.ParameterDefinition, False, "value", True), + ("_valueParameterDefinition", "_valueParameterDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePeriod", "valuePeriod", period.Period, False, "value", True), + ("_valuePeriod", "_valuePeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valuePositiveInt", "valuePositiveInt", int, False, "value", True), + ("_valuePositiveInt", "_valuePositiveInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", True), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRatio", "valueRatio", ratio.Ratio, False, "value", True), + ("_valueRatio", "_valueRatio", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRelatedArtifact", "valueRelatedArtifact", relatedartifact.RelatedArtifact, False, "value", True), + ("_valueRelatedArtifact", "_valueRelatedArtifact", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSampledData", "valueSampledData", sampleddata.SampledData, False, "value", True), + ("_valueSampledData", "_valueSampledData", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSignature", "valueSignature", signature.Signature, False, "value", True), + ("_valueSignature", "_valueSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", True), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTime", "valueTime", fhirtime.FHIRTime, False, "value", True), + ("_valueTime", "_valueTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTiming", "valueTiming", timing.Timing, False, "value", True), + ("_valueTiming", "_valueTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueTriggerDefinition", "valueTriggerDefinition", triggerdefinition.TriggerDefinition, False, "value", True), + ("_valueTriggerDefinition", "_valueTriggerDefinition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUnsignedInt", "valueUnsignedInt", int, False, "value", True), + ("_valueUnsignedInt", "_valueUnsignedInt", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", True), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUrl", "valueUrl", str, False, "value", True), + ("_valueUrl", "_valueUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUsageContext", "valueUsageContext", usagecontext.UsageContext, False, "value", True), + ("_valueUsageContext", "_valueUsageContext", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUuid", "valueUuid", str, False, "value", True), + ("_valueUuid", "_valueUuid", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -766,14 +1162,20 @@ def __init__(self, jsondict=None, strict=True): self.period = None """ When fulfillment sought. Type `Period` (represented as `dict` in JSON). """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.recipient = None """ For whom is fulfillment sought?. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._recipient = None + """ Primitive extension for recipient. List of `FHIRPrimitiveExtension` """ self.repetitions = None """ How many times to repeat. Type `int`. """ + self._repetitions = None + """ Primitive extension for repetitions. Type `FHIRPrimitiveExtension` """ super(TaskRestriction, self).__init__(jsondict=jsondict, strict=strict) @@ -781,11 +1183,15 @@ def elementProperties(self): js = super(TaskRestriction, self).elementProperties() js.extend([ ("period", "period", period.Period, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("recipient", "recipient", fhirreference.FHIRReference, True, None, False), + ("_recipient", "_recipient", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("repetitions", "repetitions", int, False, None, False), + ("_repetitions", "_repetitions", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import address from . import age @@ -821,4 +1227,4 @@ def elementProperties(self): from . import signature from . import timing from . import triggerdefinition -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/terminologycapabilities.py b/fhirclient/models/terminologycapabilities.py index 590faa3c..61c9e171 100644 --- a/fhirclient/models/terminologycapabilities.py +++ b/fhirclient/models/terminologycapabilities.py @@ -27,102 +27,150 @@ def __init__(self, jsondict=None, strict=True): """ Information about the [ConceptMap/$closure](conceptmap-operation- closure.html) operation. Type `TerminologyCapabilitiesClosure` (represented as `dict` in JSON). """ + self._closure = None + """ Primitive extension for closure. Type `FHIRPrimitiveExtension` """ self.codeSearch = None """ explicit | all. Type `str`. """ + self._codeSearch = None + """ Primitive extension for codeSearch. Type `FHIRPrimitiveExtension` """ self.codeSystem = None """ A code system supported by the server. List of `TerminologyCapabilitiesCodeSystem` items (represented as `dict` in JSON). """ + self._codeSystem = None + """ Primitive extension for codeSystem. List of `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the terminology capabilities. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expansion = None """ Information about the [ValueSet/$expand](valueset-operation- expand.html) operation. Type `TerminologyCapabilitiesExpansion` (represented as `dict` in JSON). """ + self._expansion = None + """ Primitive extension for expansion. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.implementation = None """ If this describes a specific instance. Type `TerminologyCapabilitiesImplementation` (represented as `dict` in JSON). """ + self._implementation = None + """ Primitive extension for implementation. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for terminology capabilities (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.kind = None """ instance | capability | requirements. Type `str`. """ + self._kind = None + """ Primitive extension for kind. Type `FHIRPrimitiveExtension` """ self.lockedDate = None """ Whether lockedDate is supported. Type `bool`. """ + self._lockedDate = None + """ Primitive extension for lockedDate. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this terminology capabilities (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this terminology capabilities is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.software = None """ Software that is covered by this terminology capability statement. Type `TerminologyCapabilitiesSoftware` (represented as `dict` in JSON). """ + self._software = None + """ Primitive extension for software. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this terminology capabilities (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.translation = None """ Information about the [ConceptMap/$translate](conceptmap-operation- translate.html) operation. Type `TerminologyCapabilitiesTranslation` (represented as `dict` in JSON). """ + self._translation = None + """ Primitive extension for translation. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this terminology capabilities, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.validateCode = None """ Information about the [ValueSet/$validate-code](valueset-operation- validate-code.html) operation. Type `TerminologyCapabilitiesValidateCode` (represented as `dict` in JSON). """ + self._validateCode = None + """ Primitive extension for validateCode. Type `FHIRPrimitiveExtension` """ self.version = None """ Business version of the terminology capabilities. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilities, self).__init__(jsondict=jsondict, strict=strict) @@ -130,29 +178,53 @@ def elementProperties(self): js = super(TerminologyCapabilities, self).elementProperties() js.extend([ ("closure", "closure", TerminologyCapabilitiesClosure, False, None, False), + ("_closure", "_closure", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("codeSearch", "codeSearch", str, False, None, False), + ("_codeSearch", "_codeSearch", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("codeSystem", "codeSystem", TerminologyCapabilitiesCodeSystem, True, None, False), + ("_codeSystem", "_codeSystem", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, True), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expansion", "expansion", TerminologyCapabilitiesExpansion, False, None, False), + ("_expansion", "_expansion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("implementation", "implementation", TerminologyCapabilitiesImplementation, False, None, False), + ("_implementation", "_implementation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("kind", "kind", str, False, None, True), + ("_kind", "_kind", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lockedDate", "lockedDate", bool, False, None, False), + ("_lockedDate", "_lockedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("software", "software", TerminologyCapabilitiesSoftware, False, None, False), + ("_software", "_software", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("translation", "translation", TerminologyCapabilitiesTranslation, False, None, False), + ("_translation", "_translation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("validateCode", "validateCode", TerminologyCapabilitiesValidateCode, False, None, False), + ("_validateCode", "_validateCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -179,6 +251,8 @@ def __init__(self, jsondict=None, strict=True): self.translation = None """ If cross-system closure is supported. Type `bool`. """ + self._translation = None + """ Primitive extension for translation. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesClosure, self).__init__(jsondict=jsondict, strict=strict) @@ -186,6 +260,7 @@ def elementProperties(self): js = super(TerminologyCapabilitiesClosure, self).elementProperties() js.extend([ ("translation", "translation", bool, False, None, False), + ("_translation", "_translation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -211,14 +286,20 @@ def __init__(self, jsondict=None, strict=True): self.subsumption = None """ Whether subsumption is supported. Type `bool`. """ + self._subsumption = None + """ Primitive extension for subsumption. Type `FHIRPrimitiveExtension` """ self.uri = None """ URI for the Code System. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ self.version = None """ Version of Code System supported. List of `TerminologyCapabilitiesCodeSystemVersion` items (represented as `dict` in JSON). """ + self._version = None + """ Primitive extension for version. List of `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesCodeSystem, self).__init__(jsondict=jsondict, strict=strict) @@ -226,8 +307,11 @@ def elementProperties(self): js = super(TerminologyCapabilitiesCodeSystem, self).elementProperties() js.extend([ ("subsumption", "subsumption", bool, False, None, False), + ("_subsumption", "_subsumption", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, False), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", TerminologyCapabilitiesCodeSystemVersion, True, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -251,26 +335,38 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Version identifier for this version. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.compositional = None """ If compositional grammar is supported. Type `bool`. """ + self._compositional = None + """ Primitive extension for compositional. Type `FHIRPrimitiveExtension` """ self.filter = None """ Filter Properties supported. List of `TerminologyCapabilitiesCodeSystemVersionFilter` items (represented as `dict` in JSON). """ + self._filter = None + """ Primitive extension for filter. List of `FHIRPrimitiveExtension` """ self.isDefault = None """ If this is the default version for this code system. Type `bool`. """ + self._isDefault = None + """ Primitive extension for isDefault. Type `FHIRPrimitiveExtension` """ self.language = None """ Language Displays supported. List of `str` items. """ + self._language = None + """ Primitive extension for language. List of `FHIRPrimitiveExtension` """ self.property = None """ Properties supported for $lookup. List of `str` items. """ + self._property = None + """ Primitive extension for property. List of `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesCodeSystemVersion, self).__init__(jsondict=jsondict, strict=strict) @@ -278,11 +374,17 @@ def elementProperties(self): js = super(TerminologyCapabilitiesCodeSystemVersion, self).elementProperties() js.extend([ ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("compositional", "compositional", bool, False, None, False), + ("_compositional", "_compositional", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("filter", "filter", TerminologyCapabilitiesCodeSystemVersionFilter, True, None, False), + ("_filter", "_filter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("isDefault", "isDefault", bool, False, None, False), + ("_isDefault", "_isDefault", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("language", "language", str, True, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("property", "property", str, True, None, False), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -304,10 +406,14 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code of the property supported. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.op = None """ Operations supported for the property. List of `str` items. """ + self._op = None + """ Primitive extension for op. List of `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesCodeSystemVersionFilter, self).__init__(jsondict=jsondict, strict=strict) @@ -315,7 +421,9 @@ def elementProperties(self): js = super(TerminologyCapabilitiesCodeSystemVersionFilter, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("op", "op", str, True, None, True), + ("_op", "_op", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -338,22 +446,32 @@ def __init__(self, jsondict=None, strict=True): self.hierarchical = None """ Whether the server can return nested value sets. Type `bool`. """ + self._hierarchical = None + """ Primitive extension for hierarchical. Type `FHIRPrimitiveExtension` """ self.incomplete = None """ Allow request for incomplete expansions?. Type `bool`. """ + self._incomplete = None + """ Primitive extension for incomplete. Type `FHIRPrimitiveExtension` """ self.paging = None """ Whether the server supports paging on expansion. Type `bool`. """ + self._paging = None + """ Primitive extension for paging. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Supported expansion parameter. List of `TerminologyCapabilitiesExpansionParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.textFilter = None """ Documentation about text searching works. Type `str`. """ + self._textFilter = None + """ Primitive extension for textFilter. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesExpansion, self).__init__(jsondict=jsondict, strict=strict) @@ -361,10 +479,15 @@ def elementProperties(self): js = super(TerminologyCapabilitiesExpansion, self).elementProperties() js.extend([ ("hierarchical", "hierarchical", bool, False, None, False), + ("_hierarchical", "_hierarchical", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("incomplete", "incomplete", bool, False, None, False), + ("_incomplete", "_incomplete", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("paging", "paging", bool, False, None, False), + ("_paging", "_paging", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", TerminologyCapabilitiesExpansionParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("textFilter", "textFilter", str, False, None, False), + ("_textFilter", "_textFilter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -386,10 +509,14 @@ def __init__(self, jsondict=None, strict=True): self.documentation = None """ Description of support for parameter. Type `str`. """ + self._documentation = None + """ Primitive extension for documentation. Type `FHIRPrimitiveExtension` """ self.name = None """ Expansion Parameter name. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesExpansionParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -397,7 +524,9 @@ def elementProperties(self): js = super(TerminologyCapabilitiesExpansionParameter, self).elementProperties() js.extend([ ("documentation", "documentation", str, False, None, False), + ("_documentation", "_documentation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -423,10 +552,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Describes this specific instance. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.url = None """ Base URL for the implementation. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesImplementation, self).__init__(jsondict=jsondict, strict=strict) @@ -434,7 +567,9 @@ def elementProperties(self): js = super(TerminologyCapabilitiesImplementation, self).elementProperties() js.extend([ ("description", "description", str, False, None, True), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -460,10 +595,14 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ A name the software is known by. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.version = None """ Version covered by this statement. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesSoftware, self).__init__(jsondict=jsondict, strict=strict) @@ -471,7 +610,9 @@ def elementProperties(self): js = super(TerminologyCapabilitiesSoftware, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -494,6 +635,8 @@ def __init__(self, jsondict=None, strict=True): self.needsMap = None """ Whether the client must identify the map. Type `bool`. """ + self._needsMap = None + """ Primitive extension for needsMap. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesTranslation, self).__init__(jsondict=jsondict, strict=strict) @@ -501,6 +644,7 @@ def elementProperties(self): js = super(TerminologyCapabilitiesTranslation, self).elementProperties() js.extend([ ("needsMap", "needsMap", bool, False, None, True), + ("_needsMap", "_needsMap", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -523,6 +667,8 @@ def __init__(self, jsondict=None, strict=True): self.translations = None """ Whether translations are validated. Type `bool`. """ + self._translations = None + """ Primitive extension for translations. Type `FHIRPrimitiveExtension` """ super(TerminologyCapabilitiesValidateCode, self).__init__(jsondict=jsondict, strict=strict) @@ -530,11 +676,13 @@ def elementProperties(self): js = super(TerminologyCapabilitiesValidateCode, self).elementProperties() js.extend([ ("translations", "translations", bool, False, None, True), + ("_translations", "_translations", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import contactdetail from . import fhirdatetime -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/testreport.py b/fhirclient/models/testreport.py index 3470ddab..9abdc1d7 100644 --- a/fhirclient/models/testreport.py +++ b/fhirclient/models/testreport.py @@ -23,55 +23,79 @@ def __init__(self, jsondict=None, strict=True): self.identifier = None """ External identifier. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.issued = None """ When the TestScript was executed and this TestReport was generated. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._issued = None + """ Primitive extension for issued. Type `FHIRPrimitiveExtension` """ self.name = None """ Informal name of the executed TestScript. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.participant = None """ A participant in the test execution, either the execution engine, a client, or a server. List of `TestReportParticipant` items (represented as `dict` in JSON). """ + self._participant = None + """ Primitive extension for participant. List of `FHIRPrimitiveExtension` """ self.result = None """ pass | fail | pending. Type `str`. """ + self._result = None + """ Primitive extension for result. Type `FHIRPrimitiveExtension` """ self.score = None """ The final score (percentage of tests passed) resulting from the execution of the TestScript. Type `float`. """ + self._score = None + """ Primitive extension for score. Type `FHIRPrimitiveExtension` """ self.setup = None """ The results of the series of required setup operations before the tests were executed. Type `TestReportSetup` (represented as `dict` in JSON). """ + self._setup = None + """ Primitive extension for setup. Type `FHIRPrimitiveExtension` """ self.status = None """ completed | in-progress | waiting | stopped | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.teardown = None """ The results of running the series of required clean up steps. Type `TestReportTeardown` (represented as `dict` in JSON). """ + self._teardown = None + """ Primitive extension for teardown. Type `FHIRPrimitiveExtension` """ self.test = None """ A test executed from the test script. List of `TestReportTest` items (represented as `dict` in JSON). """ + self._test = None + """ Primitive extension for test. List of `FHIRPrimitiveExtension` """ self.testScript = None """ Reference to the version-specific TestScript that was executed to produce this TestReport. Type `FHIRReference` (represented as `dict` in JSON). """ + self._testScript = None + """ Primitive extension for testScript. Type `FHIRPrimitiveExtension` """ self.tester = None """ Name of the tester producing this report (Organization or individual). Type `str`. """ + self._tester = None + """ Primitive extension for tester. Type `FHIRPrimitiveExtension` """ super(TestReport, self).__init__(jsondict=jsondict, strict=strict) @@ -79,17 +103,29 @@ def elementProperties(self): js = super(TestReport, self).elementProperties() js.extend([ ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("issued", "issued", fhirdatetime.FHIRDateTime, False, None, False), + ("_issued", "_issued", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("participant", "participant", TestReportParticipant, True, None, False), + ("_participant", "_participant", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("result", "result", str, False, None, True), + ("_result", "_result", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("score", "score", float, False, None, False), + ("_score", "_score", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("setup", "setup", TestReportSetup, False, None, False), + ("_setup", "_setup", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("teardown", "teardown", TestReportTeardown, False, None, False), + ("_teardown", "_teardown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("test", "test", TestReportTest, True, None, False), + ("_test", "_test", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("testScript", "testScript", fhirreference.FHIRReference, False, None, True), + ("_testScript", "_testScript", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("tester", "tester", str, False, None, False), + ("_tester", "_tester", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -114,14 +150,20 @@ def __init__(self, jsondict=None, strict=True): self.display = None """ The display name of the participant. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.type = None """ test-engine | client | server. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.uri = None """ The uri of the participant. An absolute URL is preferred. Type `str`. """ + self._uri = None + """ Primitive extension for uri. Type `FHIRPrimitiveExtension` """ super(TestReportParticipant, self).__init__(jsondict=jsondict, strict=strict) @@ -129,8 +171,11 @@ def elementProperties(self): js = super(TestReportParticipant, self).elementProperties() js.extend([ ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("uri", "uri", str, False, None, True), + ("_uri", "_uri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -153,6 +198,8 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ A setup operation or assert that was executed. List of `TestReportSetupAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ super(TestReportSetup, self).__init__(jsondict=jsondict, strict=strict) @@ -160,6 +207,7 @@ def elementProperties(self): js = super(TestReportSetup, self).elementProperties() js.extend([ ("action", "action", TestReportSetupAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -183,10 +231,14 @@ def __init__(self, jsondict=None, strict=True): self.assert_fhir = None """ The assertion to perform. Type `TestReportSetupActionAssert` (represented as `dict` in JSON). """ + self._assert_fhir = None + """ Primitive extension for assert_fhir. Type `FHIRPrimitiveExtension` """ self.operation = None """ The operation to perform. Type `TestReportSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestReportSetupAction, self).__init__(jsondict=jsondict, strict=strict) @@ -194,7 +246,9 @@ def elementProperties(self): js = super(TestReportSetupAction, self).elementProperties() js.extend([ ("assert_fhir", "assert", TestReportSetupActionAssert, False, None, False), + ("_assert_fhir", "_assert_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operation", "operation", TestReportSetupActionOperation, False, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -218,14 +272,20 @@ def __init__(self, jsondict=None, strict=True): self.detail = None """ A link to further details on the result. Type `str`. """ + self._detail = None + """ Primitive extension for detail. Type `FHIRPrimitiveExtension` """ self.message = None """ A message associated with the result. Type `str`. """ + self._message = None + """ Primitive extension for message. Type `FHIRPrimitiveExtension` """ self.result = None """ pass | skip | fail | warning | error. Type `str`. """ + self._result = None + """ Primitive extension for result. Type `FHIRPrimitiveExtension` """ super(TestReportSetupActionAssert, self).__init__(jsondict=jsondict, strict=strict) @@ -233,8 +293,11 @@ def elementProperties(self): js = super(TestReportSetupActionAssert, self).elementProperties() js.extend([ ("detail", "detail", str, False, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("message", "message", str, False, None, False), + ("_message", "_message", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("result", "result", str, False, None, True), + ("_result", "_result", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -258,14 +321,20 @@ def __init__(self, jsondict=None, strict=True): self.detail = None """ A link to further details on the result. Type `str`. """ + self._detail = None + """ Primitive extension for detail. Type `FHIRPrimitiveExtension` """ self.message = None """ A message associated with the result. Type `str`. """ + self._message = None + """ Primitive extension for message. Type `FHIRPrimitiveExtension` """ self.result = None """ pass | skip | fail | warning | error. Type `str`. """ + self._result = None + """ Primitive extension for result. Type `FHIRPrimitiveExtension` """ super(TestReportSetupActionOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -273,8 +342,11 @@ def elementProperties(self): js = super(TestReportSetupActionOperation, self).elementProperties() js.extend([ ("detail", "detail", str, False, None, False), + ("_detail", "_detail", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("message", "message", str, False, None, False), + ("_message", "_message", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("result", "result", str, False, None, True), + ("_result", "_result", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -299,6 +371,8 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ One or more teardown operations performed. List of `TestReportTeardownAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ super(TestReportTeardown, self).__init__(jsondict=jsondict, strict=strict) @@ -306,6 +380,7 @@ def elementProperties(self): js = super(TestReportTeardown, self).elementProperties() js.extend([ ("action", "action", TestReportTeardownAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -329,6 +404,8 @@ def __init__(self, jsondict=None, strict=True): self.operation = None """ The teardown operation performed. Type `TestReportSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestReportTeardownAction, self).__init__(jsondict=jsondict, strict=strict) @@ -336,6 +413,7 @@ def elementProperties(self): js = super(TestReportTeardownAction, self).elementProperties() js.extend([ ("operation", "operation", TestReportSetupActionOperation, False, None, True), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -357,14 +435,20 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ A test operation or assert that was performed. List of `TestReportTestAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.description = None """ Tracking/reporting short description of the test. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ Tracking/logging name of this test. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ super(TestReportTest, self).__init__(jsondict=jsondict, strict=strict) @@ -372,8 +456,11 @@ def elementProperties(self): js = super(TestReportTest, self).elementProperties() js.extend([ ("action", "action", TestReportTestAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -397,10 +484,14 @@ def __init__(self, jsondict=None, strict=True): self.assert_fhir = None """ The assertion performed. Type `TestReportSetupActionAssert` (represented as `dict` in JSON). """ + self._assert_fhir = None + """ Primitive extension for assert_fhir. Type `FHIRPrimitiveExtension` """ self.operation = None """ The operation performed. Type `TestReportSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestReportTestAction, self).__init__(jsondict=jsondict, strict=strict) @@ -408,11 +499,14 @@ def elementProperties(self): js = super(TestReportTestAction, self).elementProperties() js.extend([ ("assert_fhir", "assert", TestReportSetupActionAssert, False, None, False), + ("_assert_fhir", "_assert_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operation", "operation", TestReportSetupActionOperation, False, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import fhirdatetime from . import fhirreference -from . import identifier +from . import identifier \ No newline at end of file diff --git a/fhirclient/models/testscript.py b/fhirclient/models/testscript.py index 7ae121e6..e95ef915 100644 --- a/fhirclient/models/testscript.py +++ b/fhirclient/models/testscript.py @@ -24,102 +24,150 @@ def __init__(self, jsondict=None, strict=True): self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the test script. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.destination = None """ An abstract server representing a destination or receiver in a message exchange. List of `TestScriptDestination` items (represented as `dict` in JSON). """ + self._destination = None + """ Primitive extension for destination. List of `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.fixture = None """ Fixture in the test script - by reference (uri). List of `TestScriptFixture` items (represented as `dict` in JSON). """ + self._fixture = None + """ Primitive extension for fixture. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the test script. Type `Identifier` (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for test script (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.metadata = None """ Required capability that is assumed to function correctly on the FHIR server being tested. Type `TestScriptMetadata` (represented as `dict` in JSON). """ + self._metadata = None + """ Primitive extension for metadata. Type `FHIRPrimitiveExtension` """ self.name = None """ Name for this test script (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.origin = None """ An abstract server representing a client or sender in a message exchange. List of `TestScriptOrigin` items (represented as `dict` in JSON). """ + self._origin = None + """ Primitive extension for origin. List of `FHIRPrimitiveExtension` """ self.profile = None """ Reference of the validation profile. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._profile = None + """ Primitive extension for profile. List of `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this test script is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.setup = None """ A series of required setup operations before tests are executed. Type `TestScriptSetup` (represented as `dict` in JSON). """ + self._setup = None + """ Primitive extension for setup. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.teardown = None """ A series of required clean up steps. Type `TestScriptTeardown` (represented as `dict` in JSON). """ + self._teardown = None + """ Primitive extension for teardown. Type `FHIRPrimitiveExtension` """ self.test = None """ A test in this script. List of `TestScriptTest` items (represented as `dict` in JSON). """ + self._test = None + """ Primitive extension for test. List of `FHIRPrimitiveExtension` """ self.title = None """ Name for this test script (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this test script, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.variable = None """ Placeholder for evaluated elements. List of `TestScriptVariable` items (represented as `dict` in JSON). """ + self._variable = None + """ Primitive extension for variable. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the test script. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(TestScript, self).__init__(jsondict=jsondict, strict=strict) @@ -127,29 +175,53 @@ def elementProperties(self): js = super(TestScript, self).elementProperties() js.extend([ ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", TestScriptDestination, True, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("fixture", "fixture", TestScriptFixture, True, None, False), + ("_fixture", "_fixture", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", identifier.Identifier, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("metadata", "metadata", TestScriptMetadata, False, None, False), + ("_metadata", "_metadata", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("origin", "origin", TestScriptOrigin, True, None, False), + ("_origin", "_origin", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("profile", "profile", fhirreference.FHIRReference, True, None, False), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("setup", "setup", TestScriptSetup, False, None, False), + ("_setup", "_setup", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("teardown", "teardown", TestScriptTeardown, False, None, False), + ("_teardown", "_teardown", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("test", "test", TestScriptTest, True, None, False), + ("_test", "_test", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("variable", "variable", TestScriptVariable, True, None, False), + ("_variable", "_variable", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -177,11 +249,15 @@ def __init__(self, jsondict=None, strict=True): self.index = None """ The index of the abstract destination server starting at 1. Type `int`. """ + self._index = None + """ Primitive extension for index. Type `FHIRPrimitiveExtension` """ self.profile = None """ FHIR-Server | FHIR-SDC-FormManager | FHIR-SDC-FormReceiver | FHIR- SDC-FormProcessor. Type `Coding` (represented as `dict` in JSON). """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ super(TestScriptDestination, self).__init__(jsondict=jsondict, strict=strict) @@ -189,7 +265,9 @@ def elementProperties(self): js = super(TestScriptDestination, self).elementProperties() js.extend([ ("index", "index", int, False, None, True), + ("_index", "_index", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", coding.Coding, False, None, True), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -214,14 +292,20 @@ def __init__(self, jsondict=None, strict=True): self.autocreate = None """ Whether or not to implicitly create the fixture during setup. Type `bool`. """ + self._autocreate = None + """ Primitive extension for autocreate. Type `FHIRPrimitiveExtension` """ self.autodelete = None """ Whether or not to implicitly delete the fixture during teardown. Type `bool`. """ + self._autodelete = None + """ Primitive extension for autodelete. Type `FHIRPrimitiveExtension` """ self.resource = None """ Reference of the resource. Type `FHIRReference` (represented as `dict` in JSON). """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ super(TestScriptFixture, self).__init__(jsondict=jsondict, strict=strict) @@ -229,8 +313,11 @@ def elementProperties(self): js = super(TestScriptFixture, self).elementProperties() js.extend([ ("autocreate", "autocreate", bool, False, None, True), + ("_autocreate", "_autocreate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("autodelete", "autodelete", bool, False, None, True), + ("_autodelete", "_autodelete", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", fhirreference.FHIRReference, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -257,10 +344,14 @@ def __init__(self, jsondict=None, strict=True): """ Capabilities that are assumed to function correctly on the FHIR server being tested. List of `TestScriptMetadataCapability` items (represented as `dict` in JSON). """ + self._capability = None + """ Primitive extension for capability. List of `FHIRPrimitiveExtension` """ self.link = None """ Links to the FHIR specification. List of `TestScriptMetadataLink` items (represented as `dict` in JSON). """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ super(TestScriptMetadata, self).__init__(jsondict=jsondict, strict=strict) @@ -268,7 +359,9 @@ def elementProperties(self): js = super(TestScriptMetadata, self).elementProperties() js.extend([ ("capability", "capability", TestScriptMetadataCapability, True, None, True), + ("_capability", "_capability", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("link", "link", TestScriptMetadataLink, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -294,30 +387,44 @@ def __init__(self, jsondict=None, strict=True): self.capabilities = None """ Required Capability Statement. Type `str`. """ + self._capabilities = None + """ Primitive extension for capabilities. Type `FHIRPrimitiveExtension` """ self.description = None """ The expected capabilities of the server. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.destination = None """ Which server these requirements apply to. Type `int`. """ + self._destination = None + """ Primitive extension for destination. Type `FHIRPrimitiveExtension` """ self.link = None """ Links to the FHIR specification. List of `str` items. """ + self._link = None + """ Primitive extension for link. List of `FHIRPrimitiveExtension` """ self.origin = None """ Which origin server these requirements apply to. List of `int` items. """ + self._origin = None + """ Primitive extension for origin. List of `FHIRPrimitiveExtension` """ self.required = None """ Are the capabilities required?. Type `bool`. """ + self._required = None + """ Primitive extension for required. Type `FHIRPrimitiveExtension` """ self.validated = None """ Are the capabilities validated?. Type `bool`. """ + self._validated = None + """ Primitive extension for validated. Type `FHIRPrimitiveExtension` """ super(TestScriptMetadataCapability, self).__init__(jsondict=jsondict, strict=strict) @@ -325,12 +432,19 @@ def elementProperties(self): js = super(TestScriptMetadataCapability, self).elementProperties() js.extend([ ("capabilities", "capabilities", str, False, None, True), + ("_capabilities", "_capabilities", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", int, False, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("link", "link", str, True, None, False), + ("_link", "_link", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("origin", "origin", int, True, None, False), + ("_origin", "_origin", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("required", "required", bool, False, None, True), + ("_required", "_required", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validated", "validated", bool, False, None, True), + ("_validated", "_validated", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -354,10 +468,14 @@ def __init__(self, jsondict=None, strict=True): self.description = None """ Short description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.url = None """ URL to the specification. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(TestScriptMetadataLink, self).__init__(jsondict=jsondict, strict=strict) @@ -365,7 +483,9 @@ def elementProperties(self): js = super(TestScriptMetadataLink, self).elementProperties() js.extend([ ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, True), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -390,10 +510,14 @@ def __init__(self, jsondict=None, strict=True): self.index = None """ The index of the abstract origin server starting at 1. Type `int`. """ + self._index = None + """ Primitive extension for index. Type `FHIRPrimitiveExtension` """ self.profile = None """ FHIR-Client | FHIR-SDC-FormFiller. Type `Coding` (represented as `dict` in JSON). """ + self._profile = None + """ Primitive extension for profile. Type `FHIRPrimitiveExtension` """ super(TestScriptOrigin, self).__init__(jsondict=jsondict, strict=strict) @@ -401,7 +525,9 @@ def elementProperties(self): js = super(TestScriptOrigin, self).elementProperties() js.extend([ ("index", "index", int, False, None, True), + ("_index", "_index", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("profile", "profile", coding.Coding, False, None, True), + ("_profile", "_profile", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -423,6 +549,8 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ A setup operation or assert to perform. List of `TestScriptSetupAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ super(TestScriptSetup, self).__init__(jsondict=jsondict, strict=strict) @@ -430,6 +558,7 @@ def elementProperties(self): js = super(TestScriptSetup, self).elementProperties() js.extend([ ("action", "action", TestScriptSetupAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -453,10 +582,14 @@ def __init__(self, jsondict=None, strict=True): self.assert_fhir = None """ The assertion to perform. Type `TestScriptSetupActionAssert` (represented as `dict` in JSON). """ + self._assert_fhir = None + """ Primitive extension for assert_fhir. Type `FHIRPrimitiveExtension` """ self.operation = None """ The setup operation to perform. Type `TestScriptSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestScriptSetupAction, self).__init__(jsondict=jsondict, strict=strict) @@ -464,7 +597,9 @@ def elementProperties(self): js = super(TestScriptSetupAction, self).elementProperties() js.extend([ ("assert_fhir", "assert", TestScriptSetupActionAssert, False, None, False), + ("_assert_fhir", "_assert_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operation", "operation", TestScriptSetupActionOperation, False, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -489,93 +624,137 @@ def __init__(self, jsondict=None, strict=True): self.compareToSourceExpression = None """ The FHIRPath expression to evaluate against the source fixture. Type `str`. """ + self._compareToSourceExpression = None + """ Primitive extension for compareToSourceExpression. Type `FHIRPrimitiveExtension` """ self.compareToSourceId = None """ Id of the source fixture to be evaluated. Type `str`. """ + self._compareToSourceId = None + """ Primitive extension for compareToSourceId. Type `FHIRPrimitiveExtension` """ self.compareToSourcePath = None """ XPath or JSONPath expression to evaluate against the source fixture. Type `str`. """ + self._compareToSourcePath = None + """ Primitive extension for compareToSourcePath. Type `FHIRPrimitiveExtension` """ self.contentType = None """ Mime type to compare against the 'Content-Type' header. Type `str`. """ + self._contentType = None + """ Primitive extension for contentType. Type `FHIRPrimitiveExtension` """ self.description = None """ Tracking/reporting assertion description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.direction = None """ response | request. Type `str`. """ + self._direction = None + """ Primitive extension for direction. Type `FHIRPrimitiveExtension` """ self.expression = None """ The FHIRPath expression to be evaluated. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.headerField = None """ HTTP header field name. Type `str`. """ + self._headerField = None + """ Primitive extension for headerField. Type `FHIRPrimitiveExtension` """ self.label = None """ Tracking/logging assertion label. Type `str`. """ + self._label = None + """ Primitive extension for label. Type `FHIRPrimitiveExtension` """ self.minimumId = None """ Fixture Id of minimum content resource. Type `str`. """ + self._minimumId = None + """ Primitive extension for minimumId. Type `FHIRPrimitiveExtension` """ self.navigationLinks = None """ Perform validation on navigation links?. Type `bool`. """ + self._navigationLinks = None + """ Primitive extension for navigationLinks. Type `FHIRPrimitiveExtension` """ self.operator = None """ equals | notEquals | in | notIn | greaterThan | lessThan | empty | notEmpty | contains | notContains | eval. Type `str`. """ + self._operator = None + """ Primitive extension for operator. Type `FHIRPrimitiveExtension` """ self.path = None """ XPath or JSONPath expression. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.requestMethod = None """ delete | get | options | patch | post | put | head. Type `str`. """ + self._requestMethod = None + """ Primitive extension for requestMethod. Type `FHIRPrimitiveExtension` """ self.requestURL = None """ Request URL comparison value. Type `str`. """ + self._requestURL = None + """ Primitive extension for requestURL. Type `FHIRPrimitiveExtension` """ self.resource = None """ Resource type. Type `str`. """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.response = None """ okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable. Type `str`. """ + self._response = None + """ Primitive extension for response. Type `FHIRPrimitiveExtension` """ self.responseCode = None """ HTTP response code to test. Type `str`. """ + self._responseCode = None + """ Primitive extension for responseCode. Type `FHIRPrimitiveExtension` """ self.sourceId = None """ Fixture Id of source expression or headerField. Type `str`. """ + self._sourceId = None + """ Primitive extension for sourceId. Type `FHIRPrimitiveExtension` """ self.validateProfileId = None """ Profile Id of validation profile reference. Type `str`. """ + self._validateProfileId = None + """ Primitive extension for validateProfileId. Type `FHIRPrimitiveExtension` """ self.value = None """ The value to compare to. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ self.warningOnly = None """ Will this assert produce a warning only on error?. Type `bool`. """ + self._warningOnly = None + """ Primitive extension for warningOnly. Type `FHIRPrimitiveExtension` """ super(TestScriptSetupActionAssert, self).__init__(jsondict=jsondict, strict=strict) @@ -583,27 +762,49 @@ def elementProperties(self): js = super(TestScriptSetupActionAssert, self).elementProperties() js.extend([ ("compareToSourceExpression", "compareToSourceExpression", str, False, None, False), + ("_compareToSourceExpression", "_compareToSourceExpression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("compareToSourceId", "compareToSourceId", str, False, None, False), + ("_compareToSourceId", "_compareToSourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("compareToSourcePath", "compareToSourcePath", str, False, None, False), + ("_compareToSourcePath", "_compareToSourcePath", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentType", "contentType", str, False, None, False), + ("_contentType", "_contentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("direction", "direction", str, False, None, False), + ("_direction", "_direction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("headerField", "headerField", str, False, None, False), + ("_headerField", "_headerField", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("label", "label", str, False, None, False), + ("_label", "_label", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("minimumId", "minimumId", str, False, None, False), + ("_minimumId", "_minimumId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("navigationLinks", "navigationLinks", bool, False, None, False), + ("_navigationLinks", "_navigationLinks", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operator", "operator", str, False, None, False), + ("_operator", "_operator", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestMethod", "requestMethod", str, False, None, False), + ("_requestMethod", "_requestMethod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestURL", "requestURL", str, False, None, False), + ("_requestURL", "_requestURL", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", str, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("response", "response", str, False, None, False), + ("_response", "_response", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responseCode", "responseCode", str, False, None, False), + ("_responseCode", "_responseCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceId", "sourceId", str, False, None, False), + ("_sourceId", "_sourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validateProfileId", "validateProfileId", str, False, None, False), + ("_validateProfileId", "_validateProfileId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, False), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("warningOnly", "warningOnly", bool, False, None, True), + ("_warningOnly", "_warningOnly", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -628,71 +829,105 @@ def __init__(self, jsondict=None, strict=True): """ Mime type to accept in the payload of the response, with charset etc.. Type `str`. """ + self._accept = None + """ Primitive extension for accept. Type `FHIRPrimitiveExtension` """ self.contentType = None """ Mime type of the request payload contents, with charset etc.. Type `str`. """ + self._contentType = None + """ Primitive extension for contentType. Type `FHIRPrimitiveExtension` """ self.description = None """ Tracking/reporting operation description. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.destination = None """ Server responding to the request. Type `int`. """ + self._destination = None + """ Primitive extension for destination. Type `FHIRPrimitiveExtension` """ self.encodeRequestUrl = None """ Whether or not to send the request url in encoded format. Type `bool`. """ + self._encodeRequestUrl = None + """ Primitive extension for encodeRequestUrl. Type `FHIRPrimitiveExtension` """ self.label = None """ Tracking/logging operation label. Type `str`. """ + self._label = None + """ Primitive extension for label. Type `FHIRPrimitiveExtension` """ self.method = None """ delete | get | options | patch | post | put | head. Type `str`. """ + self._method = None + """ Primitive extension for method. Type `FHIRPrimitiveExtension` """ self.origin = None """ Server initiating the request. Type `int`. """ + self._origin = None + """ Primitive extension for origin. Type `FHIRPrimitiveExtension` """ self.params = None """ Explicitly defined path parameters. Type `str`. """ + self._params = None + """ Primitive extension for params. Type `FHIRPrimitiveExtension` """ self.requestHeader = None """ Each operation can have one or more header elements. List of `TestScriptSetupActionOperationRequestHeader` items (represented as `dict` in JSON). """ + self._requestHeader = None + """ Primitive extension for requestHeader. List of `FHIRPrimitiveExtension` """ self.requestId = None """ Fixture Id of mapped request. Type `str`. """ + self._requestId = None + """ Primitive extension for requestId. Type `FHIRPrimitiveExtension` """ self.resource = None """ Resource type. Type `str`. """ + self._resource = None + """ Primitive extension for resource. Type `FHIRPrimitiveExtension` """ self.responseId = None """ Fixture Id of mapped response. Type `str`. """ + self._responseId = None + """ Primitive extension for responseId. Type `FHIRPrimitiveExtension` """ self.sourceId = None """ Fixture Id of body for PUT and POST requests. Type `str`. """ + self._sourceId = None + """ Primitive extension for sourceId. Type `FHIRPrimitiveExtension` """ self.targetId = None """ Id of fixture used for extracting the [id], [type], and [vid] for GET requests. Type `str`. """ + self._targetId = None + """ Primitive extension for targetId. Type `FHIRPrimitiveExtension` """ self.type = None """ The operation code type that will be executed. Type `Coding` (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ self.url = None """ Request URL. Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ super(TestScriptSetupActionOperation, self).__init__(jsondict=jsondict, strict=strict) @@ -700,22 +935,39 @@ def elementProperties(self): js = super(TestScriptSetupActionOperation, self).elementProperties() js.extend([ ("accept", "accept", str, False, None, False), + ("_accept", "_accept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contentType", "contentType", str, False, None, False), + ("_contentType", "_contentType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("destination", "destination", int, False, None, False), + ("_destination", "_destination", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encodeRequestUrl", "encodeRequestUrl", bool, False, None, True), + ("_encodeRequestUrl", "_encodeRequestUrl", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("label", "label", str, False, None, False), + ("_label", "_label", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("method", "method", str, False, None, False), + ("_method", "_method", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("origin", "origin", int, False, None, False), + ("_origin", "_origin", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("params", "params", str, False, None, False), + ("_params", "_params", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("requestHeader", "requestHeader", TestScriptSetupActionOperationRequestHeader, True, None, False), + ("_requestHeader", "_requestHeader", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("requestId", "requestId", str, False, None, False), + ("_requestId", "_requestId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("resource", "resource", str, False, None, False), + ("_resource", "_resource", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("responseId", "responseId", str, False, None, False), + ("_responseId", "_responseId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceId", "sourceId", str, False, None, False), + ("_sourceId", "_sourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("targetId", "targetId", str, False, None, False), + ("_targetId", "_targetId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", coding.Coding, False, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -739,10 +991,14 @@ def __init__(self, jsondict=None, strict=True): self.field = None """ HTTP header field name. Type `str`. """ + self._field = None + """ Primitive extension for field. Type `FHIRPrimitiveExtension` """ self.value = None """ HTTP headerfield value. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(TestScriptSetupActionOperationRequestHeader, self).__init__(jsondict=jsondict, strict=strict) @@ -750,7 +1006,9 @@ def elementProperties(self): js = super(TestScriptSetupActionOperationRequestHeader, self).elementProperties() js.extend([ ("field", "field", str, False, None, True), + ("_field", "_field", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -775,6 +1033,8 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ One or more teardown operations to perform. List of `TestScriptTeardownAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ super(TestScriptTeardown, self).__init__(jsondict=jsondict, strict=strict) @@ -782,6 +1042,7 @@ def elementProperties(self): js = super(TestScriptTeardown, self).elementProperties() js.extend([ ("action", "action", TestScriptTeardownAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -805,6 +1066,8 @@ def __init__(self, jsondict=None, strict=True): self.operation = None """ The teardown operation to perform. Type `TestScriptSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestScriptTeardownAction, self).__init__(jsondict=jsondict, strict=strict) @@ -812,6 +1075,7 @@ def elementProperties(self): js = super(TestScriptTeardownAction, self).elementProperties() js.extend([ ("operation", "operation", TestScriptSetupActionOperation, False, None, True), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -833,14 +1097,20 @@ def __init__(self, jsondict=None, strict=True): self.action = None """ A test operation or assert to perform. List of `TestScriptTestAction` items (represented as `dict` in JSON). """ + self._action = None + """ Primitive extension for action. List of `FHIRPrimitiveExtension` """ self.description = None """ Tracking/reporting short description of the test. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.name = None """ Tracking/logging name of this test. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ super(TestScriptTest, self).__init__(jsondict=jsondict, strict=strict) @@ -848,8 +1118,11 @@ def elementProperties(self): js = super(TestScriptTest, self).elementProperties() js.extend([ ("action", "action", TestScriptTestAction, True, None, True), + ("_action", "_action", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -873,10 +1146,14 @@ def __init__(self, jsondict=None, strict=True): self.assert_fhir = None """ The setup assertion to perform. Type `TestScriptSetupActionAssert` (represented as `dict` in JSON). """ + self._assert_fhir = None + """ Primitive extension for assert_fhir. Type `FHIRPrimitiveExtension` """ self.operation = None """ The setup operation to perform. Type `TestScriptSetupActionOperation` (represented as `dict` in JSON). """ + self._operation = None + """ Primitive extension for operation. Type `FHIRPrimitiveExtension` """ super(TestScriptTestAction, self).__init__(jsondict=jsondict, strict=strict) @@ -884,7 +1161,9 @@ def elementProperties(self): js = super(TestScriptTestAction, self).elementProperties() js.extend([ ("assert_fhir", "assert", TestScriptSetupActionAssert, False, None, False), + ("_assert_fhir", "_assert_fhir", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("operation", "operation", TestScriptSetupActionOperation, False, None, False), + ("_operation", "_operation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -909,34 +1188,50 @@ def __init__(self, jsondict=None, strict=True): self.defaultValue = None """ Default, hard-coded, or user-defined value for this variable. Type `str`. """ + self._defaultValue = None + """ Primitive extension for defaultValue. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the variable. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expression = None """ The FHIRPath expression against the fixture body. Type `str`. """ + self._expression = None + """ Primitive extension for expression. Type `FHIRPrimitiveExtension` """ self.headerField = None """ HTTP header field name for source. Type `str`. """ + self._headerField = None + """ Primitive extension for headerField. Type `FHIRPrimitiveExtension` """ self.hint = None """ Hint help text for default value to enter. Type `str`. """ + self._hint = None + """ Primitive extension for hint. Type `FHIRPrimitiveExtension` """ self.name = None """ Descriptive name for this variable. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.path = None """ XPath or JSONPath against the fixture body. Type `str`. """ + self._path = None + """ Primitive extension for path. Type `FHIRPrimitiveExtension` """ self.sourceId = None """ Fixture Id of source expression or headerField within this variable. Type `str`. """ + self._sourceId = None + """ Primitive extension for sourceId. Type `FHIRPrimitiveExtension` """ super(TestScriptVariable, self).__init__(jsondict=jsondict, strict=strict) @@ -944,16 +1239,25 @@ def elementProperties(self): js = super(TestScriptVariable, self).elementProperties() js.extend([ ("defaultValue", "defaultValue", str, False, None, False), + ("_defaultValue", "_defaultValue", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expression", "expression", str, False, None, False), + ("_expression", "_expression", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("headerField", "headerField", str, False, None, False), + ("_headerField", "_headerField", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("hint", "hint", str, False, None, False), + ("_hint", "_hint", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("path", "path", str, False, None, False), + ("_path", "_path", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceId", "sourceId", str, False, None, False), + ("_sourceId", "_sourceId", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding @@ -961,4 +1265,4 @@ def elementProperties(self): from . import fhirdatetime from . import fhirreference from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/timing.py b/fhirclient/models/timing.py index c492ce59..092104e9 100644 --- a/fhirclient/models/timing.py +++ b/fhirclient/models/timing.py @@ -27,14 +27,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ BID | TID | QID | AM | PM | QD | QOD | +. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.event = None """ When the event occurs. List of `FHIRDateTime` items (represented as `str` in JSON). """ + self._event = None + """ Primitive extension for event. List of `FHIRPrimitiveExtension` """ self.repeat = None """ When the event is to occur. Type `TimingRepeat` (represented as `dict` in JSON). """ + self._repeat = None + """ Primitive extension for repeat. Type `FHIRPrimitiveExtension` """ super(Timing, self).__init__(jsondict=jsondict, strict=strict) @@ -42,8 +48,11 @@ def elementProperties(self): js = super(Timing, self).elementProperties() js.extend([ ("code", "code", codeableconcept.CodeableConcept, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("event", "event", fhirdatetime.FHIRDateTime, True, None, False), + ("_event", "_event", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("repeat", "repeat", TimingRepeat, False, None, False), + ("_repeat", "_repeat", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -69,70 +78,104 @@ def __init__(self, jsondict=None, strict=True): self.boundsDuration = None """ Length/Range of lengths, or (Start and/or end) limits. Type `Duration` (represented as `dict` in JSON). """ + self._boundsDuration = None + """ Primitive extension for boundsDuration. Type `FHIRPrimitiveExtension` """ self.boundsPeriod = None """ Length/Range of lengths, or (Start and/or end) limits. Type `Period` (represented as `dict` in JSON). """ + self._boundsPeriod = None + """ Primitive extension for boundsPeriod. Type `FHIRPrimitiveExtension` """ self.boundsRange = None """ Length/Range of lengths, or (Start and/or end) limits. Type `Range` (represented as `dict` in JSON). """ + self._boundsRange = None + """ Primitive extension for boundsRange. Type `FHIRPrimitiveExtension` """ self.count = None """ Number of times to repeat. Type `int`. """ + self._count = None + """ Primitive extension for count. Type `FHIRPrimitiveExtension` """ self.countMax = None """ Maximum number of times to repeat. Type `int`. """ + self._countMax = None + """ Primitive extension for countMax. Type `FHIRPrimitiveExtension` """ self.dayOfWeek = None """ mon | tue | wed | thu | fri | sat | sun. List of `str` items. """ + self._dayOfWeek = None + """ Primitive extension for dayOfWeek. List of `FHIRPrimitiveExtension` """ self.duration = None """ How long when it happens. Type `float`. """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.durationMax = None """ How long when it happens (Max). Type `float`. """ + self._durationMax = None + """ Primitive extension for durationMax. Type `FHIRPrimitiveExtension` """ self.durationUnit = None """ s | min | h | d | wk | mo | a - unit of time (UCUM). Type `str`. """ + self._durationUnit = None + """ Primitive extension for durationUnit. Type `FHIRPrimitiveExtension` """ self.frequency = None """ Event occurs frequency times per period. Type `int`. """ + self._frequency = None + """ Primitive extension for frequency. Type `FHIRPrimitiveExtension` """ self.frequencyMax = None """ Event occurs up to frequencyMax times per period. Type `int`. """ + self._frequencyMax = None + """ Primitive extension for frequencyMax. Type `FHIRPrimitiveExtension` """ self.offset = None """ Minutes from event (before or after). Type `int`. """ + self._offset = None + """ Primitive extension for offset. Type `FHIRPrimitiveExtension` """ self.period = None """ Event occurs frequency times per period. Type `float`. """ + self._period = None + """ Primitive extension for period. Type `FHIRPrimitiveExtension` """ self.periodMax = None """ Upper limit of period (3-4 hours). Type `float`. """ + self._periodMax = None + """ Primitive extension for periodMax. Type `FHIRPrimitiveExtension` """ self.periodUnit = None """ s | min | h | d | wk | mo | a - unit of time (UCUM). Type `str`. """ + self._periodUnit = None + """ Primitive extension for periodUnit. Type `FHIRPrimitiveExtension` """ self.timeOfDay = None """ Time of day for action. List of `FHIRTime` items (represented as `str` in JSON). """ + self._timeOfDay = None + """ Primitive extension for timeOfDay. List of `FHIRPrimitiveExtension` """ self.when = None """ Code for time period of occurrence. List of `str` items. """ + self._when = None + """ Primitive extension for when. List of `FHIRPrimitiveExtension` """ super(TimingRepeat, self).__init__(jsondict=jsondict, strict=strict) @@ -140,29 +183,47 @@ def elementProperties(self): js = super(TimingRepeat, self).elementProperties() js.extend([ ("boundsDuration", "boundsDuration", duration.Duration, False, "bounds", False), + ("_boundsDuration", "_boundsDuration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("boundsPeriod", "boundsPeriod", period.Period, False, "bounds", False), + ("_boundsPeriod", "_boundsPeriod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("boundsRange", "boundsRange", range.Range, False, "bounds", False), + ("_boundsRange", "_boundsRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("count", "count", int, False, None, False), + ("_count", "_count", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("countMax", "countMax", int, False, None, False), + ("_countMax", "_countMax", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dayOfWeek", "dayOfWeek", str, True, None, False), + ("_dayOfWeek", "_dayOfWeek", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("duration", "duration", float, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("durationMax", "durationMax", float, False, None, False), + ("_durationMax", "_durationMax", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("durationUnit", "durationUnit", str, False, None, False), + ("_durationUnit", "_durationUnit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("frequency", "frequency", int, False, None, False), + ("_frequency", "_frequency", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("frequencyMax", "frequencyMax", int, False, None, False), + ("_frequencyMax", "_frequencyMax", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offset", "offset", int, False, None, False), + ("_offset", "_offset", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("period", "period", float, False, None, False), + ("_period", "_period", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("periodMax", "periodMax", float, False, None, False), + ("_periodMax", "_periodMax", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("periodUnit", "periodUnit", str, False, None, False), + ("_periodUnit", "_periodUnit", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timeOfDay", "timeOfDay", fhirtime.FHIRTime, True, None, False), + ("_timeOfDay", "_timeOfDay", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("when", "when", str, True, None, False), + ("_when", "_when", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import duration from . import fhirdatetime from . import fhirtime from . import period -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/triggerdefinition.py b/fhirclient/models/triggerdefinition.py index 52223ea9..cc1984a0 100644 --- a/fhirclient/models/triggerdefinition.py +++ b/fhirclient/models/triggerdefinition.py @@ -24,35 +24,51 @@ def __init__(self, jsondict=None, strict=True): self.condition = None """ Whether the event triggers (boolean expression). Type `Expression` (represented as `dict` in JSON). """ + self._condition = None + """ Primitive extension for condition. Type `FHIRPrimitiveExtension` """ self.data = None """ Triggering data of the event (multiple = 'and'). List of `DataRequirement` items (represented as `dict` in JSON). """ + self._data = None + """ Primitive extension for data. List of `FHIRPrimitiveExtension` """ self.name = None """ Name or URI that identifies the event. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.timingDate = None """ Timing of the event. Type `FHIRDate` (represented as `str` in JSON). """ + self._timingDate = None + """ Primitive extension for timingDate. Type `FHIRPrimitiveExtension` """ self.timingDateTime = None """ Timing of the event. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timingDateTime = None + """ Primitive extension for timingDateTime. Type `FHIRPrimitiveExtension` """ self.timingReference = None """ Timing of the event. Type `FHIRReference` (represented as `dict` in JSON). """ + self._timingReference = None + """ Primitive extension for timingReference. Type `FHIRPrimitiveExtension` """ self.timingTiming = None """ Timing of the event. Type `Timing` (represented as `dict` in JSON). """ + self._timingTiming = None + """ Primitive extension for timingTiming. Type `FHIRPrimitiveExtension` """ self.type = None """ named-event | periodic | data-changed | data-added | data-modified | data-removed | data-accessed | data-access-ended. Type `str`. """ + self._type = None + """ Primitive extension for type. Type `FHIRPrimitiveExtension` """ super(TriggerDefinition, self).__init__(jsondict=jsondict, strict=strict) @@ -60,20 +76,29 @@ def elementProperties(self): js = super(TriggerDefinition, self).elementProperties() js.extend([ ("condition", "condition", expression.Expression, False, None, False), + ("_condition", "_condition", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("data", "data", datarequirement.DataRequirement, True, None, False), + ("_data", "_data", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDate", "timingDate", fhirdate.FHIRDate, False, "timing", False), + ("_timingDate", "_timingDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingDateTime", "timingDateTime", fhirdatetime.FHIRDateTime, False, "timing", False), + ("_timingDateTime", "_timingDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingReference", "timingReference", fhirreference.FHIRReference, False, "timing", False), + ("_timingReference", "_timingReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("timingTiming", "timingTiming", timing.Timing, False, "timing", False), + ("_timingTiming", "_timingTiming", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("type", "type", str, False, None, True), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import datarequirement from . import expression from . import fhirdate from . import fhirdatetime from . import fhirreference -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/usagecontext.py b/fhirclient/models/usagecontext.py index 29343f4a..63cdafb7 100644 --- a/fhirclient/models/usagecontext.py +++ b/fhirclient/models/usagecontext.py @@ -26,22 +26,32 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Type of context being specified. Type `Coding` (represented as `dict` in JSON). """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.valueCodeableConcept = None """ Value that defines the context. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._valueCodeableConcept = None + """ Primitive extension for valueCodeableConcept. Type `FHIRPrimitiveExtension` """ self.valueQuantity = None """ Value that defines the context. Type `Quantity` (represented as `dict` in JSON). """ + self._valueQuantity = None + """ Primitive extension for valueQuantity. Type `FHIRPrimitiveExtension` """ self.valueRange = None """ Value that defines the context. Type `Range` (represented as `dict` in JSON). """ + self._valueRange = None + """ Primitive extension for valueRange. Type `FHIRPrimitiveExtension` """ self.valueReference = None """ Value that defines the context. Type `FHIRReference` (represented as `dict` in JSON). """ + self._valueReference = None + """ Primitive extension for valueReference. Type `FHIRPrimitiveExtension` """ super(UsageContext, self).__init__(jsondict=jsondict, strict=strict) @@ -49,16 +59,22 @@ def elementProperties(self): js = super(UsageContext, self).elementProperties() js.extend([ ("code", "code", coding.Coding, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCodeableConcept", "valueCodeableConcept", codeableconcept.CodeableConcept, False, "value", True), + ("_valueCodeableConcept", "_valueCodeableConcept", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueQuantity", "valueQuantity", quantity.Quantity, False, "value", True), + ("_valueQuantity", "_valueQuantity", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueRange", "valueRange", range.Range, False, "value", True), + ("_valueRange", "_valueRange", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueReference", "valueReference", fhirreference.FHIRReference, False, "value", True), + ("_valueReference", "_valueReference", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding from . import fhirreference from . import quantity -from . import range +from . import range \ No newline at end of file diff --git a/fhirclient/models/valueset.py b/fhirclient/models/valueset.py index 919b0538..e7efc814 100644 --- a/fhirclient/models/valueset.py +++ b/fhirclient/models/valueset.py @@ -26,76 +26,112 @@ def __init__(self, jsondict=None, strict=True): self.compose = None """ Content logical definition of the value set (CLD). Type `ValueSetCompose` (represented as `dict` in JSON). """ + self._compose = None + """ Primitive extension for compose. Type `FHIRPrimitiveExtension` """ self.contact = None """ Contact details for the publisher. List of `ContactDetail` items (represented as `dict` in JSON). """ + self._contact = None + """ Primitive extension for contact. List of `FHIRPrimitiveExtension` """ self.copyright = None """ Use and/or publishing restrictions. Type `str`. """ + self._copyright = None + """ Primitive extension for copyright. Type `FHIRPrimitiveExtension` """ self.date = None """ Date last changed. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.description = None """ Natural language description of the value set. Type `str`. """ + self._description = None + """ Primitive extension for description. Type `FHIRPrimitiveExtension` """ self.expansion = None """ Used when the value set is "expanded". Type `ValueSetExpansion` (represented as `dict` in JSON). """ + self._expansion = None + """ Primitive extension for expansion. Type `FHIRPrimitiveExtension` """ self.experimental = None """ For testing purposes, not real usage. Type `bool`. """ + self._experimental = None + """ Primitive extension for experimental. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Additional identifier for the value set (business identifier). List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.immutable = None """ Indicates whether or not any change to the content logical definition may occur. Type `bool`. """ + self._immutable = None + """ Primitive extension for immutable. Type `FHIRPrimitiveExtension` """ self.jurisdiction = None """ Intended jurisdiction for value set (if applicable). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._jurisdiction = None + """ Primitive extension for jurisdiction. List of `FHIRPrimitiveExtension` """ self.name = None """ Name for this value set (computer friendly). Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.publisher = None """ Name of the publisher (organization or individual). Type `str`. """ + self._publisher = None + """ Primitive extension for publisher. Type `FHIRPrimitiveExtension` """ self.purpose = None """ Why this value set is defined. Type `str`. """ + self._purpose = None + """ Primitive extension for purpose. Type `FHIRPrimitiveExtension` """ self.status = None """ draft | active | retired | unknown. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.title = None """ Name for this value set (human friendly). Type `str`. """ + self._title = None + """ Primitive extension for title. Type `FHIRPrimitiveExtension` """ self.url = None """ Canonical identifier for this value set, represented as a URI (globally unique). Type `str`. """ + self._url = None + """ Primitive extension for url. Type `FHIRPrimitiveExtension` """ self.useContext = None """ The context that the content is intended to support. List of `UsageContext` items (represented as `dict` in JSON). """ + self._useContext = None + """ Primitive extension for useContext. List of `FHIRPrimitiveExtension` """ self.version = None """ Business version of the value set. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ValueSet, self).__init__(jsondict=jsondict, strict=strict) @@ -103,23 +139,41 @@ def elementProperties(self): js = super(ValueSet, self).elementProperties() js.extend([ ("compose", "compose", ValueSetCompose, False, None, False), + ("_compose", "_compose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contact", "contact", contactdetail.ContactDetail, True, None, False), + ("_contact", "_contact", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("copyright", "copyright", str, False, None, False), + ("_copyright", "_copyright", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdatetime.FHIRDateTime, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("description", "description", str, False, None, False), + ("_description", "_description", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("expansion", "expansion", ValueSetExpansion, False, None, False), + ("_expansion", "_expansion", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("experimental", "experimental", bool, False, None, False), + ("_experimental", "_experimental", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("immutable", "immutable", bool, False, None, False), + ("_immutable", "_immutable", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("jurisdiction", "jurisdiction", codeableconcept.CodeableConcept, True, None, False), + ("_jurisdiction", "_jurisdiction", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("name", "name", str, False, None, False), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("publisher", "publisher", str, False, None, False), + ("_publisher", "_publisher", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("purpose", "purpose", str, False, None, False), + ("_purpose", "_purpose", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("title", "title", str, False, None, False), + ("_title", "_title", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("url", "url", str, False, None, False), + ("_url", "_url", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("useContext", "useContext", usagecontext.UsageContext, True, None, False), + ("_useContext", "_useContext", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -147,18 +201,26 @@ def __init__(self, jsondict=None, strict=True): self.exclude = None """ Explicitly exclude codes from a code system or other value sets. List of `ValueSetComposeInclude` items (represented as `dict` in JSON). """ + self._exclude = None + """ Primitive extension for exclude. List of `FHIRPrimitiveExtension` """ self.inactive = None """ Whether inactive codes are in the value set. Type `bool`. """ + self._inactive = None + """ Primitive extension for inactive. Type `FHIRPrimitiveExtension` """ self.include = None """ Include one or more codes from a code system or other value set(s). List of `ValueSetComposeInclude` items (represented as `dict` in JSON). """ + self._include = None + """ Primitive extension for include. List of `FHIRPrimitiveExtension` """ self.lockedDate = None """ Fixed date for references with no specified version (transitive). Type `FHIRDate` (represented as `str` in JSON). """ + self._lockedDate = None + """ Primitive extension for lockedDate. Type `FHIRPrimitiveExtension` """ super(ValueSetCompose, self).__init__(jsondict=jsondict, strict=strict) @@ -166,9 +228,13 @@ def elementProperties(self): js = super(ValueSetCompose, self).elementProperties() js.extend([ ("exclude", "exclude", ValueSetComposeInclude, True, None, False), + ("_exclude", "_exclude", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("inactive", "inactive", bool, False, None, False), + ("_inactive", "_inactive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("include", "include", ValueSetComposeInclude, True, None, True), + ("_include", "_include", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lockedDate", "lockedDate", fhirdate.FHIRDate, False, None, False), + ("_lockedDate", "_lockedDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -190,22 +256,32 @@ def __init__(self, jsondict=None, strict=True): self.concept = None """ A concept defined in the system. List of `ValueSetComposeIncludeConcept` items (represented as `dict` in JSON). """ + self._concept = None + """ Primitive extension for concept. List of `FHIRPrimitiveExtension` """ self.filter = None """ Select codes/concepts by their properties (including relationships). List of `ValueSetComposeIncludeFilter` items (represented as `dict` in JSON). """ + self._filter = None + """ Primitive extension for filter. List of `FHIRPrimitiveExtension` """ self.system = None """ The system the codes come from. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.valueSet = None """ Select the contents included in this value set. List of `str` items. """ + self._valueSet = None + """ Primitive extension for valueSet. List of `FHIRPrimitiveExtension` """ self.version = None """ Specific version of the code system referred to. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ValueSetComposeInclude, self).__init__(jsondict=jsondict, strict=strict) @@ -213,10 +289,15 @@ def elementProperties(self): js = super(ValueSetComposeInclude, self).elementProperties() js.extend([ ("concept", "concept", ValueSetComposeIncludeConcept, True, None, False), + ("_concept", "_concept", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("filter", "filter", ValueSetComposeIncludeFilter, True, None, False), + ("_filter", "_filter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueSet", "valueSet", str, True, None, False), + ("_valueSet", "_valueSet", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -240,14 +321,20 @@ def __init__(self, jsondict=None, strict=True): self.code = None """ Code or expression from system. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.designation = None """ Additional representations for this concept. List of `ValueSetComposeIncludeConceptDesignation` items (represented as `dict` in JSON). """ + self._designation = None + """ Primitive extension for designation. List of `FHIRPrimitiveExtension` """ self.display = None """ Text to display for this code for this value set in this valueset. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ super(ValueSetComposeIncludeConcept, self).__init__(jsondict=jsondict, strict=strict) @@ -255,8 +342,11 @@ def elementProperties(self): js = super(ValueSetComposeIncludeConcept, self).elementProperties() js.extend([ ("code", "code", str, False, None, True), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("designation", "designation", ValueSetComposeIncludeConceptDesignation, True, None, False), + ("_designation", "_designation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -282,14 +372,20 @@ def __init__(self, jsondict=None, strict=True): self.language = None """ Human language of the designation. Type `str`. """ + self._language = None + """ Primitive extension for language. Type `FHIRPrimitiveExtension` """ self.use = None """ Types of uses of designations. Type `Coding` (represented as `dict` in JSON). """ + self._use = None + """ Primitive extension for use. Type `FHIRPrimitiveExtension` """ self.value = None """ The text value for this designation. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ValueSetComposeIncludeConceptDesignation, self).__init__(jsondict=jsondict, strict=strict) @@ -297,8 +393,11 @@ def elementProperties(self): js = super(ValueSetComposeIncludeConceptDesignation, self).elementProperties() js.extend([ ("language", "language", str, False, None, False), + ("_language", "_language", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("use", "use", coding.Coding, False, None, False), + ("_use", "_use", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -325,15 +424,21 @@ def __init__(self, jsondict=None, strict=True): """ = | is-a | descendent-of | is-not-a | regex | in | not-in | generalizes | exists. Type `str`. """ + self._op = None + """ Primitive extension for op. Type `FHIRPrimitiveExtension` """ self.property = None """ A property/filter defined by the code system. Type `str`. """ + self._property = None + """ Primitive extension for property. Type `FHIRPrimitiveExtension` """ self.value = None """ Code from the system, or regex criteria, or boolean value for exists. Type `str`. """ + self._value = None + """ Primitive extension for value. Type `FHIRPrimitiveExtension` """ super(ValueSetComposeIncludeFilter, self).__init__(jsondict=jsondict, strict=strict) @@ -341,8 +446,11 @@ def elementProperties(self): js = super(ValueSetComposeIncludeFilter, self).elementProperties() js.extend([ ("op", "op", str, False, None, True), + ("_op", "_op", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("property", "property", str, False, None, True), + ("_property", "_property", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("value", "value", str, False, None, True), + ("_value", "_value", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -368,26 +476,38 @@ def __init__(self, jsondict=None, strict=True): self.contains = None """ Codes in the value set. List of `ValueSetExpansionContains` items (represented as `dict` in JSON). """ + self._contains = None + """ Primitive extension for contains. List of `FHIRPrimitiveExtension` """ self.identifier = None """ Identifies the value set expansion (business identifier). Type `str`. """ + self._identifier = None + """ Primitive extension for identifier. Type `FHIRPrimitiveExtension` """ self.offset = None """ Offset at which this resource starts. Type `int`. """ + self._offset = None + """ Primitive extension for offset. Type `FHIRPrimitiveExtension` """ self.parameter = None """ Parameter that controlled the expansion process. List of `ValueSetExpansionParameter` items (represented as `dict` in JSON). """ + self._parameter = None + """ Primitive extension for parameter. List of `FHIRPrimitiveExtension` """ self.timestamp = None """ Time ValueSet expansion happened. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._timestamp = None + """ Primitive extension for timestamp. Type `FHIRPrimitiveExtension` """ self.total = None """ Total number of codes in the expansion. Type `int`. """ + self._total = None + """ Primitive extension for total. Type `FHIRPrimitiveExtension` """ super(ValueSetExpansion, self).__init__(jsondict=jsondict, strict=strict) @@ -395,11 +515,17 @@ def elementProperties(self): js = super(ValueSetExpansion, self).elementProperties() js.extend([ ("contains", "contains", ValueSetExpansionContains, True, None, False), + ("_contains", "_contains", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("identifier", "identifier", str, False, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("offset", "offset", int, False, None, False), + ("_offset", "_offset", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("parameter", "parameter", ValueSetExpansionParameter, True, None, False), + ("_parameter", "_parameter", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("timestamp", "timestamp", fhirdatetime.FHIRDateTime, False, None, True), + ("_timestamp", "_timestamp", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("total", "total", int, False, None, False), + ("_total", "_total", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -423,34 +549,50 @@ def __init__(self, jsondict=None, strict=True): self.abstract = None """ If user cannot select this entry. Type `bool`. """ + self._abstract = None + """ Primitive extension for abstract. Type `FHIRPrimitiveExtension` """ self.code = None """ Code - if blank, this is not a selectable code. Type `str`. """ + self._code = None + """ Primitive extension for code. Type `FHIRPrimitiveExtension` """ self.contains = None """ Codes contained under this entry. List of `ValueSetExpansionContains` items (represented as `dict` in JSON). """ + self._contains = None + """ Primitive extension for contains. List of `FHIRPrimitiveExtension` """ self.designation = None """ Additional representations for this item. List of `ValueSetComposeIncludeConceptDesignation` items (represented as `dict` in JSON). """ + self._designation = None + """ Primitive extension for designation. List of `FHIRPrimitiveExtension` """ self.display = None """ User display for the concept. Type `str`. """ + self._display = None + """ Primitive extension for display. Type `FHIRPrimitiveExtension` """ self.inactive = None """ If concept is inactive in the code system. Type `bool`. """ + self._inactive = None + """ Primitive extension for inactive. Type `FHIRPrimitiveExtension` """ self.system = None """ System value for the code. Type `str`. """ + self._system = None + """ Primitive extension for system. Type `FHIRPrimitiveExtension` """ self.version = None """ Version in which this code/display is defined. Type `str`. """ + self._version = None + """ Primitive extension for version. Type `FHIRPrimitiveExtension` """ super(ValueSetExpansionContains, self).__init__(jsondict=jsondict, strict=strict) @@ -458,13 +600,21 @@ def elementProperties(self): js = super(ValueSetExpansionContains, self).elementProperties() js.extend([ ("abstract", "abstract", bool, False, None, False), + ("_abstract", "_abstract", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("code", "code", str, False, None, False), + ("_code", "_code", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("contains", "contains", ValueSetExpansionContains, True, None, False), + ("_contains", "_contains", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("designation", "designation", ValueSetComposeIncludeConceptDesignation, True, None, False), + ("_designation", "_designation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("display", "display", str, False, None, False), + ("_display", "_display", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("inactive", "inactive", bool, False, None, False), + ("_inactive", "_inactive", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("system", "system", str, False, None, False), + ("_system", "_system", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("version", "version", str, False, None, False), + ("_version", "_version", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -490,34 +640,50 @@ def __init__(self, jsondict=None, strict=True): self.name = None """ Name as assigned by the client or server. Type `str`. """ + self._name = None + """ Primitive extension for name. Type `FHIRPrimitiveExtension` """ self.valueBoolean = None """ Value of the named parameter. Type `bool`. """ + self._valueBoolean = None + """ Primitive extension for valueBoolean. Type `FHIRPrimitiveExtension` """ self.valueCode = None """ Value of the named parameter. Type `str`. """ + self._valueCode = None + """ Primitive extension for valueCode. Type `FHIRPrimitiveExtension` """ self.valueDateTime = None """ Value of the named parameter. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._valueDateTime = None + """ Primitive extension for valueDateTime. Type `FHIRPrimitiveExtension` """ self.valueDecimal = None """ Value of the named parameter. Type `float`. """ + self._valueDecimal = None + """ Primitive extension for valueDecimal. Type `FHIRPrimitiveExtension` """ self.valueInteger = None """ Value of the named parameter. Type `int`. """ + self._valueInteger = None + """ Primitive extension for valueInteger. Type `FHIRPrimitiveExtension` """ self.valueString = None """ Value of the named parameter. Type `str`. """ + self._valueString = None + """ Primitive extension for valueString. Type `FHIRPrimitiveExtension` """ self.valueUri = None """ Value of the named parameter. Type `str`. """ + self._valueUri = None + """ Primitive extension for valueUri. Type `FHIRPrimitiveExtension` """ super(ValueSetExpansionParameter, self).__init__(jsondict=jsondict, strict=strict) @@ -525,16 +691,25 @@ def elementProperties(self): js = super(ValueSetExpansionParameter, self).elementProperties() js.extend([ ("name", "name", str, False, None, True), + ("_name", "_name", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueBoolean", "valueBoolean", bool, False, "value", False), + ("_valueBoolean", "_valueBoolean", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueCode", "valueCode", str, False, "value", False), + ("_valueCode", "_valueCode", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDateTime", "valueDateTime", fhirdatetime.FHIRDateTime, False, "value", False), + ("_valueDateTime", "_valueDateTime", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueDecimal", "valueDecimal", float, False, "value", False), + ("_valueDecimal", "_valueDecimal", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueInteger", "valueInteger", int, False, "value", False), + ("_valueInteger", "_valueInteger", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueString", "valueString", str, False, "value", False), + ("_valueString", "_valueString", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("valueUri", "valueUri", str, False, "value", False), + ("_valueUri", "_valueUri", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import coding @@ -542,4 +717,4 @@ def elementProperties(self): from . import fhirdate from . import fhirdatetime from . import identifier -from . import usagecontext +from . import usagecontext \ No newline at end of file diff --git a/fhirclient/models/verificationresult.py b/fhirclient/models/verificationresult.py index 720a5c86..473f2151 100644 --- a/fhirclient/models/verificationresult.py +++ b/fhirclient/models/verificationresult.py @@ -22,62 +22,90 @@ def __init__(self, jsondict=None, strict=True): self.attestation = None """ Information about the entity attesting to information. Type `VerificationResultAttestation` (represented as `dict` in JSON). """ + self._attestation = None + """ Primitive extension for attestation. Type `FHIRPrimitiveExtension` """ self.failureAction = None """ fatal | warn | rec-only | none. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._failureAction = None + """ Primitive extension for failureAction. Type `FHIRPrimitiveExtension` """ self.frequency = None """ Frequency of revalidation. Type `Timing` (represented as `dict` in JSON). """ + self._frequency = None + """ Primitive extension for frequency. Type `FHIRPrimitiveExtension` """ self.lastPerformed = None """ The date/time validation was last completed (including failed validations). Type `FHIRDateTime` (represented as `str` in JSON). """ + self._lastPerformed = None + """ Primitive extension for lastPerformed. Type `FHIRPrimitiveExtension` """ self.need = None """ none | initial | periodic. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._need = None + """ Primitive extension for need. Type `FHIRPrimitiveExtension` """ self.nextScheduled = None """ The date when target is next validated, if appropriate. Type `FHIRDate` (represented as `str` in JSON). """ + self._nextScheduled = None + """ Primitive extension for nextScheduled. Type `FHIRPrimitiveExtension` """ self.primarySource = None """ Information about the primary source(s) involved in validation. List of `VerificationResultPrimarySource` items (represented as `dict` in JSON). """ + self._primarySource = None + """ Primitive extension for primarySource. List of `FHIRPrimitiveExtension` """ self.status = None """ attested | validated | in-process | req-revalid | val-fail | reval- fail. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ self.statusDate = None """ When the validation status was updated. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._statusDate = None + """ Primitive extension for statusDate. Type `FHIRPrimitiveExtension` """ self.target = None """ A resource that was validated. List of `FHIRReference` items (represented as `dict` in JSON). """ + self._target = None + """ Primitive extension for target. List of `FHIRPrimitiveExtension` """ self.targetLocation = None """ The fhirpath location(s) within the resource that was validated. List of `str` items. """ + self._targetLocation = None + """ Primitive extension for targetLocation. List of `FHIRPrimitiveExtension` """ self.validationProcess = None """ The primary process by which the target is validated (edit check; value set; primary source; multiple sources; standalone; in context). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._validationProcess = None + """ Primitive extension for validationProcess. List of `FHIRPrimitiveExtension` """ self.validationType = None """ nothing | primary | multiple. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._validationType = None + """ Primitive extension for validationType. Type `FHIRPrimitiveExtension` """ self.validator = None """ Information about the entity validating information. List of `VerificationResultValidator` items (represented as `dict` in JSON). """ + self._validator = None + """ Primitive extension for validator. List of `FHIRPrimitiveExtension` """ super(VerificationResult, self).__init__(jsondict=jsondict, strict=strict) @@ -85,19 +113,33 @@ def elementProperties(self): js = super(VerificationResult, self).elementProperties() js.extend([ ("attestation", "attestation", VerificationResultAttestation, False, None, False), + ("_attestation", "_attestation", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("failureAction", "failureAction", codeableconcept.CodeableConcept, False, None, False), + ("_failureAction", "_failureAction", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("frequency", "frequency", timing.Timing, False, None, False), + ("_frequency", "_frequency", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("lastPerformed", "lastPerformed", fhirdatetime.FHIRDateTime, False, None, False), + ("_lastPerformed", "_lastPerformed", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("need", "need", codeableconcept.CodeableConcept, False, None, False), + ("_need", "_need", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("nextScheduled", "nextScheduled", fhirdate.FHIRDate, False, None, False), + ("_nextScheduled", "_nextScheduled", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("primarySource", "primarySource", VerificationResultPrimarySource, True, None, False), + ("_primarySource", "_primarySource", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("statusDate", "statusDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_statusDate", "_statusDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("target", "target", fhirreference.FHIRReference, True, None, False), + ("_target", "_target", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("targetLocation", "targetLocation", str, True, None, False), + ("_targetLocation", "_targetLocation", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("validationProcess", "validationProcess", codeableconcept.CodeableConcept, True, None, False), + ("_validationProcess", "_validationProcess", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("validationType", "validationType", codeableconcept.CodeableConcept, False, None, False), + ("_validationType", "_validationType", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validator", "validator", VerificationResultValidator, True, None, False), + ("_validator", "_validator", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ]) return js @@ -121,37 +163,53 @@ def __init__(self, jsondict=None, strict=True): self.communicationMethod = None """ The method by which attested information was submitted/retrieved. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._communicationMethod = None + """ Primitive extension for communicationMethod. Type `FHIRPrimitiveExtension` """ self.date = None """ The date the information was attested to. Type `FHIRDate` (represented as `str` in JSON). """ + self._date = None + """ Primitive extension for date. Type `FHIRPrimitiveExtension` """ self.onBehalfOf = None """ When the who is asserting on behalf of another (organization or individual). Type `FHIRReference` (represented as `dict` in JSON). """ + self._onBehalfOf = None + """ Primitive extension for onBehalfOf. Type `FHIRPrimitiveExtension` """ self.proxyIdentityCertificate = None """ A digital identity certificate associated with the proxy entity submitting attested information on behalf of the attestation source. Type `str`. """ + self._proxyIdentityCertificate = None + """ Primitive extension for proxyIdentityCertificate. Type `FHIRPrimitiveExtension` """ self.proxySignature = None """ Proxy signature. Type `Signature` (represented as `dict` in JSON). """ + self._proxySignature = None + """ Primitive extension for proxySignature. Type `FHIRPrimitiveExtension` """ self.sourceIdentityCertificate = None """ A digital identity certificate associated with the attestation source. Type `str`. """ + self._sourceIdentityCertificate = None + """ Primitive extension for sourceIdentityCertificate. Type `FHIRPrimitiveExtension` """ self.sourceSignature = None """ Attester signature. Type `Signature` (represented as `dict` in JSON). """ + self._sourceSignature = None + """ Primitive extension for sourceSignature. Type `FHIRPrimitiveExtension` """ self.who = None """ The individual or organization attesting to information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._who = None + """ Primitive extension for who. Type `FHIRPrimitiveExtension` """ super(VerificationResultAttestation, self).__init__(jsondict=jsondict, strict=strict) @@ -159,13 +217,21 @@ def elementProperties(self): js = super(VerificationResultAttestation, self).elementProperties() js.extend([ ("communicationMethod", "communicationMethod", codeableconcept.CodeableConcept, False, None, False), + ("_communicationMethod", "_communicationMethod", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("date", "date", fhirdate.FHIRDate, False, None, False), + ("_date", "_date", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("onBehalfOf", "onBehalfOf", fhirreference.FHIRReference, False, None, False), + ("_onBehalfOf", "_onBehalfOf", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("proxyIdentityCertificate", "proxyIdentityCertificate", str, False, None, False), + ("_proxyIdentityCertificate", "_proxyIdentityCertificate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("proxySignature", "proxySignature", signature.Signature, False, None, False), + ("_proxySignature", "_proxySignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceIdentityCertificate", "sourceIdentityCertificate", str, False, None, False), + ("_sourceIdentityCertificate", "_sourceIdentityCertificate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sourceSignature", "sourceSignature", signature.Signature, False, None, False), + ("_sourceSignature", "_sourceSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("who", "who", fhirreference.FHIRReference, False, None, False), + ("_who", "_who", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -187,14 +253,20 @@ def __init__(self, jsondict=None, strict=True): self.canPushUpdates = None """ yes | no | undetermined. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._canPushUpdates = None + """ Primitive extension for canPushUpdates. Type `FHIRPrimitiveExtension` """ self.communicationMethod = None """ Method for exchanging information with the primary source. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._communicationMethod = None + """ Primitive extension for communicationMethod. List of `FHIRPrimitiveExtension` """ self.pushTypeAvailable = None """ specific | any | source. List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._pushTypeAvailable = None + """ Primitive extension for pushTypeAvailable. List of `FHIRPrimitiveExtension` """ self.type = None """ Type of primary source (License Board; Primary Education; @@ -202,18 +274,26 @@ def __init__(self, jsondict=None, strict=True): Registration Authority; legal source; issuing source; authoritative source). List of `CodeableConcept` items (represented as `dict` in JSON). """ + self._type = None + """ Primitive extension for type. List of `FHIRPrimitiveExtension` """ self.validationDate = None """ When the target was validated against the primary source. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._validationDate = None + """ Primitive extension for validationDate. Type `FHIRPrimitiveExtension` """ self.validationStatus = None """ successful | failed | unknown. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._validationStatus = None + """ Primitive extension for validationStatus. Type `FHIRPrimitiveExtension` """ self.who = None """ Reference to the primary source. Type `FHIRReference` (represented as `dict` in JSON). """ + self._who = None + """ Primitive extension for who. Type `FHIRPrimitiveExtension` """ super(VerificationResultPrimarySource, self).__init__(jsondict=jsondict, strict=strict) @@ -221,12 +301,19 @@ def elementProperties(self): js = super(VerificationResultPrimarySource, self).elementProperties() js.extend([ ("canPushUpdates", "canPushUpdates", codeableconcept.CodeableConcept, False, None, False), + ("_canPushUpdates", "_canPushUpdates", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("communicationMethod", "communicationMethod", codeableconcept.CodeableConcept, True, None, False), + ("_communicationMethod", "_communicationMethod", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("pushTypeAvailable", "pushTypeAvailable", codeableconcept.CodeableConcept, True, None, False), + ("_pushTypeAvailable", "_pushTypeAvailable", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("type", "type", codeableconcept.CodeableConcept, True, None, False), + ("_type", "_type", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("validationDate", "validationDate", fhirdatetime.FHIRDateTime, False, None, False), + ("_validationDate", "_validationDate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("validationStatus", "validationStatus", codeableconcept.CodeableConcept, False, None, False), + ("_validationStatus", "_validationStatus", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("who", "who", fhirreference.FHIRReference, False, None, False), + ("_who", "_who", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -248,14 +335,20 @@ def __init__(self, jsondict=None, strict=True): self.attestationSignature = None """ Validator signature. Type `Signature` (represented as `dict` in JSON). """ + self._attestationSignature = None + """ Primitive extension for attestationSignature. Type `FHIRPrimitiveExtension` """ self.identityCertificate = None """ A digital identity certificate associated with the validator. Type `str`. """ + self._identityCertificate = None + """ Primitive extension for identityCertificate. Type `FHIRPrimitiveExtension` """ self.organization = None """ Reference to the organization validating information. Type `FHIRReference` (represented as `dict` in JSON). """ + self._organization = None + """ Primitive extension for organization. Type `FHIRPrimitiveExtension` """ super(VerificationResultValidator, self).__init__(jsondict=jsondict, strict=strict) @@ -263,15 +356,19 @@ def elementProperties(self): js = super(VerificationResultValidator, self).elementProperties() js.extend([ ("attestationSignature", "attestationSignature", signature.Signature, False, None, False), + ("_attestationSignature", "_attestationSignature", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identityCertificate", "identityCertificate", str, False, None, False), + ("_identityCertificate", "_identityCertificate", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("organization", "organization", fhirreference.FHIRReference, False, None, True), + ("_organization", "_organization", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import codeableconcept from . import fhirdate from . import fhirdatetime from . import fhirreference from . import signature -from . import timing +from . import timing \ No newline at end of file diff --git a/fhirclient/models/visionprescription.py b/fhirclient/models/visionprescription.py index 1d734a90..661b6bb2 100644 --- a/fhirclient/models/visionprescription.py +++ b/fhirclient/models/visionprescription.py @@ -24,34 +24,50 @@ def __init__(self, jsondict=None, strict=True): self.created = None """ Response creation date. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._created = None + """ Primitive extension for created. Type `FHIRPrimitiveExtension` """ self.dateWritten = None """ When prescription was authorized. Type `FHIRDateTime` (represented as `str` in JSON). """ + self._dateWritten = None + """ Primitive extension for dateWritten. Type `FHIRPrimitiveExtension` """ self.encounter = None """ Created during encounter / admission / stay. Type `FHIRReference` (represented as `dict` in JSON). """ + self._encounter = None + """ Primitive extension for encounter. Type `FHIRPrimitiveExtension` """ self.identifier = None """ Business Identifier for vision prescription. List of `Identifier` items (represented as `dict` in JSON). """ + self._identifier = None + """ Primitive extension for identifier. List of `FHIRPrimitiveExtension` """ self.lensSpecification = None """ Vision lens authorization. List of `VisionPrescriptionLensSpecification` items (represented as `dict` in JSON). """ + self._lensSpecification = None + """ Primitive extension for lensSpecification. List of `FHIRPrimitiveExtension` """ self.patient = None """ Who prescription is for. Type `FHIRReference` (represented as `dict` in JSON). """ + self._patient = None + """ Primitive extension for patient. Type `FHIRPrimitiveExtension` """ self.prescriber = None """ Who authorized the vision prescription. Type `FHIRReference` (represented as `dict` in JSON). """ + self._prescriber = None + """ Primitive extension for prescriber. Type `FHIRPrimitiveExtension` """ self.status = None """ active | cancelled | draft | entered-in-error. Type `str`. """ + self._status = None + """ Primitive extension for status. Type `FHIRPrimitiveExtension` """ super(VisionPrescription, self).__init__(jsondict=jsondict, strict=strict) @@ -59,13 +75,21 @@ def elementProperties(self): js = super(VisionPrescription, self).elementProperties() js.extend([ ("created", "created", fhirdatetime.FHIRDateTime, False, None, True), + ("_created", "_created", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("dateWritten", "dateWritten", fhirdatetime.FHIRDateTime, False, None, True), + ("_dateWritten", "_dateWritten", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("encounter", "encounter", fhirreference.FHIRReference, False, None, False), + ("_encounter", "_encounter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("identifier", "identifier", identifier.Identifier, True, None, False), + ("_identifier", "_identifier", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("lensSpecification", "lensSpecification", VisionPrescriptionLensSpecification, True, None, True), + ("_lensSpecification", "_lensSpecification", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("patient", "patient", fhirreference.FHIRReference, False, None, True), + ("_patient", "_patient", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prescriber", "prescriber", fhirreference.FHIRReference, False, None, True), + ("_prescriber", "_prescriber", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("status", "status", str, False, None, True), + ("_status", "_status", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -92,58 +116,86 @@ def __init__(self, jsondict=None, strict=True): self.add = None """ Added power for multifocal levels. Type `float`. """ + self._add = None + """ Primitive extension for add. Type `FHIRPrimitiveExtension` """ self.axis = None """ Lens meridian which contain no power for astigmatism. Type `int`. """ + self._axis = None + """ Primitive extension for axis. Type `FHIRPrimitiveExtension` """ self.backCurve = None """ Contact lens back curvature. Type `float`. """ + self._backCurve = None + """ Primitive extension for backCurve. Type `FHIRPrimitiveExtension` """ self.brand = None """ Brand required. Type `str`. """ + self._brand = None + """ Primitive extension for brand. Type `FHIRPrimitiveExtension` """ self.color = None """ Color required. Type `str`. """ + self._color = None + """ Primitive extension for color. Type `FHIRPrimitiveExtension` """ self.cylinder = None """ Lens power for astigmatism. Type `float`. """ + self._cylinder = None + """ Primitive extension for cylinder. Type `FHIRPrimitiveExtension` """ self.diameter = None """ Contact lens diameter. Type `float`. """ + self._diameter = None + """ Primitive extension for diameter. Type `FHIRPrimitiveExtension` """ self.duration = None """ Lens wear duration. Type `Quantity` (represented as `dict` in JSON). """ + self._duration = None + """ Primitive extension for duration. Type `FHIRPrimitiveExtension` """ self.eye = None """ right | left. Type `str`. """ + self._eye = None + """ Primitive extension for eye. Type `FHIRPrimitiveExtension` """ self.note = None """ Notes for coatings. List of `Annotation` items (represented as `dict` in JSON). """ + self._note = None + """ Primitive extension for note. List of `FHIRPrimitiveExtension` """ self.power = None """ Contact lens power. Type `float`. """ + self._power = None + """ Primitive extension for power. Type `FHIRPrimitiveExtension` """ self.prism = None """ Eye alignment compensation. List of `VisionPrescriptionLensSpecificationPrism` items (represented as `dict` in JSON). """ + self._prism = None + """ Primitive extension for prism. List of `FHIRPrimitiveExtension` """ self.product = None """ Product to be supplied. Type `CodeableConcept` (represented as `dict` in JSON). """ + self._product = None + """ Primitive extension for product. Type `FHIRPrimitiveExtension` """ self.sphere = None """ Power of the lens. Type `float`. """ + self._sphere = None + """ Primitive extension for sphere. Type `FHIRPrimitiveExtension` """ super(VisionPrescriptionLensSpecification, self).__init__(jsondict=jsondict, strict=strict) @@ -151,19 +203,33 @@ def elementProperties(self): js = super(VisionPrescriptionLensSpecification, self).elementProperties() js.extend([ ("add", "add", float, False, None, False), + ("_add", "_add", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("axis", "axis", int, False, None, False), + ("_axis", "_axis", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("backCurve", "backCurve", float, False, None, False), + ("_backCurve", "_backCurve", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("brand", "brand", str, False, None, False), + ("_brand", "_brand", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("color", "color", str, False, None, False), + ("_color", "_color", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("cylinder", "cylinder", float, False, None, False), + ("_cylinder", "_cylinder", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("diameter", "diameter", float, False, None, False), + ("_diameter", "_diameter", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("duration", "duration", quantity.Quantity, False, None, False), + ("_duration", "_duration", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("eye", "eye", str, False, None, True), + ("_eye", "_eye", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("note", "note", annotation.Annotation, True, None, False), + ("_note", "_note", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("power", "power", float, False, None, False), + ("_power", "_power", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("prism", "prism", VisionPrescriptionLensSpecificationPrism, True, None, False), + ("_prism", "_prism", fhirprimitiveextension.FHIRPrimitiveExtension, True, None, False), ("product", "product", codeableconcept.CodeableConcept, False, None, True), + ("_product", "_product", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("sphere", "sphere", float, False, None, False), + ("_sphere", "_sphere", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js @@ -187,10 +253,14 @@ def __init__(self, jsondict=None, strict=True): self.amount = None """ Amount of adjustment. Type `float`. """ + self._amount = None + """ Primitive extension for amount. Type `FHIRPrimitiveExtension` """ self.base = None """ up | down | in | out. Type `str`. """ + self._base = None + """ Primitive extension for base. Type `FHIRPrimitiveExtension` """ super(VisionPrescriptionLensSpecificationPrism, self).__init__(jsondict=jsondict, strict=strict) @@ -198,14 +268,17 @@ def elementProperties(self): js = super(VisionPrescriptionLensSpecificationPrism, self).elementProperties() js.extend([ ("amount", "amount", float, False, None, True), + ("_amount", "_amount", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ("base", "base", str, False, None, True), + ("_base", "_base", fhirprimitiveextension.FHIRPrimitiveExtension, False, None, False), ]) return js +from . import fhirprimitiveextension from . import annotation from . import codeableconcept from . import fhirdatetime from . import fhirreference from . import identifier -from . import quantity +from . import quantity \ No newline at end of file diff --git a/tests/models/account_test.py b/tests/models/account_test.py index 84b1af16..fb02c8bc 100644 --- a/tests/models/account_test.py +++ b/tests/models/account_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return account.Account(js) def testAccount1(self): - inst = self.instantiate_from("account-example-with-guarantor.json") + inst = self.instantiate_from("account-example.json") self.assertIsNotNone(inst, "Must have instantiated a Account instance") self.implAccount1(inst) @@ -31,24 +31,20 @@ def testAccount1(self): def implAccount1(self, inst): self.assertEqual(inst.coverage[0].priority, 1) - self.assertEqual(inst.coverage[1].priority, 2) self.assertEqual(inst.description, "Hospital charges") - self.assertFalse(inst.guarantor[0].onHold) - self.assertEqual(inst.guarantor[0].period.start.datetime, FHIRDateTime("2016-01-01").datetime) - self.assertEqual(inst.guarantor[0].period.start.as_json(), "2016-01-01") - self.assertEqual(inst.id, "ewg") + self.assertEqual(inst.id, "example") self.assertEqual(inst.identifier[0].system, "urn:oid:0.1.2.3.4.5.6.7") self.assertEqual(inst.identifier[0].value, "654321") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Inpatient: Peter James Chalmers") + self.assertEqual(inst.name, "HACC Funded Billing for Peter James Chalmers") self.assertEqual(inst.servicePeriod.end.datetime, FHIRDateTime("2016-06-30").datetime) self.assertEqual(inst.servicePeriod.end.as_json(), "2016-06-30") self.assertEqual(inst.servicePeriod.start.datetime, FHIRDateTime("2016-01-01").datetime) self.assertEqual(inst.servicePeriod.start.as_json(), "2016-01-01") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
Inpatient Admission for Peter James Chalmers Account
") + self.assertEqual(inst.text.div, "
HACC Funded Billing for Peter James Chalmers
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "PBILLACCT") self.assertEqual(inst.type.coding[0].display, "patient billing account") @@ -56,7 +52,7 @@ def implAccount1(self, inst): self.assertEqual(inst.type.text, "patient") def testAccount2(self): - inst = self.instantiate_from("account-example.json") + inst = self.instantiate_from("account-example-with-guarantor.json") self.assertIsNotNone(inst, "Must have instantiated a Account instance") self.implAccount2(inst) @@ -67,20 +63,24 @@ def testAccount2(self): def implAccount2(self, inst): self.assertEqual(inst.coverage[0].priority, 1) + self.assertEqual(inst.coverage[1].priority, 2) self.assertEqual(inst.description, "Hospital charges") - self.assertEqual(inst.id, "example") + self.assertFalse(inst.guarantor[0].onHold) + self.assertEqual(inst.guarantor[0].period.start.datetime, FHIRDateTime("2016-01-01").datetime) + self.assertEqual(inst.guarantor[0].period.start.as_json(), "2016-01-01") + self.assertEqual(inst.id, "ewg") self.assertEqual(inst.identifier[0].system, "urn:oid:0.1.2.3.4.5.6.7") self.assertEqual(inst.identifier[0].value, "654321") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "HACC Funded Billing for Peter James Chalmers") + self.assertEqual(inst.name, "Inpatient: Peter James Chalmers") self.assertEqual(inst.servicePeriod.end.datetime, FHIRDateTime("2016-06-30").datetime) self.assertEqual(inst.servicePeriod.end.as_json(), "2016-06-30") self.assertEqual(inst.servicePeriod.start.datetime, FHIRDateTime("2016-01-01").datetime) self.assertEqual(inst.servicePeriod.start.as_json(), "2016-01-01") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
HACC Funded Billing for Peter James Chalmers
") + self.assertEqual(inst.text.div, "
Inpatient Admission for Peter James Chalmers Account
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "PBILLACCT") self.assertEqual(inst.type.coding[0].display, "patient billing account") diff --git a/tests/models/activitydefinition_test.py b/tests/models/activitydefinition_test.py index 1ea16a16..44941a1e 100644 --- a/tests/models/activitydefinition_test.py +++ b/tests/models/activitydefinition_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return activitydefinition.ActivityDefinition(js) def testActivityDefinition1(self): - inst = self.instantiate_from("activitydefinition-supplyrequest-example.json") + inst = self.instantiate_from("activitydefinition-predecessor-example.json") self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") self.implActivityDefinition1(inst) @@ -30,31 +30,6 @@ def testActivityDefinition1(self): self.implActivityDefinition1(inst2) def implActivityDefinition1(self, inst): - self.assertEqual(inst.code.coding[0].code, "BlueTubes") - self.assertEqual(inst.code.coding[0].display, "Blood collect tubes blue cap") - self.assertEqual(inst.description, "10 Blood collect tubes blue cap") - self.assertEqual(inst.id, "blood-tubes-supply") - self.assertEqual(inst.kind, "SupplyRequest") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.purpose, "Describes a request for 10 Blood collection tubes with blue caps.") - self.assertEqual(inst.quantity.value, 10) - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.transform, "StructureMap/supplyrequest-transform") - - def testActivityDefinition2(self): - inst = self.instantiate_from("activitydefinition-predecessor-example.json") - self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") - self.implActivityDefinition2(inst) - - js = inst.as_json() - self.assertEqual("ActivityDefinition", js["resourceType"]) - inst2 = activitydefinition.ActivityDefinition(js) - self.implActivityDefinition2(inst2) - - def implActivityDefinition2(self, inst): self.assertEqual(inst.approvalDate.date, FHIRDate("2016-03-12").date) self.assertEqual(inst.approvalDate.as_json(), "2016-03-12") self.assertEqual(inst.author[0].name, "Motive Medical Intelligence") @@ -141,17 +116,17 @@ def implActivityDefinition2(self, inst): self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.version, "1.0.0") - def testActivityDefinition3(self): + def testActivityDefinition2(self): inst = self.instantiate_from("activitydefinition-medicationorder-example.json") self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") - self.implActivityDefinition3(inst) + self.implActivityDefinition2(inst) js = inst.as_json() self.assertEqual("ActivityDefinition", js["resourceType"]) inst2 = activitydefinition.ActivityDefinition(js) - self.implActivityDefinition3(inst2) + self.implActivityDefinition2(inst2) - def implActivityDefinition3(self, inst): + def implActivityDefinition2(self, inst): self.assertEqual(inst.approvalDate.date, FHIRDate("2016-03-12").date) self.assertEqual(inst.approvalDate.as_json(), "2016-03-12") self.assertEqual(inst.author[0].name, "Motive Medical Intelligence") @@ -258,62 +233,17 @@ def implActivityDefinition3(self, inst): self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.version, "1.0.0") - def testActivityDefinition4(self): - inst = self.instantiate_from("activitydefinition-servicerequest-example.json") - self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") - self.implActivityDefinition4(inst) - - js = inst.as_json() - self.assertEqual("ActivityDefinition", js["resourceType"]) - inst2 = activitydefinition.ActivityDefinition(js) - self.implActivityDefinition4(inst2) - - def implActivityDefinition4(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "17401000") - self.assertEqual(inst.bodySite[0].coding[0].display, "Heart valve structure") - self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[0].code, "34068001") - self.assertEqual(inst.code.coding[0].display, "Heart valve replacement") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.description, "Heart valve replacement") - self.assertEqual(inst.id, "heart-valve-replacement") - self.assertEqual(inst.kind, "ServiceRequest") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.participant[0].role.coding[0].code, "207RI0011X") - self.assertEqual(inst.participant[0].role.coding[0].display, "Interventional Cardiology") - self.assertEqual(inst.participant[0].role.coding[0].system, "http://nucc.org/provider-taxonomy") - self.assertEqual(inst.participant[0].role.text, "Interventional Cardiology") - self.assertEqual(inst.participant[0].type, "practitioner") - self.assertEqual(inst.purpose, "Describes the proposal to perform a Heart Valve replacement.") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.topic[0].coding[0].code, "34068001") - self.assertEqual(inst.topic[0].coding[0].display, "Heart valve replacement") - self.assertEqual(inst.topic[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[0].code.code, "age") - self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "D000328") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Adult") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "https://meshb.nlm.nih.gov") - self.assertEqual(inst.useContext[1].code.code, "user") - self.assertEqual(inst.useContext[1].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].code, "309343006") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].display, "Physician") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - - def testActivityDefinition5(self): + def testActivityDefinition3(self): inst = self.instantiate_from("activitydefinition-example.json") self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") - self.implActivityDefinition5(inst) + self.implActivityDefinition3(inst) js = inst.as_json() self.assertEqual("ActivityDefinition", js["resourceType"]) inst2 = activitydefinition.ActivityDefinition(js) - self.implActivityDefinition5(inst2) + self.implActivityDefinition3(inst2) - def implActivityDefinition5(self, inst): + def implActivityDefinition3(self, inst): self.assertEqual(inst.approvalDate.date, FHIRDate("2017-03-01").date) self.assertEqual(inst.approvalDate.as_json(), "2017-03-01") self.assertEqual(inst.author[0].name, "Motive Medical Intelligence") @@ -399,4 +329,74 @@ def implActivityDefinition5(self, inst): self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].display, "Outpatient environment") self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.version, "1.1.0") + + def testActivityDefinition4(self): + inst = self.instantiate_from("activitydefinition-servicerequest-example.json") + self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") + self.implActivityDefinition4(inst) + + js = inst.as_json() + self.assertEqual("ActivityDefinition", js["resourceType"]) + inst2 = activitydefinition.ActivityDefinition(js) + self.implActivityDefinition4(inst2) + + def implActivityDefinition4(self, inst): + self.assertEqual(inst.bodySite[0].coding[0].code, "17401000") + self.assertEqual(inst.bodySite[0].coding[0].display, "Heart valve structure") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.coding[0].code, "34068001") + self.assertEqual(inst.code.coding[0].display, "Heart valve replacement") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.description, "Heart valve replacement") + self.assertEqual(inst.id, "heart-valve-replacement") + self.assertEqual(inst.kind, "ServiceRequest") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.participant[0].role.coding[0].code, "207RI0011X") + self.assertEqual(inst.participant[0].role.coding[0].display, "Interventional Cardiology") + self.assertEqual(inst.participant[0].role.coding[0].system, "http://nucc.org/provider-taxonomy") + self.assertEqual(inst.participant[0].role.text, "Interventional Cardiology") + self.assertEqual(inst.participant[0].type, "practitioner") + self.assertEqual(inst.purpose, "Describes the proposal to perform a Heart Valve replacement.") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.topic[0].coding[0].code, "34068001") + self.assertEqual(inst.topic[0].coding[0].display, "Heart valve replacement") + self.assertEqual(inst.topic[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[0].code.code, "age") + self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "D000328") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Adult") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "https://meshb.nlm.nih.gov") + self.assertEqual(inst.useContext[1].code.code, "user") + self.assertEqual(inst.useContext[1].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].code, "309343006") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].display, "Physician") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + + def testActivityDefinition5(self): + inst = self.instantiate_from("activitydefinition-supplyrequest-example.json") + self.assertIsNotNone(inst, "Must have instantiated a ActivityDefinition instance") + self.implActivityDefinition5(inst) + + js = inst.as_json() + self.assertEqual("ActivityDefinition", js["resourceType"]) + inst2 = activitydefinition.ActivityDefinition(js) + self.implActivityDefinition5(inst2) + + def implActivityDefinition5(self, inst): + self.assertEqual(inst.code.coding[0].code, "BlueTubes") + self.assertEqual(inst.code.coding[0].display, "Blood collect tubes blue cap") + self.assertEqual(inst.description, "10 Blood collect tubes blue cap") + self.assertEqual(inst.id, "blood-tubes-supply") + self.assertEqual(inst.kind, "SupplyRequest") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.purpose, "Describes a request for 10 Blood collection tubes with blue caps.") + self.assertEqual(inst.quantity.value, 10) + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.transform, "StructureMap/supplyrequest-transform") diff --git a/tests/models/appointment_test.py b/tests/models/appointment_test.py index e4c8d122..6122be23 100644 --- a/tests/models/appointment_test.py +++ b/tests/models/appointment_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return appointment.Appointment(js) def testAppointment1(self): - inst = self.instantiate_from("appointment-example2doctors.json") + inst = self.instantiate_from("appointment-example.json") self.assertIsNotNone(inst, "Must have instantiated a Appointment instance") self.implAppointment1(inst) @@ -30,51 +30,6 @@ def testAppointment1(self): self.implAppointment1(inst2) def implAppointment1(self, inst): - self.assertEqual(inst.appointmentType.coding[0].code, "WALKIN") - self.assertEqual(inst.appointmentType.coding[0].display, "A previously unscheduled walk-in visit") - self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") - self.assertEqual(inst.comment, "Clarify the results of the MRI to ensure context of test was correct") - self.assertEqual(inst.description, "Discussion about Peter Chalmers MRI results") - self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-09T11:00:00Z").datetime) - self.assertEqual(inst.end.as_json(), "2013-12-09T11:00:00Z") - self.assertEqual(inst.id, "2docs") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.participant[0].required, "information-only") - self.assertEqual(inst.participant[0].status, "accepted") - self.assertEqual(inst.participant[1].required, "required") - self.assertEqual(inst.participant[1].status, "accepted") - self.assertEqual(inst.participant[2].required, "required") - self.assertEqual(inst.participant[2].status, "accepted") - self.assertEqual(inst.participant[3].required, "information-only") - self.assertEqual(inst.participant[3].status, "accepted") - self.assertEqual(inst.priority, 5) - self.assertEqual(inst.serviceCategory[0].coding[0].code, "gp") - self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") - self.assertEqual(inst.serviceCategory[0].coding[0].system, "http://example.org/service-category") - self.assertEqual(inst.serviceType[0].coding[0].code, "52") - self.assertEqual(inst.serviceType[0].coding[0].display, "General Discussion") - self.assertEqual(inst.specialty[0].coding[0].code, "394814009") - self.assertEqual(inst.specialty[0].coding[0].display, "General practice") - self.assertEqual(inst.specialty[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-09T09:00:00Z").datetime) - self.assertEqual(inst.start.as_json(), "2013-12-09T09:00:00Z") - self.assertEqual(inst.status, "booked") - self.assertEqual(inst.text.div, "
Brian MRI results discussion
") - self.assertEqual(inst.text.status, "generated") - - def testAppointment2(self): - inst = self.instantiate_from("appointment-example.json") - self.assertIsNotNone(inst, "Must have instantiated a Appointment instance") - self.implAppointment2(inst) - - js = inst.as_json() - self.assertEqual("Appointment", js["resourceType"]) - inst2 = appointment.Appointment(js) - self.implAppointment2(inst2) - - def implAppointment2(self, inst): self.assertEqual(inst.appointmentType.coding[0].code, "FOLLOWUP") self.assertEqual(inst.appointmentType.coding[0].display, "A follow up visit from a previous appointment") self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") @@ -111,17 +66,17 @@ def implAppointment2(self, inst): self.assertEqual(inst.text.div, "
Brian MRI results discussion
") self.assertEqual(inst.text.status, "generated") - def testAppointment3(self): + def testAppointment2(self): inst = self.instantiate_from("appointment-example-request.json") self.assertIsNotNone(inst, "Must have instantiated a Appointment instance") - self.implAppointment3(inst) + self.implAppointment2(inst) js = inst.as_json() self.assertEqual("Appointment", js["resourceType"]) inst2 = appointment.Appointment(js) - self.implAppointment3(inst2) + self.implAppointment2(inst2) - def implAppointment3(self, inst): + def implAppointment2(self, inst): self.assertEqual(inst.appointmentType.coding[0].code, "WALKIN") self.assertEqual(inst.appointmentType.coding[0].display, "A previously unscheduled walk-in visit") self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") @@ -161,4 +116,49 @@ def implAppointment3(self, inst): self.assertEqual(inst.status, "proposed") self.assertEqual(inst.text.div, "
Brian MRI results discussion
") self.assertEqual(inst.text.status, "generated") + + def testAppointment3(self): + inst = self.instantiate_from("appointment-example2doctors.json") + self.assertIsNotNone(inst, "Must have instantiated a Appointment instance") + self.implAppointment3(inst) + + js = inst.as_json() + self.assertEqual("Appointment", js["resourceType"]) + inst2 = appointment.Appointment(js) + self.implAppointment3(inst2) + + def implAppointment3(self, inst): + self.assertEqual(inst.appointmentType.coding[0].code, "WALKIN") + self.assertEqual(inst.appointmentType.coding[0].display, "A previously unscheduled walk-in visit") + self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") + self.assertEqual(inst.comment, "Clarify the results of the MRI to ensure context of test was correct") + self.assertEqual(inst.description, "Discussion about Peter Chalmers MRI results") + self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-09T11:00:00Z").datetime) + self.assertEqual(inst.end.as_json(), "2013-12-09T11:00:00Z") + self.assertEqual(inst.id, "2docs") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.participant[0].required, "information-only") + self.assertEqual(inst.participant[0].status, "accepted") + self.assertEqual(inst.participant[1].required, "required") + self.assertEqual(inst.participant[1].status, "accepted") + self.assertEqual(inst.participant[2].required, "required") + self.assertEqual(inst.participant[2].status, "accepted") + self.assertEqual(inst.participant[3].required, "information-only") + self.assertEqual(inst.participant[3].status, "accepted") + self.assertEqual(inst.priority, 5) + self.assertEqual(inst.serviceCategory[0].coding[0].code, "gp") + self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") + self.assertEqual(inst.serviceCategory[0].coding[0].system, "http://example.org/service-category") + self.assertEqual(inst.serviceType[0].coding[0].code, "52") + self.assertEqual(inst.serviceType[0].coding[0].display, "General Discussion") + self.assertEqual(inst.specialty[0].coding[0].code, "394814009") + self.assertEqual(inst.specialty[0].coding[0].display, "General practice") + self.assertEqual(inst.specialty[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-09T09:00:00Z").datetime) + self.assertEqual(inst.start.as_json(), "2013-12-09T09:00:00Z") + self.assertEqual(inst.status, "booked") + self.assertEqual(inst.text.div, "
Brian MRI results discussion
") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/auditevent_test.py b/tests/models/auditevent_test.py index 30b86fa0..fb0dfcd1 100644 --- a/tests/models/auditevent_test.py +++ b/tests/models/auditevent_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return auditevent.AuditEvent(js) def testAuditEvent1(self): - inst = self.instantiate_from("audit-event-example-vread.json") + inst = self.instantiate_from("audit-event-example-search.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent1(inst) @@ -30,7 +30,7 @@ def testAuditEvent1(self): self.implAuditEvent1(inst2) def implAuditEvent1(self, inst): - self.assertEqual(inst.action, "R") + self.assertEqual(inst.action, "E") self.assertEqual(inst.agent[0].altId, "601847123") self.assertEqual(inst.agent[0].name, "Grahame Grieve") self.assertTrue(inst.agent[0].requestor) @@ -44,25 +44,26 @@ def implAuditEvent1(self, inst): self.assertEqual(inst.agent[1].type.coding[0].code, "110153") self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.entity[0].lifecycle.code, "6") - self.assertEqual(inst.entity[0].lifecycle.display, "Access / Use") - self.assertEqual(inst.entity[0].lifecycle.system, "http://terminology.hl7.org/CodeSystem/dicom-audit-lifecycle") + self.assertEqual(inst.entity[0].query, "aHR0cDovL2ZoaXItZGV2LmhlYWx0aGludGVyc2VjdGlvbnMuY29tLmF1L29wZW4vRW5jb3VudGVyP3BhcnRpY2lwYW50PTEz") + self.assertEqual(inst.entity[0].role.code, "24") + self.assertEqual(inst.entity[0].role.display, "Query") + self.assertEqual(inst.entity[0].role.system, "http://terminology.hl7.org/CodeSystem/object-role") self.assertEqual(inst.entity[0].type.code, "2") self.assertEqual(inst.entity[0].type.display, "System Object") self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.id, "example-rest") + self.assertEqual(inst.id, "example-search") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:42:24Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:42:24Z") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2015-08-22T23:42:24Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2015-08-22T23:42:24Z") self.assertEqual(inst.source.site, "Cloud") self.assertEqual(inst.source.type[0].code, "3") self.assertEqual(inst.source.type[0].display, "Web Server") self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "vread") - self.assertEqual(inst.subtype[0].display, "vread") + self.assertEqual(inst.subtype[0].code, "search") + self.assertEqual(inst.subtype[0].display, "search") self.assertEqual(inst.subtype[0].system, "http://hl7.org/fhir/restful-interaction") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.code, "rest") @@ -70,7 +71,7 @@ def implAuditEvent1(self, inst): self.assertEqual(inst.type.system, "http://terminology.hl7.org/CodeSystem/audit-event-type") def testAuditEvent2(self): - inst = self.instantiate_from("auditevent-example-disclosure.json") + inst = self.instantiate_from("audit-event-example-logout.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent2(inst) @@ -80,76 +81,43 @@ def testAuditEvent2(self): self.implAuditEvent2(inst2) def implAuditEvent2(self, inst): - self.assertEqual(inst.action, "R") - self.assertEqual(inst.agent[0].altId, "notMe") - self.assertEqual(inst.agent[0].name, "That guy everyone wishes would be caught") - self.assertEqual(inst.agent[0].network.address, "custodian.net") - self.assertEqual(inst.agent[0].network.type, "1") - self.assertEqual(inst.agent[0].policy[0], "http://consent.com/yes") + self.assertEqual(inst.action, "E") + self.assertEqual(inst.agent[0].altId, "601847123") + self.assertEqual(inst.agent[0].name, "Grahame Grieve") + self.assertEqual(inst.agent[0].network.address, "127.0.0.1") + self.assertEqual(inst.agent[0].network.type, "2") self.assertTrue(inst.agent[0].requestor) - self.assertEqual(inst.agent[0].type.coding[0].code, "110153") - self.assertEqual(inst.agent[0].type.coding[0].display, "Source Role ID") - self.assertEqual(inst.agent[0].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.agent[1].network.address, "marketing.land") + self.assertEqual(inst.agent[0].type.coding[0].code, "humanuser") + self.assertEqual(inst.agent[0].type.coding[0].display, "human user") + self.assertEqual(inst.agent[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/extra-security-role-type") + self.assertEqual(inst.agent[1].altId, "6580") + self.assertEqual(inst.agent[1].network.address, "Workstation1.ehr.familyclinic.com") self.assertEqual(inst.agent[1].network.type, "1") - self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].code, "HMARKT") - self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].display, "healthcare marketing") - self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertFalse(inst.agent[1].requestor) - self.assertEqual(inst.agent[1].type.coding[0].code, "110152") - self.assertEqual(inst.agent[1].type.coding[0].display, "Destination Role ID") + self.assertEqual(inst.agent[1].type.coding[0].code, "110153") + self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.entity[0].role.code, "1") - self.assertEqual(inst.entity[0].role.display, "Patient") - self.assertEqual(inst.entity[0].role.system, "http://terminology.hl7.org/CodeSystem/object-role") - self.assertEqual(inst.entity[0].type.code, "1") - self.assertEqual(inst.entity[0].type.display, "Person") - self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.entity[1].description, "data about Everthing important") - self.assertEqual(inst.entity[1].lifecycle.code, "11") - self.assertEqual(inst.entity[1].lifecycle.display, "Disclosure") - self.assertEqual(inst.entity[1].lifecycle.system, "http://terminology.hl7.org/CodeSystem/dicom-audit-lifecycle") - self.assertEqual(inst.entity[1].name, "Namne of What") - self.assertEqual(inst.entity[1].role.code, "4") - self.assertEqual(inst.entity[1].role.display, "Domain Resource") - self.assertEqual(inst.entity[1].role.system, "http://terminology.hl7.org/CodeSystem/object-role") - self.assertEqual(inst.entity[1].securityLabel[0].code, "V") - self.assertEqual(inst.entity[1].securityLabel[0].display, "very restricted") - self.assertEqual(inst.entity[1].securityLabel[0].system, "http://terminology.hl7.org/CodeSystem/v3-Confidentiality") - self.assertEqual(inst.entity[1].securityLabel[1].code, "STD") - self.assertEqual(inst.entity[1].securityLabel[1].display, "sexually transmitted disease information sensitivity") - self.assertEqual(inst.entity[1].securityLabel[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.entity[1].securityLabel[2].code, "DELAU") - self.assertEqual(inst.entity[1].securityLabel[2].display, "delete after use") - self.assertEqual(inst.entity[1].securityLabel[2].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.entity[1].type.code, "2") - self.assertEqual(inst.entity[1].type.display, "System Object") - self.assertEqual(inst.entity[1].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.id, "example-disclosure") + self.assertEqual(inst.id, "example-logout") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.outcomeDesc, "Successful Disclosure") - self.assertEqual(inst.purposeOfEvent[0].coding[0].code, "HMARKT") - self.assertEqual(inst.purposeOfEvent[0].coding[0].display, "healthcare marketing") - self.assertEqual(inst.purposeOfEvent[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-09-22T00:08:00Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2013-09-22T00:08:00Z") - self.assertEqual(inst.source.site, "Watcher") - self.assertEqual(inst.source.type[0].code, "4") - self.assertEqual(inst.source.type[0].display, "Application Server") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:46:41Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:46:41Z") + self.assertEqual(inst.source.site, "Cloud") + self.assertEqual(inst.source.type[0].code, "3") + self.assertEqual(inst.source.type[0].display, "Web Server") self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "Disclosure") - self.assertEqual(inst.subtype[0].display, "HIPAA disclosure") - self.assertEqual(inst.text.div, "
Disclosure by some idiot, for marketing reasons, to places unknown, of a Poor Sap, data about Everthing important.
") + self.assertEqual(inst.subtype[0].code, "110123") + self.assertEqual(inst.subtype[0].display, "Logout") + self.assertEqual(inst.subtype[0].system, "http://dicom.nema.org/resources/ontology/DCM") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.code, "110106") - self.assertEqual(inst.type.display, "Export") + self.assertEqual(inst.type.code, "110114") + self.assertEqual(inst.type.display, "User Authentication") self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent3(self): - inst = self.instantiate_from("auditevent-example-error.json") + inst = self.instantiate_from("audit-event-example-vread.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent3(inst) @@ -159,7 +127,7 @@ def testAuditEvent3(self): self.implAuditEvent3(inst2) def implAuditEvent3(self, inst): - self.assertEqual(inst.action, "C") + self.assertEqual(inst.action, "R") self.assertEqual(inst.agent[0].altId, "601847123") self.assertEqual(inst.agent[0].name, "Grahame Grieve") self.assertTrue(inst.agent[0].requestor) @@ -173,30 +141,25 @@ def implAuditEvent3(self, inst): self.assertEqual(inst.agent[1].type.coding[0].code, "110153") self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.contained[0].id, "o1") - self.assertEqual(inst.entity[0].detail[0].type, "requested transaction") - self.assertEqual(inst.entity[0].detail[0].valueString, "http POST ..... ") + self.assertEqual(inst.entity[0].lifecycle.code, "6") + self.assertEqual(inst.entity[0].lifecycle.display, "Access / Use") + self.assertEqual(inst.entity[0].lifecycle.system, "http://terminology.hl7.org/CodeSystem/dicom-audit-lifecycle") self.assertEqual(inst.entity[0].type.code, "2") self.assertEqual(inst.entity[0].type.display, "System Object") self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.entity[1].description, "transaction failed") - self.assertEqual(inst.entity[1].type.code, "OperationOutcome") - self.assertEqual(inst.entity[1].type.display, "OperationOutcome") - self.assertEqual(inst.entity[1].type.system, "http://hl7.org/fhir/resource-types") - self.assertEqual(inst.id, "example-error") + self.assertEqual(inst.id, "example-rest") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "8") - self.assertEqual(inst.outcomeDesc, "Invalid request to create an Operation resource on the Patient endpoint.") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2017-09-07T23:42:24Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2017-09-07T23:42:24Z") + self.assertEqual(inst.outcome, "0") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:42:24Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:42:24Z") self.assertEqual(inst.source.site, "Cloud") self.assertEqual(inst.source.type[0].code, "3") self.assertEqual(inst.source.type[0].display, "Web Server") self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "create") - self.assertEqual(inst.subtype[0].display, "create") + self.assertEqual(inst.subtype[0].code, "vread") + self.assertEqual(inst.subtype[0].display, "vread") self.assertEqual(inst.subtype[0].system, "http://hl7.org/fhir/restful-interaction") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.code, "rest") @@ -264,7 +227,7 @@ def implAuditEvent4(self, inst): self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent5(self): - inst = self.instantiate_from("audit-event-example-logout.json") + inst = self.instantiate_from("audit-event-example-login.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent5(inst) @@ -290,19 +253,19 @@ def implAuditEvent5(self, inst): self.assertEqual(inst.agent[1].type.coding[0].code, "110153") self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.id, "example-logout") + self.assertEqual(inst.id, "example-login") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:46:41Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:46:41Z") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:41:23Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:41:23Z") self.assertEqual(inst.source.site, "Cloud") self.assertEqual(inst.source.type[0].code, "3") self.assertEqual(inst.source.type[0].display, "Web Server") self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "110123") - self.assertEqual(inst.subtype[0].display, "Logout") + self.assertEqual(inst.subtype[0].code, "110122") + self.assertEqual(inst.subtype[0].display, "Login") self.assertEqual(inst.subtype[0].system, "http://dicom.nema.org/resources/ontology/DCM") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.code, "110114") @@ -310,7 +273,7 @@ def implAuditEvent5(self, inst): self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent6(self): - inst = self.instantiate_from("audit-event-example-login.json") + inst = self.instantiate_from("audit-event-example-pixQuery.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent6(inst) @@ -321,38 +284,46 @@ def testAuditEvent6(self): def implAuditEvent6(self, inst): self.assertEqual(inst.action, "E") - self.assertEqual(inst.agent[0].altId, "601847123") - self.assertEqual(inst.agent[0].name, "Grahame Grieve") - self.assertEqual(inst.agent[0].network.address, "127.0.0.1") - self.assertEqual(inst.agent[0].network.type, "2") - self.assertTrue(inst.agent[0].requestor) - self.assertEqual(inst.agent[0].type.coding[0].code, "humanuser") - self.assertEqual(inst.agent[0].type.coding[0].display, "human user") - self.assertEqual(inst.agent[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/extra-security-role-type") - self.assertEqual(inst.agent[1].altId, "6580") - self.assertEqual(inst.agent[1].network.address, "Workstation1.ehr.familyclinic.com") - self.assertEqual(inst.agent[1].network.type, "1") - self.assertFalse(inst.agent[1].requestor) - self.assertEqual(inst.agent[1].type.coding[0].code, "110153") - self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") - self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.id, "example-login") + self.assertEqual(inst.agent[0].altId, "6580") + self.assertEqual(inst.agent[0].network.address, "Workstation1.ehr.familyclinic.com") + self.assertEqual(inst.agent[0].network.type, "1") + self.assertFalse(inst.agent[0].requestor) + self.assertEqual(inst.agent[0].type.coding[0].code, "110153") + self.assertEqual(inst.agent[0].type.coding[0].display, "Source Role ID") + self.assertEqual(inst.agent[0].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") + self.assertEqual(inst.agent[1].altId, "601847123") + self.assertEqual(inst.agent[1].name, "Grahame Grieve") + self.assertTrue(inst.agent[1].requestor) + self.assertEqual(inst.agent[1].type.coding[0].code, "humanuser") + self.assertEqual(inst.agent[1].type.coding[0].display, "human user") + self.assertEqual(inst.agent[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/extra-security-role-type") + self.assertEqual(inst.entity[0].role.code, "1") + self.assertEqual(inst.entity[0].role.display, "Patient") + self.assertEqual(inst.entity[0].role.system, "http://terminology.hl7.org/CodeSystem/object-role") + self.assertEqual(inst.entity[0].type.code, "1") + self.assertEqual(inst.entity[0].type.display, "Person") + self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") + self.assertEqual(inst.entity[1].detail[0].type, "MSH-10") + self.assertEqual(inst.entity[1].detail[0].valueBase64Binary, "MS4yLjg0MC4xMTQzNTAuMS4xMy4wLjEuNy4xLjE=") + self.assertEqual(inst.entity[1].role.code, "24") + self.assertEqual(inst.entity[1].role.display, "Query") + self.assertEqual(inst.entity[1].role.system, "http://terminology.hl7.org/CodeSystem/object-role") + self.assertEqual(inst.entity[1].type.code, "2") + self.assertEqual(inst.entity[1].type.display, "System Object") + self.assertEqual(inst.entity[1].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") + self.assertEqual(inst.id, "example-pixQuery") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-06-20T23:41:23Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2013-06-20T23:41:23Z") - self.assertEqual(inst.source.site, "Cloud") - self.assertEqual(inst.source.type[0].code, "3") - self.assertEqual(inst.source.type[0].display, "Web Server") - self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "110122") - self.assertEqual(inst.subtype[0].display, "Login") - self.assertEqual(inst.subtype[0].system, "http://dicom.nema.org/resources/ontology/DCM") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2015-08-26T23:42:24Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2015-08-26T23:42:24Z") + self.assertEqual(inst.subtype[0].code, "ITI-9") + self.assertEqual(inst.subtype[0].display, "PIX Query") + self.assertEqual(inst.subtype[0].system, "urn:oid:1.3.6.1.4.1.19376.1.2") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.code, "110114") - self.assertEqual(inst.type.display, "User Authentication") + self.assertEqual(inst.type.code, "110112") + self.assertEqual(inst.type.display, "Query") self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent7(self): @@ -412,7 +383,7 @@ def implAuditEvent7(self, inst): self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent8(self): - inst = self.instantiate_from("audit-event-example-pixQuery.json") + inst = self.instantiate_from("auditevent-example-disclosure.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent8(inst) @@ -422,51 +393,76 @@ def testAuditEvent8(self): self.implAuditEvent8(inst2) def implAuditEvent8(self, inst): - self.assertEqual(inst.action, "E") - self.assertEqual(inst.agent[0].altId, "6580") - self.assertEqual(inst.agent[0].network.address, "Workstation1.ehr.familyclinic.com") + self.assertEqual(inst.action, "R") + self.assertEqual(inst.agent[0].altId, "notMe") + self.assertEqual(inst.agent[0].name, "That guy everyone wishes would be caught") + self.assertEqual(inst.agent[0].network.address, "custodian.net") self.assertEqual(inst.agent[0].network.type, "1") - self.assertFalse(inst.agent[0].requestor) + self.assertEqual(inst.agent[0].policy[0], "http://consent.com/yes") + self.assertTrue(inst.agent[0].requestor) self.assertEqual(inst.agent[0].type.coding[0].code, "110153") self.assertEqual(inst.agent[0].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[0].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.agent[1].altId, "601847123") - self.assertEqual(inst.agent[1].name, "Grahame Grieve") - self.assertTrue(inst.agent[1].requestor) - self.assertEqual(inst.agent[1].type.coding[0].code, "humanuser") - self.assertEqual(inst.agent[1].type.coding[0].display, "human user") - self.assertEqual(inst.agent[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/extra-security-role-type") + self.assertEqual(inst.agent[1].network.address, "marketing.land") + self.assertEqual(inst.agent[1].network.type, "1") + self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].code, "HMARKT") + self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].display, "healthcare marketing") + self.assertEqual(inst.agent[1].purposeOfUse[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertFalse(inst.agent[1].requestor) + self.assertEqual(inst.agent[1].type.coding[0].code, "110152") + self.assertEqual(inst.agent[1].type.coding[0].display, "Destination Role ID") + self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") self.assertEqual(inst.entity[0].role.code, "1") self.assertEqual(inst.entity[0].role.display, "Patient") self.assertEqual(inst.entity[0].role.system, "http://terminology.hl7.org/CodeSystem/object-role") self.assertEqual(inst.entity[0].type.code, "1") self.assertEqual(inst.entity[0].type.display, "Person") self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.entity[1].detail[0].type, "MSH-10") - self.assertEqual(inst.entity[1].detail[0].valueBase64Binary, "MS4yLjg0MC4xMTQzNTAuMS4xMy4wLjEuNy4xLjE=") - self.assertEqual(inst.entity[1].role.code, "24") - self.assertEqual(inst.entity[1].role.display, "Query") + self.assertEqual(inst.entity[1].description, "data about Everthing important") + self.assertEqual(inst.entity[1].lifecycle.code, "11") + self.assertEqual(inst.entity[1].lifecycle.display, "Disclosure") + self.assertEqual(inst.entity[1].lifecycle.system, "http://terminology.hl7.org/CodeSystem/dicom-audit-lifecycle") + self.assertEqual(inst.entity[1].name, "Namne of What") + self.assertEqual(inst.entity[1].role.code, "4") + self.assertEqual(inst.entity[1].role.display, "Domain Resource") self.assertEqual(inst.entity[1].role.system, "http://terminology.hl7.org/CodeSystem/object-role") + self.assertEqual(inst.entity[1].securityLabel[0].code, "V") + self.assertEqual(inst.entity[1].securityLabel[0].display, "very restricted") + self.assertEqual(inst.entity[1].securityLabel[0].system, "http://terminology.hl7.org/CodeSystem/v3-Confidentiality") + self.assertEqual(inst.entity[1].securityLabel[1].code, "STD") + self.assertEqual(inst.entity[1].securityLabel[1].display, "sexually transmitted disease information sensitivity") + self.assertEqual(inst.entity[1].securityLabel[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.entity[1].securityLabel[2].code, "DELAU") + self.assertEqual(inst.entity[1].securityLabel[2].display, "delete after use") + self.assertEqual(inst.entity[1].securityLabel[2].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") self.assertEqual(inst.entity[1].type.code, "2") self.assertEqual(inst.entity[1].type.display, "System Object") self.assertEqual(inst.entity[1].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.id, "example-pixQuery") + self.assertEqual(inst.id, "example-disclosure") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2015-08-26T23:42:24Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2015-08-26T23:42:24Z") - self.assertEqual(inst.subtype[0].code, "ITI-9") - self.assertEqual(inst.subtype[0].display, "PIX Query") - self.assertEqual(inst.subtype[0].system, "urn:oid:1.3.6.1.4.1.19376.1.2") + self.assertEqual(inst.outcomeDesc, "Successful Disclosure") + self.assertEqual(inst.purposeOfEvent[0].coding[0].code, "HMARKT") + self.assertEqual(inst.purposeOfEvent[0].coding[0].display, "healthcare marketing") + self.assertEqual(inst.purposeOfEvent[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2013-09-22T00:08:00Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2013-09-22T00:08:00Z") + self.assertEqual(inst.source.site, "Watcher") + self.assertEqual(inst.source.type[0].code, "4") + self.assertEqual(inst.source.type[0].display, "Application Server") + self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") + self.assertEqual(inst.subtype[0].code, "Disclosure") + self.assertEqual(inst.subtype[0].display, "HIPAA disclosure") + self.assertEqual(inst.text.div, "
Disclosure by some idiot, for marketing reasons, to places unknown, of a Poor Sap, data about Everthing important.
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.code, "110112") - self.assertEqual(inst.type.display, "Query") + self.assertEqual(inst.type.code, "110106") + self.assertEqual(inst.type.display, "Export") self.assertEqual(inst.type.system, "http://dicom.nema.org/resources/ontology/DCM") def testAuditEvent9(self): - inst = self.instantiate_from("audit-event-example-search.json") + inst = self.instantiate_from("auditevent-example-error.json") self.assertIsNotNone(inst, "Must have instantiated a AuditEvent instance") self.implAuditEvent9(inst) @@ -476,7 +472,7 @@ def testAuditEvent9(self): self.implAuditEvent9(inst2) def implAuditEvent9(self, inst): - self.assertEqual(inst.action, "E") + self.assertEqual(inst.action, "C") self.assertEqual(inst.agent[0].altId, "601847123") self.assertEqual(inst.agent[0].name, "Grahame Grieve") self.assertTrue(inst.agent[0].requestor) @@ -490,26 +486,30 @@ def implAuditEvent9(self, inst): self.assertEqual(inst.agent[1].type.coding[0].code, "110153") self.assertEqual(inst.agent[1].type.coding[0].display, "Source Role ID") self.assertEqual(inst.agent[1].type.coding[0].system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.entity[0].query, "aHR0cDovL2ZoaXItZGV2LmhlYWx0aGludGVyc2VjdGlvbnMuY29tLmF1L29wZW4vRW5jb3VudGVyP3BhcnRpY2lwYW50PTEz") - self.assertEqual(inst.entity[0].role.code, "24") - self.assertEqual(inst.entity[0].role.display, "Query") - self.assertEqual(inst.entity[0].role.system, "http://terminology.hl7.org/CodeSystem/object-role") + self.assertEqual(inst.contained[0].id, "o1") + self.assertEqual(inst.entity[0].detail[0].type, "requested transaction") + self.assertEqual(inst.entity[0].detail[0].valueString, "http POST ..... ") self.assertEqual(inst.entity[0].type.code, "2") self.assertEqual(inst.entity[0].type.display, "System Object") self.assertEqual(inst.entity[0].type.system, "http://terminology.hl7.org/CodeSystem/audit-entity-type") - self.assertEqual(inst.id, "example-search") + self.assertEqual(inst.entity[1].description, "transaction failed") + self.assertEqual(inst.entity[1].type.code, "OperationOutcome") + self.assertEqual(inst.entity[1].type.display, "OperationOutcome") + self.assertEqual(inst.entity[1].type.system, "http://hl7.org/fhir/resource-types") + self.assertEqual(inst.id, "example-error") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "0") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2015-08-22T23:42:24Z").datetime) - self.assertEqual(inst.recorded.as_json(), "2015-08-22T23:42:24Z") + self.assertEqual(inst.outcome, "8") + self.assertEqual(inst.outcomeDesc, "Invalid request to create an Operation resource on the Patient endpoint.") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2017-09-07T23:42:24Z").datetime) + self.assertEqual(inst.recorded.as_json(), "2017-09-07T23:42:24Z") self.assertEqual(inst.source.site, "Cloud") self.assertEqual(inst.source.type[0].code, "3") self.assertEqual(inst.source.type[0].display, "Web Server") self.assertEqual(inst.source.type[0].system, "http://terminology.hl7.org/CodeSystem/security-source-type") - self.assertEqual(inst.subtype[0].code, "search") - self.assertEqual(inst.subtype[0].display, "search") + self.assertEqual(inst.subtype[0].code, "create") + self.assertEqual(inst.subtype[0].display, "create") self.assertEqual(inst.subtype[0].system, "http://hl7.org/fhir/restful-interaction") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.code, "rest") diff --git a/tests/models/basic_test.py b/tests/models/basic_test.py index 57155edf..f829b6d2 100644 --- a/tests/models/basic_test.py +++ b/tests/models/basic_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return basic.Basic(js) def testBasic1(self): - inst = self.instantiate_from("basic-example.json") + inst = self.instantiate_from("basic-example2.json") self.assertIsNotNone(inst, "Must have instantiated a Basic instance") self.implBasic1(inst) @@ -30,44 +30,6 @@ def testBasic1(self): self.implBasic1(inst2) def implBasic1(self, inst): - self.assertEqual(inst.code.coding[0].code, "referral") - self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/basic-resource-type") - self.assertEqual(inst.created.date, FHIRDate("2013-05-14").date) - self.assertEqual(inst.created.as_json(), "2013-05-14") - self.assertEqual(inst.extension[0].url, "http://example.org/do-not-use/fhir-extensions/referral#requestingPractitioner") - self.assertEqual(inst.extension[1].url, "http://example.org/do-not-use/fhir-extensions/referral#notes") - self.assertEqual(inst.extension[1].valueString, "The patient had fever peaks over the last couple of days. He is worried about these peaks.") - self.assertEqual(inst.extension[2].url, "http://example.org/do-not-use/fhir-extensions/referral#fulfillingEncounter") - self.assertEqual(inst.id, "referral") - self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/basic/identifiers") - self.assertEqual(inst.identifier[0].value, "19283746") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.modifierExtension[0].url, "http://example.org/do-not-use/fhir-extensions/referral#referredForService") - self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].code, "11429006") - self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].display, "Consultation") - self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.modifierExtension[1].url, "http://example.org/do-not-use/fhir-extensions/referral#targetDate") - self.assertEqual(inst.modifierExtension[1].valuePeriod.end.datetime, FHIRDateTime("2013-04-15").datetime) - self.assertEqual(inst.modifierExtension[1].valuePeriod.end.as_json(), "2013-04-15") - self.assertEqual(inst.modifierExtension[1].valuePeriod.start.datetime, FHIRDateTime("2013-04-01").datetime) - self.assertEqual(inst.modifierExtension[1].valuePeriod.start.as_json(), "2013-04-01") - self.assertEqual(inst.modifierExtension[2].url, "http://example.org/do-not-use/fhir-extensions/referral#status") - self.assertEqual(inst.modifierExtension[2].valueCode, "complete") - self.assertEqual(inst.text.status, "generated") - - def testBasic2(self): - inst = self.instantiate_from("basic-example2.json") - self.assertIsNotNone(inst, "Must have instantiated a Basic instance") - self.implBasic2(inst) - - js = inst.as_json() - self.assertEqual("Basic", js["resourceType"]) - inst2 = basic.Basic(js) - self.implBasic2(inst2) - - def implBasic2(self, inst): self.assertEqual(inst.code.coding[0].code, "UMLCLASSMODEL") self.assertEqual(inst.code.coding[0].system, "http://example.org/do-not-use/fhir-codes#resourceTypes") self.assertEqual(inst.extension[0].extension[0].url, "name") @@ -93,21 +55,59 @@ def implBasic2(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") - def testBasic3(self): + def testBasic2(self): inst = self.instantiate_from("basic-example-narrative.json") self.assertIsNotNone(inst, "Must have instantiated a Basic instance") - self.implBasic3(inst) + self.implBasic2(inst) js = inst.as_json() self.assertEqual("Basic", js["resourceType"]) inst2 = basic.Basic(js) - self.implBasic3(inst2) + self.implBasic2(inst2) - def implBasic3(self, inst): + def implBasic2(self, inst): self.assertEqual(inst.code.text, "Example Narrative Tester") self.assertEqual(inst.id, "basic-example-narrative") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "additional") + + def testBasic3(self): + inst = self.instantiate_from("basic-example.json") + self.assertIsNotNone(inst, "Must have instantiated a Basic instance") + self.implBasic3(inst) + + js = inst.as_json() + self.assertEqual("Basic", js["resourceType"]) + inst2 = basic.Basic(js) + self.implBasic3(inst2) + + def implBasic3(self, inst): + self.assertEqual(inst.code.coding[0].code, "referral") + self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/basic-resource-type") + self.assertEqual(inst.created.date, FHIRDate("2013-05-14").date) + self.assertEqual(inst.created.as_json(), "2013-05-14") + self.assertEqual(inst.extension[0].url, "http://example.org/do-not-use/fhir-extensions/referral#requestingPractitioner") + self.assertEqual(inst.extension[1].url, "http://example.org/do-not-use/fhir-extensions/referral#notes") + self.assertEqual(inst.extension[1].valueString, "The patient had fever peaks over the last couple of days. He is worried about these peaks.") + self.assertEqual(inst.extension[2].url, "http://example.org/do-not-use/fhir-extensions/referral#fulfillingEncounter") + self.assertEqual(inst.id, "referral") + self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/basic/identifiers") + self.assertEqual(inst.identifier[0].value, "19283746") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.modifierExtension[0].url, "http://example.org/do-not-use/fhir-extensions/referral#referredForService") + self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].code, "11429006") + self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].display, "Consultation") + self.assertEqual(inst.modifierExtension[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.modifierExtension[1].url, "http://example.org/do-not-use/fhir-extensions/referral#targetDate") + self.assertEqual(inst.modifierExtension[1].valuePeriod.end.datetime, FHIRDateTime("2013-04-15").datetime) + self.assertEqual(inst.modifierExtension[1].valuePeriod.end.as_json(), "2013-04-15") + self.assertEqual(inst.modifierExtension[1].valuePeriod.start.datetime, FHIRDateTime("2013-04-01").datetime) + self.assertEqual(inst.modifierExtension[1].valuePeriod.start.as_json(), "2013-04-01") + self.assertEqual(inst.modifierExtension[2].url, "http://example.org/do-not-use/fhir-extensions/referral#status") + self.assertEqual(inst.modifierExtension[2].valueCode, "complete") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/bodystructure_test.py b/tests/models/bodystructure_test.py index 952182d4..c88975bb 100644 --- a/tests/models/bodystructure_test.py +++ b/tests/models/bodystructure_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return bodystructure.BodyStructure(js) def testBodyStructure1(self): - inst = self.instantiate_from("bodystructure-example-skin-patch.json") + inst = self.instantiate_from("bodystructure-example-fetus.json") self.assertIsNotNone(inst, "Must have instantiated a BodyStructure instance") self.implBodyStructure1(inst) @@ -30,27 +30,17 @@ def testBodyStructure1(self): self.implBodyStructure1(inst2) def implBodyStructure1(self, inst): - self.assertFalse(inst.active) - self.assertEqual(inst.description, "inner surface (volar) of the left forearm") - self.assertEqual(inst.id, "skin-patch") + self.assertEqual(inst.description, "EDD 1/1/2017 confirmation by LMP") + self.assertEqual(inst.id, "fetus") self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/bodystructure/identifiers") self.assertEqual(inst.identifier[0].value, "12345") - self.assertEqual(inst.location.coding[0].code, "14975008") - self.assertEqual(inst.location.coding[0].display, "Forearm") + self.assertEqual(inst.location.coding[0].code, "83418008") + self.assertEqual(inst.location.coding[0].display, "Entire fetus (body structure)") self.assertEqual(inst.location.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.location.text, "Forearm") - self.assertEqual(inst.locationQualifier[0].coding[0].code, "419161000") - self.assertEqual(inst.locationQualifier[0].coding[0].display, "Unilateral left") - self.assertEqual(inst.locationQualifier[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.locationQualifier[0].text, "Left") - self.assertEqual(inst.locationQualifier[1].coding[0].code, "263929005") - self.assertEqual(inst.locationQualifier[1].coding[0].display, "Volar") - self.assertEqual(inst.locationQualifier[1].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.locationQualifier[1].text, "Volar") + self.assertEqual(inst.location.text, "Fetus") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.morphology.text, "Skin patch") self.assertEqual(inst.text.status, "generated") def testBodyStructure2(self): @@ -84,7 +74,7 @@ def implBodyStructure2(self, inst): self.assertEqual(inst.text.status, "generated") def testBodyStructure3(self): - inst = self.instantiate_from("bodystructure-example-fetus.json") + inst = self.instantiate_from("bodystructure-example-skin-patch.json") self.assertIsNotNone(inst, "Must have instantiated a BodyStructure instance") self.implBodyStructure3(inst) @@ -94,16 +84,26 @@ def testBodyStructure3(self): self.implBodyStructure3(inst2) def implBodyStructure3(self, inst): - self.assertEqual(inst.description, "EDD 1/1/2017 confirmation by LMP") - self.assertEqual(inst.id, "fetus") + self.assertFalse(inst.active) + self.assertEqual(inst.description, "inner surface (volar) of the left forearm") + self.assertEqual(inst.id, "skin-patch") self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/bodystructure/identifiers") self.assertEqual(inst.identifier[0].value, "12345") - self.assertEqual(inst.location.coding[0].code, "83418008") - self.assertEqual(inst.location.coding[0].display, "Entire fetus (body structure)") + self.assertEqual(inst.location.coding[0].code, "14975008") + self.assertEqual(inst.location.coding[0].display, "Forearm") self.assertEqual(inst.location.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.location.text, "Fetus") + self.assertEqual(inst.location.text, "Forearm") + self.assertEqual(inst.locationQualifier[0].coding[0].code, "419161000") + self.assertEqual(inst.locationQualifier[0].coding[0].display, "Unilateral left") + self.assertEqual(inst.locationQualifier[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.locationQualifier[0].text, "Left") + self.assertEqual(inst.locationQualifier[1].coding[0].code, "263929005") + self.assertEqual(inst.locationQualifier[1].coding[0].display, "Volar") + self.assertEqual(inst.locationQualifier[1].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.locationQualifier[1].text, "Volar") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.morphology.text, "Skin patch") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/bundle_test.py b/tests/models/bundle_test.py index 377b64e5..63f1aace 100644 --- a/tests/models/bundle_test.py +++ b/tests/models/bundle_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return bundle.Bundle(js) def testBundle1(self): - inst = self.instantiate_from("practitionerrole-examples-general.json") + inst = self.instantiate_from("diagnosticreport-example-f202-bloodculture.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle1(inst) @@ -30,27 +30,11 @@ def testBundle1(self): self.implBundle1(inst2) def implBundle1(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/PractitionerRole/f003-0") - self.assertEqual(inst.entry[0].resource.id, "f003-0") - self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-0") - self.assertEqual(inst.entry[1].resource.id, "example-0") - self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-1") - self.assertEqual(inst.entry[2].resource.id, "example-1") - self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-2") - self.assertEqual(inst.entry[3].resource.id, "example-2") - self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/PractitionerRole/f007-0") - self.assertEqual(inst.entry[4].resource.id, "f007-0") - self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/PractitionerRole/f004-0") - self.assertEqual(inst.entry[5].resource.id, "f004-0") - self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/PractitionerRole/xcda1-0") - self.assertEqual(inst.entry[6].resource.id, "xcda1-0") - self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/PractitionerRole/f202-0") - self.assertEqual(inst.entry[7].resource.id, "f202-0") - self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/PractitionerRole/f201-0") - self.assertEqual(inst.entry[8].resource.id, "f201-0") - self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/PractitionerRole/f203-0") - self.assertEqual(inst.entry[9].resource.id, "f203-0") - self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897808") + self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/f202") + self.assertEqual(inst.entry[0].resource.id, "f202") + self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/ServiceRequest/req") + self.assertEqual(inst.entry[1].resource.id, "req") + self.assertEqual(inst.id, "f202") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -106,7 +90,7 @@ def implBundle2(self, inst): self.assertEqual(inst.type, "transaction") def testBundle3(self): - inst = self.instantiate_from("diagnosticreport-example-f001-bloodexam.json") + inst = self.instantiate_from("diagnosticreport-example-ghp.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle3(inst) @@ -116,18 +100,36 @@ def testBundle3(self): self.implBundle3(inst2) def implBundle3(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/f001") - self.assertEqual(inst.entry[0].resource.id, "f001") - self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/ServiceRequest/req") - self.assertEqual(inst.entry[1].resource.id, "req") - self.assertEqual(inst.id, "f001") + self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/ghp") + self.assertEqual(inst.entry[0].resource.id, "ghp") + self.assertEqual(inst.entry[0].resource.meta.lastUpdated.datetime, FHIRInstant("2015-08-16T10:35:23Z").datetime) + self.assertEqual(inst.entry[0].resource.meta.lastUpdated.as_json(), "2015-08-16T10:35:23Z") + self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/Specimen/rtt") + self.assertEqual(inst.entry[1].resource.id, "rtt") + self.assertEqual(inst.entry[2].fullUrl, "https://example.com/base/Specimen/ltt") + self.assertEqual(inst.entry[2].resource.id, "ltt") + self.assertEqual(inst.entry[3].fullUrl, "https://example.com/base/Specimen/urine") + self.assertEqual(inst.entry[3].resource.id, "urine") + self.assertEqual(inst.entry[4].fullUrl, "https://example.com/base/Observation/p2") + self.assertEqual(inst.entry[4].resource.id, "p2") + self.assertEqual(inst.entry[5].fullUrl, "https://example.com/base/Observation/r1") + self.assertEqual(inst.entry[5].resource.id, "r1") + self.assertEqual(inst.entry[6].fullUrl, "https://example.com/base/Observation/r2") + self.assertEqual(inst.entry[6].resource.id, "r2") + self.assertEqual(inst.entry[7].fullUrl, "https://example.com/base/Observation/r3") + self.assertEqual(inst.entry[7].resource.id, "r3") + self.assertEqual(inst.entry[8].fullUrl, "https://example.com/base/Observation/r4") + self.assertEqual(inst.entry[8].resource.id, "r4") + self.assertEqual(inst.entry[9].fullUrl, "https://example.com/base/Observation/r5") + self.assertEqual(inst.entry[9].resource.id, "r5") + self.assertEqual(inst.id, "ghp") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.type, "collection") def testBundle4(self): - inst = self.instantiate_from("diagnosticreport-example-f202-bloodculture.json") + inst = self.instantiate_from("practitioner-examples-general.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle4(inst) @@ -137,18 +139,54 @@ def testBundle4(self): self.implBundle4(inst2) def implBundle4(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/f202") - self.assertEqual(inst.entry[0].resource.id, "f202") - self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/ServiceRequest/req") - self.assertEqual(inst.entry[1].resource.id, "req") - self.assertEqual(inst.id, "f202") + self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/Practitioner/1") + self.assertEqual(inst.entry[0].resource.id, "1") + self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/Practitioner/13") + self.assertEqual(inst.entry[1].resource.id, "13") + self.assertEqual(inst.entry[1].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[1].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/Practitioner/14") + self.assertEqual(inst.entry[2].resource.id, "14") + self.assertEqual(inst.entry[2].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[2].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/Practitioner/15") + self.assertEqual(inst.entry[3].resource.id, "15") + self.assertEqual(inst.entry[3].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[3].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/Practitioner/16") + self.assertEqual(inst.entry[4].resource.id, "16") + self.assertEqual(inst.entry[4].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[4].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/Practitioner/17") + self.assertEqual(inst.entry[5].resource.id, "17") + self.assertEqual(inst.entry[5].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[5].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/Practitioner/18") + self.assertEqual(inst.entry[6].resource.id, "18") + self.assertEqual(inst.entry[6].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[6].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/Practitioner/19") + self.assertEqual(inst.entry[7].resource.id, "19") + self.assertEqual(inst.entry[7].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[7].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/Practitioner/20") + self.assertEqual(inst.entry[8].resource.id, "20") + self.assertEqual(inst.entry[8].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[8].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/Practitioner/21") + self.assertEqual(inst.entry[9].resource.id, "21") + self.assertEqual(inst.entry[9].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.entry[9].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897809") + self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.type, "collection") def testBundle5(self): - inst = self.instantiate_from("location-examples-general.json") + inst = self.instantiate_from("diagnosticreport-example-lipids.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle5(inst) @@ -158,18 +196,24 @@ def testBundle5(self): self.implBundle5(inst2) def implBundle5(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/Location/2") - self.assertEqual(inst.entry[0].resource.id, "2") - self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/Location/3") - self.assertEqual(inst.entry[1].resource.id, "3") - self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897819") + self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/lipids") + self.assertEqual(inst.entry[0].resource.id, "lipids") + self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/Observation/cholesterol") + self.assertEqual(inst.entry[1].resource.id, "cholesterol") + self.assertEqual(inst.entry[2].fullUrl, "https://example.com/base/Observation/triglyceride") + self.assertEqual(inst.entry[2].resource.id, "triglyceride") + self.assertEqual(inst.entry[3].fullUrl, "https://example.com/base/Observation/hdlcholesterol") + self.assertEqual(inst.entry[3].resource.id, "hdlcholesterol") + self.assertEqual(inst.entry[4].fullUrl, "https://example.com/base/Observation/ldlcholesterol") + self.assertEqual(inst.entry[4].resource.id, "ldlcholesterol") + self.assertEqual(inst.id, "lipids") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.type, "collection") def testBundle6(self): - inst = self.instantiate_from("questionnaire-profile-example-ussg-fht.json") + inst = self.instantiate_from("diagnosticreport-hla-genetics-results-example.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle6(inst) @@ -179,73 +223,6 @@ def testBundle6(self): self.implBundle6(inst2) def implBundle6(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/us/sdc/Questionnaire/54127-6") - self.assertEqual(inst.entry[0].request.method, "PUT") - self.assertEqual(inst.entry[0].request.url, "http://hl7.org/fhir/us/sdc/Questionnaire/54127-6") - self.assertEqual(inst.entry[0].resource.id, "54127-6") - self.assertEqual(inst.entry[0].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-questionnaire") - self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL1-9") - self.assertEqual(inst.entry[1].request.method, "PUT") - self.assertEqual(inst.entry[1].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL1-9") - self.assertEqual(inst.entry[1].resource.id, "LL1-9") - self.assertEqual(inst.entry[1].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL623-0") - self.assertEqual(inst.entry[2].request.method, "PUT") - self.assertEqual(inst.entry[2].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL623-0") - self.assertEqual(inst.entry[2].resource.id, "LL623-0") - self.assertEqual(inst.entry[2].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL361-7") - self.assertEqual(inst.entry[3].request.method, "PUT") - self.assertEqual(inst.entry[3].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL361-7") - self.assertEqual(inst.entry[3].resource.id, "LL361-7") - self.assertEqual(inst.entry[3].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL629-7") - self.assertEqual(inst.entry[4].request.method, "PUT") - self.assertEqual(inst.entry[4].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL629-7") - self.assertEqual(inst.entry[4].resource.id, "LL629-7") - self.assertEqual(inst.entry[4].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL628-9") - self.assertEqual(inst.entry[5].request.method, "PUT") - self.assertEqual(inst.entry[5].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL628-9") - self.assertEqual(inst.entry[5].resource.id, "LL628-9") - self.assertEqual(inst.entry[5].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL626-3") - self.assertEqual(inst.entry[6].request.method, "PUT") - self.assertEqual(inst.entry[6].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL626-3") - self.assertEqual(inst.entry[6].resource.id, "LL626-3") - self.assertEqual(inst.entry[6].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL619-8") - self.assertEqual(inst.entry[7].request.method, "PUT") - self.assertEqual(inst.entry[7].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL619-8") - self.assertEqual(inst.entry[7].resource.id, "LL619-8") - self.assertEqual(inst.entry[7].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL621-4") - self.assertEqual(inst.entry[8].request.method, "PUT") - self.assertEqual(inst.entry[8].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL621-4") - self.assertEqual(inst.entry[8].resource.id, "LL621-4") - self.assertEqual(inst.entry[8].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/us/sdc/ValueSet/LL624-8") - self.assertEqual(inst.entry[9].request.method, "PUT") - self.assertEqual(inst.entry[9].request.url, "http://hl7.org/fhir/us/sdc/ValueSet/LL624-8") - self.assertEqual(inst.entry[9].resource.id, "LL624-8") - self.assertEqual(inst.entry[9].resource.meta.profile[0], "http://hl7.org/fhir/us/sdc/StructureDefinition/sdc-valueset") - self.assertEqual(inst.id, "ussg-fht") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.type, "transaction") - - def testBundle7(self): - inst = self.instantiate_from("diagnosticreport-hla-genetics-results-example.json") - self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") - self.implBundle7(inst) - - js = inst.as_json() - self.assertEqual("Bundle", js["resourceType"]) - inst2 = bundle.Bundle(js) - self.implBundle7(inst2) - - def implBundle7(self, inst): self.assertEqual(inst.entry[0].fullUrl, "urn:uuid:b0a4b18e-94e7-4b1b-8031-c7ae4bdd8db9") self.assertEqual(inst.entry[0].request.method, "POST") self.assertEqual(inst.entry[0].request.url, "DiagnosticReport") @@ -282,8 +259,45 @@ def implBundle7(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.type, "transaction") + def testBundle7(self): + inst = self.instantiate_from("practitionerrole-examples-general.json") + self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") + self.implBundle7(inst) + + js = inst.as_json() + self.assertEqual("Bundle", js["resourceType"]) + inst2 = bundle.Bundle(js) + self.implBundle7(inst2) + + def implBundle7(self, inst): + self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/PractitionerRole/f003-0") + self.assertEqual(inst.entry[0].resource.id, "f003-0") + self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-0") + self.assertEqual(inst.entry[1].resource.id, "example-0") + self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-1") + self.assertEqual(inst.entry[2].resource.id, "example-1") + self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/PractitionerRole/example-2") + self.assertEqual(inst.entry[3].resource.id, "example-2") + self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/PractitionerRole/f007-0") + self.assertEqual(inst.entry[4].resource.id, "f007-0") + self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/PractitionerRole/f004-0") + self.assertEqual(inst.entry[5].resource.id, "f004-0") + self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/PractitionerRole/xcda1-0") + self.assertEqual(inst.entry[6].resource.id, "xcda1-0") + self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/PractitionerRole/f202-0") + self.assertEqual(inst.entry[7].resource.id, "f202-0") + self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/PractitionerRole/f201-0") + self.assertEqual(inst.entry[8].resource.id, "f201-0") + self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/PractitionerRole/f203-0") + self.assertEqual(inst.entry[9].resource.id, "f203-0") + self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897808") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.type, "collection") + def testBundle8(self): - inst = self.instantiate_from("bundle-example.json") + inst = self.instantiate_from("diagnosticreport-example-f001-bloodexam.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle8(inst) @@ -293,28 +307,18 @@ def testBundle8(self): self.implBundle8(inst2) def implBundle8(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/MedicationRequest/3123") - self.assertEqual(inst.entry[0].resource.id, "3123") - self.assertEqual(inst.entry[0].search.mode, "match") - self.assertEqual(inst.entry[0].search.score, 1) - self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/Medication/example") - self.assertEqual(inst.entry[1].resource.id, "example") - self.assertEqual(inst.entry[1].search.mode, "include") - self.assertEqual(inst.id, "bundle-example") - self.assertEqual(inst.link[0].relation, "self") - self.assertEqual(inst.link[0].url, "https://example.com/base/MedicationRequest?patient=347&_include=MedicationRequest.medication&_count=2") - self.assertEqual(inst.link[1].relation, "next") - self.assertEqual(inst.link[1].url, "https://example.com/base/MedicationRequest?patient=347&searchId=ff15fd40-ff71-4b48-b366-09c706bed9d0&page=2") - self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2014-08-18T01:43:30Z").datetime) - self.assertEqual(inst.meta.lastUpdated.as_json(), "2014-08-18T01:43:30Z") + self.assertEqual(inst.entry[0].fullUrl, "https://example.com/base/DiagnosticReport/f001") + self.assertEqual(inst.entry[0].resource.id, "f001") + self.assertEqual(inst.entry[1].fullUrl, "https://example.com/base/ServiceRequest/req") + self.assertEqual(inst.entry[1].resource.id, "req") + self.assertEqual(inst.id, "f001") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.total, 3) - self.assertEqual(inst.type, "searchset") + self.assertEqual(inst.type, "collection") def testBundle9(self): - inst = self.instantiate_from("diagnosticreport-examples-general.json") + inst = self.instantiate_from("document-example-dischargesummary.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle9(inst) @@ -324,36 +328,50 @@ def testBundle9(self): self.implBundle9(inst2) def implBundle9(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/Bundle/3") - self.assertEqual(inst.entry[0].resource.id, "3") - self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/Bundle/4") - self.assertEqual(inst.entry[1].resource.id, "4") - self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/Bundle/5") - self.assertEqual(inst.entry[2].resource.id, "5") - self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/Bundle/6") - self.assertEqual(inst.entry[3].resource.id, "6") - self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/Bundle/7") - self.assertEqual(inst.entry[4].resource.id, "7") - self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/Bundle/8") - self.assertEqual(inst.entry[5].resource.id, "8") - self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/Bundle/9") - self.assertEqual(inst.entry[6].resource.id, "9") - self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/Bundle/15") - self.assertEqual(inst.entry[7].resource.id, "15") - self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/Bundle/16") - self.assertEqual(inst.entry[8].resource.id, "16") - self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/Bundle/17") - self.assertEqual(inst.entry[9].resource.id, "17") - self.assertEqual(inst.id, "72ac8493-52ac-41bd-8d5d-7258c289b5ea") - self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2012-04-14T10:35:23Z").datetime) - self.assertEqual(inst.meta.lastUpdated.as_json(), "2012-04-14T10:35:23Z") + self.assertEqual(inst.entry[0].fullUrl, "http://fhir.healthintersections.com.au/open/Composition/180f219f-97a8-486d-99d9-ed631fe4fc57") + self.assertEqual(inst.entry[0].resource.id, "180f219f-97a8-486d-99d9-ed631fe4fc57") + self.assertEqual(inst.entry[0].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-28T22:12:21Z").datetime) + self.assertEqual(inst.entry[0].resource.meta.lastUpdated.as_json(), "2013-05-28T22:12:21Z") + self.assertEqual(inst.entry[1].fullUrl, "http://fhir.healthintersections.com.au/open/Practitioner/example") + self.assertEqual(inst.entry[1].resource.id, "example") + self.assertEqual(inst.entry[1].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-05T16:13:03Z").datetime) + self.assertEqual(inst.entry[1].resource.meta.lastUpdated.as_json(), "2013-05-05T16:13:03Z") + self.assertEqual(inst.entry[2].fullUrl, "http://fhir.healthintersections.com.au/open/Patient/d1") + self.assertEqual(inst.entry[2].resource.id, "d1") + self.assertEqual(inst.entry[3].fullUrl, "http://fhir.healthintersections.com.au/open/Encounter/doc-example") + self.assertEqual(inst.entry[3].resource.id, "doc-example") + self.assertEqual(inst.entry[3].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-05T16:13:03Z").datetime) + self.assertEqual(inst.entry[3].resource.meta.lastUpdated.as_json(), "2013-05-05T16:13:03Z") + self.assertEqual(inst.entry[4].fullUrl, "urn:uuid:541a72a8-df75-4484-ac89-ac4923f03b81") + self.assertEqual(inst.entry[4].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-05T16:13:03Z").datetime) + self.assertEqual(inst.entry[4].resource.meta.lastUpdated.as_json(), "2013-05-05T16:13:03Z") + self.assertEqual(inst.entry[5].fullUrl, "urn:uuid:124a6916-5d84-4b8c-b250-10cefb8e6e86") + self.assertEqual(inst.entry[5].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-05T16:13:03Z").datetime) + self.assertEqual(inst.entry[5].resource.meta.lastUpdated.as_json(), "2013-05-05T16:13:03Z") + self.assertEqual(inst.entry[6].fullUrl, "urn:uuid:673f8db5-0ffd-4395-9657-6da00420bbc1") + self.assertEqual(inst.entry[7].fullUrl, "urn:uuid:47600e0f-b6b5-4308-84b5-5dec157f7637") + self.assertEqual(inst.entry[7].resource.meta.lastUpdated.datetime, FHIRInstant("2013-05-05T16:13:03Z").datetime) + self.assertEqual(inst.entry[7].resource.meta.lastUpdated.as_json(), "2013-05-05T16:13:03Z") + self.assertEqual(inst.id, "father") + self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") + self.assertEqual(inst.identifier.value, "urn:uuid:0c3151bd-1cbf-4d64-b04d-cd9187a4c6e0") + self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2013-05-28T22:12:21Z").datetime) + self.assertEqual(inst.meta.lastUpdated.as_json(), "2013-05-28T22:12:21Z") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.type, "collection") + self.assertEqual(inst.signature.sigFormat, "image/jpg") + self.assertEqual(inst.signature.type[0].code, "1.2.840.10065.1.12.1.1") + self.assertEqual(inst.signature.type[0].display, "Author's Signature") + self.assertEqual(inst.signature.type[0].system, "urn:iso-astm:E1762-95:2013") + self.assertEqual(inst.signature.when.datetime, FHIRInstant("2015-08-31T07:42:33+10:00").datetime) + self.assertEqual(inst.signature.when.as_json(), "2015-08-31T07:42:33+10:00") + self.assertEqual(inst.timestamp.datetime, FHIRInstant("2013-05-28T22:12:21Z").datetime) + self.assertEqual(inst.timestamp.as_json(), "2013-05-28T22:12:21Z") + self.assertEqual(inst.type, "document") def testBundle10(self): - inst = self.instantiate_from("practitioner-examples-general.json") + inst = self.instantiate_from("location-examples-general.json") self.assertIsNotNone(inst, "Must have instantiated a Bundle instance") self.implBundle10(inst) @@ -363,47 +381,11 @@ def testBundle10(self): self.implBundle10(inst2) def implBundle10(self, inst): - self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/Practitioner/1") - self.assertEqual(inst.entry[0].resource.id, "1") - self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/Practitioner/13") - self.assertEqual(inst.entry[1].resource.id, "13") - self.assertEqual(inst.entry[1].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[1].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[2].fullUrl, "http://hl7.org/fhir/Practitioner/14") - self.assertEqual(inst.entry[2].resource.id, "14") - self.assertEqual(inst.entry[2].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[2].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[3].fullUrl, "http://hl7.org/fhir/Practitioner/15") - self.assertEqual(inst.entry[3].resource.id, "15") - self.assertEqual(inst.entry[3].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[3].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[4].fullUrl, "http://hl7.org/fhir/Practitioner/16") - self.assertEqual(inst.entry[4].resource.id, "16") - self.assertEqual(inst.entry[4].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[4].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[5].fullUrl, "http://hl7.org/fhir/Practitioner/17") - self.assertEqual(inst.entry[5].resource.id, "17") - self.assertEqual(inst.entry[5].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[5].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[6].fullUrl, "http://hl7.org/fhir/Practitioner/18") - self.assertEqual(inst.entry[6].resource.id, "18") - self.assertEqual(inst.entry[6].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[6].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[7].fullUrl, "http://hl7.org/fhir/Practitioner/19") - self.assertEqual(inst.entry[7].resource.id, "19") - self.assertEqual(inst.entry[7].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[7].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[8].fullUrl, "http://hl7.org/fhir/Practitioner/20") - self.assertEqual(inst.entry[8].resource.id, "20") - self.assertEqual(inst.entry[8].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[8].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.entry[9].fullUrl, "http://hl7.org/fhir/Practitioner/21") - self.assertEqual(inst.entry[9].resource.id, "21") - self.assertEqual(inst.entry[9].resource.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.entry[9].resource.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") - self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897809") - self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) - self.assertEqual(inst.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.entry[0].fullUrl, "http://hl7.org/fhir/Location/2") + self.assertEqual(inst.entry[0].resource.id, "2") + self.assertEqual(inst.entry[1].fullUrl, "http://hl7.org/fhir/Location/3") + self.assertEqual(inst.entry[1].resource.id, "3") + self.assertEqual(inst.id, "3ad0687e-f477-468c-afd5-fcc2bf897819") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") diff --git a/tests/models/careplan_test.py b/tests/models/careplan_test.py index 5b324f4d..34f81d91 100644 --- a/tests/models/careplan_test.py +++ b/tests/models/careplan_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return careplan.CarePlan(js) def testCarePlan1(self): - inst = self.instantiate_from("careplan-example-f203-sepsis.json") + inst = self.instantiate_from("careplan-example-f002-lung.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") self.implCarePlan1(inst) @@ -30,28 +30,32 @@ def testCarePlan1(self): self.implCarePlan1(inst2) def implCarePlan1(self, inst): - self.assertEqual(inst.activity[0].detail.code.coding[0].code, "241541005") - self.assertEqual(inst.activity[0].detail.code.coding[0].display, "High resolution computed tomography of lungs") + self.assertEqual(inst.activity[0].detail.code.coding[0].code, "359615001") + self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Partial lobectomy of lung") self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") - self.assertFalse(inst.activity[0].detail.doNotPerform) + self.assertTrue(inst.activity[0].detail.doNotPerform) self.assertEqual(inst.activity[0].detail.kind, "ServiceRequest") - self.assertEqual(inst.activity[0].detail.status, "not-started") + self.assertEqual(inst.activity[0].detail.scheduledString, "2011-07-07T09:30:10+01:00") + self.assertEqual(inst.activity[0].detail.status, "completed") self.assertEqual(inst.contained[0].id, "careteam") self.assertEqual(inst.contained[1].id, "goal") - self.assertEqual(inst.id, "f203") + self.assertEqual(inst.id, "f002") + self.assertEqual(inst.identifier[0].system, "http://www.bmc.nl/zorgportal/identifiers/careplans") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "CP2934") self.assertEqual(inst.intent, "plan") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-04-21").datetime) - self.assertEqual(inst.period.end.as_json(), "2013-04-21") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2013-04-14").datetime) - self.assertEqual(inst.period.start.as_json(), "2013-04-14") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-07-07").datetime) + self.assertEqual(inst.period.end.as_json(), "2013-07-07") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-07-06").datetime) + self.assertEqual(inst.period.start.as_json(), "2011-07-06") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testCarePlan2(self): - inst = self.instantiate_from("careplan-example-obesity-narrative.json") + inst = self.instantiate_from("careplan-example-f202-malignancy.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") self.implCarePlan2(inst) @@ -61,16 +65,28 @@ def testCarePlan2(self): self.implCarePlan2(inst2) def implCarePlan2(self, inst): - self.assertEqual(inst.id, "obesity-narrative") + self.assertEqual(inst.activity[0].detail.code.coding[0].code, "367336001") + self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Chemotherapy") + self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") + self.assertFalse(inst.activity[0].detail.doNotPerform) + self.assertEqual(inst.activity[0].detail.kind, "ServiceRequest") + self.assertEqual(inst.activity[0].detail.status, "in-progress") + self.assertEqual(inst.contained[0].id, "doce") + self.assertEqual(inst.contained[1].id, "cisp") + self.assertEqual(inst.contained[2].id, "fluo") + self.assertEqual(inst.contained[3].id, "tpf") + self.assertEqual(inst.contained[4].id, "careteam") + self.assertEqual(inst.contained[5].id, "goal") + self.assertEqual(inst.id, "f202") self.assertEqual(inst.intent, "plan") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "additional") + self.assertEqual(inst.text.status, "generated") def testCarePlan3(self): - inst = self.instantiate_from("careplan-example-GPVisit.json") + inst = self.instantiate_from("careplan-example-obesity-narrative.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") self.implCarePlan3(inst) @@ -80,6 +96,110 @@ def testCarePlan3(self): self.implCarePlan3(inst2) def implCarePlan3(self, inst): + self.assertEqual(inst.id, "obesity-narrative") + self.assertEqual(inst.intent, "plan") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "additional") + + def testCarePlan4(self): + inst = self.instantiate_from("careplan-example.json") + self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") + self.implCarePlan4(inst) + + js = inst.as_json() + self.assertEqual("CarePlan", js["resourceType"]) + inst2 = careplan.CarePlan(js) + self.implCarePlan4(inst2) + + def implCarePlan4(self, inst): + self.assertEqual(inst.activity[0].detail.code.coding[0].code, "3141-9") + self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Weight Measured") + self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.activity[0].detail.code.coding[1].code, "27113001") + self.assertEqual(inst.activity[0].detail.code.coding[1].display, "Body weight") + self.assertEqual(inst.activity[0].detail.code.coding[1].system, "http://snomed.info/sct") + self.assertFalse(inst.activity[0].detail.doNotPerform) + self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.frequency, 1) + self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.period, 1) + self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.periodUnit, "d") + self.assertEqual(inst.activity[0].detail.status, "completed") + self.assertEqual(inst.activity[0].detail.statusReason.text, "Achieved weight loss to mitigate diabetes risk.") + self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].code, "161832001") + self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].display, "Progressive weight loss") + self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].text, "Weight management plan") + self.assertEqual(inst.contained[0].id, "p1") + self.assertEqual(inst.created.datetime, FHIRDateTime("2016-01-01").datetime) + self.assertEqual(inst.created.as_json(), "2016-01-01") + self.assertEqual(inst.description, "Manage obesity and weight loss") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.instantiatesUri[0], "http://example.org/protocol-for-obesity") + self.assertEqual(inst.intent, "plan") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2017-06-01").datetime) + self.assertEqual(inst.period.end.as_json(), "2017-06-01") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "additional") + + def testCarePlan5(self): + inst = self.instantiate_from("careplan-example-f201-renal.json") + self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") + self.implCarePlan5(inst) + + js = inst.as_json() + self.assertEqual("CarePlan", js["resourceType"]) + inst2 = careplan.CarePlan(js) + self.implCarePlan5(inst2) + + def implCarePlan5(self, inst): + self.assertEqual(inst.activity[0].detail.code.coding[0].code, "284093001") + self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Potassium supplementation") + self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.activity[0].detail.dailyAmount.code, "258718000") + self.assertEqual(inst.activity[0].detail.dailyAmount.system, "http://snomed.info/sct") + self.assertEqual(inst.activity[0].detail.dailyAmount.unit, "mmol") + self.assertEqual(inst.activity[0].detail.dailyAmount.value, 80) + self.assertFalse(inst.activity[0].detail.doNotPerform) + self.assertEqual(inst.activity[0].detail.kind, "NutritionOrder") + self.assertEqual(inst.activity[0].detail.scheduledString, "daily") + self.assertEqual(inst.activity[0].detail.status, "completed") + self.assertEqual(inst.activity[1].detail.code.coding[0].code, "306005") + self.assertEqual(inst.activity[1].detail.code.coding[0].display, "Echography of kidney") + self.assertEqual(inst.activity[1].detail.code.coding[0].system, "http://snomed.info/sct") + self.assertFalse(inst.activity[1].detail.doNotPerform) + self.assertEqual(inst.activity[1].detail.kind, "ServiceRequest") + self.assertEqual(inst.activity[1].detail.status, "completed") + self.assertEqual(inst.contained[0].id, "careteam") + self.assertEqual(inst.contained[1].id, "goal") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.intent, "proposal") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-03-13").datetime) + self.assertEqual(inst.period.end.as_json(), "2013-03-13") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2013-03-11").datetime) + self.assertEqual(inst.period.start.as_json(), "2013-03-11") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + + def testCarePlan6(self): + inst = self.instantiate_from("careplan-example-GPVisit.json") + self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") + self.implCarePlan6(inst) + + js = inst.as_json() + self.assertEqual("CarePlan", js["resourceType"]) + inst2 = careplan.CarePlan(js) + self.implCarePlan6(inst2) + + def implCarePlan6(self, inst): self.assertEqual(inst.activity[0].detail.code.coding[0].code, "nursecon") self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://example.org/local") self.assertEqual(inst.activity[0].detail.code.text, "Nurse Consultation") @@ -109,52 +229,17 @@ def implCarePlan3(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "additional") - def testCarePlan4(self): - inst = self.instantiate_from("careplan-example-f002-lung.json") - self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") - self.implCarePlan4(inst) - - js = inst.as_json() - self.assertEqual("CarePlan", js["resourceType"]) - inst2 = careplan.CarePlan(js) - self.implCarePlan4(inst2) - - def implCarePlan4(self, inst): - self.assertEqual(inst.activity[0].detail.code.coding[0].code, "359615001") - self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Partial lobectomy of lung") - self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") - self.assertTrue(inst.activity[0].detail.doNotPerform) - self.assertEqual(inst.activity[0].detail.kind, "ServiceRequest") - self.assertEqual(inst.activity[0].detail.scheduledString, "2011-07-07T09:30:10+01:00") - self.assertEqual(inst.activity[0].detail.status, "completed") - self.assertEqual(inst.contained[0].id, "careteam") - self.assertEqual(inst.contained[1].id, "goal") - self.assertEqual(inst.id, "f002") - self.assertEqual(inst.identifier[0].system, "http://www.bmc.nl/zorgportal/identifiers/careplans") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "CP2934") - self.assertEqual(inst.intent, "plan") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-07-07").datetime) - self.assertEqual(inst.period.end.as_json(), "2013-07-07") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-07-06").datetime) - self.assertEqual(inst.period.start.as_json(), "2011-07-06") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.status, "generated") - - def testCarePlan5(self): + def testCarePlan7(self): inst = self.instantiate_from("careplan-example-integrated.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") - self.implCarePlan5(inst) + self.implCarePlan7(inst) js = inst.as_json() self.assertEqual("CarePlan", js["resourceType"]) inst2 = careplan.CarePlan(js) - self.implCarePlan5(inst2) + self.implCarePlan7(inst2) - def implCarePlan5(self, inst): + def implCarePlan7(self, inst): self.assertEqual(inst.activity[0].detail.description, "Eve will review photos of high and low density foods and share with her parents") self.assertFalse(inst.activity[0].detail.doNotPerform) self.assertEqual(inst.activity[0].detail.extension[0].url, "http://example.org/fhir/StructureDefinition/RevisionDate") @@ -286,114 +371,6 @@ def implCarePlan5(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testCarePlan6(self): - inst = self.instantiate_from("careplan-example-pregnancy.json") - self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") - self.implCarePlan6(inst) - - js = inst.as_json() - self.assertEqual("CarePlan", js["resourceType"]) - inst2 = careplan.CarePlan(js) - self.implCarePlan6(inst2) - - def implCarePlan6(self, inst): - self.assertEqual(inst.activity[1].detail.code.coding[0].code, "1an") - self.assertEqual(inst.activity[1].detail.code.coding[0].system, "http://example.org/mySystem") - self.assertEqual(inst.activity[1].detail.code.text, "First Antenatal encounter") - self.assertEqual(inst.activity[1].detail.description, "The first antenatal encounter. This is where a detailed physical examination is performed. and the pregnanacy discussed with the mother-to-be.") - self.assertFalse(inst.activity[1].detail.doNotPerform) - self.assertEqual(inst.activity[1].detail.kind, "Appointment") - self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-02-28").datetime) - self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-02-28") - self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-02-14").datetime) - self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-02-14") - self.assertEqual(inst.activity[1].detail.status, "scheduled") - self.assertEqual(inst.activity[1].extension[0].url, "http://example.org/fhir/StructureDefinition/careplan#andetails") - self.assertEqual(inst.activity[1].extension[0].valueUri, "http://orionhealth.com/fhir/careplan/1andetails") - self.assertEqual(inst.activity[2].detail.code.coding[0].code, "an") - self.assertEqual(inst.activity[2].detail.code.coding[0].system, "http://example.org/mySystem") - self.assertEqual(inst.activity[2].detail.code.text, "Follow-up Antenatal encounter") - self.assertEqual(inst.activity[2].detail.description, "The second antenatal encounter. Discuss any issues that arose from the first antenatal encounter") - self.assertFalse(inst.activity[2].detail.doNotPerform) - self.assertEqual(inst.activity[2].detail.kind, "Appointment") - self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-03-14").datetime) - self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-03-14") - self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-03-01").datetime) - self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-03-01") - self.assertEqual(inst.activity[2].detail.status, "not-started") - self.assertEqual(inst.activity[3].detail.code.coding[0].code, "del") - self.assertEqual(inst.activity[3].detail.code.coding[0].system, "http://example.org/mySystem") - self.assertEqual(inst.activity[3].detail.code.text, "Delivery") - self.assertEqual(inst.activity[3].detail.description, "The delivery.") - self.assertFalse(inst.activity[3].detail.doNotPerform) - self.assertEqual(inst.activity[3].detail.kind, "Appointment") - self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-09-14").datetime) - self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-09-14") - self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-09-01").datetime) - self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-09-01") - self.assertEqual(inst.activity[3].detail.status, "not-started") - self.assertEqual(inst.contained[0].id, "p1") - self.assertEqual(inst.contained[1].id, "pr1") - self.assertEqual(inst.contained[2].id, "pr2") - self.assertEqual(inst.contained[3].id, "careteam") - self.assertEqual(inst.contained[4].id, "goal") - self.assertEqual(inst.extension[0].url, "http://example.org/fhir/StructureDefinition/careplan#lmp") - self.assertEqual(inst.extension[0].valueDateTime.datetime, FHIRDateTime("2013-01-01").datetime) - self.assertEqual(inst.extension[0].valueDateTime.as_json(), "2013-01-01") - self.assertEqual(inst.id, "preg") - self.assertEqual(inst.intent, "plan") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-10-01").datetime) - self.assertEqual(inst.period.end.as_json(), "2013-10-01") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2013-01-01").datetime) - self.assertEqual(inst.period.start.as_json(), "2013-01-01") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "additional") - - def testCarePlan7(self): - inst = self.instantiate_from("careplan-example-f201-renal.json") - self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") - self.implCarePlan7(inst) - - js = inst.as_json() - self.assertEqual("CarePlan", js["resourceType"]) - inst2 = careplan.CarePlan(js) - self.implCarePlan7(inst2) - - def implCarePlan7(self, inst): - self.assertEqual(inst.activity[0].detail.code.coding[0].code, "284093001") - self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Potassium supplementation") - self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.activity[0].detail.dailyAmount.code, "258718000") - self.assertEqual(inst.activity[0].detail.dailyAmount.system, "http://snomed.info/sct") - self.assertEqual(inst.activity[0].detail.dailyAmount.unit, "mmol") - self.assertEqual(inst.activity[0].detail.dailyAmount.value, 80) - self.assertFalse(inst.activity[0].detail.doNotPerform) - self.assertEqual(inst.activity[0].detail.kind, "NutritionOrder") - self.assertEqual(inst.activity[0].detail.scheduledString, "daily") - self.assertEqual(inst.activity[0].detail.status, "completed") - self.assertEqual(inst.activity[1].detail.code.coding[0].code, "306005") - self.assertEqual(inst.activity[1].detail.code.coding[0].display, "Echography of kidney") - self.assertEqual(inst.activity[1].detail.code.coding[0].system, "http://snomed.info/sct") - self.assertFalse(inst.activity[1].detail.doNotPerform) - self.assertEqual(inst.activity[1].detail.kind, "ServiceRequest") - self.assertEqual(inst.activity[1].detail.status, "completed") - self.assertEqual(inst.contained[0].id, "careteam") - self.assertEqual(inst.contained[1].id, "goal") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.intent, "proposal") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-03-13").datetime) - self.assertEqual(inst.period.end.as_json(), "2013-03-13") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2013-03-11").datetime) - self.assertEqual(inst.period.start.as_json(), "2013-03-11") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - def testCarePlan8(self): inst = self.instantiate_from("careplan-example-f003-pharynx.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") @@ -430,7 +407,7 @@ def implCarePlan8(self, inst): self.assertEqual(inst.text.status, "generated") def testCarePlan9(self): - inst = self.instantiate_from("careplan-example.json") + inst = self.instantiate_from("careplan-example-f001-heart.json") self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") self.implCarePlan9(inst) @@ -440,49 +417,6 @@ def testCarePlan9(self): self.implCarePlan9(inst2) def implCarePlan9(self, inst): - self.assertEqual(inst.activity[0].detail.code.coding[0].code, "3141-9") - self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Weight Measured") - self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.activity[0].detail.code.coding[1].code, "27113001") - self.assertEqual(inst.activity[0].detail.code.coding[1].display, "Body weight") - self.assertEqual(inst.activity[0].detail.code.coding[1].system, "http://snomed.info/sct") - self.assertFalse(inst.activity[0].detail.doNotPerform) - self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.frequency, 1) - self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.period, 1) - self.assertEqual(inst.activity[0].detail.scheduledTiming.repeat.periodUnit, "d") - self.assertEqual(inst.activity[0].detail.status, "completed") - self.assertEqual(inst.activity[0].detail.statusReason.text, "Achieved weight loss to mitigate diabetes risk.") - self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].code, "161832001") - self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].display, "Progressive weight loss") - self.assertEqual(inst.activity[0].outcomeCodeableConcept[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].text, "Weight management plan") - self.assertEqual(inst.contained[0].id, "p1") - self.assertEqual(inst.created.datetime, FHIRDateTime("2016-01-01").datetime) - self.assertEqual(inst.created.as_json(), "2016-01-01") - self.assertEqual(inst.description, "Manage obesity and weight loss") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].value, "12345") - self.assertEqual(inst.instantiatesUri[0], "http://example.org/protocol-for-obesity") - self.assertEqual(inst.intent, "plan") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2017-06-01").datetime) - self.assertEqual(inst.period.end.as_json(), "2017-06-01") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "additional") - - def testCarePlan10(self): - inst = self.instantiate_from("careplan-example-f001-heart.json") - self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") - self.implCarePlan10(inst) - - js = inst.as_json() - self.assertEqual("CarePlan", js["resourceType"]) - inst2 = careplan.CarePlan(js) - self.implCarePlan10(inst2) - - def implCarePlan10(self, inst): self.assertEqual(inst.activity[0].detail.code.coding[0].code, "64915003") self.assertEqual(inst.activity[0].detail.code.coding[0].display, "Operation on heart") self.assertEqual(inst.activity[0].detail.code.coding[0].system, "http://snomed.info/sct") @@ -506,4 +440,70 @@ def implCarePlan10(self, inst): self.assertEqual(inst.period.start.as_json(), "2011-06-26") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") + + def testCarePlan10(self): + inst = self.instantiate_from("careplan-example-pregnancy.json") + self.assertIsNotNone(inst, "Must have instantiated a CarePlan instance") + self.implCarePlan10(inst) + + js = inst.as_json() + self.assertEqual("CarePlan", js["resourceType"]) + inst2 = careplan.CarePlan(js) + self.implCarePlan10(inst2) + + def implCarePlan10(self, inst): + self.assertEqual(inst.activity[1].detail.code.coding[0].code, "1an") + self.assertEqual(inst.activity[1].detail.code.coding[0].system, "http://example.org/mySystem") + self.assertEqual(inst.activity[1].detail.code.text, "First Antenatal encounter") + self.assertEqual(inst.activity[1].detail.description, "The first antenatal encounter. This is where a detailed physical examination is performed. and the pregnanacy discussed with the mother-to-be.") + self.assertFalse(inst.activity[1].detail.doNotPerform) + self.assertEqual(inst.activity[1].detail.kind, "Appointment") + self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-02-28").datetime) + self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-02-28") + self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-02-14").datetime) + self.assertEqual(inst.activity[1].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-02-14") + self.assertEqual(inst.activity[1].detail.status, "scheduled") + self.assertEqual(inst.activity[1].extension[0].url, "http://example.org/fhir/StructureDefinition/careplan#andetails") + self.assertEqual(inst.activity[1].extension[0].valueUri, "http://orionhealth.com/fhir/careplan/1andetails") + self.assertEqual(inst.activity[2].detail.code.coding[0].code, "an") + self.assertEqual(inst.activity[2].detail.code.coding[0].system, "http://example.org/mySystem") + self.assertEqual(inst.activity[2].detail.code.text, "Follow-up Antenatal encounter") + self.assertEqual(inst.activity[2].detail.description, "The second antenatal encounter. Discuss any issues that arose from the first antenatal encounter") + self.assertFalse(inst.activity[2].detail.doNotPerform) + self.assertEqual(inst.activity[2].detail.kind, "Appointment") + self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-03-14").datetime) + self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-03-14") + self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-03-01").datetime) + self.assertEqual(inst.activity[2].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-03-01") + self.assertEqual(inst.activity[2].detail.status, "not-started") + self.assertEqual(inst.activity[3].detail.code.coding[0].code, "del") + self.assertEqual(inst.activity[3].detail.code.coding[0].system, "http://example.org/mySystem") + self.assertEqual(inst.activity[3].detail.code.text, "Delivery") + self.assertEqual(inst.activity[3].detail.description, "The delivery.") + self.assertFalse(inst.activity[3].detail.doNotPerform) + self.assertEqual(inst.activity[3].detail.kind, "Appointment") + self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.end.datetime, FHIRDateTime("2013-09-14").datetime) + self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.end.as_json(), "2013-09-14") + self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.start.datetime, FHIRDateTime("2013-09-01").datetime) + self.assertEqual(inst.activity[3].detail.scheduledTiming.repeat.boundsPeriod.start.as_json(), "2013-09-01") + self.assertEqual(inst.activity[3].detail.status, "not-started") + self.assertEqual(inst.contained[0].id, "p1") + self.assertEqual(inst.contained[1].id, "pr1") + self.assertEqual(inst.contained[2].id, "pr2") + self.assertEqual(inst.contained[3].id, "careteam") + self.assertEqual(inst.contained[4].id, "goal") + self.assertEqual(inst.extension[0].url, "http://example.org/fhir/StructureDefinition/careplan#lmp") + self.assertEqual(inst.extension[0].valueDateTime.datetime, FHIRDateTime("2013-01-01").datetime) + self.assertEqual(inst.extension[0].valueDateTime.as_json(), "2013-01-01") + self.assertEqual(inst.id, "preg") + self.assertEqual(inst.intent, "plan") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2013-10-01").datetime) + self.assertEqual(inst.period.end.as_json(), "2013-10-01") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2013-01-01").datetime) + self.assertEqual(inst.period.start.as_json(), "2013-01-01") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "additional") diff --git a/tests/models/chargeitemdefinition_test.py b/tests/models/chargeitemdefinition_test.py index fb032fa4..5a06357d 100644 --- a/tests/models/chargeitemdefinition_test.py +++ b/tests/models/chargeitemdefinition_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return chargeitemdefinition.ChargeItemDefinition(js) def testChargeItemDefinition1(self): - inst = self.instantiate_from("chargeitemdefinition-ebm-example.json") + inst = self.instantiate_from("chargeitemdefinition-device-example.json") self.assertIsNotNone(inst, "Must have instantiated a ChargeItemDefinition instance") self.implChargeItemDefinition1(inst) @@ -30,48 +30,6 @@ def testChargeItemDefinition1(self): self.implChargeItemDefinition1(inst2) def implChargeItemDefinition1(self, inst): - self.assertEqual(inst.applicability[0].description, "Excludes billing code 13250 for same Encounter") - self.assertEqual(inst.applicability[0].expression, "[some CQL expression]") - self.assertEqual(inst.applicability[0].language, "text/cql") - self.assertEqual(inst.applicability[1].description, "Applies only once per Encounter") - self.assertEqual(inst.applicability[1].expression, "[some CQL expression]") - self.assertEqual(inst.applicability[1].language, "text/CQL") - self.assertEqual(inst.code.coding[0].code, "30110") - self.assertEqual(inst.code.coding[0].display, "Allergologiediagnostik I") - self.assertEqual(inst.code.coding[0].system, "http://fhir.de/CodingSystem/kbv/ebm") - self.assertEqual(inst.description, "Allergologisch-diagnostischer Komplex zur Diagnostik und/oder zum Ausschluss einer (Kontakt-)Allergie vom Spättyp (Typ IV), einschl. Kosten") - self.assertEqual(inst.effectivePeriod.end.datetime, FHIRDateTime("2018-06-30").datetime) - self.assertEqual(inst.effectivePeriod.end.as_json(), "2018-06-30") - self.assertEqual(inst.effectivePeriod.start.datetime, FHIRDateTime("2018-04-01").datetime) - self.assertEqual(inst.effectivePeriod.start.as_json(), "2018-04-01") - self.assertEqual(inst.id, "ebm") - self.assertEqual(inst.propertyGroup[0].priceComponent[0].amount.currency, "EUR") - self.assertEqual(inst.propertyGroup[0].priceComponent[0].amount.value, 67.44) - self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].code, "gesamt-euro") - self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].display, "Gesamt (Euro)") - self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].system, "http://fhir.de/CodeSystem/kbv/ebm-attribute") - self.assertEqual(inst.propertyGroup[0].priceComponent[0].type, "base") - self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].code, "gesamt-punkte") - self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].display, "Gesamt (Punkte)") - self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].system, "http://fhir.de/CodeSystem/kbv/ebm-attribute") - self.assertEqual(inst.propertyGroup[0].priceComponent[1].factor, 633) - self.assertEqual(inst.propertyGroup[0].priceComponent[1].type, "informational") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://fhir.de/ChargeItemDefinition/kbv/ebm-30110") - self.assertEqual(inst.version, "2-2018") - - def testChargeItemDefinition2(self): - inst = self.instantiate_from("chargeitemdefinition-device-example.json") - self.assertIsNotNone(inst, "Must have instantiated a ChargeItemDefinition instance") - self.implChargeItemDefinition2(inst) - - js = inst.as_json() - self.assertEqual("ChargeItemDefinition", js["resourceType"]) - inst2 = chargeitemdefinition.ChargeItemDefinition(js) - self.implChargeItemDefinition2(inst2) - - def implChargeItemDefinition2(self, inst): self.assertEqual(inst.applicability[0].description, "Verify ChargeItem pertains to Device 12345") self.assertEqual(inst.applicability[0].expression, "%context.service.suppliedItem='Device/12345'") self.assertEqual(inst.applicability[0].language, "text/fhirpath") @@ -102,4 +60,46 @@ def implChargeItemDefinition2(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.url, "http://sap.org/ChargeItemDefinition/device-123") + + def testChargeItemDefinition2(self): + inst = self.instantiate_from("chargeitemdefinition-ebm-example.json") + self.assertIsNotNone(inst, "Must have instantiated a ChargeItemDefinition instance") + self.implChargeItemDefinition2(inst) + + js = inst.as_json() + self.assertEqual("ChargeItemDefinition", js["resourceType"]) + inst2 = chargeitemdefinition.ChargeItemDefinition(js) + self.implChargeItemDefinition2(inst2) + + def implChargeItemDefinition2(self, inst): + self.assertEqual(inst.applicability[0].description, "Excludes billing code 13250 for same Encounter") + self.assertEqual(inst.applicability[0].expression, "[some CQL expression]") + self.assertEqual(inst.applicability[0].language, "text/cql") + self.assertEqual(inst.applicability[1].description, "Applies only once per Encounter") + self.assertEqual(inst.applicability[1].expression, "[some CQL expression]") + self.assertEqual(inst.applicability[1].language, "text/CQL") + self.assertEqual(inst.code.coding[0].code, "30110") + self.assertEqual(inst.code.coding[0].display, "Allergologiediagnostik I") + self.assertEqual(inst.code.coding[0].system, "http://fhir.de/CodingSystem/kbv/ebm") + self.assertEqual(inst.description, "Allergologisch-diagnostischer Komplex zur Diagnostik und/oder zum Ausschluss einer (Kontakt-)Allergie vom Spättyp (Typ IV), einschl. Kosten") + self.assertEqual(inst.effectivePeriod.end.datetime, FHIRDateTime("2018-06-30").datetime) + self.assertEqual(inst.effectivePeriod.end.as_json(), "2018-06-30") + self.assertEqual(inst.effectivePeriod.start.datetime, FHIRDateTime("2018-04-01").datetime) + self.assertEqual(inst.effectivePeriod.start.as_json(), "2018-04-01") + self.assertEqual(inst.id, "ebm") + self.assertEqual(inst.propertyGroup[0].priceComponent[0].amount.currency, "EUR") + self.assertEqual(inst.propertyGroup[0].priceComponent[0].amount.value, 67.44) + self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].code, "gesamt-euro") + self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].display, "Gesamt (Euro)") + self.assertEqual(inst.propertyGroup[0].priceComponent[0].code.coding[0].system, "http://fhir.de/CodeSystem/kbv/ebm-attribute") + self.assertEqual(inst.propertyGroup[0].priceComponent[0].type, "base") + self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].code, "gesamt-punkte") + self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].display, "Gesamt (Punkte)") + self.assertEqual(inst.propertyGroup[0].priceComponent[1].code.coding[0].system, "http://fhir.de/CodeSystem/kbv/ebm-attribute") + self.assertEqual(inst.propertyGroup[0].priceComponent[1].factor, 633) + self.assertEqual(inst.propertyGroup[0].priceComponent[1].type, "informational") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.url, "http://fhir.de/ChargeItemDefinition/kbv/ebm-30110") + self.assertEqual(inst.version, "2-2018") diff --git a/tests/models/claim_test.py b/tests/models/claim_test.py index 9d930dc6..919a4dcf 100644 --- a/tests/models/claim_test.py +++ b/tests/models/claim_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return claim.Claim(js) def testClaim1(self): - inst = self.instantiate_from("claim-example-professional.json") + inst = self.instantiate_from("claim-example-institutional-rich.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") self.implClaim1(inst) @@ -30,40 +30,78 @@ def testClaim1(self): self.implClaim1(inst2) def implClaim1(self, inst): + self.assertEqual(inst.accident.date.date, FHIRDate("2014-07-09").date) + self.assertEqual(inst.accident.date.as_json(), "2014-07-09") + self.assertEqual(inst.accident.locationAddress.text, "Grouse Mountain Ski Hill") + self.assertEqual(inst.accident.type.coding[0].code, "SPT") + self.assertEqual(inst.accident.type.coding[0].display, "Sporting Accident") + self.assertEqual(inst.accident.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActIncidentCode") + self.assertEqual(inst.billablePeriod.end.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.billablePeriod.end.as_json(), "2014-08-16") + self.assertEqual(inst.billablePeriod.start.datetime, FHIRDateTime("2014-08-15").datetime) + self.assertEqual(inst.billablePeriod.start.as_json(), "2014-08-15") + self.assertEqual(inst.careTeam[0].qualification.coding[0].code, "physician") + self.assertEqual(inst.careTeam[0].qualification.coding[0].system, "http://example.org/fhir/CodeSystem/provider-qualification") + self.assertTrue(inst.careTeam[0].responsible) + self.assertEqual(inst.careTeam[0].role.coding[0].code, "primary") + self.assertEqual(inst.careTeam[0].role.coding[0].system, "http://example.org/fhir/CodeSystem/claim-careteamrole") self.assertEqual(inst.careTeam[0].sequence, 1) self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654456") + self.assertEqual(inst.diagnosis[0].packageCode.coding[0].code, "400") + self.assertEqual(inst.diagnosis[0].packageCode.coding[0].display, "Head trauma - concussion") + self.assertEqual(inst.diagnosis[0].packageCode.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-diagnosisrelatedgroup") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "860150") - self.assertEqual(inst.identifier[0].system, "http://happypdocs.com/claim") - self.assertEqual(inst.identifier[0].value, "8612345") + self.assertEqual(inst.diagnosis[0].type[0].coding[0].code, "admitting") + self.assertEqual(inst.diagnosis[0].type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-diagnosistype") + self.assertEqual(inst.id, "960151") + self.assertEqual(inst.identifier[0].system, "http://happyhospital.com/claim") + self.assertEqual(inst.identifier[0].value, "96123451") + self.assertEqual(inst.insurance[0].businessArrangement, "BA987123") self.assertTrue(inst.insurance[0].focal) + self.assertEqual(inst.insurance[0].preAuthRef[0], "PA2014G56473") self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 75.0) + self.assertEqual(inst.item[0].net.value, 125.0) self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-serviceproduct") self.assertEqual(inst.item[0].sequence, 1) self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 75.0) + self.assertEqual(inst.item[0].unitPrice.value, 125.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") self.assertEqual(inst.priority.coding[0].code, "normal") self.assertEqual(inst.status, "active") + self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "employmentimpacted") + self.assertEqual(inst.supportingInfo[0].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[0].sequence, 1) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.as_json(), "2014-08-16") + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.as_json(), "2014-08-16") + self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "hospitalized") + self.assertEqual(inst.supportingInfo[1].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[1].sequence, 2) + self.assertEqual(inst.supportingInfo[1].timingPeriod.end.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.supportingInfo[1].timingPeriod.end.as_json(), "2014-08-16") + self.assertEqual(inst.supportingInfo[1].timingPeriod.start.datetime, FHIRDateTime("2014-08-15").datetime) + self.assertEqual(inst.supportingInfo[1].timingPeriod.start.as_json(), "2014-08-15") self.assertEqual(inst.text.div, "
A human-readable rendering of the Claim
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "professional") + self.assertEqual(inst.total.currency, "USD") + self.assertEqual(inst.total.value, 125.0) + self.assertEqual(inst.type.coding[0].code, "institutional") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") def testClaim2(self): - inst = self.instantiate_from("claim-example-pharmacy-medication.json") + inst = self.instantiate_from("claim-example-professional.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") self.implClaim2(inst) @@ -78,72 +116,35 @@ def implClaim2(self, inst): self.assertEqual(inst.created.as_json(), "2014-08-16") self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654456") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "760151") - self.assertEqual(inst.identifier[0].system, "http://happypharma.com/claim") - self.assertEqual(inst.identifier[0].value, "7612345") + self.assertEqual(inst.id, "860150") + self.assertEqual(inst.identifier[0].system, "http://happypdocs.com/claim") + self.assertEqual(inst.identifier[0].value, "8612345") self.assertTrue(inst.insurance[0].focal) self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) - self.assertEqual(inst.item[0].detail[0].net.currency, "USD") - self.assertEqual(inst.item[0].detail[0].net.value, 45.0) - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].code, "drugcost") - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") - self.assertEqual(inst.item[0].detail[0].sequence, 1) - self.assertEqual(inst.item[0].detail[1].net.currency, "USD") - self.assertEqual(inst.item[0].detail[1].net.value, 9.0) - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].code, "markup") - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") - self.assertEqual(inst.item[0].detail[1].sequence, 2) - self.assertEqual(inst.item[0].detail[2].net.currency, "USD") - self.assertEqual(inst.item[0].detail[2].net.value, 36.0) - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].code, "dispensefee") - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") - self.assertEqual(inst.item[0].detail[2].sequence, 3) - self.assertEqual(inst.item[0].informationSequence[0], 1) - self.assertEqual(inst.item[0].informationSequence[1], 2) - self.assertEqual(inst.item[0].informationSequence[2], 3) self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 90.0) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "562721") - self.assertEqual(inst.item[0].productOrService.coding[0].display, "Alprazolam 0.25mg (Xanax)") - self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://www.nlm.nih.gov/research/umls/rxnorm") - self.assertEqual(inst.item[0].quantity.code, "TAB") - self.assertEqual(inst.item[0].quantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.item[0].quantity.unit, "TAB") - self.assertEqual(inst.item[0].quantity.value, 90) + self.assertEqual(inst.item[0].net.value, 75.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-serviceproduct") self.assertEqual(inst.item[0].sequence, 1) self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[0].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].unitPrice.value, 75.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") - self.assertEqual(inst.priority.coding[0].code, "stat") + self.assertEqual(inst.priority.coding[0].code, "normal") self.assertEqual(inst.status, "active") - self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "pharmacyrefill") - self.assertEqual(inst.supportingInfo[0].code.coding[0].code, "new") - self.assertEqual(inst.supportingInfo[0].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-refill") - self.assertEqual(inst.supportingInfo[0].sequence, 1) - self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "pharmacyinformation") - self.assertEqual(inst.supportingInfo[1].code.coding[0].code, "refillsremaining") - self.assertEqual(inst.supportingInfo[1].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-information") - self.assertEqual(inst.supportingInfo[1].sequence, 2) - self.assertEqual(inst.supportingInfo[1].valueQuantity.value, 2) - self.assertEqual(inst.supportingInfo[2].category.coding[0].code, "pharmacyinformation") - self.assertEqual(inst.supportingInfo[2].code.coding[0].code, "dayssupply") - self.assertEqual(inst.supportingInfo[2].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-information") - self.assertEqual(inst.supportingInfo[2].sequence, 3) - self.assertEqual(inst.supportingInfo[2].valueQuantity.value, 90) - self.assertEqual(inst.text.div, "
A human-readable rendering of the Pharmacy Claim
") + self.assertEqual(inst.text.div, "
A human-readable rendering of the Claim
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.total.currency, "USD") - self.assertEqual(inst.total.value, 90.0) - self.assertEqual(inst.type.coding[0].code, "pharmacy") + self.assertEqual(inst.type.coding[0].code, "professional") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") def testClaim3(self): - inst = self.instantiate_from("claim-example-vision-glasses-3tier.json") + inst = self.instantiate_from("claim-example.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") self.implClaim3(inst) @@ -153,6 +154,93 @@ def testClaim3(self): self.implClaim3(inst2) def implClaim3(self, inst): + self.assertEqual(inst.careTeam[0].sequence, 1) + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123456") + self.assertEqual(inst.diagnosis[0].sequence, 1) + self.assertEqual(inst.id, "100150") + self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") + self.assertEqual(inst.identifier[0].value, "12345") + self.assertTrue(inst.insurance[0].focal) + self.assertEqual(inst.insurance[0].identifier.system, "http://happyvalley.com/claim") + self.assertEqual(inst.insurance[0].identifier.value, "12345") + self.assertEqual(inst.insurance[0].sequence, 1) + self.assertEqual(inst.item[0].careTeamSequence[0], 1) + self.assertEqual(inst.item[0].net.currency, "USD") + self.assertEqual(inst.item[0].net.value, 135.57) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "1200") + self.assertEqual(inst.item[0].sequence, 1) + self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) + self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[0].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].unitPrice.value, 135.57) + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.payee.type.coding[0].code, "provider") + self.assertEqual(inst.priority.coding[0].code, "normal") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "
A human-readable rendering of the Oral Health Claim
") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") + self.assertEqual(inst.use, "claim") + + def testClaim4(self): + inst = self.instantiate_from("claim-example-vision.json") + self.assertIsNotNone(inst, "Must have instantiated a Claim instance") + self.implClaim4(inst) + + js = inst.as_json() + self.assertEqual("Claim", js["resourceType"]) + inst2 = claim.Claim(js) + self.implClaim4(inst2) + + def implClaim4(self, inst): + self.assertEqual(inst.careTeam[0].sequence, 1) + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654321") + self.assertEqual(inst.diagnosis[0].sequence, 1) + self.assertEqual(inst.id, "660150") + self.assertEqual(inst.identifier[0].system, "http://happysight.com/claim") + self.assertEqual(inst.identifier[0].value, "6612345") + self.assertTrue(inst.insurance[0].focal) + self.assertEqual(inst.insurance[0].sequence, 1) + self.assertEqual(inst.item[0].careTeamSequence[0], 1) + self.assertEqual(inst.item[0].net.currency, "USD") + self.assertEqual(inst.item[0].net.value, 80.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") + self.assertEqual(inst.item[0].sequence, 1) + self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) + self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[0].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].unitPrice.value, 80.0) + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.payee.type.coding[0].code, "provider") + self.assertEqual(inst.priority.coding[0].code, "normal") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "
A human-readable rendering of the Vision Claim
") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "vision") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") + self.assertEqual(inst.use, "claim") + + def testClaim5(self): + inst = self.instantiate_from("claim-example-vision-glasses-3tier.json") + self.assertIsNotNone(inst, "Must have instantiated a Claim instance") + self.implClaim5(inst) + + js = inst.as_json() + self.assertEqual("Claim", js["resourceType"]) + inst2 = claim.Claim(js) + self.implClaim5(inst2) + + def implClaim5(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) self.assertEqual(inst.contained[0].id, "device-frame") self.assertEqual(inst.contained[1].id, "device-lens") @@ -300,147 +388,84 @@ def implClaim3(self, inst): self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") - def testClaim4(self): - inst = self.instantiate_from("claim-example-oral-orthoplan.json") + def testClaim6(self): + inst = self.instantiate_from("claim-example-institutional.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") - self.implClaim4(inst) + self.implClaim6(inst) js = inst.as_json() self.assertEqual("Claim", js["resourceType"]) inst2 = claim.Claim(js) - self.implClaim4(inst2) + self.implClaim6(inst2) - def implClaim4(self, inst): + def implClaim6(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) - self.assertEqual(inst.created.datetime, FHIRDateTime("2015-03-16").datetime) - self.assertEqual(inst.created.as_json(), "2015-03-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123457") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654456") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.fundsReserve.coding[0].code, "provider") - self.assertEqual(inst.id, "100153") - self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") - self.assertEqual(inst.identifier[0].value, "12355") + self.assertEqual(inst.id, "960150") + self.assertEqual(inst.identifier[0].system, "http://happyhospital.com/claim") + self.assertEqual(inst.identifier[0].value, "9612345") self.assertTrue(inst.insurance[0].focal) self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) - self.assertEqual(inst.item[0].detail[0].net.currency, "USD") - self.assertEqual(inst.item[0].detail[0].net.value, 1000.0) - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].code, "ORTHOEXAM") - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[0].detail[0].sequence, 1) - self.assertEqual(inst.item[0].detail[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[0].unitPrice.value, 1000.0) - self.assertEqual(inst.item[0].detail[1].net.currency, "USD") - self.assertEqual(inst.item[0].detail[1].net.value, 1500.0) - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].code, "ORTHODIAG") - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[0].detail[1].sequence, 2) - self.assertEqual(inst.item[0].detail[1].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[1].unitPrice.value, 1500.0) - self.assertEqual(inst.item[0].detail[2].net.currency, "USD") - self.assertEqual(inst.item[0].detail[2].net.value, 500.0) - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].code, "ORTHOINITIAL") - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[0].detail[2].sequence, 3) - self.assertEqual(inst.item[0].detail[2].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[2].unitPrice.value, 500.0) - self.assertEqual(inst.item[0].detail[3].productOrService.coding[0].code, "ORTHOMONTHS") - self.assertEqual(inst.item[0].detail[3].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[0].detail[3].quantity.value, 24) - self.assertEqual(inst.item[0].detail[3].sequence, 4) - self.assertEqual(inst.item[0].detail[4].net.currency, "USD") - self.assertEqual(inst.item[0].detail[4].net.value, 250.0) - self.assertEqual(inst.item[0].detail[4].productOrService.coding[0].code, "ORTHOPERIODIC") - self.assertEqual(inst.item[0].detail[4].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[0].detail[4].quantity.value, 24) - self.assertEqual(inst.item[0].detail[4].sequence, 5) - self.assertEqual(inst.item[0].detail[4].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[4].unitPrice.value, 250.0) - self.assertEqual(inst.item[0].diagnosisSequence[0], 1) self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 9000.0) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "ORTHPLAN") - self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].net.value, 125.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-serviceproduct") self.assertEqual(inst.item[0].sequence, 1) - self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2015-05-16").date) - self.assertEqual(inst.item[0].servicedDate.as_json(), "2015-05-16") + self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) + self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 9000.0) - self.assertEqual(inst.item[1].bodySite.coding[0].code, "21") - self.assertEqual(inst.item[1].bodySite.coding[0].system, "http://fdi.org/fhir/oraltoothcodes") - self.assertEqual(inst.item[1].careTeamSequence[0], 1) - self.assertEqual(inst.item[1].net.currency, "USD") - self.assertEqual(inst.item[1].net.value, 105.0) - self.assertEqual(inst.item[1].productOrService.coding[0].code, "21211") - self.assertEqual(inst.item[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[1].sequence, 2) - self.assertEqual(inst.item[1].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[1].servicedDate.as_json(), "2014-08-16") - self.assertEqual(inst.item[1].subSite[0].coding[0].code, "L") - self.assertEqual(inst.item[1].subSite[0].coding[0].system, "http://fdi.org/fhir/oralsurfacecodes") - self.assertEqual(inst.item[1].unitPrice.currency, "USD") - self.assertEqual(inst.item[1].unitPrice.value, 105.0) - self.assertEqual(inst.item[2].bodySite.coding[0].code, "36") - self.assertEqual(inst.item[2].bodySite.coding[0].system, "http://fdi.org/fhir/oraltoothcodes") - self.assertEqual(inst.item[2].careTeamSequence[0], 1) - self.assertEqual(inst.item[2].detail[0].net.currency, "USD") - self.assertEqual(inst.item[2].detail[0].net.value, 750.0) - self.assertEqual(inst.item[2].detail[0].productOrService.coding[0].code, "27211") - self.assertEqual(inst.item[2].detail[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[2].detail[0].sequence, 1) - self.assertEqual(inst.item[2].detail[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[2].detail[0].unitPrice.value, 750.0) - self.assertEqual(inst.item[2].detail[1].net.currency, "USD") - self.assertEqual(inst.item[2].detail[1].net.value, 350.0) - self.assertEqual(inst.item[2].detail[1].productOrService.coding[0].code, "lab") - self.assertEqual(inst.item[2].detail[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[2].detail[1].sequence, 2) - self.assertEqual(inst.item[2].detail[1].unitPrice.currency, "USD") - self.assertEqual(inst.item[2].detail[1].unitPrice.value, 350.0) - self.assertEqual(inst.item[2].net.currency, "USD") - self.assertEqual(inst.item[2].net.value, 1100.0) - self.assertEqual(inst.item[2].productOrService.coding[0].code, "27211") - self.assertEqual(inst.item[2].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") - self.assertEqual(inst.item[2].sequence, 3) - self.assertEqual(inst.item[2].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[2].servicedDate.as_json(), "2014-08-16") - self.assertEqual(inst.item[2].unitPrice.currency, "USD") - self.assertEqual(inst.item[2].unitPrice.value, 1100.0) + self.assertEqual(inst.item[0].unitPrice.value, 125.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") self.assertEqual(inst.priority.coding[0].code, "normal") + self.assertEqual(inst.procedure[0].date.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.procedure[0].date.as_json(), "2014-08-16") + self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].code, "SDI9901") + self.assertEqual(inst.procedure[0].procedureCodeableConcept.text, "Subcutaneous diagnostic implant") + self.assertEqual(inst.procedure[0].sequence, 1) + self.assertEqual(inst.procedure[0].type[0].coding[0].code, "primary") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the Oral Health Claim
") + self.assertEqual(inst.subType.coding[0].code, "emergency") + self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") + self.assertEqual(inst.text.div, "
A human-readable rendering of the Claim
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.total.currency, "USD") + self.assertEqual(inst.total.value, 125.0) + self.assertEqual(inst.type.coding[0].code, "institutional") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "preauthorization") + self.assertEqual(inst.use, "claim") - def testClaim5(self): - inst = self.instantiate_from("claim-example.json") + def testClaim7(self): + inst = self.instantiate_from("claim-example-oral-contained.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") - self.implClaim5(inst) + self.implClaim7(inst) js = inst.as_json() self.assertEqual("Claim", js["resourceType"]) inst2 = claim.Claim(js) - self.implClaim5(inst2) + self.implClaim7(inst2) - def implClaim5(self, inst): + def implClaim7(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) + self.assertEqual(inst.contained[0].id, "org-insurer") + self.assertEqual(inst.contained[1].id, "org-org") + self.assertEqual(inst.contained[2].id, "provider-1") + self.assertEqual(inst.contained[3].id, "patient-1") + self.assertEqual(inst.contained[4].id, "coverage-1") self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123456") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "100150") + self.assertEqual(inst.id, "100152") self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") - self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.identifier[0].value, "12347") self.assertTrue(inst.insurance[0].focal) - self.assertEqual(inst.insurance[0].identifier.system, "http://happyvalley.com/claim") - self.assertEqual(inst.insurance[0].identifier.value, "12345") self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) self.assertEqual(inst.item[0].net.currency, "USD") @@ -463,174 +488,88 @@ def implClaim5(self, inst): self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") - def testClaim6(self): - inst = self.instantiate_from("claim-example-vision-glasses.json") + def testClaim8(self): + inst = self.instantiate_from("claim-example-pharmacy-medication.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") - self.implClaim6(inst) + self.implClaim8(inst) js = inst.as_json() self.assertEqual("Claim", js["resourceType"]) inst2 = claim.Claim(js) - self.implClaim6(inst2) + self.implClaim8(inst2) - def implClaim6(self, inst): + def implClaim8(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654321") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654456") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "660151") - self.assertEqual(inst.identifier[0].system, "http://happysight.com/claim") - self.assertEqual(inst.identifier[0].value, "6612346") + self.assertEqual(inst.id, "760151") + self.assertEqual(inst.identifier[0].system, "http://happypharma.com/claim") + self.assertEqual(inst.identifier[0].value, "7612345") self.assertTrue(inst.insurance[0].focal) self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) self.assertEqual(inst.item[0].detail[0].net.currency, "USD") - self.assertEqual(inst.item[0].detail[0].net.value, 100.0) - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].code, "frame") - self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") + self.assertEqual(inst.item[0].detail[0].net.value, 45.0) + self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].code, "drugcost") + self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") self.assertEqual(inst.item[0].detail[0].sequence, 1) - self.assertEqual(inst.item[0].detail[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[0].unitPrice.value, 100.0) self.assertEqual(inst.item[0].detail[1].net.currency, "USD") - self.assertEqual(inst.item[0].detail[1].net.value, 100.0) - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].code, "lens") - self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") - self.assertEqual(inst.item[0].detail[1].quantity.value, 2) + self.assertEqual(inst.item[0].detail[1].net.value, 9.0) + self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].code, "markup") + self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") self.assertEqual(inst.item[0].detail[1].sequence, 2) - self.assertEqual(inst.item[0].detail[1].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[1].unitPrice.value, 50.0) - self.assertEqual(inst.item[0].detail[2].factor, 0.07) self.assertEqual(inst.item[0].detail[2].net.currency, "USD") - self.assertEqual(inst.item[0].detail[2].net.value, 14.0) - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].code, "fst") - self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") + self.assertEqual(inst.item[0].detail[2].net.value, 36.0) + self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].code, "dispensefee") + self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].system, "http://hl7.org/fhir/ex-pharmaservice") self.assertEqual(inst.item[0].detail[2].sequence, 3) - self.assertEqual(inst.item[0].detail[2].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].detail[2].unitPrice.value, 200.0) - self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 214.0) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "glasses") - self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") - self.assertEqual(inst.item[0].sequence, 1) - self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") - self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 214.0) - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.payee.type.coding[0].code, "provider") - self.assertEqual(inst.priority.coding[0].code, "normal") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the Vision Claim for Glasses
") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "vision") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "claim") - - def testClaim7(self): - inst = self.instantiate_from("claim-example-institutional.json") - self.assertIsNotNone(inst, "Must have instantiated a Claim instance") - self.implClaim7(inst) - - js = inst.as_json() - self.assertEqual("Claim", js["resourceType"]) - inst2 = claim.Claim(js) - self.implClaim7(inst2) - - def implClaim7(self, inst): - self.assertEqual(inst.careTeam[0].sequence, 1) - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654456") - self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "960150") - self.assertEqual(inst.identifier[0].system, "http://happyhospital.com/claim") - self.assertEqual(inst.identifier[0].value, "9612345") - self.assertTrue(inst.insurance[0].focal) - self.assertEqual(inst.insurance[0].sequence, 1) - self.assertEqual(inst.item[0].careTeamSequence[0], 1) + self.assertEqual(inst.item[0].informationSequence[0], 1) + self.assertEqual(inst.item[0].informationSequence[1], 2) + self.assertEqual(inst.item[0].informationSequence[2], 3) self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 125.0) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") - self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://hl7.org/fhir/ex-serviceproduct") + self.assertEqual(inst.item[0].net.value, 90.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "562721") + self.assertEqual(inst.item[0].productOrService.coding[0].display, "Alprazolam 0.25mg (Xanax)") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://www.nlm.nih.gov/research/umls/rxnorm") + self.assertEqual(inst.item[0].quantity.code, "TAB") + self.assertEqual(inst.item[0].quantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.item[0].quantity.unit, "TAB") + self.assertEqual(inst.item[0].quantity.value, 90) self.assertEqual(inst.item[0].sequence, 1) self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") - self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 125.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") - self.assertEqual(inst.priority.coding[0].code, "normal") - self.assertEqual(inst.procedure[0].date.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.procedure[0].date.as_json(), "2014-08-16") - self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].code, "SDI9901") - self.assertEqual(inst.procedure[0].procedureCodeableConcept.text, "Subcutaneous diagnostic implant") - self.assertEqual(inst.procedure[0].sequence, 1) - self.assertEqual(inst.procedure[0].type[0].coding[0].code, "primary") + self.assertEqual(inst.priority.coding[0].code, "stat") self.assertEqual(inst.status, "active") - self.assertEqual(inst.subType.coding[0].code, "emergency") - self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") - self.assertEqual(inst.text.div, "
A human-readable rendering of the Claim
") + self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "pharmacyrefill") + self.assertEqual(inst.supportingInfo[0].code.coding[0].code, "new") + self.assertEqual(inst.supportingInfo[0].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-refill") + self.assertEqual(inst.supportingInfo[0].sequence, 1) + self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "pharmacyinformation") + self.assertEqual(inst.supportingInfo[1].code.coding[0].code, "refillsremaining") + self.assertEqual(inst.supportingInfo[1].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-information") + self.assertEqual(inst.supportingInfo[1].sequence, 2) + self.assertEqual(inst.supportingInfo[1].valueQuantity.value, 2) + self.assertEqual(inst.supportingInfo[2].category.coding[0].code, "pharmacyinformation") + self.assertEqual(inst.supportingInfo[2].code.coding[0].code, "dayssupply") + self.assertEqual(inst.supportingInfo[2].code.coding[0].system, "http://example.org/fhir/CodeSystem/pharmacy-information") + self.assertEqual(inst.supportingInfo[2].sequence, 3) + self.assertEqual(inst.supportingInfo[2].valueQuantity.value, 90) + self.assertEqual(inst.text.div, "
A human-readable rendering of the Pharmacy Claim
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.total.currency, "USD") - self.assertEqual(inst.total.value, 125.0) - self.assertEqual(inst.type.coding[0].code, "institutional") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "claim") - - def testClaim8(self): - inst = self.instantiate_from("claim-example-oral-contained.json") - self.assertIsNotNone(inst, "Must have instantiated a Claim instance") - self.implClaim8(inst) - - js = inst.as_json() - self.assertEqual("Claim", js["resourceType"]) - inst2 = claim.Claim(js) - self.implClaim8(inst2) - - def implClaim8(self, inst): - self.assertEqual(inst.careTeam[0].sequence, 1) - self.assertEqual(inst.contained[0].id, "org-insurer") - self.assertEqual(inst.contained[1].id, "org-org") - self.assertEqual(inst.contained[2].id, "provider-1") - self.assertEqual(inst.contained[3].id, "patient-1") - self.assertEqual(inst.contained[4].id, "coverage-1") - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123456") - self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "100152") - self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") - self.assertEqual(inst.identifier[0].value, "12347") - self.assertTrue(inst.insurance[0].focal) - self.assertEqual(inst.insurance[0].sequence, 1) - self.assertEqual(inst.item[0].careTeamSequence[0], 1) - self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 135.57) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "1200") - self.assertEqual(inst.item[0].sequence, 1) - self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") - self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 135.57) - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.payee.type.coding[0].code, "provider") - self.assertEqual(inst.priority.coding[0].code, "normal") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the Oral Health Claim
") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.total.value, 90.0) + self.assertEqual(inst.type.coding[0].code, "pharmacy") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") def testClaim9(self): - inst = self.instantiate_from("claim-example-vision.json") + inst = self.instantiate_from("claim-example-oral-orthoplan.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") self.implClaim9(inst) @@ -641,39 +580,115 @@ def testClaim9(self): def implClaim9(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "654321") + self.assertEqual(inst.created.datetime, FHIRDateTime("2015-03-16").datetime) + self.assertEqual(inst.created.as_json(), "2015-03-16") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123457") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "660150") - self.assertEqual(inst.identifier[0].system, "http://happysight.com/claim") - self.assertEqual(inst.identifier[0].value, "6612345") + self.assertEqual(inst.fundsReserve.coding[0].code, "provider") + self.assertEqual(inst.id, "100153") + self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") + self.assertEqual(inst.identifier[0].value, "12355") self.assertTrue(inst.insurance[0].focal) self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) + self.assertEqual(inst.item[0].detail[0].net.currency, "USD") + self.assertEqual(inst.item[0].detail[0].net.value, 1000.0) + self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].code, "ORTHOEXAM") + self.assertEqual(inst.item[0].detail[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].detail[0].sequence, 1) + self.assertEqual(inst.item[0].detail[0].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].detail[0].unitPrice.value, 1000.0) + self.assertEqual(inst.item[0].detail[1].net.currency, "USD") + self.assertEqual(inst.item[0].detail[1].net.value, 1500.0) + self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].code, "ORTHODIAG") + self.assertEqual(inst.item[0].detail[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].detail[1].sequence, 2) + self.assertEqual(inst.item[0].detail[1].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].detail[1].unitPrice.value, 1500.0) + self.assertEqual(inst.item[0].detail[2].net.currency, "USD") + self.assertEqual(inst.item[0].detail[2].net.value, 500.0) + self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].code, "ORTHOINITIAL") + self.assertEqual(inst.item[0].detail[2].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].detail[2].sequence, 3) + self.assertEqual(inst.item[0].detail[2].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].detail[2].unitPrice.value, 500.0) + self.assertEqual(inst.item[0].detail[3].productOrService.coding[0].code, "ORTHOMONTHS") + self.assertEqual(inst.item[0].detail[3].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].detail[3].quantity.value, 24) + self.assertEqual(inst.item[0].detail[3].sequence, 4) + self.assertEqual(inst.item[0].detail[4].net.currency, "USD") + self.assertEqual(inst.item[0].detail[4].net.value, 250.0) + self.assertEqual(inst.item[0].detail[4].productOrService.coding[0].code, "ORTHOPERIODIC") + self.assertEqual(inst.item[0].detail[4].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[0].detail[4].quantity.value, 24) + self.assertEqual(inst.item[0].detail[4].sequence, 5) + self.assertEqual(inst.item[0].detail[4].unitPrice.currency, "USD") + self.assertEqual(inst.item[0].detail[4].unitPrice.value, 250.0) + self.assertEqual(inst.item[0].diagnosisSequence[0], 1) self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 80.0) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "exam") - self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://example.org/fhir/CodeSystem/ex-visionservice") + self.assertEqual(inst.item[0].net.value, 9000.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "ORTHPLAN") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") self.assertEqual(inst.item[0].sequence, 1) - self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2015-05-16").date) + self.assertEqual(inst.item[0].servicedDate.as_json(), "2015-05-16") self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 80.0) + self.assertEqual(inst.item[0].unitPrice.value, 9000.0) + self.assertEqual(inst.item[1].bodySite.coding[0].code, "21") + self.assertEqual(inst.item[1].bodySite.coding[0].system, "http://fdi.org/fhir/oraltoothcodes") + self.assertEqual(inst.item[1].careTeamSequence[0], 1) + self.assertEqual(inst.item[1].net.currency, "USD") + self.assertEqual(inst.item[1].net.value, 105.0) + self.assertEqual(inst.item[1].productOrService.coding[0].code, "21211") + self.assertEqual(inst.item[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[1].sequence, 2) + self.assertEqual(inst.item[1].servicedDate.date, FHIRDate("2014-08-16").date) + self.assertEqual(inst.item[1].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[1].subSite[0].coding[0].code, "L") + self.assertEqual(inst.item[1].subSite[0].coding[0].system, "http://fdi.org/fhir/oralsurfacecodes") + self.assertEqual(inst.item[1].unitPrice.currency, "USD") + self.assertEqual(inst.item[1].unitPrice.value, 105.0) + self.assertEqual(inst.item[2].bodySite.coding[0].code, "36") + self.assertEqual(inst.item[2].bodySite.coding[0].system, "http://fdi.org/fhir/oraltoothcodes") + self.assertEqual(inst.item[2].careTeamSequence[0], 1) + self.assertEqual(inst.item[2].detail[0].net.currency, "USD") + self.assertEqual(inst.item[2].detail[0].net.value, 750.0) + self.assertEqual(inst.item[2].detail[0].productOrService.coding[0].code, "27211") + self.assertEqual(inst.item[2].detail[0].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[2].detail[0].sequence, 1) + self.assertEqual(inst.item[2].detail[0].unitPrice.currency, "USD") + self.assertEqual(inst.item[2].detail[0].unitPrice.value, 750.0) + self.assertEqual(inst.item[2].detail[1].net.currency, "USD") + self.assertEqual(inst.item[2].detail[1].net.value, 350.0) + self.assertEqual(inst.item[2].detail[1].productOrService.coding[0].code, "lab") + self.assertEqual(inst.item[2].detail[1].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[2].detail[1].sequence, 2) + self.assertEqual(inst.item[2].detail[1].unitPrice.currency, "USD") + self.assertEqual(inst.item[2].detail[1].unitPrice.value, 350.0) + self.assertEqual(inst.item[2].net.currency, "USD") + self.assertEqual(inst.item[2].net.value, 1100.0) + self.assertEqual(inst.item[2].productOrService.coding[0].code, "27211") + self.assertEqual(inst.item[2].productOrService.coding[0].system, "http://example.org/fhir/oralservicecodes") + self.assertEqual(inst.item[2].sequence, 3) + self.assertEqual(inst.item[2].servicedDate.date, FHIRDate("2014-08-16").date) + self.assertEqual(inst.item[2].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[2].unitPrice.currency, "USD") + self.assertEqual(inst.item[2].unitPrice.value, 1100.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") self.assertEqual(inst.priority.coding[0].code, "normal") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the Vision Claim
") + self.assertEqual(inst.text.div, "
A human-readable rendering of the Oral Health Claim
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "vision") + self.assertEqual(inst.type.coding[0].code, "oral") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "claim") + self.assertEqual(inst.use, "preauthorization") def testClaim10(self): - inst = self.instantiate_from("claim-example-oral-identifier.json") + inst = self.instantiate_from("claim-example-cms1500-medical.json") self.assertIsNotNone(inst, "Must have instantiated a Claim instance") self.implClaim10(inst) @@ -684,33 +699,77 @@ def testClaim10(self): def implClaim10(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "123456") + self.assertEqual(inst.contained[0].id, "patient-1") + self.assertEqual(inst.contained[1].id, "coverage-1") + self.assertEqual(inst.created.datetime, FHIRDateTime("2015-10-16T00:00:00-07:00").datetime) + self.assertEqual(inst.created.as_json(), "2015-10-16T00:00:00-07:00") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].code, "M96.1") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].display, "Postlaminectomy syndrome") + self.assertEqual(inst.diagnosis[0].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") self.assertEqual(inst.diagnosis[0].sequence, 1) - self.assertEqual(inst.id, "100154") - self.assertEqual(inst.identifier[0].system, "http://happyvalley.com/claim") - self.assertEqual(inst.identifier[0].value, "12347") + self.assertEqual(inst.diagnosis[1].diagnosisCodeableConcept.coding[0].code, "G89.4") + self.assertEqual(inst.diagnosis[1].diagnosisCodeableConcept.coding[0].display, "Chronic pain syndrome") + self.assertEqual(inst.diagnosis[1].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") + self.assertEqual(inst.diagnosis[1].sequence, 2) + self.assertEqual(inst.diagnosis[2].diagnosisCodeableConcept.coding[0].code, "M53.88") + self.assertEqual(inst.diagnosis[2].diagnosisCodeableConcept.coding[0].display, "Other specified dorsopathies, sacral and sacrococcygeal region") + self.assertEqual(inst.diagnosis[2].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") + self.assertEqual(inst.diagnosis[2].sequence, 3) + self.assertEqual(inst.diagnosis[3].diagnosisCodeableConcept.coding[0].code, "M47.816") + self.assertEqual(inst.diagnosis[3].diagnosisCodeableConcept.coding[0].display, "Spondylosis without myelopathy or radiculopathy, lumbar region") + self.assertEqual(inst.diagnosis[3].diagnosisCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/icd-10") + self.assertEqual(inst.diagnosis[3].sequence, 4) + self.assertEqual(inst.id, "MED-00050") + self.assertEqual(inst.identifier[0].system, "http://CedarArmsMedicalCenter.com/claim") + self.assertEqual(inst.identifier[0].value, "MED-00050") self.assertTrue(inst.insurance[0].focal) + self.assertEqual(inst.insurance[0].identifier.system, "http://CedarArmsMedicalCenter.com/claim") + self.assertEqual(inst.insurance[0].identifier.value, "MED-00050") self.assertEqual(inst.insurance[0].sequence, 1) self.assertEqual(inst.item[0].careTeamSequence[0], 1) + self.assertEqual(inst.item[0].diagnosisSequence[0], 2) + self.assertEqual(inst.item[0].diagnosisSequence[1], 4) + self.assertEqual(inst.item[0].informationSequence[0], 1) + self.assertEqual(inst.item[0].locationCodeableConcept.coding[0].code, "24") + self.assertEqual(inst.item[0].locationCodeableConcept.coding[0].display, "Ambulatory Surgical Center") + self.assertEqual(inst.item[0].locationCodeableConcept.coding[0].system, "https://www.cms.gov/medicare/coding/place-of-service-codes/place_of_service_code_set.html") self.assertEqual(inst.item[0].net.currency, "USD") - self.assertEqual(inst.item[0].net.value, 135.57) - self.assertEqual(inst.item[0].productOrService.coding[0].code, "1200") + self.assertEqual(inst.item[0].net.value, 12500.0) + self.assertEqual(inst.item[0].productOrService.coding[0].code, "62264") + self.assertEqual(inst.item[0].productOrService.coding[0].display, "Surgical Procedures on the Spine and Spinal Cord") + self.assertEqual(inst.item[0].productOrService.coding[0].system, "http://www.ama-assn.org/go/cpt") self.assertEqual(inst.item[0].sequence, 1) - self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2014-08-16").date) - self.assertEqual(inst.item[0].servicedDate.as_json(), "2014-08-16") + self.assertEqual(inst.item[0].servicedDate.date, FHIRDate("2015-10-13").date) + self.assertEqual(inst.item[0].servicedDate.as_json(), "2015-10-13") self.assertEqual(inst.item[0].unitPrice.currency, "USD") - self.assertEqual(inst.item[0].unitPrice.value, 135.57) + self.assertEqual(inst.item[0].unitPrice.value, 12500.0) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.payee.type.coding[0].code, "provider") + self.assertEqual(inst.payee.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/payeetype") self.assertEqual(inst.priority.coding[0].code, "normal") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
This example assumes a national health care scheme where patients, providers and organizations have known business identifiers.
") + self.assertEqual(inst.subType.coding[0].code, "831") + self.assertEqual(inst.subType.coding[0].system, "https://www.cms.gov/codes/billtype") + self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "hospitalized") + self.assertEqual(inst.supportingInfo[0].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[0].sequence, 1) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.datetime, FHIRDateTime("2015-10-05T00:00:00-07:00").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.as_json(), "2015-10-05T00:00:00-07:00") + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.datetime, FHIRDateTime("2015-10-01T00:00:00-07:00").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.as_json(), "2015-10-01T00:00:00-07:00") + self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "discharge") + self.assertEqual(inst.supportingInfo[1].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[1].code.coding[0].code, "01") + self.assertEqual(inst.supportingInfo[1].code.coding[0].display, "Discharge to Home or Self Care") + self.assertEqual(inst.supportingInfo[1].code.coding[0].system, "https://www.cms.gov/Outreach-and-Education/Medicare-Learning-Network-MLN/MLNMattersArticles/downloads/SE0801.pdf") + self.assertEqual(inst.supportingInfo[1].sequence, 2) + self.assertEqual(inst.text.div, "
A human-readable rendering of a CMS 1500 Claim
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.total.currency, "USD") + self.assertEqual(inst.total.value, 12500.0) + self.assertEqual(inst.type.coding[0].code, "institutional") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") diff --git a/tests/models/claimresponse_test.py b/tests/models/claimresponse_test.py index b8b3b6b3..8886a47b 100644 --- a/tests/models/claimresponse_test.py +++ b/tests/models/claimresponse_test.py @@ -98,7 +98,7 @@ def implClaimResponse1(self, inst): self.assertEqual(inst.use, "preauthorization") def testClaimResponse2(self): - inst = self.instantiate_from("claimresponse-example.json") + inst = self.instantiate_from("claimresponse-example-additem.json") self.assertIsNotNone(inst, "Must have instantiated a ClaimResponse instance") self.implClaimResponse2(inst) @@ -108,67 +108,6 @@ def testClaimResponse2(self): self.implClaimResponse2(inst2) def implClaimResponse2(self, inst): - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.disposition, "Claim settled as per contract.") - self.assertEqual(inst.id, "R3500") - self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/remittance") - self.assertEqual(inst.identifier[0].value, "R3500") - self.assertEqual(inst.item[0].adjudication[0].amount.currency, "USD") - self.assertEqual(inst.item[0].adjudication[0].amount.value, 135.57) - self.assertEqual(inst.item[0].adjudication[0].category.coding[0].code, "eligible") - self.assertEqual(inst.item[0].adjudication[1].amount.currency, "USD") - self.assertEqual(inst.item[0].adjudication[1].amount.value, 10.0) - self.assertEqual(inst.item[0].adjudication[1].category.coding[0].code, "copay") - self.assertEqual(inst.item[0].adjudication[2].category.coding[0].code, "eligpercent") - self.assertEqual(inst.item[0].adjudication[2].value, 80.0) - self.assertEqual(inst.item[0].adjudication[3].amount.currency, "USD") - self.assertEqual(inst.item[0].adjudication[3].amount.value, 90.47) - self.assertEqual(inst.item[0].adjudication[3].category.coding[0].code, "benefit") - self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].code, "ar002") - self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].display, "Plan Limit Reached") - self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-reason") - self.assertEqual(inst.item[0].itemSequence, 1) - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "complete") - self.assertEqual(inst.payeeType.coding[0].code, "provider") - self.assertEqual(inst.payeeType.coding[0].system, "http://terminology.hl7.org/CodeSystem/payeetype") - self.assertEqual(inst.payment.amount.currency, "USD") - self.assertEqual(inst.payment.amount.value, 100.47) - self.assertEqual(inst.payment.date.date, FHIRDate("2014-08-31").date) - self.assertEqual(inst.payment.date.as_json(), "2014-08-31") - self.assertEqual(inst.payment.identifier.system, "http://www.BenefitsInc.com/fhir/paymentidentifier") - self.assertEqual(inst.payment.identifier.value, "201408-2-1569478") - self.assertEqual(inst.payment.type.coding[0].code, "complete") - self.assertEqual(inst.payment.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-paymenttype") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.subType.coding[0].code, "emergency") - self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") - self.assertEqual(inst.text.div, "
A human-readable rendering of the ClaimResponse
") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.total[0].amount.currency, "USD") - self.assertEqual(inst.total[0].amount.value, 135.57) - self.assertEqual(inst.total[0].category.coding[0].code, "submitted") - self.assertEqual(inst.total[1].amount.currency, "USD") - self.assertEqual(inst.total[1].amount.value, 90.47) - self.assertEqual(inst.total[1].category.coding[0].code, "benefit") - self.assertEqual(inst.type.coding[0].code, "oral") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "claim") - - def testClaimResponse3(self): - inst = self.instantiate_from("claimresponse-example-additem.json") - self.assertIsNotNone(inst, "Must have instantiated a ClaimResponse instance") - self.implClaimResponse3(inst) - - js = inst.as_json() - self.assertEqual("ClaimResponse", js["resourceType"]) - inst2 = claimresponse.ClaimResponse(js) - self.implClaimResponse3(inst2) - - def implClaimResponse3(self, inst): self.assertEqual(inst.addItem[0].adjudication[0].amount.currency, "USD") self.assertEqual(inst.addItem[0].adjudication[0].amount.value, 100.0) self.assertEqual(inst.addItem[0].adjudication[0].category.coding[0].code, "eligible") @@ -303,56 +242,78 @@ def implClaimResponse3(self, inst): self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") - def testClaimResponse4(self): - inst = self.instantiate_from("claimresponse-example-2.json") + def testClaimResponse3(self): + inst = self.instantiate_from("claimresponse-example.json") self.assertIsNotNone(inst, "Must have instantiated a ClaimResponse instance") - self.implClaimResponse4(inst) + self.implClaimResponse3(inst) js = inst.as_json() self.assertEqual("ClaimResponse", js["resourceType"]) inst2 = claimresponse.ClaimResponse(js) - self.implClaimResponse4(inst2) + self.implClaimResponse3(inst2) - def implClaimResponse4(self, inst): + def implClaimResponse3(self, inst): self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.disposition, "Claim could not be processed") - self.assertEqual(inst.error[0].code.coding[0].code, "a002") - self.assertEqual(inst.error[0].code.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-error") - self.assertEqual(inst.error[0].detailSequence, 2) - self.assertEqual(inst.error[0].itemSequence, 3) - self.assertEqual(inst.formCode.coding[0].code, "2") - self.assertEqual(inst.formCode.coding[0].system, "http://terminology.hl7.org/CodeSystem/forms-codes") - self.assertEqual(inst.id, "R3501") + self.assertEqual(inst.disposition, "Claim settled as per contract.") + self.assertEqual(inst.id, "R3500") self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/remittance") - self.assertEqual(inst.identifier[0].value, "R3501") + self.assertEqual(inst.identifier[0].value, "R3500") + self.assertEqual(inst.item[0].adjudication[0].amount.currency, "USD") + self.assertEqual(inst.item[0].adjudication[0].amount.value, 135.57) + self.assertEqual(inst.item[0].adjudication[0].category.coding[0].code, "eligible") + self.assertEqual(inst.item[0].adjudication[1].amount.currency, "USD") + self.assertEqual(inst.item[0].adjudication[1].amount.value, 10.0) + self.assertEqual(inst.item[0].adjudication[1].category.coding[0].code, "copay") + self.assertEqual(inst.item[0].adjudication[2].category.coding[0].code, "eligpercent") + self.assertEqual(inst.item[0].adjudication[2].value, 80.0) + self.assertEqual(inst.item[0].adjudication[3].amount.currency, "USD") + self.assertEqual(inst.item[0].adjudication[3].amount.value, 90.47) + self.assertEqual(inst.item[0].adjudication[3].category.coding[0].code, "benefit") + self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].code, "ar002") + self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].display, "Plan Limit Reached") + self.assertEqual(inst.item[0].adjudication[3].reason.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-reason") + self.assertEqual(inst.item[0].itemSequence, 1) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "error") - self.assertEqual(inst.processNote[0].language.coding[0].code, "en-CA") - self.assertEqual(inst.processNote[0].language.coding[0].system, "urn:ietf:bcp:47") - self.assertEqual(inst.processNote[0].number, 1) - self.assertEqual(inst.processNote[0].text, "Invalid claim") - self.assertEqual(inst.processNote[0].type, "display") + self.assertEqual(inst.outcome, "complete") + self.assertEqual(inst.payeeType.coding[0].code, "provider") + self.assertEqual(inst.payeeType.coding[0].system, "http://terminology.hl7.org/CodeSystem/payeetype") + self.assertEqual(inst.payment.amount.currency, "USD") + self.assertEqual(inst.payment.amount.value, 100.47) + self.assertEqual(inst.payment.date.date, FHIRDate("2014-08-31").date) + self.assertEqual(inst.payment.date.as_json(), "2014-08-31") + self.assertEqual(inst.payment.identifier.system, "http://www.BenefitsInc.com/fhir/paymentidentifier") + self.assertEqual(inst.payment.identifier.value, "201408-2-1569478") + self.assertEqual(inst.payment.type.coding[0].code, "complete") + self.assertEqual(inst.payment.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-paymenttype") self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the ClaimResponse that demonstrates returning errors
") + self.assertEqual(inst.subType.coding[0].code, "emergency") + self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") + self.assertEqual(inst.text.div, "
A human-readable rendering of the ClaimResponse
") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.total[0].amount.currency, "USD") + self.assertEqual(inst.total[0].amount.value, 135.57) + self.assertEqual(inst.total[0].category.coding[0].code, "submitted") + self.assertEqual(inst.total[1].amount.currency, "USD") + self.assertEqual(inst.total[1].amount.value, 90.47) + self.assertEqual(inst.total[1].category.coding[0].code, "benefit") self.assertEqual(inst.type.coding[0].code, "oral") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") - def testClaimResponse5(self): + def testClaimResponse4(self): inst = self.instantiate_from("claimresponse-example-vision-3tier.json") self.assertIsNotNone(inst, "Must have instantiated a ClaimResponse instance") - self.implClaimResponse5(inst) + self.implClaimResponse4(inst) js = inst.as_json() self.assertEqual("ClaimResponse", js["resourceType"]) inst2 = claimresponse.ClaimResponse(js) - self.implClaimResponse5(inst2) + self.implClaimResponse4(inst2) - def implClaimResponse5(self, inst): + def implClaimResponse4(self, inst): self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") self.assertEqual(inst.disposition, "Claim settled as per contract.") @@ -469,4 +430,43 @@ def implClaimResponse5(self, inst): self.assertEqual(inst.type.coding[0].code, "vision") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") + + def testClaimResponse5(self): + inst = self.instantiate_from("claimresponse-example-2.json") + self.assertIsNotNone(inst, "Must have instantiated a ClaimResponse instance") + self.implClaimResponse5(inst) + + js = inst.as_json() + self.assertEqual("ClaimResponse", js["resourceType"]) + inst2 = claimresponse.ClaimResponse(js) + self.implClaimResponse5(inst2) + + def implClaimResponse5(self, inst): + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.disposition, "Claim could not be processed") + self.assertEqual(inst.error[0].code.coding[0].code, "a002") + self.assertEqual(inst.error[0].code.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-error") + self.assertEqual(inst.error[0].detailSequence, 2) + self.assertEqual(inst.error[0].itemSequence, 3) + self.assertEqual(inst.formCode.coding[0].code, "2") + self.assertEqual(inst.formCode.coding[0].system, "http://terminology.hl7.org/CodeSystem/forms-codes") + self.assertEqual(inst.id, "R3501") + self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/remittance") + self.assertEqual(inst.identifier[0].value, "R3501") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.outcome, "error") + self.assertEqual(inst.processNote[0].language.coding[0].code, "en-CA") + self.assertEqual(inst.processNote[0].language.coding[0].system, "urn:ietf:bcp:47") + self.assertEqual(inst.processNote[0].number, 1) + self.assertEqual(inst.processNote[0].text, "Invalid claim") + self.assertEqual(inst.processNote[0].type, "display") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "
A human-readable rendering of the ClaimResponse that demonstrates returning errors
") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") + self.assertEqual(inst.use, "claim") diff --git a/tests/models/codesystem_test.py b/tests/models/codesystem_test.py index 26ab1d46..60203b6e 100644 --- a/tests/models/codesystem_test.py +++ b/tests/models/codesystem_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return codesystem.CodeSystem(js) def testCodeSystem1(self): - inst = self.instantiate_from("codesystem-example-summary.json") + inst = self.instantiate_from("codesystem-example-supplement.json") self.assertIsNotNone(inst, "Must have instantiated a CodeSystem instance") self.implCodeSystem1(inst) @@ -30,28 +30,33 @@ def testCodeSystem1(self): self.implCodeSystem1(inst2) def implCodeSystem1(self, inst): - self.assertTrue(inst.caseSensitive) + self.assertEqual(inst.concept[0].code, "chol-mmol") + self.assertEqual(inst.concept[0].property[0].code, "legacy") + self.assertFalse(inst.concept[0].property[0].valueBoolean) + self.assertEqual(inst.concept[1].code, "chol-mass") + self.assertEqual(inst.concept[1].property[0].code, "legacy") + self.assertTrue(inst.concept[1].property[0].valueBoolean) + self.assertEqual(inst.concept[2].code, "chol") + self.assertEqual(inst.concept[2].property[0].code, "legacy") + self.assertTrue(inst.concept[2].property[0].valueBoolean) self.assertEqual(inst.contact[0].name, "FHIR project team") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.content, "not-present") - self.assertEqual(inst.count, 92) - self.assertEqual(inst.description, "This is an example code system summary for the ACME codes for body site.") + self.assertEqual(inst.content, "supplement") + self.assertEqual(inst.date.datetime, FHIRDateTime("2016-01-28").datetime) + self.assertEqual(inst.date.as_json(), "2016-01-28") self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "summary") - self.assertEqual(inst.jurisdiction[0].coding[0].code, "CA") - self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") - self.assertEqual(inst.name, "Code system summary example for ACME body sites") - self.assertEqual(inst.publisher, "HL7 International") + self.assertEqual(inst.id, "example-supplement") + self.assertEqual(inst.name, "CholCodeLegacyStatus") + self.assertEqual(inst.property[0].code, "legacy") + self.assertEqual(inst.property[0].description, "hether the test is currently performed") + self.assertEqual(inst.property[0].type, "boolean") + self.assertEqual(inst.publisher, "ACME Co") self.assertEqual(inst.status, "draft") + self.assertEqual(inst.supplements, "http://hl7.org/fhir/CodeSystem/example") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/CodeSystem/summary") - self.assertEqual(inst.useContext[0].code.code, "species") - self.assertEqual(inst.useContext[0].code.system, "http://example.org/CodeSystem/contexttype") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "337915000") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Homo sapiens (organism)") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.version, "4.0.1") + self.assertEqual(inst.url, "http://hl7.org/fhir/CodeSystem/example-supplement") + self.assertEqual(inst.version, "201801103") def testCodeSystem2(self): inst = self.instantiate_from("codesystem-list-example-codes.json") @@ -166,7 +171,7 @@ def implCodeSystem3(self, inst): self.assertEqual(inst.version, "4.0.1") def testCodeSystem4(self): - inst = self.instantiate_from("codesystem-example.json") + inst = self.instantiate_from("codesystem-example-summary.json") self.assertIsNotNone(inst, "Must have instantiated a CodeSystem instance") self.implCodeSystem4(inst) @@ -176,6 +181,40 @@ def testCodeSystem4(self): self.implCodeSystem4(inst2) def implCodeSystem4(self, inst): + self.assertTrue(inst.caseSensitive) + self.assertEqual(inst.contact[0].name, "FHIR project team") + self.assertEqual(inst.contact[0].telecom[0].system, "url") + self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") + self.assertEqual(inst.content, "not-present") + self.assertEqual(inst.count, 92) + self.assertEqual(inst.description, "This is an example code system summary for the ACME codes for body site.") + self.assertTrue(inst.experimental) + self.assertEqual(inst.id, "summary") + self.assertEqual(inst.jurisdiction[0].coding[0].code, "CA") + self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") + self.assertEqual(inst.name, "Code system summary example for ACME body sites") + self.assertEqual(inst.publisher, "HL7 International") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.url, "http://hl7.org/fhir/CodeSystem/summary") + self.assertEqual(inst.useContext[0].code.code, "species") + self.assertEqual(inst.useContext[0].code.system, "http://example.org/CodeSystem/contexttype") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "337915000") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Homo sapiens (organism)") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.version, "4.0.1") + + def testCodeSystem5(self): + inst = self.instantiate_from("codesystem-example.json") + self.assertIsNotNone(inst, "Must have instantiated a CodeSystem instance") + self.implCodeSystem5(inst) + + js = inst.as_json() + self.assertEqual("CodeSystem", js["resourceType"]) + inst2 = codesystem.CodeSystem(js) + self.implCodeSystem5(inst2) + + def implCodeSystem5(self, inst): self.assertTrue(inst.caseSensitive) self.assertEqual(inst.concept[0].code, "chol-mmol") self.assertEqual(inst.concept[0].definition, "Serum Cholesterol, in mmol/L") @@ -218,43 +257,4 @@ def implCodeSystem4(self, inst): self.assertEqual(inst.title, "ACME Codes for Cholesterol in Serum/Plasma") self.assertEqual(inst.url, "http://hl7.org/fhir/CodeSystem/example") self.assertEqual(inst.version, "20160128") - - def testCodeSystem5(self): - inst = self.instantiate_from("codesystem-example-supplement.json") - self.assertIsNotNone(inst, "Must have instantiated a CodeSystem instance") - self.implCodeSystem5(inst) - - js = inst.as_json() - self.assertEqual("CodeSystem", js["resourceType"]) - inst2 = codesystem.CodeSystem(js) - self.implCodeSystem5(inst2) - - def implCodeSystem5(self, inst): - self.assertEqual(inst.concept[0].code, "chol-mmol") - self.assertEqual(inst.concept[0].property[0].code, "legacy") - self.assertFalse(inst.concept[0].property[0].valueBoolean) - self.assertEqual(inst.concept[1].code, "chol-mass") - self.assertEqual(inst.concept[1].property[0].code, "legacy") - self.assertTrue(inst.concept[1].property[0].valueBoolean) - self.assertEqual(inst.concept[2].code, "chol") - self.assertEqual(inst.concept[2].property[0].code, "legacy") - self.assertTrue(inst.concept[2].property[0].valueBoolean) - self.assertEqual(inst.contact[0].name, "FHIR project team") - self.assertEqual(inst.contact[0].telecom[0].system, "url") - self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.content, "supplement") - self.assertEqual(inst.date.datetime, FHIRDateTime("2016-01-28").datetime) - self.assertEqual(inst.date.as_json(), "2016-01-28") - self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "example-supplement") - self.assertEqual(inst.name, "CholCodeLegacyStatus") - self.assertEqual(inst.property[0].code, "legacy") - self.assertEqual(inst.property[0].description, "hether the test is currently performed") - self.assertEqual(inst.property[0].type, "boolean") - self.assertEqual(inst.publisher, "ACME Co") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.supplements, "http://hl7.org/fhir/CodeSystem/example") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/CodeSystem/example-supplement") - self.assertEqual(inst.version, "201801103") diff --git a/tests/models/communication_test.py b/tests/models/communication_test.py index edc249be..b87b23df 100644 --- a/tests/models/communication_test.py +++ b/tests/models/communication_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return communication.Communication(js) def testCommunication1(self): - inst = self.instantiate_from("communication-example.json") + inst = self.instantiate_from("communication-example-fm-attachment.json") self.assertIsNotNone(inst, "Must have instantiated a Communication instance") self.implCommunication1(inst) @@ -30,41 +30,6 @@ def testCommunication1(self): self.implCommunication1(inst2) def implCommunication1(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "Alert") - self.assertEqual(inst.category[0].coding[0].system, "http://acme.org/messagetypes") - self.assertEqual(inst.category[0].text, "Alert") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "urn:oid:1.3.4.5.6.7") - self.assertEqual(inst.identifier[0].type.text, "Paging System") - self.assertEqual(inst.identifier[0].value, "2345678901") - self.assertEqual(inst.instantiatesUri[0], "http://example.org/hyperkalemia") - self.assertEqual(inst.medium[0].coding[0].code, "WRITTEN") - self.assertEqual(inst.medium[0].coding[0].display, "written") - self.assertEqual(inst.medium[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationMode") - self.assertEqual(inst.medium[0].text, "written") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.payload[0].contentString, "Patient 1 has a very high serum potassium value (7.2 mmol/L on 2014-Dec-12 at 5:55 pm)") - self.assertEqual(inst.received.datetime, FHIRDateTime("2014-12-12T18:01:11-08:00").datetime) - self.assertEqual(inst.received.as_json(), "2014-12-12T18:01:11-08:00") - self.assertEqual(inst.sent.datetime, FHIRDateTime("2014-12-12T18:01:10-08:00").datetime) - self.assertEqual(inst.sent.as_json(), "2014-12-12T18:01:10-08:00") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
Patient has very high serum potassium
") - self.assertEqual(inst.text.status, "generated") - - def testCommunication2(self): - inst = self.instantiate_from("communication-example-fm-attachment.json") - self.assertIsNotNone(inst, "Must have instantiated a Communication instance") - self.implCommunication2(inst) - - js = inst.as_json() - self.assertEqual("Communication", js["resourceType"]) - inst2 = communication.Communication(js) - self.implCommunication2(inst2) - - def implCommunication2(self, inst): self.assertEqual(inst.category[0].coding[0].code, "SolicitedAttachment") self.assertEqual(inst.category[0].coding[0].system, "http://acme.org/messagetypes") self.assertEqual(inst.id, "fm-attachment") @@ -90,17 +55,17 @@ def implCommunication2(self, inst): self.assertEqual(inst.text.div, "
Attachment which is unsolicited
") self.assertEqual(inst.text.status, "generated") - def testCommunication3(self): + def testCommunication2(self): inst = self.instantiate_from("communication-example-fm-solicited-attachment.json") self.assertIsNotNone(inst, "Must have instantiated a Communication instance") - self.implCommunication3(inst) + self.implCommunication2(inst) js = inst.as_json() self.assertEqual("Communication", js["resourceType"]) inst2 = communication.Communication(js) - self.implCommunication3(inst2) + self.implCommunication2(inst2) - def implCommunication3(self, inst): + def implCommunication2(self, inst): self.assertEqual(inst.category[0].coding[0].code, "SolicitedAttachment") self.assertEqual(inst.category[0].coding[0].system, "http://acme.org/messagetypes") self.assertEqual(inst.contained[0].id, "provider") @@ -128,4 +93,39 @@ def implCommunication3(self, inst): self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.div, "
Attachment in response to a Request
") self.assertEqual(inst.text.status, "generated") + + def testCommunication3(self): + inst = self.instantiate_from("communication-example.json") + self.assertIsNotNone(inst, "Must have instantiated a Communication instance") + self.implCommunication3(inst) + + js = inst.as_json() + self.assertEqual("Communication", js["resourceType"]) + inst2 = communication.Communication(js) + self.implCommunication3(inst2) + + def implCommunication3(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "Alert") + self.assertEqual(inst.category[0].coding[0].system, "http://acme.org/messagetypes") + self.assertEqual(inst.category[0].text, "Alert") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "urn:oid:1.3.4.5.6.7") + self.assertEqual(inst.identifier[0].type.text, "Paging System") + self.assertEqual(inst.identifier[0].value, "2345678901") + self.assertEqual(inst.instantiatesUri[0], "http://example.org/hyperkalemia") + self.assertEqual(inst.medium[0].coding[0].code, "WRITTEN") + self.assertEqual(inst.medium[0].coding[0].display, "written") + self.assertEqual(inst.medium[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationMode") + self.assertEqual(inst.medium[0].text, "written") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.payload[0].contentString, "Patient 1 has a very high serum potassium value (7.2 mmol/L on 2014-Dec-12 at 5:55 pm)") + self.assertEqual(inst.received.datetime, FHIRDateTime("2014-12-12T18:01:11-08:00").datetime) + self.assertEqual(inst.received.as_json(), "2014-12-12T18:01:11-08:00") + self.assertEqual(inst.sent.datetime, FHIRDateTime("2014-12-12T18:01:10-08:00").datetime) + self.assertEqual(inst.sent.as_json(), "2014-12-12T18:01:10-08:00") + self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.div, "
Patient has very high serum potassium
") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/conceptmap_test.py b/tests/models/conceptmap_test.py index e74c0923..c7d4578c 100644 --- a/tests/models/conceptmap_test.py +++ b/tests/models/conceptmap_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return conceptmap.ConceptMap(js) def testConceptMap1(self): - inst = self.instantiate_from("conceptmap-example-specimen-type.json") + inst = self.instantiate_from("conceptmap-example.json") self.assertIsNotNone(inst, "Must have instantiated a ConceptMap instance") self.implConceptMap1(inst) @@ -30,68 +30,57 @@ def testConceptMap1(self): self.implConceptMap1(inst2) def implConceptMap1(self, inst): + self.assertEqual(inst.contact[0].name, "FHIR project team (example)") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.contact[1].telecom[0].system, "url") - self.assertEqual(inst.contact[1].telecom[0].value, "http://www.phconnect.org/group/laboratorymessagingcommunityofpractice/forum/attachment/download?id=3649725%3AUploadedFile%3A145786") - self.assertEqual(inst.date.datetime, FHIRDateTime("2013-07-25").datetime) - self.assertEqual(inst.date.as_json(), "2013-07-25") - self.assertFalse(inst.experimental) - self.assertEqual(inst.group[0].element[0].code, "ACNE") - self.assertEqual(inst.group[0].element[0].target[0].code, "309068002") + self.assertEqual(inst.copyright, "Creative Commons 0") + self.assertEqual(inst.date.datetime, FHIRDateTime("2012-06-13").datetime) + self.assertEqual(inst.date.as_json(), "2012-06-13") + self.assertEqual(inst.description, "A mapping between the FHIR and HL7 v3 AddressUse Code systems") + self.assertTrue(inst.experimental) + self.assertEqual(inst.group[0].element[0].code, "home") + self.assertEqual(inst.group[0].element[0].display, "home") + self.assertEqual(inst.group[0].element[0].target[0].code, "H") + self.assertEqual(inst.group[0].element[0].target[0].display, "home") self.assertEqual(inst.group[0].element[0].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[1].code, "ACNFLD") - self.assertEqual(inst.group[0].element[1].target[0].code, "119323008") - self.assertEqual(inst.group[0].element[1].target[0].comment, "HL7 term is a historical term. mapped to Pus") + self.assertEqual(inst.group[0].element[1].code, "work") + self.assertEqual(inst.group[0].element[1].display, "work") + self.assertEqual(inst.group[0].element[1].target[0].code, "WP") + self.assertEqual(inst.group[0].element[1].target[0].display, "work place") self.assertEqual(inst.group[0].element[1].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[1].target[0].product[0].property, "TypeModifier") - self.assertEqual(inst.group[0].element[1].target[0].product[0].system, "http://snomed.info/sct") - self.assertEqual(inst.group[0].element[1].target[0].product[0].value, "47002008") - self.assertEqual(inst.group[0].element[2].code, "AIRS") - self.assertEqual(inst.group[0].element[2].target[0].code, "446302006") + self.assertEqual(inst.group[0].element[2].code, "temp") + self.assertEqual(inst.group[0].element[2].display, "temp") + self.assertEqual(inst.group[0].element[2].target[0].code, "TMP") + self.assertEqual(inst.group[0].element[2].target[0].display, "temporary address") self.assertEqual(inst.group[0].element[2].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[3].code, "ALL") - self.assertEqual(inst.group[0].element[3].target[0].code, "119376003") - self.assertEqual(inst.group[0].element[3].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[3].target[0].product[0].property, "TypeModifier") - self.assertEqual(inst.group[0].element[3].target[0].product[0].system, "http://snomed.info/sct") - self.assertEqual(inst.group[0].element[3].target[0].product[0].value, "7970006") - self.assertEqual(inst.group[0].element[4].code, "AMP") - self.assertEqual(inst.group[0].element[4].target[0].code, "408654003") - self.assertEqual(inst.group[0].element[4].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[4].target[0].product[0].property, "http://snomed.info/id/246380002") - self.assertEqual(inst.group[0].element[4].target[0].product[0].system, "http://snomed.info/sct") - self.assertEqual(inst.group[0].element[4].target[0].product[0].value, "81723002") - self.assertEqual(inst.group[0].element[5].code, "ANGI") - self.assertEqual(inst.group[0].element[5].target[0].code, "119312009") - self.assertEqual(inst.group[0].element[5].target[0].comment, "TBD in detail") - self.assertEqual(inst.group[0].element[5].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[6].code, "ARTC") - self.assertEqual(inst.group[0].element[6].target[0].code, "119312009") - self.assertEqual(inst.group[0].element[6].target[0].comment, "TBD in detail") - self.assertEqual(inst.group[0].element[6].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[7].code, "ASERU") - self.assertEqual(inst.group[0].element[7].target[0].comment, "pending") - self.assertEqual(inst.group[0].element[7].target[0].equivalence, "unmatched") - self.assertEqual(inst.group[0].element[8].code, "ASP") - self.assertEqual(inst.group[0].element[8].target[0].code, "119295008") - self.assertEqual(inst.group[0].element[8].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[8].target[0].product[0].property, "http://snomed.info/id/246380002") - self.assertEqual(inst.group[0].element[8].target[0].product[0].system, "http://snomed.info/sct") - self.assertEqual(inst.group[0].element[8].target[0].product[0].value, "14766002") - self.assertEqual(inst.group[0].element[9].code, "ATTE") - self.assertEqual(inst.group[0].element[9].target[0].comment, "TBD") - self.assertEqual(inst.group[0].element[9].target[0].equivalence, "unmatched") - self.assertEqual(inst.group[0].source, "http://terminology.hl7.org/CodeSystem/v2-0487") - self.assertEqual(inst.group[0].target, "http://snomed.info/sct") - self.assertEqual(inst.id, "102") - self.assertEqual(inst.name, "Specimen mapping from v2 table 0487 to SNOMED CT") - self.assertEqual(inst.publisher, "FHIR project team (original source: LabMCoP)") - self.assertEqual(inst.sourceCanonical, "http://terminology.hl7.org/ValueSet/v2-0487") + self.assertEqual(inst.group[0].element[3].code, "old") + self.assertEqual(inst.group[0].element[3].display, "old") + self.assertEqual(inst.group[0].element[3].target[0].code, "BAD") + self.assertEqual(inst.group[0].element[3].target[0].comment, "In the HL7 v3 AD, old is handled by the usablePeriod element, but you have to provide a time, there's no simple equivalent of flagging an address as old") + self.assertEqual(inst.group[0].element[3].target[0].display, "bad address") + self.assertEqual(inst.group[0].element[3].target[0].equivalence, "disjoint") + self.assertEqual(inst.group[0].source, "http://hl7.org/fhir/address-use") + self.assertEqual(inst.group[0].target, "http://terminology.hl7.org/CodeSystem/v3-AddressUse") + self.assertEqual(inst.group[0].unmapped.code, "temp") + self.assertEqual(inst.group[0].unmapped.display, "temp") + self.assertEqual(inst.group[0].unmapped.mode, "fixed") + self.assertEqual(inst.id, "101") + self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") + self.assertEqual(inst.identifier.value, "urn:uuid:53cd62ee-033e-414c-9f58-3ca97b5ffc3b") + self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") + self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") + self.assertEqual(inst.name, "FHIR-v3-Address-Use") + self.assertEqual(inst.publisher, "HL7, Inc") + self.assertEqual(inst.purpose, "To help implementers map from HL7 v3/CDA to FHIR") + self.assertEqual(inst.sourceUri, "http://hl7.org/fhir/ValueSet/address-use") self.assertEqual(inst.status, "draft") - self.assertEqual(inst.targetCanonical, "http://snomed.info/sct?fhir_vs") + self.assertEqual(inst.targetUri, "http://terminology.hl7.org/ValueSet/v3-AddressUse") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/ConceptMap/102") + self.assertEqual(inst.title, "FHIR/v3 Address Use Mapping") + self.assertEqual(inst.url, "http://hl7.org/fhir/ConceptMap/101") + self.assertEqual(inst.useContext[0].code.code, "venue") + self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[0].valueCodeableConcept.text, "for CCDA Usage") self.assertEqual(inst.version, "4.0.1") def testConceptMap2(self): @@ -138,7 +127,7 @@ def implConceptMap2(self, inst): self.assertEqual(inst.version, "4.0.1") def testConceptMap3(self): - inst = self.instantiate_from("conceptmap-example.json") + inst = self.instantiate_from("conceptmap-example-specimen-type.json") self.assertIsNotNone(inst, "Must have instantiated a ConceptMap instance") self.implConceptMap3(inst) @@ -148,56 +137,67 @@ def testConceptMap3(self): self.implConceptMap3(inst2) def implConceptMap3(self, inst): - self.assertEqual(inst.contact[0].name, "FHIR project team (example)") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.copyright, "Creative Commons 0") - self.assertEqual(inst.date.datetime, FHIRDateTime("2012-06-13").datetime) - self.assertEqual(inst.date.as_json(), "2012-06-13") - self.assertEqual(inst.description, "A mapping between the FHIR and HL7 v3 AddressUse Code systems") - self.assertTrue(inst.experimental) - self.assertEqual(inst.group[0].element[0].code, "home") - self.assertEqual(inst.group[0].element[0].display, "home") - self.assertEqual(inst.group[0].element[0].target[0].code, "H") - self.assertEqual(inst.group[0].element[0].target[0].display, "home") + self.assertEqual(inst.contact[1].telecom[0].system, "url") + self.assertEqual(inst.contact[1].telecom[0].value, "http://www.phconnect.org/group/laboratorymessagingcommunityofpractice/forum/attachment/download?id=3649725%3AUploadedFile%3A145786") + self.assertEqual(inst.date.datetime, FHIRDateTime("2013-07-25").datetime) + self.assertEqual(inst.date.as_json(), "2013-07-25") + self.assertFalse(inst.experimental) + self.assertEqual(inst.group[0].element[0].code, "ACNE") + self.assertEqual(inst.group[0].element[0].target[0].code, "309068002") self.assertEqual(inst.group[0].element[0].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[1].code, "work") - self.assertEqual(inst.group[0].element[1].display, "work") - self.assertEqual(inst.group[0].element[1].target[0].code, "WP") - self.assertEqual(inst.group[0].element[1].target[0].display, "work place") + self.assertEqual(inst.group[0].element[1].code, "ACNFLD") + self.assertEqual(inst.group[0].element[1].target[0].code, "119323008") + self.assertEqual(inst.group[0].element[1].target[0].comment, "HL7 term is a historical term. mapped to Pus") self.assertEqual(inst.group[0].element[1].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[2].code, "temp") - self.assertEqual(inst.group[0].element[2].display, "temp") - self.assertEqual(inst.group[0].element[2].target[0].code, "TMP") - self.assertEqual(inst.group[0].element[2].target[0].display, "temporary address") + self.assertEqual(inst.group[0].element[1].target[0].product[0].property, "TypeModifier") + self.assertEqual(inst.group[0].element[1].target[0].product[0].system, "http://snomed.info/sct") + self.assertEqual(inst.group[0].element[1].target[0].product[0].value, "47002008") + self.assertEqual(inst.group[0].element[2].code, "AIRS") + self.assertEqual(inst.group[0].element[2].target[0].code, "446302006") self.assertEqual(inst.group[0].element[2].target[0].equivalence, "equivalent") - self.assertEqual(inst.group[0].element[3].code, "old") - self.assertEqual(inst.group[0].element[3].display, "old") - self.assertEqual(inst.group[0].element[3].target[0].code, "BAD") - self.assertEqual(inst.group[0].element[3].target[0].comment, "In the HL7 v3 AD, old is handled by the usablePeriod element, but you have to provide a time, there's no simple equivalent of flagging an address as old") - self.assertEqual(inst.group[0].element[3].target[0].display, "bad address") - self.assertEqual(inst.group[0].element[3].target[0].equivalence, "disjoint") - self.assertEqual(inst.group[0].source, "http://hl7.org/fhir/address-use") - self.assertEqual(inst.group[0].target, "http://terminology.hl7.org/CodeSystem/v3-AddressUse") - self.assertEqual(inst.group[0].unmapped.code, "temp") - self.assertEqual(inst.group[0].unmapped.display, "temp") - self.assertEqual(inst.group[0].unmapped.mode, "fixed") - self.assertEqual(inst.id, "101") - self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:uuid:53cd62ee-033e-414c-9f58-3ca97b5ffc3b") - self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") - self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") - self.assertEqual(inst.name, "FHIR-v3-Address-Use") - self.assertEqual(inst.publisher, "HL7, Inc") - self.assertEqual(inst.purpose, "To help implementers map from HL7 v3/CDA to FHIR") - self.assertEqual(inst.sourceUri, "http://hl7.org/fhir/ValueSet/address-use") + self.assertEqual(inst.group[0].element[3].code, "ALL") + self.assertEqual(inst.group[0].element[3].target[0].code, "119376003") + self.assertEqual(inst.group[0].element[3].target[0].equivalence, "equivalent") + self.assertEqual(inst.group[0].element[3].target[0].product[0].property, "TypeModifier") + self.assertEqual(inst.group[0].element[3].target[0].product[0].system, "http://snomed.info/sct") + self.assertEqual(inst.group[0].element[3].target[0].product[0].value, "7970006") + self.assertEqual(inst.group[0].element[4].code, "AMP") + self.assertEqual(inst.group[0].element[4].target[0].code, "408654003") + self.assertEqual(inst.group[0].element[4].target[0].equivalence, "equivalent") + self.assertEqual(inst.group[0].element[4].target[0].product[0].property, "http://snomed.info/id/246380002") + self.assertEqual(inst.group[0].element[4].target[0].product[0].system, "http://snomed.info/sct") + self.assertEqual(inst.group[0].element[4].target[0].product[0].value, "81723002") + self.assertEqual(inst.group[0].element[5].code, "ANGI") + self.assertEqual(inst.group[0].element[5].target[0].code, "119312009") + self.assertEqual(inst.group[0].element[5].target[0].comment, "TBD in detail") + self.assertEqual(inst.group[0].element[5].target[0].equivalence, "equivalent") + self.assertEqual(inst.group[0].element[6].code, "ARTC") + self.assertEqual(inst.group[0].element[6].target[0].code, "119312009") + self.assertEqual(inst.group[0].element[6].target[0].comment, "TBD in detail") + self.assertEqual(inst.group[0].element[6].target[0].equivalence, "equivalent") + self.assertEqual(inst.group[0].element[7].code, "ASERU") + self.assertEqual(inst.group[0].element[7].target[0].comment, "pending") + self.assertEqual(inst.group[0].element[7].target[0].equivalence, "unmatched") + self.assertEqual(inst.group[0].element[8].code, "ASP") + self.assertEqual(inst.group[0].element[8].target[0].code, "119295008") + self.assertEqual(inst.group[0].element[8].target[0].equivalence, "equivalent") + self.assertEqual(inst.group[0].element[8].target[0].product[0].property, "http://snomed.info/id/246380002") + self.assertEqual(inst.group[0].element[8].target[0].product[0].system, "http://snomed.info/sct") + self.assertEqual(inst.group[0].element[8].target[0].product[0].value, "14766002") + self.assertEqual(inst.group[0].element[9].code, "ATTE") + self.assertEqual(inst.group[0].element[9].target[0].comment, "TBD") + self.assertEqual(inst.group[0].element[9].target[0].equivalence, "unmatched") + self.assertEqual(inst.group[0].source, "http://terminology.hl7.org/CodeSystem/v2-0487") + self.assertEqual(inst.group[0].target, "http://snomed.info/sct") + self.assertEqual(inst.id, "102") + self.assertEqual(inst.name, "Specimen mapping from v2 table 0487 to SNOMED CT") + self.assertEqual(inst.publisher, "FHIR project team (original source: LabMCoP)") + self.assertEqual(inst.sourceCanonical, "http://terminology.hl7.org/ValueSet/v2-0487") self.assertEqual(inst.status, "draft") - self.assertEqual(inst.targetUri, "http://terminology.hl7.org/ValueSet/v3-AddressUse") + self.assertEqual(inst.targetCanonical, "http://snomed.info/sct?fhir_vs") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "FHIR/v3 Address Use Mapping") - self.assertEqual(inst.url, "http://hl7.org/fhir/ConceptMap/101") - self.assertEqual(inst.useContext[0].code.code, "venue") - self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[0].valueCodeableConcept.text, "for CCDA Usage") + self.assertEqual(inst.url, "http://hl7.org/fhir/ConceptMap/102") self.assertEqual(inst.version, "4.0.1") diff --git a/tests/models/condition_test.py b/tests/models/condition_test.py index d47cfbf4..769eb0da 100644 --- a/tests/models/condition_test.py +++ b/tests/models/condition_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return condition.Condition(js) def testCondition1(self): - inst = self.instantiate_from("condition-example-f204-renal.json") + inst = self.instantiate_from("condition-example-f003-abscess.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition1(inst) @@ -30,42 +30,37 @@ def testCondition1(self): self.implCondition1(inst2) def implCondition1(self, inst): - self.assertEqual(inst.abatementDateTime.datetime, FHIRDateTime("2013-03-20").datetime) - self.assertEqual(inst.abatementDateTime.as_json(), "2013-03-20") - self.assertEqual(inst.bodySite[0].coding[0].code, "181414000") - self.assertEqual(inst.bodySite[0].coding[0].display, "Kidney") + self.assertEqual(inst.bodySite[0].coding[0].code, "280193007") + self.assertEqual(inst.bodySite[0].coding[0].display, "Entire retropharyngeal area") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[0].code, "55607006") - self.assertEqual(inst.category[0].coding[0].display, "Problem") + self.assertEqual(inst.category[0].coding[0].code, "439401001") + self.assertEqual(inst.category[0].coding[0].display, "diagnosis") self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[1].code, "problem-list-item") - self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/condition-category") - self.assertEqual(inst.clinicalStatus.coding[0].code, "inactive") + self.assertEqual(inst.clinicalStatus.coding[0].code, "active") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "36225005") - self.assertEqual(inst.code.coding[0].display, "Acute renal insufficiency specified as due to procedure") + self.assertEqual(inst.code.coding[0].code, "18099001") + self.assertEqual(inst.code.coding[0].display, "Retropharyngeal abscess") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f204") + self.assertEqual(inst.evidence[0].code[0].coding[0].code, "169068008") + self.assertEqual(inst.evidence[0].code[0].coding[0].display, "CT of neck") + self.assertEqual(inst.evidence[0].code[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.id, "f003") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "The patient is anuric.") - self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2013-03-11").datetime) - self.assertEqual(inst.onsetDateTime.as_json(), "2013-03-11") - self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-03-11").datetime) - self.assertEqual(inst.recordedDate.as_json(), "2013-03-11") - self.assertEqual(inst.severity.coding[0].code, "24484000") - self.assertEqual(inst.severity.coding[0].display, "Severe") + self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2012-02-27").datetime) + self.assertEqual(inst.onsetDateTime.as_json(), "2012-02-27") + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2012-02-20").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2012-02-20") + self.assertEqual(inst.severity.coding[0].code, "371923003") + self.assertEqual(inst.severity.coding[0].display, "Mild to moderate") self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.stage[0].summary.coding[0].code, "14803004") - self.assertEqual(inst.stage[0].summary.coding[0].display, "Temporary") - self.assertEqual(inst.stage[0].summary.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.verificationStatus.coding[0].code, "differential") + self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition2(self): - inst = self.instantiate_from("condition-example2.json") + inst = self.instantiate_from("condition-example-f203-sepsis.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition2(inst) @@ -75,21 +70,30 @@ def testCondition2(self): self.implCondition2(inst2) def implCondition2(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "problem-list-item") - self.assertEqual(inst.category[0].coding[0].display, "Problem List Item") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") + self.assertEqual(inst.bodySite[0].coding[0].code, "281158006") + self.assertEqual(inst.bodySite[0].coding[0].display, "Pulmonary vascular structure") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[0].code, "55607006") + self.assertEqual(inst.category[0].coding[0].display, "Problem") + self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[1].code, "problem-list-item") + self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/condition-category") self.assertEqual(inst.clinicalStatus.coding[0].code, "active") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.text, "Asthma") - self.assertEqual(inst.id, "example2") + self.assertEqual(inst.code.coding[0].code, "10001005") + self.assertEqual(inst.code.coding[0].display, "Bacterial sepsis") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.id, "f203") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.onsetString, "approximately November 2012") - self.assertEqual(inst.severity.coding[0].code, "255604002") - self.assertEqual(inst.severity.coding[0].display, "Mild") + self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2013-03-08").datetime) + self.assertEqual(inst.onsetDateTime.as_json(), "2013-03-08") + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-03-11").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2013-03-11") + self.assertEqual(inst.severity.coding[0].code, "371924009") + self.assertEqual(inst.severity.coding[0].display, "Moderate to severe") self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.text.div, "
Mild Asthma (Date: 12-Nov 2012)
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") @@ -126,7 +130,7 @@ def implCondition3(self, inst): self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition4(self): - inst = self.instantiate_from("condition-example-f002-lung.json") + inst = self.instantiate_from("condition-example-family-history.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition4(inst) @@ -136,6 +140,32 @@ def testCondition4(self): self.implCondition4(inst2) def implCondition4(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "problem-list-item") + self.assertEqual(inst.category[0].coding[0].display, "Problem List Item") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") + self.assertEqual(inst.clinicalStatus.coding[0].code, "active") + self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") + self.assertEqual(inst.code.coding[0].code, "312824007") + self.assertEqual(inst.code.coding[0].display, "Family history of cancer of colon") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.id, "family-history") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.text.div, "
Family history of cancer of colon
") + self.assertEqual(inst.text.status, "generated") + + def testCondition5(self): + inst = self.instantiate_from("condition-example-f002-lung.json") + self.assertIsNotNone(inst, "Must have instantiated a Condition instance") + self.implCondition5(inst) + + js = inst.as_json() + self.assertEqual("Condition", js["resourceType"]) + inst2 = condition.Condition(js) + self.implCondition5(inst2) + + def implCondition5(self, inst): self.assertEqual(inst.bodySite[0].coding[0].code, "51185008") self.assertEqual(inst.bodySite[0].coding[0].display, "Thorax") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") @@ -171,47 +201,8 @@ def implCondition4(self, inst): self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") - def testCondition5(self): - inst = self.instantiate_from("condition-example-f203-sepsis.json") - self.assertIsNotNone(inst, "Must have instantiated a Condition instance") - self.implCondition5(inst) - - js = inst.as_json() - self.assertEqual("Condition", js["resourceType"]) - inst2 = condition.Condition(js) - self.implCondition5(inst2) - - def implCondition5(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "281158006") - self.assertEqual(inst.bodySite[0].coding[0].display, "Pulmonary vascular structure") - self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[0].code, "55607006") - self.assertEqual(inst.category[0].coding[0].display, "Problem") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[1].code, "problem-list-item") - self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/condition-category") - self.assertEqual(inst.clinicalStatus.coding[0].code, "active") - self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "10001005") - self.assertEqual(inst.code.coding[0].display, "Bacterial sepsis") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f203") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2013-03-08").datetime) - self.assertEqual(inst.onsetDateTime.as_json(), "2013-03-08") - self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-03-11").datetime) - self.assertEqual(inst.recordedDate.as_json(), "2013-03-11") - self.assertEqual(inst.severity.coding[0].code, "371924009") - self.assertEqual(inst.severity.coding[0].display, "Moderate to severe") - self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") - self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") - def testCondition6(self): - inst = self.instantiate_from("condition-example.json") + inst = self.instantiate_from("condition-example-f205-infection.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition6(inst) @@ -221,38 +212,23 @@ def testCondition6(self): self.implCondition6(inst2) def implCondition6(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "49521004") - self.assertEqual(inst.bodySite[0].coding[0].display, "Left external ear structure") - self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.bodySite[0].text, "Left Ear") - self.assertEqual(inst.category[0].coding[0].code, "encounter-diagnosis") - self.assertEqual(inst.category[0].coding[0].display, "Encounter Diagnosis") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") - self.assertEqual(inst.category[0].coding[1].code, "439401001") - self.assertEqual(inst.category[0].coding[1].display, "Diagnosis") - self.assertEqual(inst.category[0].coding[1].system, "http://snomed.info/sct") self.assertEqual(inst.clinicalStatus.coding[0].code, "active") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "39065001") - self.assertEqual(inst.code.coding[0].display, "Burn of ear") + self.assertEqual(inst.code.coding[0].code, "87628006") + self.assertEqual(inst.code.coding[0].display, "Bacterial infectious disease") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Burnt Ear") - self.assertEqual(inst.id, "example") + self.assertEqual(inst.id, "f205") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2012-05-24").datetime) - self.assertEqual(inst.onsetDateTime.as_json(), "2012-05-24") - self.assertEqual(inst.severity.coding[0].code, "24484000") - self.assertEqual(inst.severity.coding[0].display, "Severe") - self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.text.div, "
Severe burn of left ear (Date: 24-May 2012)
") + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-04-04").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2013-04-04") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") + self.assertEqual(inst.verificationStatus.coding[0].code, "differential") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition7(self): - inst = self.instantiate_from("condition-example-family-history.json") + inst = self.instantiate_from("condition-example-f204-renal.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition7(inst) @@ -262,23 +238,42 @@ def testCondition7(self): self.implCondition7(inst2) def implCondition7(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "problem-list-item") - self.assertEqual(inst.category[0].coding[0].display, "Problem List Item") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") - self.assertEqual(inst.clinicalStatus.coding[0].code, "active") + self.assertEqual(inst.abatementDateTime.datetime, FHIRDateTime("2013-03-20").datetime) + self.assertEqual(inst.abatementDateTime.as_json(), "2013-03-20") + self.assertEqual(inst.bodySite[0].coding[0].code, "181414000") + self.assertEqual(inst.bodySite[0].coding[0].display, "Kidney") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[0].code, "55607006") + self.assertEqual(inst.category[0].coding[0].display, "Problem") + self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[1].code, "problem-list-item") + self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/condition-category") + self.assertEqual(inst.clinicalStatus.coding[0].code, "inactive") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "312824007") - self.assertEqual(inst.code.coding[0].display, "Family history of cancer of colon") + self.assertEqual(inst.code.coding[0].code, "36225005") + self.assertEqual(inst.code.coding[0].display, "Acute renal insufficiency specified as due to procedure") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "family-history") + self.assertEqual(inst.id, "f204") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.text.div, "
Family history of cancer of colon
") + self.assertEqual(inst.note[0].text, "The patient is anuric.") + self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2013-03-11").datetime) + self.assertEqual(inst.onsetDateTime.as_json(), "2013-03-11") + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-03-11").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2013-03-11") + self.assertEqual(inst.severity.coding[0].code, "24484000") + self.assertEqual(inst.severity.coding[0].display, "Severe") + self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.stage[0].summary.coding[0].code, "14803004") + self.assertEqual(inst.stage[0].summary.coding[0].display, "Temporary") + self.assertEqual(inst.stage[0].summary.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.verificationStatus.coding[0].code, "differential") + self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition8(self): - inst = self.instantiate_from("condition-example-f003-abscess.json") + inst = self.instantiate_from("condition-example2.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition8(inst) @@ -288,37 +283,27 @@ def testCondition8(self): self.implCondition8(inst2) def implCondition8(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "280193007") - self.assertEqual(inst.bodySite[0].coding[0].display, "Entire retropharyngeal area") - self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[0].code, "439401001") - self.assertEqual(inst.category[0].coding[0].display, "diagnosis") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[0].code, "problem-list-item") + self.assertEqual(inst.category[0].coding[0].display, "Problem List Item") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") self.assertEqual(inst.clinicalStatus.coding[0].code, "active") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "18099001") - self.assertEqual(inst.code.coding[0].display, "Retropharyngeal abscess") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.evidence[0].code[0].coding[0].code, "169068008") - self.assertEqual(inst.evidence[0].code[0].coding[0].display, "CT of neck") - self.assertEqual(inst.evidence[0].code[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f003") + self.assertEqual(inst.code.text, "Asthma") + self.assertEqual(inst.id, "example2") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2012-02-27").datetime) - self.assertEqual(inst.onsetDateTime.as_json(), "2012-02-27") - self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2012-02-20").datetime) - self.assertEqual(inst.recordedDate.as_json(), "2012-02-20") - self.assertEqual(inst.severity.coding[0].code, "371923003") - self.assertEqual(inst.severity.coding[0].display, "Mild to moderate") + self.assertEqual(inst.onsetString, "approximately November 2012") + self.assertEqual(inst.severity.coding[0].code, "255604002") + self.assertEqual(inst.severity.coding[0].display, "Mild") self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.text.div, "
Mild Asthma (Date: 12-Nov 2012)
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition9(self): - inst = self.instantiate_from("condition-example-f205-infection.json") + inst = self.instantiate_from("condition-example-f202-malignancy.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition9(inst) @@ -328,23 +313,42 @@ def testCondition9(self): self.implCondition9(inst2) def implCondition9(self, inst): - self.assertEqual(inst.clinicalStatus.coding[0].code, "active") + self.assertEqual(inst.abatementAge.code, "a") + self.assertEqual(inst.abatementAge.system, "http://unitsofmeasure.org") + self.assertEqual(inst.abatementAge.unit, "years") + self.assertEqual(inst.abatementAge.value, 54) + self.assertEqual(inst.bodySite[0].coding[0].code, "361355005") + self.assertEqual(inst.bodySite[0].coding[0].display, "Entire head and neck") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[0].code, "encounter-diagnosis") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-category") + self.assertEqual(inst.clinicalStatus.coding[0].code, "resolved") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "87628006") - self.assertEqual(inst.code.coding[0].display, "Bacterial infectious disease") + self.assertEqual(inst.code.coding[0].code, "363346000") + self.assertEqual(inst.code.coding[0].display, "Malignant neoplastic disease") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f205") + self.assertEqual(inst.id, "f202") + self.assertEqual(inst.meta.security[0].code, "TBOO") + self.assertEqual(inst.meta.security[0].display, "taboo") + self.assertEqual(inst.meta.security[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-04-04").datetime) - self.assertEqual(inst.recordedDate.as_json(), "2013-04-04") + self.assertEqual(inst.onsetAge.code, "a") + self.assertEqual(inst.onsetAge.system, "http://unitsofmeasure.org") + self.assertEqual(inst.onsetAge.unit, "years") + self.assertEqual(inst.onsetAge.value, 52) + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2012-12-01").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2012-12-01") + self.assertEqual(inst.severity.coding[0].code, "24484000") + self.assertEqual(inst.severity.coding[0].display, "Severe") + self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.verificationStatus.coding[0].code, "differential") + self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") self.assertEqual(inst.verificationStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-ver-status") def testCondition10(self): - inst = self.instantiate_from("condition-example-f001-heart.json") + inst = self.instantiate_from("condition-example-f201-fever.json") self.assertIsNotNone(inst, "Must have instantiated a Condition instance") self.implCondition10(inst) @@ -354,31 +358,34 @@ def testCondition10(self): self.implCondition10(inst2) def implCondition10(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "40768004") - self.assertEqual(inst.bodySite[0].coding[0].display, "Left thorax") + self.assertEqual(inst.abatementString, "around April 9, 2013") + self.assertEqual(inst.bodySite[0].coding[0].code, "38266002") + self.assertEqual(inst.bodySite[0].coding[0].display, "Entire body as a whole") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.bodySite[0].text, "heart structure") - self.assertEqual(inst.category[0].coding[0].code, "439401001") - self.assertEqual(inst.category[0].coding[0].display, "diagnosis") + self.assertEqual(inst.category[0].coding[0].code, "55607006") + self.assertEqual(inst.category[0].coding[0].display, "Problem") self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.clinicalStatus.coding[0].code, "active") + self.assertEqual(inst.category[0].coding[1].code, "problem-list-item") + self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/condition-category") + self.assertEqual(inst.clinicalStatus.coding[0].code, "resolved") self.assertEqual(inst.clinicalStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/condition-clinical") - self.assertEqual(inst.code.coding[0].code, "368009") - self.assertEqual(inst.code.coding[0].display, "Heart valve disorder") + self.assertEqual(inst.code.coding[0].code, "386661006") + self.assertEqual(inst.code.coding[0].display, "Fever") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.evidence[0].code[0].coding[0].code, "426396005") - self.assertEqual(inst.evidence[0].code[0].coding[0].display, "Cardiac chest pain") + self.assertEqual(inst.evidence[0].code[0].coding[0].code, "258710007") + self.assertEqual(inst.evidence[0].code[0].coding[0].display, "degrees C") self.assertEqual(inst.evidence[0].code[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f001") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.identifier[0].value, "12345") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2011-08-05").datetime) - self.assertEqual(inst.onsetDateTime.as_json(), "2011-08-05") - self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2011-10-05").datetime) - self.assertEqual(inst.recordedDate.as_json(), "2011-10-05") - self.assertEqual(inst.severity.coding[0].code, "6736007") - self.assertEqual(inst.severity.coding[0].display, "Moderate") + self.assertEqual(inst.onsetDateTime.datetime, FHIRDateTime("2013-04-02").datetime) + self.assertEqual(inst.onsetDateTime.as_json(), "2013-04-02") + self.assertEqual(inst.recordedDate.datetime, FHIRDateTime("2013-04-04").datetime) + self.assertEqual(inst.recordedDate.as_json(), "2013-04-04") + self.assertEqual(inst.severity.coding[0].code, "255604002") + self.assertEqual(inst.severity.coding[0].display, "Mild") self.assertEqual(inst.severity.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.verificationStatus.coding[0].code, "confirmed") diff --git a/tests/models/consent_test.py b/tests/models/consent_test.py index 51e047f7..0756b258 100644 --- a/tests/models/consent_test.py +++ b/tests/models/consent_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return consent.Consent(js) def testConsent1(self): - inst = self.instantiate_from("consent-example-Out.json") + inst = self.instantiate_from("consent-example-notThis.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") self.implConsent1(inst) @@ -34,14 +34,13 @@ def implConsent1(self, inst): self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) self.assertEqual(inst.dateTime.as_json(), "2015-11-18") - self.assertEqual(inst.id, "consent-example-Out") + self.assertEqual(inst.id, "consent-example-notThis") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.policyRule.coding[0].code, "OPTOUT") + self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.actor[0].role.coding[0].code, "CST") - self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") + self.assertEqual(inst.provision.data[0].meaning, "related") self.assertEqual(inst.scope.coding[0].code, "patient-privacy") self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") @@ -49,7 +48,7 @@ def implConsent1(self, inst): self.assertEqual(inst.text.status, "generated") def testConsent2(self): - inst = self.instantiate_from("consent-example.json") + inst = self.instantiate_from("consent-example-smartonfhir.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") self.implConsent2(inst) @@ -61,26 +60,30 @@ def testConsent2(self): def implConsent2(self, inst): self.assertEqual(inst.category[0].coding[0].code, "59284-0") self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-05-11").datetime) - self.assertEqual(inst.dateTime.as_json(), "2016-05-11") - self.assertEqual(inst.id, "consent-example-basic") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-06-23T17:02:33+10:00").datetime) + self.assertEqual(inst.dateTime.as_json(), "2016-06-23T17:02:33+10:00") + self.assertEqual(inst.id, "consent-example-smartonfhir") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2016-01-01").datetime) - self.assertEqual(inst.provision.period.end.as_json(), "2016-01-01") - self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("1964-01-01").datetime) - self.assertEqual(inst.provision.period.start.as_json(), "1964-01-01") + self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2016-06-23T17:32:33+10:00").datetime) + self.assertEqual(inst.provision.period.end.as_json(), "2016-06-23T17:32:33+10:00") + self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("2016-06-23T17:02:33+10:00").datetime) + self.assertEqual(inst.provision.period.start.as_json(), "2016-06-23T17:02:33+10:00") + self.assertEqual(inst.provision.provision[0].action[0].coding[0].code, "access") + self.assertEqual(inst.provision.provision[0].action[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") + self.assertEqual(inst.provision.provision[0].class_fhir[0].code, "MedicationRequest") + self.assertEqual(inst.provision.provision[0].class_fhir[0].system, "http://hl7.org/fhir/resource-types") + self.assertEqual(inst.provision.provision[0].type, "permit") self.assertEqual(inst.scope.coding[0].code, "patient-privacy") self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") - self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") def testConsent3(self): - inst = self.instantiate_from("consent-example-signature.json") + inst = self.instantiate_from("consent-example-notAuthor.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") self.implConsent3(inst) @@ -90,6 +93,66 @@ def testConsent3(self): self.implConsent3(inst2) def implConsent3(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "59284-0") + self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.dateTime.as_json(), "2015-11-18") + self.assertEqual(inst.id, "consent-example-notAuthor") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") + self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.provision.actor[0].role.coding[0].code, "CST") + self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") + self.assertEqual(inst.scope.coding[0].code, "patient-privacy") + self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") + self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + + def testConsent4(self): + inst = self.instantiate_from("consent-example-notTime.json") + self.assertIsNotNone(inst, "Must have instantiated a Consent instance") + self.implConsent4(inst) + + js = inst.as_json() + self.assertEqual("Consent", js["resourceType"]) + inst2 = consent.Consent(js) + self.implConsent4(inst2) + + def implConsent4(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "59284-0") + self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.dateTime.as_json(), "2015-11-18") + self.assertEqual(inst.id, "consent-example-notTime") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") + self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2015-02-01").datetime) + self.assertEqual(inst.provision.period.end.as_json(), "2015-02-01") + self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("2015-01-01").datetime) + self.assertEqual(inst.provision.period.start.as_json(), "2015-01-01") + self.assertEqual(inst.scope.coding[0].code, "patient-privacy") + self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") + self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + + def testConsent5(self): + inst = self.instantiate_from("consent-example-signature.json") + self.assertIsNotNone(inst, "Must have instantiated a Consent instance") + self.implConsent5(inst) + + js = inst.as_json() + self.assertEqual("Consent", js["resourceType"]) + inst2 = consent.Consent(js) + self.implConsent5(inst2) + + def implConsent5(self, inst): self.assertEqual(inst.category[0].coding[0].code, "npp") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentcategorycodes") self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-05-26T00:41:10-04:00").datetime) @@ -122,17 +185,50 @@ def implConsent3(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testConsent4(self): + def testConsent6(self): + inst = self.instantiate_from("consent-example-notThem.json") + self.assertIsNotNone(inst, "Must have instantiated a Consent instance") + self.implConsent6(inst) + + js = inst.as_json() + self.assertEqual("Consent", js["resourceType"]) + inst2 = consent.Consent(js) + self.implConsent6(inst2) + + def implConsent6(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "59284-0") + self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.dateTime.as_json(), "2015-11-18") + self.assertEqual(inst.id, "consent-example-notThem") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") + self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.provision.action[0].coding[0].code, "access") + self.assertEqual(inst.provision.action[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") + self.assertEqual(inst.provision.action[1].coding[0].code, "correct") + self.assertEqual(inst.provision.action[1].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") + self.assertEqual(inst.provision.actor[0].role.coding[0].code, "PRCP") + self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") + self.assertEqual(inst.scope.coding[0].code, "patient-privacy") + self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") + self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + + def testConsent7(self): inst = self.instantiate_from("consent-example-grantor.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent4(inst) + self.implConsent7(inst) js = inst.as_json() self.assertEqual("Consent", js["resourceType"]) inst2 = consent.Consent(js) - self.implConsent4(inst2) + self.implConsent7(inst2) - def implConsent4(self, inst): + def implConsent7(self, inst): self.assertEqual(inst.category[0].coding[0].code, "INFAO") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) @@ -155,52 +251,51 @@ def implConsent4(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testConsent5(self): - inst = self.instantiate_from("consent-example-smartonfhir.json") + def testConsent8(self): + inst = self.instantiate_from("consent-example-notOrg.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent5(inst) + self.implConsent8(inst) js = inst.as_json() self.assertEqual("Consent", js["resourceType"]) inst2 = consent.Consent(js) - self.implConsent5(inst2) + self.implConsent8(inst2) - def implConsent5(self, inst): + def implConsent8(self, inst): self.assertEqual(inst.category[0].coding[0].code, "59284-0") self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-06-23T17:02:33+10:00").datetime) - self.assertEqual(inst.dateTime.as_json(), "2016-06-23T17:02:33+10:00") - self.assertEqual(inst.id, "consent-example-smartonfhir") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.dateTime.as_json(), "2015-11-18") + self.assertEqual(inst.id, "consent-example-notOrg") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2016-06-23T17:32:33+10:00").datetime) - self.assertEqual(inst.provision.period.end.as_json(), "2016-06-23T17:32:33+10:00") - self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("2016-06-23T17:02:33+10:00").datetime) - self.assertEqual(inst.provision.period.start.as_json(), "2016-06-23T17:02:33+10:00") - self.assertEqual(inst.provision.provision[0].action[0].coding[0].code, "access") - self.assertEqual(inst.provision.provision[0].action[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") - self.assertEqual(inst.provision.provision[0].class_fhir[0].code, "MedicationRequest") - self.assertEqual(inst.provision.provision[0].class_fhir[0].system, "http://hl7.org/fhir/resource-types") - self.assertEqual(inst.provision.provision[0].type, "permit") + self.assertEqual(inst.provision.action[0].coding[0].code, "access") + self.assertEqual(inst.provision.action[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") + self.assertEqual(inst.provision.action[1].coding[0].code, "correct") + self.assertEqual(inst.provision.action[1].coding[0].system, "http://terminology.hl7.org/CodeSystem/consentaction") + self.assertEqual(inst.provision.actor[0].role.coding[0].code, "PRCP") + self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") + self.assertEqual(inst.provision.type, "deny") self.assertEqual(inst.scope.coding[0].code, "patient-privacy") self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") + self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testConsent6(self): + def testConsent9(self): inst = self.instantiate_from("consent-example-pkb.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent6(inst) + self.implConsent9(inst) js = inst.as_json() self.assertEqual("Consent", js["resourceType"]) inst2 = consent.Consent(js) - self.implConsent6(inst2) + self.implConsent9(inst2) - def implConsent6(self, inst): + def implConsent9(self, inst): self.assertEqual(inst.category[0].coding[0].code, "59284-0") self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-06-16").datetime) @@ -282,96 +377,8 @@ def implConsent6(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testConsent7(self): - inst = self.instantiate_from("consent-example-notTime.json") - self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent7(inst) - - js = inst.as_json() - self.assertEqual("Consent", js["resourceType"]) - inst2 = consent.Consent(js) - self.implConsent7(inst2) - - def implConsent7(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "59284-0") - self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.dateTime.as_json(), "2015-11-18") - self.assertEqual(inst.id, "consent-example-notTime") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") - self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2015-02-01").datetime) - self.assertEqual(inst.provision.period.end.as_json(), "2015-02-01") - self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("2015-01-01").datetime) - self.assertEqual(inst.provision.period.start.as_json(), "2015-01-01") - self.assertEqual(inst.scope.coding[0].code, "patient-privacy") - self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") - self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - - def testConsent8(self): - inst = self.instantiate_from("consent-example-notAuthor.json") - self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent8(inst) - - js = inst.as_json() - self.assertEqual("Consent", js["resourceType"]) - inst2 = consent.Consent(js) - self.implConsent8(inst2) - - def implConsent8(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "59284-0") - self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.dateTime.as_json(), "2015-11-18") - self.assertEqual(inst.id, "consent-example-notAuthor") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") - self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.actor[0].role.coding[0].code, "CST") - self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") - self.assertEqual(inst.scope.coding[0].code, "patient-privacy") - self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") - self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - - def testConsent9(self): - inst = self.instantiate_from("consent-example-notThis.json") - self.assertIsNotNone(inst, "Must have instantiated a Consent instance") - self.implConsent9(inst) - - js = inst.as_json() - self.assertEqual("Consent", js["resourceType"]) - inst2 = consent.Consent(js) - self.implConsent9(inst2) - - def implConsent9(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "59284-0") - self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.dateTime.as_json(), "2015-11-18") - self.assertEqual(inst.id, "consent-example-notThis") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") - self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.data[0].meaning, "related") - self.assertEqual(inst.scope.coding[0].code, "patient-privacy") - self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") - self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - def testConsent10(self): - inst = self.instantiate_from("consent-example-Emergency.json") + inst = self.instantiate_from("consent-example.json") self.assertIsNotNone(inst, "Must have instantiated a Consent instance") self.implConsent10(inst) @@ -381,23 +388,20 @@ def testConsent10(self): self.implConsent10(inst2) def implConsent10(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "EMRGONLY") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.dateTime.as_json(), "2015-11-18") - self.assertEqual(inst.id, "consent-example-Emergency") + self.assertEqual(inst.category[0].coding[0].code, "59284-0") + self.assertEqual(inst.category[0].coding[0].system, "http://loinc.org") + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2016-05-11").datetime) + self.assertEqual(inst.dateTime.as_json(), "2016-05-11") + self.assertEqual(inst.id, "consent-example-basic") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.policyRule.coding[0].code, "OPTOUT") + self.assertEqual(inst.policyRule.coding[0].code, "OPTIN") self.assertEqual(inst.policyRule.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.provision.actor[0].role.coding[0].code, "CST") - self.assertEqual(inst.provision.actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") - self.assertEqual(inst.provision.provision[0].actor[0].role.coding[0].code, "CST") - self.assertEqual(inst.provision.provision[0].actor[0].role.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") - self.assertEqual(inst.provision.provision[0].type, "deny") - self.assertEqual(inst.provision.purpose[0].code, "ETREAT") - self.assertEqual(inst.provision.purpose[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.provision.period.end.datetime, FHIRDateTime("2016-01-01").datetime) + self.assertEqual(inst.provision.period.end.as_json(), "2016-01-01") + self.assertEqual(inst.provision.period.start.datetime, FHIRDateTime("1964-01-01").datetime) + self.assertEqual(inst.provision.period.start.as_json(), "1964-01-01") self.assertEqual(inst.scope.coding[0].code, "patient-privacy") self.assertEqual(inst.scope.coding[0].system, "http://terminology.hl7.org/CodeSystem/consentscope") self.assertEqual(inst.sourceAttachment.title, "The terms of the consent in lawyer speak.") diff --git a/tests/models/contract_test.py b/tests/models/contract_test.py index 50771259..02dbb015 100644 --- a/tests/models/contract_test.py +++ b/tests/models/contract_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return contract.Contract(js) def testContract1(self): - inst = self.instantiate_from("pcd-example-notThis.json") + inst = self.instantiate_from("pcd-example-notOrg.json") self.assertIsNotNone(inst, "Must have instantiated a Contract instance") self.implContract1(inst) @@ -31,7 +31,7 @@ def testContract1(self): def implContract1(self, inst): self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") - self.assertEqual(inst.id, "pcd-example-notThis") + self.assertEqual(inst.id, "pcd-example-notOrg") self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) self.assertEqual(inst.issued.as_json(), "2015-11-18") self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") @@ -41,22 +41,16 @@ def implContract1(self, inst): self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") - self.assertEqual(inst.term[0].applies.start.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.term[0].applies.start.as_json(), "2015-11-18") - self.assertEqual(inst.term[0].identifier.system, "http://example.org/fhir/term-items") - self.assertEqual(inst.term[0].identifier.value, "3347689") - self.assertEqual(inst.term[0].issued.datetime, FHIRDateTime("2015-11-01").datetime) - self.assertEqual(inst.term[0].issued.as_json(), "2015-11-01") self.assertEqual(inst.term[0].offer.text, "Withhold this order and any results or related objects from any provider.") - self.assertEqual(inst.term[0].type.coding[0].code, "withhold-identified-object-and-related") - self.assertEqual(inst.term[0].type.coding[0].display, "Withhold the identified object and any other resources that are related to this object.") + self.assertEqual(inst.term[0].type.coding[0].code, "withhold-from") + self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data from specified actor entity.") self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "57016-8") self.assertEqual(inst.type.coding[0].system, "http://loinc.org") def testContract2(self): - inst = self.instantiate_from("pcd-example-notLabs.json") + inst = self.instantiate_from("contract-example-ins-policy.json") self.assertIsNotNone(inst, "Must have instantiated a Contract instance") self.implContract2(inst) @@ -66,34 +60,52 @@ def testContract2(self): self.implContract2(inst2) def implContract2(self, inst): - self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") - self.assertEqual(inst.id, "pcd-example-notLabs") - self.assertEqual(inst.issued.datetime, FHIRDateTime("2014-08-17").datetime) - self.assertEqual(inst.issued.as_json(), "2014-08-17") - self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.applies.start.datetime, FHIRDateTime("2017-01-01").datetime) + self.assertEqual(inst.applies.start.as_json(), "2017-01-01") + self.assertEqual(inst.id, "INS-101") + self.assertEqual(inst.identifier[0].system, "http://xyz-insurance.com/forms") + self.assertEqual(inst.identifier[0].value, "YCSCWLN(01-2017)") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") - self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") - self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") - self.assertEqual(inst.term[0].group[0].offer.text, "Withhold orders from any provider.") - self.assertEqual(inst.term[0].group[0].subType.coding[0].code, "ServiceRequest") - self.assertEqual(inst.term[0].group[0].subType.coding[0].system, "http://hl7.org/fhir/resource-types") - self.assertEqual(inst.term[0].group[0].type.coding[0].code, "withhold-object-type") - self.assertEqual(inst.term[0].group[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") - self.assertEqual(inst.term[0].group[1].offer.text, "Withhold order results from any provider.") - self.assertEqual(inst.term[0].group[1].subType.coding[0].code, "DiagnosticReport") - self.assertEqual(inst.term[0].group[1].subType.coding[0].system, "http://hl7.org/fhir/resource-types") - self.assertEqual(inst.term[0].group[1].type.coding[0].code, "withhold-object-type") - self.assertEqual(inst.term[0].group[1].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") - self.assertEqual(inst.term[0].offer.text, "sample") + self.assertEqual(inst.term[0].asset[0].period[0].start.datetime, FHIRDateTime("2017-06-01").datetime) + self.assertEqual(inst.term[0].asset[0].period[0].start.as_json(), "2017-06-01") + self.assertEqual(inst.term[0].asset[0].subtype[0].text, "sample") + self.assertEqual(inst.term[0].asset[0].type[0].coding[0].code, "RicardianContract") + self.assertEqual(inst.term[0].asset[0].type[0].coding[0].system, "urn:ietf:rfc:3986") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].effectiveTime.datetime, FHIRDateTime("1995").datetime) + self.assertEqual(inst.term[0].asset[0].valuedItem[0].effectiveTime.as_json(), "1995") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].entityCodeableConcept.text, "Ford Bobcat") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].factor, 1.0) + self.assertEqual(inst.term[0].asset[0].valuedItem[0].identifier.system, "http://somewhere.motor-vehicle.com/vin") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].identifier.value, "XXSVT34-7665t952236") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].net.currency, "CAD") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].net.value, 200.0) + self.assertEqual(inst.term[0].asset[0].valuedItem[0].points, 1.0) + self.assertEqual(inst.term[0].asset[0].valuedItem[0].quantity.value, 1) + self.assertEqual(inst.term[0].asset[0].valuedItem[0].unitPrice.currency, "CAD") + self.assertEqual(inst.term[0].asset[0].valuedItem[0].unitPrice.value, 200.0) + self.assertEqual(inst.term[0].group[0].offer.text, "Eligible Providers") + self.assertEqual(inst.term[0].group[1].offer.text, "Responsibility for Payment") + self.assertEqual(inst.term[0].group[2].group[0].group[0].offer.text, "Emergency Room Copay") + self.assertEqual(inst.term[0].group[2].group[0].group[1].offer.text, "Professional Visit Copay") + self.assertEqual(inst.term[0].group[2].group[0].offer.text, "Copays") + self.assertEqual(inst.term[0].group[2].group[1].offer.text, "Calendar Year Deductible") + self.assertEqual(inst.term[0].group[2].group[2].offer.text, "Out-Of-Pocket Maximum") + self.assertEqual(inst.term[0].group[2].group[3].group[0].offer.text, "Ambulance Services") + self.assertEqual(inst.term[0].group[2].group[3].group[1].offer.text, "Dental Services") + self.assertEqual(inst.term[0].group[2].group[3].group[2].offer.text, "Diagnostic Services") + self.assertEqual(inst.term[0].group[2].group[3].group[3].offer.text, "Emergency Room Services") + self.assertEqual(inst.term[0].group[2].group[3].group[4].offer.text, "Hospital Inpatient Care") + self.assertEqual(inst.term[0].group[2].group[3].offer.text, "Medical Services") + self.assertEqual(inst.term[0].group[2].offer.text, "List of Benefits") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "57016-8") - self.assertEqual(inst.type.coding[0].system, "http://loinc.org") + self.assertEqual(inst.type.coding[0].code, "healthinsurance") + self.assertEqual(inst.type.coding[0].display, "Health Insurance") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/contract-type") def testContract3(self): - inst = self.instantiate_from("pcd-example-notOrg.json") + inst = self.instantiate_from("contract-example-42cfr-part2.json") self.assertIsNotNone(inst, "Must have instantiated a Contract instance") self.implContract3(inst) @@ -103,66 +115,6 @@ def testContract3(self): self.implContract3(inst2) def implContract3(self, inst): - self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") - self.assertEqual(inst.id, "pcd-example-notOrg") - self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.issued.as_json(), "2015-11-18") - self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") - self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") - self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") - self.assertEqual(inst.term[0].offer.text, "Withhold this order and any results or related objects from any provider.") - self.assertEqual(inst.term[0].type.coding[0].code, "withhold-from") - self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data from specified actor entity.") - self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "57016-8") - self.assertEqual(inst.type.coding[0].system, "http://loinc.org") - - def testContract4(self): - inst = self.instantiate_from("pcd-example-notAuthor.json") - self.assertIsNotNone(inst, "Must have instantiated a Contract instance") - self.implContract4(inst) - - js = inst.as_json() - self.assertEqual("Contract", js["resourceType"]) - inst2 = contract.Contract(js) - self.implContract4(inst2) - - def implContract4(self, inst): - self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") - self.assertEqual(inst.id, "pcd-example-notAuthor") - self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) - self.assertEqual(inst.issued.as_json(), "2015-11-18") - self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") - self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") - self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") - self.assertEqual(inst.term[0].offer.text, "Withhold all data authored by Good Health provider.") - self.assertEqual(inst.term[0].type.coding[0].code, "withhold-authored-by") - self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data authored by specified actor entity.") - self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "57016-8") - self.assertEqual(inst.type.coding[0].system, "http://loinc.org") - - def testContract5(self): - inst = self.instantiate_from("contract-example-42cfr-part2.json") - self.assertIsNotNone(inst, "Must have instantiated a Contract instance") - self.implContract5(inst) - - js = inst.as_json() - self.assertEqual("Contract", js["resourceType"]) - inst2 = contract.Contract(js) - self.implContract5(inst2) - - def implContract5(self, inst): self.assertEqual(inst.applies.start.datetime, FHIRDateTime("2013-11-01T21:18:27-04:00").datetime) self.assertEqual(inst.applies.start.as_json(), "2013-11-01T21:18:27-04:00") self.assertEqual(inst.contentDerivative.coding[0].code, "registration") @@ -216,8 +168,81 @@ def implContract5(self, inst): self.assertEqual(inst.type.coding[0].system, "http://mdhhs.org/fhir/consentdirective-type") self.assertEqual(inst.type.text, "Opt-in consent directive") + def testContract4(self): + inst = self.instantiate_from("pcd-example-notLabs.json") + self.assertIsNotNone(inst, "Must have instantiated a Contract instance") + self.implContract4(inst) + + js = inst.as_json() + self.assertEqual("Contract", js["resourceType"]) + inst2 = contract.Contract(js) + self.implContract4(inst2) + + def implContract4(self, inst): + self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") + self.assertEqual(inst.id, "pcd-example-notLabs") + self.assertEqual(inst.issued.datetime, FHIRDateTime("2014-08-17").datetime) + self.assertEqual(inst.issued.as_json(), "2014-08-17") + self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") + self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") + self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") + self.assertEqual(inst.term[0].group[0].offer.text, "Withhold orders from any provider.") + self.assertEqual(inst.term[0].group[0].subType.coding[0].code, "ServiceRequest") + self.assertEqual(inst.term[0].group[0].subType.coding[0].system, "http://hl7.org/fhir/resource-types") + self.assertEqual(inst.term[0].group[0].type.coding[0].code, "withhold-object-type") + self.assertEqual(inst.term[0].group[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") + self.assertEqual(inst.term[0].group[1].offer.text, "Withhold order results from any provider.") + self.assertEqual(inst.term[0].group[1].subType.coding[0].code, "DiagnosticReport") + self.assertEqual(inst.term[0].group[1].subType.coding[0].system, "http://hl7.org/fhir/resource-types") + self.assertEqual(inst.term[0].group[1].type.coding[0].code, "withhold-object-type") + self.assertEqual(inst.term[0].group[1].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") + self.assertEqual(inst.term[0].offer.text, "sample") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "57016-8") + self.assertEqual(inst.type.coding[0].system, "http://loinc.org") + + def testContract5(self): + inst = self.instantiate_from("pcd-example-notThem.json") + self.assertIsNotNone(inst, "Must have instantiated a Contract instance") + self.implContract5(inst) + + js = inst.as_json() + self.assertEqual("Contract", js["resourceType"]) + inst2 = contract.Contract(js) + self.implContract5(inst2) + + def implContract5(self, inst): + self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") + self.assertEqual(inst.id, "pcd-example-notThem") + self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.issued.as_json(), "2015-11-18") + self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.signer[0].signature[0].type[0].code, "1.2.840.10065.1.12.1.1") + self.assertEqual(inst.signer[0].signature[0].type[0].system, "urn:iso-astm:E1762-95:2013") + self.assertEqual(inst.signer[0].signature[0].when.datetime, FHIRInstant("2013-06-08T10:57:34-07:00").datetime) + self.assertEqual(inst.signer[0].signature[0].when.as_json(), "2013-06-08T10:57:34-07:00") + self.assertEqual(inst.signer[0].type.code, "COVPTY") + self.assertEqual(inst.signer[0].type.system, "http://terminology.hl7.org/CodeSystem/contractsignertypecodes") + self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") + self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") + self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") + self.assertEqual(inst.term[0].offer.text, "Withhold this order and any results or related objects from specified nurse provider.") + self.assertEqual(inst.term[0].type.coding[0].code, "withhold-from") + self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data from specified actor entity.") + self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "57016-8") + self.assertEqual(inst.type.coding[0].system, "http://loinc.org") + def testContract6(self): - inst = self.instantiate_from("contract-example-ins-policy.json") + inst = self.instantiate_from("pcd-example-notAuthor.json") self.assertIsNotNone(inst, "Must have instantiated a Contract instance") self.implContract6(inst) @@ -227,49 +252,24 @@ def testContract6(self): self.implContract6(inst2) def implContract6(self, inst): - self.assertEqual(inst.applies.start.datetime, FHIRDateTime("2017-01-01").datetime) - self.assertEqual(inst.applies.start.as_json(), "2017-01-01") - self.assertEqual(inst.id, "INS-101") - self.assertEqual(inst.identifier[0].system, "http://xyz-insurance.com/forms") - self.assertEqual(inst.identifier[0].value, "YCSCWLN(01-2017)") + self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") + self.assertEqual(inst.id, "pcd-example-notAuthor") + self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.issued.as_json(), "2015-11-18") + self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.term[0].asset[0].period[0].start.datetime, FHIRDateTime("2017-06-01").datetime) - self.assertEqual(inst.term[0].asset[0].period[0].start.as_json(), "2017-06-01") - self.assertEqual(inst.term[0].asset[0].subtype[0].text, "sample") - self.assertEqual(inst.term[0].asset[0].type[0].coding[0].code, "RicardianContract") - self.assertEqual(inst.term[0].asset[0].type[0].coding[0].system, "urn:ietf:rfc:3986") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].effectiveTime.datetime, FHIRDateTime("1995").datetime) - self.assertEqual(inst.term[0].asset[0].valuedItem[0].effectiveTime.as_json(), "1995") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].entityCodeableConcept.text, "Ford Bobcat") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].factor, 1.0) - self.assertEqual(inst.term[0].asset[0].valuedItem[0].identifier.system, "http://somewhere.motor-vehicle.com/vin") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].identifier.value, "XXSVT34-7665t952236") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].net.currency, "CAD") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].net.value, 200.0) - self.assertEqual(inst.term[0].asset[0].valuedItem[0].points, 1.0) - self.assertEqual(inst.term[0].asset[0].valuedItem[0].quantity.value, 1) - self.assertEqual(inst.term[0].asset[0].valuedItem[0].unitPrice.currency, "CAD") - self.assertEqual(inst.term[0].asset[0].valuedItem[0].unitPrice.value, 200.0) - self.assertEqual(inst.term[0].group[0].offer.text, "Eligible Providers") - self.assertEqual(inst.term[0].group[1].offer.text, "Responsibility for Payment") - self.assertEqual(inst.term[0].group[2].group[0].group[0].offer.text, "Emergency Room Copay") - self.assertEqual(inst.term[0].group[2].group[0].group[1].offer.text, "Professional Visit Copay") - self.assertEqual(inst.term[0].group[2].group[0].offer.text, "Copays") - self.assertEqual(inst.term[0].group[2].group[1].offer.text, "Calendar Year Deductible") - self.assertEqual(inst.term[0].group[2].group[2].offer.text, "Out-Of-Pocket Maximum") - self.assertEqual(inst.term[0].group[2].group[3].group[0].offer.text, "Ambulance Services") - self.assertEqual(inst.term[0].group[2].group[3].group[1].offer.text, "Dental Services") - self.assertEqual(inst.term[0].group[2].group[3].group[2].offer.text, "Diagnostic Services") - self.assertEqual(inst.term[0].group[2].group[3].group[3].offer.text, "Emergency Room Services") - self.assertEqual(inst.term[0].group[2].group[3].group[4].offer.text, "Hospital Inpatient Care") - self.assertEqual(inst.term[0].group[2].group[3].offer.text, "Medical Services") - self.assertEqual(inst.term[0].group[2].offer.text, "List of Benefits") + self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") + self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") + self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") + self.assertEqual(inst.term[0].offer.text, "Withhold all data authored by Good Health provider.") + self.assertEqual(inst.term[0].type.coding[0].code, "withhold-authored-by") + self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data authored by specified actor entity.") + self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "healthinsurance") - self.assertEqual(inst.type.coding[0].display, "Health Insurance") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/contract-type") + self.assertEqual(inst.type.coding[0].code, "57016-8") + self.assertEqual(inst.type.coding[0].system, "http://loinc.org") def testContract7(self): inst = self.instantiate_from("contract-example.json") @@ -314,7 +314,7 @@ def implContract7(self, inst): self.assertEqual(inst.text.status, "generated") def testContract8(self): - inst = self.instantiate_from("pcd-example-notThem.json") + inst = self.instantiate_from("pcd-example-notThis.json") self.assertIsNotNone(inst, "Must have instantiated a Contract instance") self.implContract8(inst) @@ -325,25 +325,25 @@ def testContract8(self): def implContract8(self, inst): self.assertEqual(inst.friendly[0].contentAttachment.title, "The terms of the consent in friendly consumer speak.") - self.assertEqual(inst.id, "pcd-example-notThem") + self.assertEqual(inst.id, "pcd-example-notThis") self.assertEqual(inst.issued.datetime, FHIRDateTime("2015-11-18").datetime) self.assertEqual(inst.issued.as_json(), "2015-11-18") self.assertEqual(inst.legal[0].contentAttachment.title, "The terms of the consent in lawyer speak.") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.signer[0].signature[0].type[0].code, "1.2.840.10065.1.12.1.1") - self.assertEqual(inst.signer[0].signature[0].type[0].system, "urn:iso-astm:E1762-95:2013") - self.assertEqual(inst.signer[0].signature[0].when.datetime, FHIRInstant("2013-06-08T10:57:34-07:00").datetime) - self.assertEqual(inst.signer[0].signature[0].when.as_json(), "2013-06-08T10:57:34-07:00") - self.assertEqual(inst.signer[0].type.code, "COVPTY") - self.assertEqual(inst.signer[0].type.system, "http://terminology.hl7.org/CodeSystem/contractsignertypecodes") self.assertEqual(inst.subType[0].coding[0].code, "Opt-In") self.assertEqual(inst.subType[0].coding[0].display, "Default Authorization with exceptions.") self.assertEqual(inst.subType[0].coding[0].system, "http://www.infoway-inforoute.ca.org/Consent-subtype-codes") - self.assertEqual(inst.term[0].offer.text, "Withhold this order and any results or related objects from specified nurse provider.") - self.assertEqual(inst.term[0].type.coding[0].code, "withhold-from") - self.assertEqual(inst.term[0].type.coding[0].display, "Withhold all data from specified actor entity.") + self.assertEqual(inst.term[0].applies.start.datetime, FHIRDateTime("2015-11-18").datetime) + self.assertEqual(inst.term[0].applies.start.as_json(), "2015-11-18") + self.assertEqual(inst.term[0].identifier.system, "http://example.org/fhir/term-items") + self.assertEqual(inst.term[0].identifier.value, "3347689") + self.assertEqual(inst.term[0].issued.datetime, FHIRDateTime("2015-11-01").datetime) + self.assertEqual(inst.term[0].issued.as_json(), "2015-11-01") + self.assertEqual(inst.term[0].offer.text, "Withhold this order and any results or related objects from any provider.") + self.assertEqual(inst.term[0].type.coding[0].code, "withhold-identified-object-and-related") + self.assertEqual(inst.term[0].type.coding[0].display, "Withhold the identified object and any other resources that are related to this object.") self.assertEqual(inst.term[0].type.coding[0].system, "http://example.org/fhir/consent-term-type-codes") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "57016-8") diff --git a/tests/models/coverage_test.py b/tests/models/coverage_test.py index 001cb840..4150f817 100644 --- a/tests/models/coverage_test.py +++ b/tests/models/coverage_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return coverage.Coverage(js) def testCoverage1(self): - inst = self.instantiate_from("coverage-example.json") + inst = self.instantiate_from("coverage-example-2.json") self.assertIsNotNone(inst, "Must have instantiated a Coverage instance") self.implCoverage1(inst) @@ -30,55 +30,44 @@ def testCoverage1(self): self.implCoverage1(inst2) def implCoverage1(self, inst): - self.assertEqual(inst.class_fhir[0].name, "Corporate Baker's Inc. Local #35") + self.assertEqual(inst.class_fhir[0].name, "Western Airlines") self.assertEqual(inst.class_fhir[0].type.coding[0].code, "group") self.assertEqual(inst.class_fhir[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[0].value, "CB135") - self.assertEqual(inst.class_fhir[1].name, "Trainee Part-time Benefits") - self.assertEqual(inst.class_fhir[1].type.coding[0].code, "subgroup") + self.assertEqual(inst.class_fhir[0].value, "WESTAIR") + self.assertEqual(inst.class_fhir[1].name, "Full Coverage: Medical, Dental, Pharmacy, Vision, EHC") + self.assertEqual(inst.class_fhir[1].type.coding[0].code, "plan") self.assertEqual(inst.class_fhir[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[1].value, "123") - self.assertEqual(inst.class_fhir[2].name, "Full Coverage: Medical, Dental, Pharmacy, Vision, EHC") - self.assertEqual(inst.class_fhir[2].type.coding[0].code, "plan") + self.assertEqual(inst.class_fhir[1].value, "BG4352") + self.assertEqual(inst.class_fhir[2].name, "Platinum") + self.assertEqual(inst.class_fhir[2].type.coding[0].code, "subplan") self.assertEqual(inst.class_fhir[2].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[2].value, "B37FC") - self.assertEqual(inst.class_fhir[3].name, "Includes afterlife benefits") - self.assertEqual(inst.class_fhir[3].type.coding[0].code, "subplan") - self.assertEqual(inst.class_fhir[3].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[3].value, "P7") - self.assertEqual(inst.class_fhir[4].name, "Silver: Family Plan spouse only") - self.assertEqual(inst.class_fhir[4].type.coding[0].code, "class") - self.assertEqual(inst.class_fhir[4].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[4].value, "SILVER") - self.assertEqual(inst.class_fhir[5].name, "Low deductable, max $20 copay") - self.assertEqual(inst.class_fhir[5].type.coding[0].code, "subclass") - self.assertEqual(inst.class_fhir[5].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[5].value, "Tier2") - self.assertEqual(inst.class_fhir[6].type.coding[0].code, "sequence") - self.assertEqual(inst.class_fhir[6].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[6].value, "9") - self.assertEqual(inst.class_fhir[7].type.coding[0].code, "rxid") - self.assertEqual(inst.class_fhir[7].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[7].value, "MDF12345") - self.assertEqual(inst.class_fhir[8].type.coding[0].code, "rxbin") - self.assertEqual(inst.class_fhir[8].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[8].value, "987654") - self.assertEqual(inst.class_fhir[9].type.coding[0].code, "rxgroup") - self.assertEqual(inst.class_fhir[9].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[9].value, "M35PT") - self.assertEqual(inst.dependent, "0") - self.assertEqual(inst.id, "9876B1") - self.assertEqual(inst.identifier[0].system, "http://benefitsinc.com/certificate") - self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.class_fhir[2].value, "D15C9") + self.assertEqual(inst.costToBeneficiary[0].exception[0].period.end.datetime, FHIRDateTime("2018-12-31").datetime) + self.assertEqual(inst.costToBeneficiary[0].exception[0].period.end.as_json(), "2018-12-31") + self.assertEqual(inst.costToBeneficiary[0].exception[0].period.start.datetime, FHIRDateTime("2018-01-01").datetime) + self.assertEqual(inst.costToBeneficiary[0].exception[0].period.start.as_json(), "2018-01-01") + self.assertEqual(inst.costToBeneficiary[0].exception[0].type.coding[0].code, "retired") + self.assertEqual(inst.costToBeneficiary[0].exception[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-coverage-financial-exception") + self.assertEqual(inst.costToBeneficiary[0].type.coding[0].code, "gpvisit") + self.assertEqual(inst.costToBeneficiary[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-copay-type") + self.assertEqual(inst.costToBeneficiary[0].valueMoney.currency, "USD") + self.assertEqual(inst.costToBeneficiary[0].valueMoney.value, 20.0) + self.assertEqual(inst.dependent, "1") + self.assertEqual(inst.id, "7546D") + self.assertEqual(inst.identifier[0].system, "http://xyz.com/codes/identifier") + self.assertEqual(inst.identifier[0].value, "AB98761") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2012-05-23").datetime) - self.assertEqual(inst.period.end.as_json(), "2012-05-23") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-05-23").datetime) - self.assertEqual(inst.period.start.as_json(), "2011-05-23") + self.assertEqual(inst.network, "5") + self.assertEqual(inst.order, 2) + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2012-03-17").datetime) + self.assertEqual(inst.period.end.as_json(), "2012-03-17") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-03-17").datetime) + self.assertEqual(inst.period.start.as_json(), "2011-03-17") self.assertEqual(inst.relationship.coding[0].code, "self") self.assertEqual(inst.status, "active") + self.assertEqual(inst.subscriberId, "AB9876") self.assertEqual(inst.text.div, "
A human-readable rendering of the coverage
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "EHCPOL") @@ -140,7 +129,7 @@ def implCoverage3(self, inst): self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") def testCoverage4(self): - inst = self.instantiate_from("coverage-example-2.json") + inst = self.instantiate_from("coverage-example.json") self.assertIsNotNone(inst, "Must have instantiated a Coverage instance") self.implCoverage4(inst) @@ -150,44 +139,55 @@ def testCoverage4(self): self.implCoverage4(inst2) def implCoverage4(self, inst): - self.assertEqual(inst.class_fhir[0].name, "Western Airlines") + self.assertEqual(inst.class_fhir[0].name, "Corporate Baker's Inc. Local #35") self.assertEqual(inst.class_fhir[0].type.coding[0].code, "group") self.assertEqual(inst.class_fhir[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[0].value, "WESTAIR") - self.assertEqual(inst.class_fhir[1].name, "Full Coverage: Medical, Dental, Pharmacy, Vision, EHC") - self.assertEqual(inst.class_fhir[1].type.coding[0].code, "plan") + self.assertEqual(inst.class_fhir[0].value, "CB135") + self.assertEqual(inst.class_fhir[1].name, "Trainee Part-time Benefits") + self.assertEqual(inst.class_fhir[1].type.coding[0].code, "subgroup") self.assertEqual(inst.class_fhir[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[1].value, "BG4352") - self.assertEqual(inst.class_fhir[2].name, "Platinum") - self.assertEqual(inst.class_fhir[2].type.coding[0].code, "subplan") + self.assertEqual(inst.class_fhir[1].value, "123") + self.assertEqual(inst.class_fhir[2].name, "Full Coverage: Medical, Dental, Pharmacy, Vision, EHC") + self.assertEqual(inst.class_fhir[2].type.coding[0].code, "plan") self.assertEqual(inst.class_fhir[2].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") - self.assertEqual(inst.class_fhir[2].value, "D15C9") - self.assertEqual(inst.costToBeneficiary[0].exception[0].period.end.datetime, FHIRDateTime("2018-12-31").datetime) - self.assertEqual(inst.costToBeneficiary[0].exception[0].period.end.as_json(), "2018-12-31") - self.assertEqual(inst.costToBeneficiary[0].exception[0].period.start.datetime, FHIRDateTime("2018-01-01").datetime) - self.assertEqual(inst.costToBeneficiary[0].exception[0].period.start.as_json(), "2018-01-01") - self.assertEqual(inst.costToBeneficiary[0].exception[0].type.coding[0].code, "retired") - self.assertEqual(inst.costToBeneficiary[0].exception[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-coverage-financial-exception") - self.assertEqual(inst.costToBeneficiary[0].type.coding[0].code, "gpvisit") - self.assertEqual(inst.costToBeneficiary[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-copay-type") - self.assertEqual(inst.costToBeneficiary[0].valueMoney.currency, "USD") - self.assertEqual(inst.costToBeneficiary[0].valueMoney.value, 20.0) - self.assertEqual(inst.dependent, "1") - self.assertEqual(inst.id, "7546D") - self.assertEqual(inst.identifier[0].system, "http://xyz.com/codes/identifier") - self.assertEqual(inst.identifier[0].value, "AB98761") + self.assertEqual(inst.class_fhir[2].value, "B37FC") + self.assertEqual(inst.class_fhir[3].name, "Includes afterlife benefits") + self.assertEqual(inst.class_fhir[3].type.coding[0].code, "subplan") + self.assertEqual(inst.class_fhir[3].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[3].value, "P7") + self.assertEqual(inst.class_fhir[4].name, "Silver: Family Plan spouse only") + self.assertEqual(inst.class_fhir[4].type.coding[0].code, "class") + self.assertEqual(inst.class_fhir[4].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[4].value, "SILVER") + self.assertEqual(inst.class_fhir[5].name, "Low deductable, max $20 copay") + self.assertEqual(inst.class_fhir[5].type.coding[0].code, "subclass") + self.assertEqual(inst.class_fhir[5].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[5].value, "Tier2") + self.assertEqual(inst.class_fhir[6].type.coding[0].code, "sequence") + self.assertEqual(inst.class_fhir[6].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[6].value, "9") + self.assertEqual(inst.class_fhir[7].type.coding[0].code, "rxid") + self.assertEqual(inst.class_fhir[7].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[7].value, "MDF12345") + self.assertEqual(inst.class_fhir[8].type.coding[0].code, "rxbin") + self.assertEqual(inst.class_fhir[8].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[8].value, "987654") + self.assertEqual(inst.class_fhir[9].type.coding[0].code, "rxgroup") + self.assertEqual(inst.class_fhir[9].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/coverage-class") + self.assertEqual(inst.class_fhir[9].value, "M35PT") + self.assertEqual(inst.dependent, "0") + self.assertEqual(inst.id, "9876B1") + self.assertEqual(inst.identifier[0].system, "http://benefitsinc.com/certificate") + self.assertEqual(inst.identifier[0].value, "12345") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.network, "5") - self.assertEqual(inst.order, 2) - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2012-03-17").datetime) - self.assertEqual(inst.period.end.as_json(), "2012-03-17") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-03-17").datetime) - self.assertEqual(inst.period.start.as_json(), "2011-03-17") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2012-05-23").datetime) + self.assertEqual(inst.period.end.as_json(), "2012-05-23") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2011-05-23").datetime) + self.assertEqual(inst.period.start.as_json(), "2011-05-23") self.assertEqual(inst.relationship.coding[0].code, "self") self.assertEqual(inst.status, "active") - self.assertEqual(inst.subscriberId, "AB9876") self.assertEqual(inst.text.div, "
A human-readable rendering of the coverage
") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type.coding[0].code, "EHCPOL") diff --git a/tests/models/coverageeligibilityresponse_test.py b/tests/models/coverageeligibilityresponse_test.py index 548fc33c..1cc18428 100644 --- a/tests/models/coverageeligibilityresponse_test.py +++ b/tests/models/coverageeligibilityresponse_test.py @@ -47,7 +47,7 @@ def implCoverageEligibilityResponse1(self, inst): self.assertEqual(inst.text.status, "generated") def testCoverageEligibilityResponse2(self): - inst = self.instantiate_from("coverageeligibilityresponse-example-benefits.json") + inst = self.instantiate_from("coverageeligibilityresponse-example-error.json") self.assertIsNotNone(inst, "Must have instantiated a CoverageEligibilityResponse instance") self.implCoverageEligibilityResponse2(inst) @@ -57,17 +57,52 @@ def testCoverageEligibilityResponse2(self): self.implCoverageEligibilityResponse2(inst2) def implCoverageEligibilityResponse2(self, inst): - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-09-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-09-16") + self.assertEqual(inst.disposition, "Eligibiliy request could not be processed, please address errors before submitting.") + self.assertEqual(inst.error[0].code.coding[0].code, "a001") + self.assertEqual(inst.error[0].code.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-error") + self.assertEqual(inst.form.coding[0].code, "ELRSP/2017/01") + self.assertEqual(inst.form.coding[0].system, "http://national.org/form") + self.assertEqual(inst.id, "E2503") + self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/coverageeligibilityresponse") + self.assertEqual(inst.identifier[0].value, "8812343") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.outcome, "error") + self.assertEqual(inst.purpose[0], "validation") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "
A human-readable rendering of the CoverageEligibilityResponse.
") + self.assertEqual(inst.text.status, "generated") + + def testCoverageEligibilityResponse3(self): + inst = self.instantiate_from("coverageeligibilityresponse-example-benefits-2.json") + self.assertIsNotNone(inst, "Must have instantiated a CoverageEligibilityResponse instance") + self.implCoverageEligibilityResponse3(inst) + + js = inst.as_json() + self.assertEqual("CoverageEligibilityResponse", js["resourceType"]) + inst2 = coverageeligibilityresponse.CoverageEligibilityResponse(js) + self.implCoverageEligibilityResponse3(inst2) + + def implCoverageEligibilityResponse3(self, inst): + self.assertEqual(inst.contained[0].id, "coverage-1") + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-09-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-09-16") self.assertEqual(inst.disposition, "Policy is currently in-force.") - self.assertEqual(inst.id, "E2501") + self.assertEqual(inst.form.coding[0].code, "ELRSP/2017/01") + self.assertEqual(inst.form.coding[0].system, "http://national.org/form") + self.assertEqual(inst.id, "E2502") self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/coverageeligibilityresponse") - self.assertEqual(inst.identifier[0].value, "881234") + self.assertEqual(inst.identifier[0].value, "8812342") self.assertTrue(inst.insurance[0].inforce) - self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.currency, "USD") self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.value, 500000) self.assertEqual(inst.insurance[0].item[0].benefit[0].type.coding[0].code, "benefit") - self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[0].benefit[0].usedMoney.currency, "USD") + self.assertEqual(inst.insurance[0].item[0].benefit[0].usedMoney.value, 3748.0) + self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.currency, "USD") self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.value, 100) self.assertEqual(inst.insurance[0].item[0].benefit[1].type.coding[0].code, "copay-maximum") self.assertEqual(inst.insurance[0].item[0].benefit[2].allowedUnsignedInt, 20) @@ -81,7 +116,7 @@ def implCoverageEligibilityResponse2(self, inst): self.assertEqual(inst.insurance[0].item[0].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[0].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[0].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.currency, "USD") self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.value, 15000) self.assertEqual(inst.insurance[0].item[1].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[1].category.coding[0].code, "69") @@ -93,7 +128,7 @@ def implCoverageEligibilityResponse2(self, inst): self.assertEqual(inst.insurance[0].item[1].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[1].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[1].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.currency, "USD") self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.value, 2000) self.assertEqual(inst.insurance[0].item[2].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[2].category.coding[0].code, "F3") @@ -105,71 +140,44 @@ def implCoverageEligibilityResponse2(self, inst): self.assertEqual(inst.insurance[0].item[2].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[2].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[2].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[3].benefit[0].allowedMoney.currency, "SAR") - self.assertEqual(inst.insurance[0].item[3].benefit[0].allowedMoney.value, 400) - self.assertEqual(inst.insurance[0].item[3].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[3].category.coding[0].code, "F6") self.assertEqual(inst.insurance[0].item[3].category.coding[0].display, "Vision Coverage") self.assertEqual(inst.insurance[0].item[3].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-benefitcategory") - self.assertEqual(inst.insurance[0].item[3].network.coding[0].code, "in") - self.assertEqual(inst.insurance[0].item[3].network.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-network") - self.assertEqual(inst.insurance[0].item[3].term.coding[0].code, "annual") - self.assertEqual(inst.insurance[0].item[3].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") - self.assertEqual(inst.insurance[0].item[3].unit.coding[0].code, "individual") - self.assertEqual(inst.insurance[0].item[3].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[4].benefit[0].allowedString, "shared") - self.assertEqual(inst.insurance[0].item[4].benefit[0].type.coding[0].code, "room") - self.assertEqual(inst.insurance[0].item[4].benefit[1].allowedMoney.currency, "SAR") - self.assertEqual(inst.insurance[0].item[4].benefit[1].allowedMoney.value, 600) - self.assertEqual(inst.insurance[0].item[4].benefit[1].type.coding[0].code, "benefit") - self.assertEqual(inst.insurance[0].item[4].category.coding[0].code, "49") - self.assertEqual(inst.insurance[0].item[4].category.coding[0].display, "Hospital Room and Board") - self.assertEqual(inst.insurance[0].item[4].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-benefitcategory") - self.assertEqual(inst.insurance[0].item[4].network.coding[0].code, "in") - self.assertEqual(inst.insurance[0].item[4].network.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-network") - self.assertEqual(inst.insurance[0].item[4].term.coding[0].code, "day") - self.assertEqual(inst.insurance[0].item[4].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") - self.assertEqual(inst.insurance[0].item[4].unit.coding[0].code, "individual") - self.assertEqual(inst.insurance[0].item[4].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") + self.assertEqual(inst.insurance[0].item[3].description, "Vision products and services such as exams, glasses and contact lenses.") + self.assertTrue(inst.insurance[0].item[3].excluded) + self.assertEqual(inst.insurance[0].item[3].name, "Vision") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "complete") self.assertEqual(inst.purpose[0], "validation") self.assertEqual(inst.purpose[1], "benefits") - self.assertEqual(inst.servicedDate.date, FHIRDate("2014-09-17").date) - self.assertEqual(inst.servicedDate.as_json(), "2014-09-17") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.div, "
A human-readable rendering of the CoverageEligibilityResponse.
") self.assertEqual(inst.text.status, "generated") - def testCoverageEligibilityResponse3(self): - inst = self.instantiate_from("coverageeligibilityresponse-example-benefits-2.json") + def testCoverageEligibilityResponse4(self): + inst = self.instantiate_from("coverageeligibilityresponse-example-benefits.json") self.assertIsNotNone(inst, "Must have instantiated a CoverageEligibilityResponse instance") - self.implCoverageEligibilityResponse3(inst) + self.implCoverageEligibilityResponse4(inst) js = inst.as_json() self.assertEqual("CoverageEligibilityResponse", js["resourceType"]) inst2 = coverageeligibilityresponse.CoverageEligibilityResponse(js) - self.implCoverageEligibilityResponse3(inst2) + self.implCoverageEligibilityResponse4(inst2) - def implCoverageEligibilityResponse3(self, inst): - self.assertEqual(inst.contained[0].id, "coverage-1") - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-09-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-09-16") + def implCoverageEligibilityResponse4(self, inst): + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") self.assertEqual(inst.disposition, "Policy is currently in-force.") - self.assertEqual(inst.form.coding[0].code, "ELRSP/2017/01") - self.assertEqual(inst.form.coding[0].system, "http://national.org/form") - self.assertEqual(inst.id, "E2502") + self.assertEqual(inst.id, "E2501") self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/coverageeligibilityresponse") - self.assertEqual(inst.identifier[0].value, "8812342") + self.assertEqual(inst.identifier[0].value, "881234") self.assertTrue(inst.insurance[0].inforce) - self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.currency, "USD") + self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.currency, "SAR") self.assertEqual(inst.insurance[0].item[0].benefit[0].allowedMoney.value, 500000) self.assertEqual(inst.insurance[0].item[0].benefit[0].type.coding[0].code, "benefit") - self.assertEqual(inst.insurance[0].item[0].benefit[0].usedMoney.currency, "USD") - self.assertEqual(inst.insurance[0].item[0].benefit[0].usedMoney.value, 3748.0) - self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.currency, "USD") + self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.currency, "SAR") self.assertEqual(inst.insurance[0].item[0].benefit[1].allowedMoney.value, 100) self.assertEqual(inst.insurance[0].item[0].benefit[1].type.coding[0].code, "copay-maximum") self.assertEqual(inst.insurance[0].item[0].benefit[2].allowedUnsignedInt, 20) @@ -183,7 +191,7 @@ def implCoverageEligibilityResponse3(self, inst): self.assertEqual(inst.insurance[0].item[0].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[0].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[0].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.currency, "USD") + self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.currency, "SAR") self.assertEqual(inst.insurance[0].item[1].benefit[0].allowedMoney.value, 15000) self.assertEqual(inst.insurance[0].item[1].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[1].category.coding[0].code, "69") @@ -195,7 +203,7 @@ def implCoverageEligibilityResponse3(self, inst): self.assertEqual(inst.insurance[0].item[1].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[1].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[1].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") - self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.currency, "USD") + self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.currency, "SAR") self.assertEqual(inst.insurance[0].item[2].benefit[0].allowedMoney.value, 2000) self.assertEqual(inst.insurance[0].item[2].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[2].category.coding[0].code, "F3") @@ -207,48 +215,40 @@ def implCoverageEligibilityResponse3(self, inst): self.assertEqual(inst.insurance[0].item[2].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") self.assertEqual(inst.insurance[0].item[2].unit.coding[0].code, "individual") self.assertEqual(inst.insurance[0].item[2].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") + self.assertEqual(inst.insurance[0].item[3].benefit[0].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[3].benefit[0].allowedMoney.value, 400) + self.assertEqual(inst.insurance[0].item[3].benefit[0].type.coding[0].code, "benefit") self.assertEqual(inst.insurance[0].item[3].category.coding[0].code, "F6") self.assertEqual(inst.insurance[0].item[3].category.coding[0].display, "Vision Coverage") self.assertEqual(inst.insurance[0].item[3].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-benefitcategory") - self.assertEqual(inst.insurance[0].item[3].description, "Vision products and services such as exams, glasses and contact lenses.") - self.assertTrue(inst.insurance[0].item[3].excluded) - self.assertEqual(inst.insurance[0].item[3].name, "Vision") + self.assertEqual(inst.insurance[0].item[3].network.coding[0].code, "in") + self.assertEqual(inst.insurance[0].item[3].network.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-network") + self.assertEqual(inst.insurance[0].item[3].term.coding[0].code, "annual") + self.assertEqual(inst.insurance[0].item[3].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") + self.assertEqual(inst.insurance[0].item[3].unit.coding[0].code, "individual") + self.assertEqual(inst.insurance[0].item[3].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") + self.assertEqual(inst.insurance[0].item[4].benefit[0].allowedString, "shared") + self.assertEqual(inst.insurance[0].item[4].benefit[0].type.coding[0].code, "room") + self.assertEqual(inst.insurance[0].item[4].benefit[1].allowedMoney.currency, "SAR") + self.assertEqual(inst.insurance[0].item[4].benefit[1].allowedMoney.value, 600) + self.assertEqual(inst.insurance[0].item[4].benefit[1].type.coding[0].code, "benefit") + self.assertEqual(inst.insurance[0].item[4].category.coding[0].code, "49") + self.assertEqual(inst.insurance[0].item[4].category.coding[0].display, "Hospital Room and Board") + self.assertEqual(inst.insurance[0].item[4].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-benefitcategory") + self.assertEqual(inst.insurance[0].item[4].network.coding[0].code, "in") + self.assertEqual(inst.insurance[0].item[4].network.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-network") + self.assertEqual(inst.insurance[0].item[4].term.coding[0].code, "day") + self.assertEqual(inst.insurance[0].item[4].term.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-term") + self.assertEqual(inst.insurance[0].item[4].unit.coding[0].code, "individual") + self.assertEqual(inst.insurance[0].item[4].unit.coding[0].system, "http://terminology.hl7.org/CodeSystem/benefit-unit") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome, "complete") self.assertEqual(inst.purpose[0], "validation") self.assertEqual(inst.purpose[1], "benefits") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
A human-readable rendering of the CoverageEligibilityResponse.
") - self.assertEqual(inst.text.status, "generated") - - def testCoverageEligibilityResponse4(self): - inst = self.instantiate_from("coverageeligibilityresponse-example-error.json") - self.assertIsNotNone(inst, "Must have instantiated a CoverageEligibilityResponse instance") - self.implCoverageEligibilityResponse4(inst) - - js = inst.as_json() - self.assertEqual("CoverageEligibilityResponse", js["resourceType"]) - inst2 = coverageeligibilityresponse.CoverageEligibilityResponse(js) - self.implCoverageEligibilityResponse4(inst2) - - def implCoverageEligibilityResponse4(self, inst): - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-09-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-09-16") - self.assertEqual(inst.disposition, "Eligibiliy request could not be processed, please address errors before submitting.") - self.assertEqual(inst.error[0].code.coding[0].code, "a001") - self.assertEqual(inst.error[0].code.coding[0].system, "http://terminology.hl7.org/CodeSystem/adjudication-error") - self.assertEqual(inst.form.coding[0].code, "ELRSP/2017/01") - self.assertEqual(inst.form.coding[0].system, "http://national.org/form") - self.assertEqual(inst.id, "E2503") - self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/coverageeligibilityresponse") - self.assertEqual(inst.identifier[0].value, "8812343") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "error") - self.assertEqual(inst.purpose[0], "validation") + self.assertEqual(inst.servicedDate.date, FHIRDate("2014-09-17").date) + self.assertEqual(inst.servicedDate.as_json(), "2014-09-17") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.div, "
A human-readable rendering of the CoverageEligibilityResponse.
") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/detectedissue_test.py b/tests/models/detectedissue_test.py index 9ca6cf99..261e76f5 100644 --- a/tests/models/detectedissue_test.py +++ b/tests/models/detectedissue_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return detectedissue.DetectedIssue(js) def testDetectedIssue1(self): - inst = self.instantiate_from("detectedissue-example-lab.json") + inst = self.instantiate_from("detectedissue-example-allergy.json") self.assertIsNotNone(inst, "Must have instantiated a DetectedIssue instance") self.implDetectedIssue1(inst) @@ -30,7 +30,7 @@ def testDetectedIssue1(self): self.implDetectedIssue1(inst2) def implDetectedIssue1(self, inst): - self.assertEqual(inst.id, "lab") + self.assertEqual(inst.id, "allergy") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -39,7 +39,7 @@ def implDetectedIssue1(self, inst): self.assertEqual(inst.text.status, "generated") def testDetectedIssue2(self): - inst = self.instantiate_from("detectedissue-example-allergy.json") + inst = self.instantiate_from("detectedissue-example-dup.json") self.assertIsNotNone(inst, "Must have instantiated a DetectedIssue instance") self.implDetectedIssue2(inst) @@ -49,25 +49,6 @@ def testDetectedIssue2(self): self.implDetectedIssue2(inst2) def implDetectedIssue2(self, inst): - self.assertEqual(inst.id, "allergy") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "final") - self.assertEqual(inst.text.div, "
[Put rendering here]
") - self.assertEqual(inst.text.status, "generated") - - def testDetectedIssue3(self): - inst = self.instantiate_from("detectedissue-example-dup.json") - self.assertIsNotNone(inst, "Must have instantiated a DetectedIssue instance") - self.implDetectedIssue3(inst) - - js = inst.as_json() - self.assertEqual("DetectedIssue", js["resourceType"]) - inst2 = detectedissue.DetectedIssue(js) - self.implDetectedIssue3(inst2) - - def implDetectedIssue3(self, inst): self.assertEqual(inst.code.coding[0].code, "DUPTHPY") self.assertEqual(inst.code.coding[0].display, "Duplicate Therapy Alert") self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") @@ -85,17 +66,17 @@ def implDetectedIssue3(self, inst): self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - def testDetectedIssue4(self): + def testDetectedIssue3(self): inst = self.instantiate_from("detectedissue-example.json") self.assertIsNotNone(inst, "Must have instantiated a DetectedIssue instance") - self.implDetectedIssue4(inst) + self.implDetectedIssue3(inst) js = inst.as_json() self.assertEqual("DetectedIssue", js["resourceType"]) inst2 = detectedissue.DetectedIssue(js) - self.implDetectedIssue4(inst2) + self.implDetectedIssue3(inst2) - def implDetectedIssue4(self, inst): + def implDetectedIssue3(self, inst): self.assertEqual(inst.code.coding[0].code, "DRG") self.assertEqual(inst.code.coding[0].display, "Drug Interaction Alert") self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") @@ -114,4 +95,23 @@ def implDetectedIssue4(self, inst): self.assertEqual(inst.severity, "high") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") + + def testDetectedIssue4(self): + inst = self.instantiate_from("detectedissue-example-lab.json") + self.assertIsNotNone(inst, "Must have instantiated a DetectedIssue instance") + self.implDetectedIssue4(inst) + + js = inst.as_json() + self.assertEqual("DetectedIssue", js["resourceType"]) + inst2 = detectedissue.DetectedIssue(js) + self.implDetectedIssue4(inst2) + + def implDetectedIssue4(self, inst): + self.assertEqual(inst.id, "lab") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.status, "final") + self.assertEqual(inst.text.div, "
[Put rendering here]
") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/device_test.py b/tests/models/device_test.py index e9732d57..e40fb773 100644 --- a/tests/models/device_test.py +++ b/tests/models/device_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return device.Device(js) def testDevice1(self): - inst = self.instantiate_from("device-example.json") + inst = self.instantiate_from("device-example-f001-feedingtube.json") self.assertIsNotNone(inst, "Must have instantiated a Device instance") self.implDevice1(inst) @@ -30,17 +30,18 @@ def testDevice1(self): self.implDevice1(inst2) def implDevice1(self, inst): - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "http://goodcare.org/devices/id") - self.assertEqual(inst.identifier[0].value, "345675") + self.assertEqual(inst.id, "f001") + self.assertEqual(inst.identifier[0].system, "http:/goodhealthhospital/identifier/devices") + self.assertEqual(inst.identifier[0].value, "12345") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.text.div, "

Generated Narrative with Details

id: example

identifier: 345675

") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "

Generated Narrative with Details

id: f001

identifier: 12345

status: active

") self.assertEqual(inst.text.status, "generated") def testDevice2(self): - inst = self.instantiate_from("device-example-f001-feedingtube.json") + inst = self.instantiate_from("device-example.json") self.assertIsNotNone(inst, "Must have instantiated a Device instance") self.implDevice2(inst) @@ -50,13 +51,12 @@ def testDevice2(self): self.implDevice2(inst2) def implDevice2(self, inst): - self.assertEqual(inst.id, "f001") - self.assertEqual(inst.identifier[0].system, "http:/goodhealthhospital/identifier/devices") - self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "http://goodcare.org/devices/id") + self.assertEqual(inst.identifier[0].value, "345675") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "

Generated Narrative with Details

id: f001

identifier: 12345

status: active

") + self.assertEqual(inst.text.div, "

Generated Narrative with Details

id: example

identifier: 345675

") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/diagnosticreport_test.py b/tests/models/diagnosticreport_test.py index 2e9bc62b..85dff46f 100644 --- a/tests/models/diagnosticreport_test.py +++ b/tests/models/diagnosticreport_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return diagnosticreport.DiagnosticReport(js) def testDiagnosticReport1(self): - inst = self.instantiate_from("diagnosticreport-example-pgx.json") + inst = self.instantiate_from("diagnosticreport-example-ultrasound.json") self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") self.implDiagnosticReport1(inst) @@ -30,30 +30,30 @@ def testDiagnosticReport1(self): self.implDiagnosticReport1(inst2) def implDiagnosticReport1(self, inst): - self.assertEqual(inst.code.coding[0].code, "PGxReport") - self.assertEqual(inst.code.coding[0].display, "Pharmacogenetics Report") - self.assertEqual(inst.code.coding[0].system, "https://system/PGxReport") - self.assertEqual(inst.code.text, "Pharmacogenetics Report") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2016-10-15T12:34:56+11:00").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2016-10-15T12:34:56+11:00") - self.assertEqual(inst.id, "example-pgx") - self.assertEqual(inst.issued.datetime, FHIRInstant("2016-10-20T14:00:05+11:00").datetime) - self.assertEqual(inst.issued.as_json(), "2016-10-20T14:00:05+11:00") + self.assertEqual(inst.category[0].coding[0].code, "394914008") + self.assertEqual(inst.category[0].coding[0].display, "Radiology") + self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].coding[1].code, "RAD") + self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v2-0074") + self.assertEqual(inst.code.coding[0].code, "45036003") + self.assertEqual(inst.code.coding[0].display, "Ultrasonography of abdomen") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.text, "Abdominal Ultrasound") + self.assertEqual(inst.conclusion, "Unremarkable study") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2012-12-01T12:00:00+01:00").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "2012-12-01T12:00:00+01:00") + self.assertEqual(inst.id, "ultrasound") + self.assertEqual(inst.issued.datetime, FHIRInstant("2012-12-01T12:00:00+01:00").datetime) + self.assertEqual(inst.issued.as_json(), "2012-12-01T12:00:00+01:00") + self.assertEqual(inst.media[0].comment, "A comment about the image") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.presentedForm[0].contentType, "application/pdf") - self.assertEqual(inst.presentedForm[0].creation.datetime, FHIRDateTime("2016-10-20T20:00:00+11:00").datetime) - self.assertEqual(inst.presentedForm[0].creation.as_json(), "2016-10-20T20:00:00+11:00") - self.assertEqual(inst.presentedForm[0].data, "cGRmSW5CYXNlNjRCaW5hcnk=") - self.assertEqual(inst.presentedForm[0].hash, "571ef9c5655840f324e679072ed62b1b95eef8a0") - self.assertEqual(inst.presentedForm[0].language, "en") - self.assertEqual(inst.presentedForm[0].title, "Pharmacogenetics Report") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") def testDiagnosticReport2(self): - inst = self.instantiate_from("diagnosticreport-example-papsmear.json") + inst = self.instantiate_from("diagnosticreport-example-f201-brainct.json") self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") self.implDiagnosticReport2(inst) @@ -63,30 +63,6 @@ def testDiagnosticReport2(self): self.implDiagnosticReport2(inst2) def implDiagnosticReport2(self, inst): - self.assertEqual(inst.code.coding[0].code, "47527-7") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2013-02-11T10:33:33+11:00").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2013-02-11T10:33:33+11:00") - self.assertEqual(inst.id, "pap") - self.assertEqual(inst.issued.datetime, FHIRInstant("2013-02-13T11:45:33+11:00").datetime) - self.assertEqual(inst.issued.as_json(), "2013-02-13T11:45:33+11:00") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "final") - self.assertEqual(inst.text.status, "additional") - - def testDiagnosticReport3(self): - inst = self.instantiate_from("diagnosticreport-example-f201-brainct.json") - self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") - self.implDiagnosticReport3(inst) - - js = inst.as_json() - self.assertEqual("DiagnosticReport", js["resourceType"]) - inst2 = diagnosticreport.DiagnosticReport(js) - self.implDiagnosticReport3(inst2) - - def implDiagnosticReport3(self, inst): self.assertEqual(inst.category[0].coding[0].code, "394914008") self.assertEqual(inst.category[0].coding[0].display, "Radiology") self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") @@ -111,50 +87,41 @@ def implDiagnosticReport3(self, inst): self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - def testDiagnosticReport4(self): - inst = self.instantiate_from("diagnosticreport-example-ultrasound.json") + def testDiagnosticReport3(self): + inst = self.instantiate_from("diagnosticreport-example-papsmear.json") self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") - self.implDiagnosticReport4(inst) + self.implDiagnosticReport3(inst) js = inst.as_json() self.assertEqual("DiagnosticReport", js["resourceType"]) inst2 = diagnosticreport.DiagnosticReport(js) - self.implDiagnosticReport4(inst2) + self.implDiagnosticReport3(inst2) - def implDiagnosticReport4(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "394914008") - self.assertEqual(inst.category[0].coding[0].display, "Radiology") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].coding[1].code, "RAD") - self.assertEqual(inst.category[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v2-0074") - self.assertEqual(inst.code.coding[0].code, "45036003") - self.assertEqual(inst.code.coding[0].display, "Ultrasonography of abdomen") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Abdominal Ultrasound") - self.assertEqual(inst.conclusion, "Unremarkable study") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2012-12-01T12:00:00+01:00").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2012-12-01T12:00:00+01:00") - self.assertEqual(inst.id, "ultrasound") - self.assertEqual(inst.issued.datetime, FHIRInstant("2012-12-01T12:00:00+01:00").datetime) - self.assertEqual(inst.issued.as_json(), "2012-12-01T12:00:00+01:00") - self.assertEqual(inst.media[0].comment, "A comment about the image") + def implDiagnosticReport3(self, inst): + self.assertEqual(inst.code.coding[0].code, "47527-7") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2013-02-11T10:33:33+11:00").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "2013-02-11T10:33:33+11:00") + self.assertEqual(inst.id, "pap") + self.assertEqual(inst.issued.datetime, FHIRInstant("2013-02-13T11:45:33+11:00").datetime) + self.assertEqual(inst.issued.as_json(), "2013-02-13T11:45:33+11:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") - self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.text.status, "additional") - def testDiagnosticReport5(self): + def testDiagnosticReport4(self): inst = self.instantiate_from("diagnosticreport-example-gingival-mass.json") self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") - self.implDiagnosticReport5(inst) + self.implDiagnosticReport4(inst) js = inst.as_json() self.assertEqual("DiagnosticReport", js["resourceType"]) inst2 = diagnosticreport.DiagnosticReport(js) - self.implDiagnosticReport5(inst2) + self.implDiagnosticReport4(inst2) - def implDiagnosticReport5(self, inst): + def implDiagnosticReport4(self, inst): self.assertEqual(inst.category[0].coding[0].code, "PAT") self.assertEqual(inst.category[0].coding[0].display, "Pathology (gross & histopath, not surgical)") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0074") @@ -179,6 +146,39 @@ def implDiagnosticReport5(self, inst): self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") + def testDiagnosticReport5(self): + inst = self.instantiate_from("diagnosticreport-example-pgx.json") + self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") + self.implDiagnosticReport5(inst) + + js = inst.as_json() + self.assertEqual("DiagnosticReport", js["resourceType"]) + inst2 = diagnosticreport.DiagnosticReport(js) + self.implDiagnosticReport5(inst2) + + def implDiagnosticReport5(self, inst): + self.assertEqual(inst.code.coding[0].code, "PGxReport") + self.assertEqual(inst.code.coding[0].display, "Pharmacogenetics Report") + self.assertEqual(inst.code.coding[0].system, "https://system/PGxReport") + self.assertEqual(inst.code.text, "Pharmacogenetics Report") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2016-10-15T12:34:56+11:00").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "2016-10-15T12:34:56+11:00") + self.assertEqual(inst.id, "example-pgx") + self.assertEqual(inst.issued.datetime, FHIRInstant("2016-10-20T14:00:05+11:00").datetime) + self.assertEqual(inst.issued.as_json(), "2016-10-20T14:00:05+11:00") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.presentedForm[0].contentType, "application/pdf") + self.assertEqual(inst.presentedForm[0].creation.datetime, FHIRDateTime("2016-10-20T20:00:00+11:00").datetime) + self.assertEqual(inst.presentedForm[0].creation.as_json(), "2016-10-20T20:00:00+11:00") + self.assertEqual(inst.presentedForm[0].data, "cGRmSW5CYXNlNjRCaW5hcnk=") + self.assertEqual(inst.presentedForm[0].hash, "571ef9c5655840f324e679072ed62b1b95eef8a0") + self.assertEqual(inst.presentedForm[0].language, "en") + self.assertEqual(inst.presentedForm[0].title, "Pharmacogenetics Report") + self.assertEqual(inst.status, "final") + self.assertEqual(inst.text.status, "generated") + def testDiagnosticReport6(self): inst = self.instantiate_from("diagnosticreport-example-dxa.json") self.assertIsNotNone(inst, "Must have instantiated a DiagnosticReport instance") diff --git a/tests/models/encounter_test.py b/tests/models/encounter_test.py index 9209e2e4..c4d7f2bc 100644 --- a/tests/models/encounter_test.py +++ b/tests/models/encounter_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return encounter.Encounter(js) def testEncounter1(self): - inst = self.instantiate_from("encounter-example-f001-heart.json") + inst = self.instantiate_from("encounter-example-home.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter1(inst) @@ -30,43 +30,33 @@ def testEncounter1(self): self.implEncounter1(inst2) def implEncounter1(self, inst): - self.assertEqual(inst.class_fhir.code, "AMB") - self.assertEqual(inst.class_fhir.display, "ambulatory") + self.assertEqual(inst.class_fhir.code, "HH") + self.assertEqual(inst.class_fhir.display, "home health") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "305956004") - self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "Referral by physician") - self.assertEqual(inst.hospitalization.admitSource.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].code, "306689006") - self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].display, "Discharge to home") - self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.hospitalization.preAdmissionIdentifier.system, "http://www.amc.nl/zorgportal/identifiers/pre-admissions") - self.assertEqual(inst.hospitalization.preAdmissionIdentifier.use, "official") - self.assertEqual(inst.hospitalization.preAdmissionIdentifier.value, "93042") - self.assertEqual(inst.id, "f001") - self.assertEqual(inst.identifier[0].system, "http://www.amc.nl/zorgportal/identifiers/visits") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "v1451") - self.assertEqual(inst.length.code, "min") - self.assertEqual(inst.length.system, "http://unitsofmeasure.org") - self.assertEqual(inst.length.unit, "min") - self.assertEqual(inst.length.value, 140) + self.assertEqual(inst.contained[0].id, "home") + self.assertEqual(inst.id, "home") + self.assertEqual(inst.location[0].period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) + self.assertEqual(inst.location[0].period.end.as_json(), "2015-01-17T16:30:00+10:00") + self.assertEqual(inst.location[0].period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) + self.assertEqual(inst.location[0].period.start.as_json(), "2015-01-17T16:00:00+10:00") + self.assertEqual(inst.location[0].status, "completed") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority.coding[0].code, "310361003") - self.assertEqual(inst.priority.coding[0].display, "Non-urgent cardiological admission") - self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.reasonCode[0].coding[0].code, "34068001") - self.assertEqual(inst.reasonCode[0].coding[0].display, "Heart valve replacement") - self.assertEqual(inst.reasonCode[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.participant[0].period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) + self.assertEqual(inst.participant[0].period.end.as_json(), "2015-01-17T16:30:00+10:00") + self.assertEqual(inst.participant[0].period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) + self.assertEqual(inst.participant[0].period.start.as_json(), "2015-01-17T16:00:00+10:00") + self.assertEqual(inst.period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) + self.assertEqual(inst.period.end.as_json(), "2015-01-17T16:30:00+10:00") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) + self.assertEqual(inst.period.start.as_json(), "2015-01-17T16:00:00+10:00") self.assertEqual(inst.status, "finished") + self.assertEqual(inst.text.div, "
Encounter with patient @example who is at home
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "270427003") - self.assertEqual(inst.type[0].coding[0].display, "Patient-initiated encounter") - self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") def testEncounter2(self): - inst = self.instantiate_from("encounter-example-f202-20130128.json") + inst = self.instantiate_from("encounter-example-f201-20130404.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter2(inst) @@ -79,32 +69,20 @@ def implEncounter2(self, inst): self.assertEqual(inst.class_fhir.code, "AMB") self.assertEqual(inst.class_fhir.display, "ambulatory") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.diagnosis[0].rank, 2) - self.assertEqual(inst.diagnosis[0].use.coding[0].code, "AD") - self.assertEqual(inst.diagnosis[0].use.coding[0].display, "Admission diagnosis") - self.assertEqual(inst.diagnosis[0].use.coding[0].system, "http://terminology.hl7.org/CodeSystem/diagnosis-role") - self.assertEqual(inst.diagnosis[1].rank, 1) - self.assertEqual(inst.diagnosis[1].use.coding[0].code, "CC") - self.assertEqual(inst.diagnosis[1].use.coding[0].display, "Chief complaint") - self.assertEqual(inst.diagnosis[1].use.coding[0].system, "http://terminology.hl7.org/CodeSystem/diagnosis-role") - self.assertEqual(inst.id, "f202") + self.assertEqual(inst.id, "f201") self.assertEqual(inst.identifier[0].use, "temp") - self.assertEqual(inst.identifier[0].value, "Encounter_Roel_20130128") - self.assertEqual(inst.length.code, "min") - self.assertEqual(inst.length.system, "http://unitsofmeasure.org") - self.assertEqual(inst.length.unit, "minutes") - self.assertEqual(inst.length.value, 56) + self.assertEqual(inst.identifier[0].value, "Encounter_Roel_20130404") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority.coding[0].code, "103391001") - self.assertEqual(inst.priority.coding[0].display, "Urgent") + self.assertEqual(inst.priority.coding[0].code, "17621005") + self.assertEqual(inst.priority.coding[0].display, "Normal") self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.reasonCode[0].text, "The patient is treated for a tumor.") + self.assertEqual(inst.reasonCode[0].text, "The patient had fever peaks over the last couple of days. He is worried about these peaks.") self.assertEqual(inst.status, "finished") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "367336001") - self.assertEqual(inst.type[0].coding[0].display, "Chemotherapy") + self.assertEqual(inst.type[0].coding[0].code, "11429006") + self.assertEqual(inst.type[0].coding[0].display, "Consultation") self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") def testEncounter3(self): @@ -154,7 +132,7 @@ def implEncounter3(self, inst): self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") def testEncounter4(self): - inst = self.instantiate_from("encounter-example-emerg.json") + inst = self.instantiate_from("encounter-example.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter4(inst) @@ -164,82 +142,19 @@ def testEncounter4(self): self.implEncounter4(inst2) def implEncounter4(self, inst): - self.assertEqual(inst.classHistory[0].class_fhir.code, "EMER") - self.assertEqual(inst.classHistory[0].class_fhir.display, "emergency") - self.assertEqual(inst.classHistory[0].class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.classHistory[0].period.end.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) - self.assertEqual(inst.classHistory[0].period.end.as_json(), "2017-02-01T09:27:00+10:00") - self.assertEqual(inst.classHistory[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) - self.assertEqual(inst.classHistory[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") - self.assertEqual(inst.classHistory[1].class_fhir.code, "IMP") - self.assertEqual(inst.classHistory[1].class_fhir.display, "inpatient encounter") - self.assertEqual(inst.classHistory[1].class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.classHistory[1].period.start.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) - self.assertEqual(inst.classHistory[1].period.start.as_json(), "2017-02-01T09:27:00+10:00") self.assertEqual(inst.class_fhir.code, "IMP") self.assertEqual(inst.class_fhir.display, "inpatient encounter") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "emd") - self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "From accident/emergency department") - self.assertEqual(inst.hospitalization.admitSource.coding[0].system, "http://terminology.hl7.org/CodeSystem/admit-source") - self.assertEqual(inst.id, "emerg") - self.assertEqual(inst.location[0].period.end.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) - self.assertEqual(inst.location[0].period.end.as_json(), "2017-02-01T08:45:00+10:00") - self.assertEqual(inst.location[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) - self.assertEqual(inst.location[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") - self.assertEqual(inst.location[0].status, "active") - self.assertEqual(inst.location[1].period.end.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) - self.assertEqual(inst.location[1].period.end.as_json(), "2017-02-01T09:27:00+10:00") - self.assertEqual(inst.location[1].period.start.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) - self.assertEqual(inst.location[1].period.start.as_json(), "2017-02-01T08:45:00+10:00") - self.assertEqual(inst.location[1].status, "active") - self.assertEqual(inst.location[2].period.end.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) - self.assertEqual(inst.location[2].period.end.as_json(), "2017-02-01T12:15:00+10:00") - self.assertEqual(inst.location[2].period.start.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) - self.assertEqual(inst.location[2].period.start.as_json(), "2017-02-01T09:27:00+10:00") - self.assertEqual(inst.location[2].status, "active") - self.assertEqual(inst.location[3].period.end.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) - self.assertEqual(inst.location[3].period.end.as_json(), "2017-02-01T12:45:00+10:00") - self.assertEqual(inst.location[3].period.start.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) - self.assertEqual(inst.location[3].period.start.as_json(), "2017-02-01T12:15:00+10:00") - self.assertEqual(inst.location[3].status, "reserved") - self.assertEqual(inst.location[4].period.start.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) - self.assertEqual(inst.location[4].period.start.as_json(), "2017-02-01T12:45:00+10:00") - self.assertEqual(inst.location[4].status, "active") + self.assertEqual(inst.id, "example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) - self.assertEqual(inst.period.start.as_json(), "2017-02-01T07:15:00+10:00") self.assertEqual(inst.status, "in-progress") - self.assertEqual(inst.statusHistory[0].period.end.datetime, FHIRDateTime("2017-02-01T07:35:00+10:00").datetime) - self.assertEqual(inst.statusHistory[0].period.end.as_json(), "2017-02-01T07:35:00+10:00") - self.assertEqual(inst.statusHistory[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) - self.assertEqual(inst.statusHistory[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") - self.assertEqual(inst.statusHistory[0].status, "arrived") - self.assertEqual(inst.statusHistory[1].period.end.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) - self.assertEqual(inst.statusHistory[1].period.end.as_json(), "2017-02-01T08:45:00+10:00") - self.assertEqual(inst.statusHistory[1].period.start.datetime, FHIRDateTime("2017-02-01T07:35:00+10:00").datetime) - self.assertEqual(inst.statusHistory[1].period.start.as_json(), "2017-02-01T07:35:00+10:00") - self.assertEqual(inst.statusHistory[1].status, "triaged") - self.assertEqual(inst.statusHistory[2].period.end.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) - self.assertEqual(inst.statusHistory[2].period.end.as_json(), "2017-02-01T12:15:00+10:00") - self.assertEqual(inst.statusHistory[2].period.start.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) - self.assertEqual(inst.statusHistory[2].period.start.as_json(), "2017-02-01T08:45:00+10:00") - self.assertEqual(inst.statusHistory[2].status, "in-progress") - self.assertEqual(inst.statusHistory[3].period.end.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) - self.assertEqual(inst.statusHistory[3].period.end.as_json(), "2017-02-01T12:45:00+10:00") - self.assertEqual(inst.statusHistory[3].period.start.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) - self.assertEqual(inst.statusHistory[3].period.start.as_json(), "2017-02-01T12:15:00+10:00") - self.assertEqual(inst.statusHistory[3].status, "onleave") - self.assertEqual(inst.statusHistory[4].period.start.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) - self.assertEqual(inst.statusHistory[4].period.start.as_json(), "2017-02-01T12:45:00+10:00") - self.assertEqual(inst.statusHistory[4].status, "in-progress") - self.assertEqual(inst.text.div, "
Emergency visit that escalated into inpatient patient @example
") + self.assertEqual(inst.text.div, "
Encounter with patient @example
") self.assertEqual(inst.text.status, "generated") def testEncounter5(self): - inst = self.instantiate_from("encounter-example-home.json") + inst = self.instantiate_from("encounter-example-f002-lung.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter5(inst) @@ -249,69 +164,52 @@ def testEncounter5(self): self.implEncounter5(inst2) def implEncounter5(self, inst): - self.assertEqual(inst.class_fhir.code, "HH") - self.assertEqual(inst.class_fhir.display, "home health") - self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.contained[0].id, "home") - self.assertEqual(inst.id, "home") - self.assertEqual(inst.location[0].period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) - self.assertEqual(inst.location[0].period.end.as_json(), "2015-01-17T16:30:00+10:00") - self.assertEqual(inst.location[0].period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) - self.assertEqual(inst.location[0].period.start.as_json(), "2015-01-17T16:00:00+10:00") - self.assertEqual(inst.location[0].status, "completed") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.participant[0].period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) - self.assertEqual(inst.participant[0].period.end.as_json(), "2015-01-17T16:30:00+10:00") - self.assertEqual(inst.participant[0].period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) - self.assertEqual(inst.participant[0].period.start.as_json(), "2015-01-17T16:00:00+10:00") - self.assertEqual(inst.period.end.datetime, FHIRDateTime("2015-01-17T16:30:00+10:00").datetime) - self.assertEqual(inst.period.end.as_json(), "2015-01-17T16:30:00+10:00") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2015-01-17T16:00:00+10:00").datetime) - self.assertEqual(inst.period.start.as_json(), "2015-01-17T16:00:00+10:00") - self.assertEqual(inst.status, "finished") - self.assertEqual(inst.text.div, "
Encounter with patient @example who is at home
") - self.assertEqual(inst.text.status, "generated") - - def testEncounter6(self): - inst = self.instantiate_from("encounter-example-xcda.json") - self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") - self.implEncounter6(inst) - - js = inst.as_json() - self.assertEqual("Encounter", js["resourceType"]) - inst2 = encounter.Encounter(js) - self.implEncounter6(inst2) - - def implEncounter6(self, inst): self.assertEqual(inst.class_fhir.code, "AMB") self.assertEqual(inst.class_fhir.display, "ambulatory") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.id, "xcda") - self.assertEqual(inst.identifier[0].system, "http://healthcare.example.org/identifiers/enocunter") + self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "305997006") + self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "Referral by radiologist") + self.assertEqual(inst.hospitalization.admitSource.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].code, "306689006") + self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].display, "Discharge to home") + self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.hospitalization.preAdmissionIdentifier.system, "http://www.bmc.nl/zorgportal/identifiers/pre-admissions") + self.assertEqual(inst.hospitalization.preAdmissionIdentifier.use, "official") + self.assertEqual(inst.hospitalization.preAdmissionIdentifier.value, "98682") + self.assertEqual(inst.id, "f002") + self.assertEqual(inst.identifier[0].system, "http://www.bmc.nl/zorgportal/identifiers/encounters") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "1234213.52345873") + self.assertEqual(inst.identifier[0].value, "v3251") + self.assertEqual(inst.length.code, "min") + self.assertEqual(inst.length.system, "http://unitsofmeasure.org") + self.assertEqual(inst.length.unit, "min") + self.assertEqual(inst.length.value, 140) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.reasonCode[0].coding[0].code, "T-D8200") - self.assertEqual(inst.reasonCode[0].coding[0].display, "Arm") - self.assertEqual(inst.reasonCode[0].coding[0].system, "http://ihe.net/xds/connectathon/eventCodes") + self.assertEqual(inst.priority.coding[0].code, "103391001") + self.assertEqual(inst.priority.coding[0].display, "Urgent") + self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.reasonCode[0].coding[0].code, "34068001") + self.assertEqual(inst.reasonCode[0].coding[0].display, "Partial lobectomy of lung") + self.assertEqual(inst.reasonCode[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.status, "finished") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type[0].coding[0].code, "270427003") + self.assertEqual(inst.type[0].coding[0].display, "Patient-initiated encounter") + self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") - def testEncounter7(self): + def testEncounter6(self): inst = self.instantiate_from("encounter-example-f203-20130311.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") - self.implEncounter7(inst) + self.implEncounter6(inst) js = inst.as_json() self.assertEqual("Encounter", js["resourceType"]) inst2 = encounter.Encounter(js) - self.implEncounter7(inst2) + self.implEncounter6(inst2) - def implEncounter7(self, inst): + def implEncounter6(self, inst): self.assertEqual(inst.class_fhir.code, "IMP") self.assertEqual(inst.class_fhir.display, "inpatient encounter") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") @@ -360,8 +258,35 @@ def implEncounter7(self, inst): self.assertEqual(inst.type[0].coding[0].display, "Inpatient stay for nine days") self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") + def testEncounter7(self): + inst = self.instantiate_from("encounter-example-xcda.json") + self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") + self.implEncounter7(inst) + + js = inst.as_json() + self.assertEqual("Encounter", js["resourceType"]) + inst2 = encounter.Encounter(js) + self.implEncounter7(inst2) + + def implEncounter7(self, inst): + self.assertEqual(inst.class_fhir.code, "AMB") + self.assertEqual(inst.class_fhir.display, "ambulatory") + self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.id, "xcda") + self.assertEqual(inst.identifier[0].system, "http://healthcare.example.org/identifiers/enocunter") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "1234213.52345873") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.reasonCode[0].coding[0].code, "T-D8200") + self.assertEqual(inst.reasonCode[0].coding[0].display, "Arm") + self.assertEqual(inst.reasonCode[0].coding[0].system, "http://ihe.net/xds/connectathon/eventCodes") + self.assertEqual(inst.status, "finished") + self.assertEqual(inst.text.status, "generated") + def testEncounter8(self): - inst = self.instantiate_from("encounter-example.json") + inst = self.instantiate_from("encounter-example-f202-20130128.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter8(inst) @@ -371,19 +296,39 @@ def testEncounter8(self): self.implEncounter8(inst2) def implEncounter8(self, inst): - self.assertEqual(inst.class_fhir.code, "IMP") - self.assertEqual(inst.class_fhir.display, "inpatient encounter") + self.assertEqual(inst.class_fhir.code, "AMB") + self.assertEqual(inst.class_fhir.display, "ambulatory") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.id, "example") + self.assertEqual(inst.diagnosis[0].rank, 2) + self.assertEqual(inst.diagnosis[0].use.coding[0].code, "AD") + self.assertEqual(inst.diagnosis[0].use.coding[0].display, "Admission diagnosis") + self.assertEqual(inst.diagnosis[0].use.coding[0].system, "http://terminology.hl7.org/CodeSystem/diagnosis-role") + self.assertEqual(inst.diagnosis[1].rank, 1) + self.assertEqual(inst.diagnosis[1].use.coding[0].code, "CC") + self.assertEqual(inst.diagnosis[1].use.coding[0].display, "Chief complaint") + self.assertEqual(inst.diagnosis[1].use.coding[0].system, "http://terminology.hl7.org/CodeSystem/diagnosis-role") + self.assertEqual(inst.id, "f202") + self.assertEqual(inst.identifier[0].use, "temp") + self.assertEqual(inst.identifier[0].value, "Encounter_Roel_20130128") + self.assertEqual(inst.length.code, "min") + self.assertEqual(inst.length.system, "http://unitsofmeasure.org") + self.assertEqual(inst.length.unit, "minutes") + self.assertEqual(inst.length.value, 56) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "in-progress") - self.assertEqual(inst.text.div, "
Encounter with patient @example
") + self.assertEqual(inst.priority.coding[0].code, "103391001") + self.assertEqual(inst.priority.coding[0].display, "Urgent") + self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.reasonCode[0].text, "The patient is treated for a tumor.") + self.assertEqual(inst.status, "finished") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type[0].coding[0].code, "367336001") + self.assertEqual(inst.type[0].coding[0].display, "Chemotherapy") + self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") def testEncounter9(self): - inst = self.instantiate_from("encounter-example-f201-20130404.json") + inst = self.instantiate_from("encounter-example-emerg.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter9(inst) @@ -393,27 +338,82 @@ def testEncounter9(self): self.implEncounter9(inst2) def implEncounter9(self, inst): - self.assertEqual(inst.class_fhir.code, "AMB") - self.assertEqual(inst.class_fhir.display, "ambulatory") + self.assertEqual(inst.classHistory[0].class_fhir.code, "EMER") + self.assertEqual(inst.classHistory[0].class_fhir.display, "emergency") + self.assertEqual(inst.classHistory[0].class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.classHistory[0].period.end.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) + self.assertEqual(inst.classHistory[0].period.end.as_json(), "2017-02-01T09:27:00+10:00") + self.assertEqual(inst.classHistory[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) + self.assertEqual(inst.classHistory[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") + self.assertEqual(inst.classHistory[1].class_fhir.code, "IMP") + self.assertEqual(inst.classHistory[1].class_fhir.display, "inpatient encounter") + self.assertEqual(inst.classHistory[1].class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.classHistory[1].period.start.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) + self.assertEqual(inst.classHistory[1].period.start.as_json(), "2017-02-01T09:27:00+10:00") + self.assertEqual(inst.class_fhir.code, "IMP") + self.assertEqual(inst.class_fhir.display, "inpatient encounter") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.identifier[0].use, "temp") - self.assertEqual(inst.identifier[0].value, "Encounter_Roel_20130404") + self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "emd") + self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "From accident/emergency department") + self.assertEqual(inst.hospitalization.admitSource.coding[0].system, "http://terminology.hl7.org/CodeSystem/admit-source") + self.assertEqual(inst.id, "emerg") + self.assertEqual(inst.location[0].period.end.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) + self.assertEqual(inst.location[0].period.end.as_json(), "2017-02-01T08:45:00+10:00") + self.assertEqual(inst.location[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) + self.assertEqual(inst.location[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") + self.assertEqual(inst.location[0].status, "active") + self.assertEqual(inst.location[1].period.end.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) + self.assertEqual(inst.location[1].period.end.as_json(), "2017-02-01T09:27:00+10:00") + self.assertEqual(inst.location[1].period.start.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) + self.assertEqual(inst.location[1].period.start.as_json(), "2017-02-01T08:45:00+10:00") + self.assertEqual(inst.location[1].status, "active") + self.assertEqual(inst.location[2].period.end.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) + self.assertEqual(inst.location[2].period.end.as_json(), "2017-02-01T12:15:00+10:00") + self.assertEqual(inst.location[2].period.start.datetime, FHIRDateTime("2017-02-01T09:27:00+10:00").datetime) + self.assertEqual(inst.location[2].period.start.as_json(), "2017-02-01T09:27:00+10:00") + self.assertEqual(inst.location[2].status, "active") + self.assertEqual(inst.location[3].period.end.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) + self.assertEqual(inst.location[3].period.end.as_json(), "2017-02-01T12:45:00+10:00") + self.assertEqual(inst.location[3].period.start.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) + self.assertEqual(inst.location[3].period.start.as_json(), "2017-02-01T12:15:00+10:00") + self.assertEqual(inst.location[3].status, "reserved") + self.assertEqual(inst.location[4].period.start.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) + self.assertEqual(inst.location[4].period.start.as_json(), "2017-02-01T12:45:00+10:00") + self.assertEqual(inst.location[4].status, "active") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority.coding[0].code, "17621005") - self.assertEqual(inst.priority.coding[0].display, "Normal") - self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.reasonCode[0].text, "The patient had fever peaks over the last couple of days. He is worried about these peaks.") - self.assertEqual(inst.status, "finished") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) + self.assertEqual(inst.period.start.as_json(), "2017-02-01T07:15:00+10:00") + self.assertEqual(inst.status, "in-progress") + self.assertEqual(inst.statusHistory[0].period.end.datetime, FHIRDateTime("2017-02-01T07:35:00+10:00").datetime) + self.assertEqual(inst.statusHistory[0].period.end.as_json(), "2017-02-01T07:35:00+10:00") + self.assertEqual(inst.statusHistory[0].period.start.datetime, FHIRDateTime("2017-02-01T07:15:00+10:00").datetime) + self.assertEqual(inst.statusHistory[0].period.start.as_json(), "2017-02-01T07:15:00+10:00") + self.assertEqual(inst.statusHistory[0].status, "arrived") + self.assertEqual(inst.statusHistory[1].period.end.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) + self.assertEqual(inst.statusHistory[1].period.end.as_json(), "2017-02-01T08:45:00+10:00") + self.assertEqual(inst.statusHistory[1].period.start.datetime, FHIRDateTime("2017-02-01T07:35:00+10:00").datetime) + self.assertEqual(inst.statusHistory[1].period.start.as_json(), "2017-02-01T07:35:00+10:00") + self.assertEqual(inst.statusHistory[1].status, "triaged") + self.assertEqual(inst.statusHistory[2].period.end.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) + self.assertEqual(inst.statusHistory[2].period.end.as_json(), "2017-02-01T12:15:00+10:00") + self.assertEqual(inst.statusHistory[2].period.start.datetime, FHIRDateTime("2017-02-01T08:45:00+10:00").datetime) + self.assertEqual(inst.statusHistory[2].period.start.as_json(), "2017-02-01T08:45:00+10:00") + self.assertEqual(inst.statusHistory[2].status, "in-progress") + self.assertEqual(inst.statusHistory[3].period.end.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) + self.assertEqual(inst.statusHistory[3].period.end.as_json(), "2017-02-01T12:45:00+10:00") + self.assertEqual(inst.statusHistory[3].period.start.datetime, FHIRDateTime("2017-02-01T12:15:00+10:00").datetime) + self.assertEqual(inst.statusHistory[3].period.start.as_json(), "2017-02-01T12:15:00+10:00") + self.assertEqual(inst.statusHistory[3].status, "onleave") + self.assertEqual(inst.statusHistory[4].period.start.datetime, FHIRDateTime("2017-02-01T12:45:00+10:00").datetime) + self.assertEqual(inst.statusHistory[4].period.start.as_json(), "2017-02-01T12:45:00+10:00") + self.assertEqual(inst.statusHistory[4].status, "in-progress") + self.assertEqual(inst.text.div, "
Emergency visit that escalated into inpatient patient @example
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "11429006") - self.assertEqual(inst.type[0].coding[0].display, "Consultation") - self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") def testEncounter10(self): - inst = self.instantiate_from("encounter-example-f002-lung.json") + inst = self.instantiate_from("encounter-example-f001-heart.json") self.assertIsNotNone(inst, "Must have instantiated a Encounter instance") self.implEncounter10(inst) @@ -426,19 +426,19 @@ def implEncounter10(self, inst): self.assertEqual(inst.class_fhir.code, "AMB") self.assertEqual(inst.class_fhir.display, "ambulatory") self.assertEqual(inst.class_fhir.system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "305997006") - self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "Referral by radiologist") + self.assertEqual(inst.hospitalization.admitSource.coding[0].code, "305956004") + self.assertEqual(inst.hospitalization.admitSource.coding[0].display, "Referral by physician") self.assertEqual(inst.hospitalization.admitSource.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].code, "306689006") self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].display, "Discharge to home") self.assertEqual(inst.hospitalization.dischargeDisposition.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.hospitalization.preAdmissionIdentifier.system, "http://www.bmc.nl/zorgportal/identifiers/pre-admissions") + self.assertEqual(inst.hospitalization.preAdmissionIdentifier.system, "http://www.amc.nl/zorgportal/identifiers/pre-admissions") self.assertEqual(inst.hospitalization.preAdmissionIdentifier.use, "official") - self.assertEqual(inst.hospitalization.preAdmissionIdentifier.value, "98682") - self.assertEqual(inst.id, "f002") - self.assertEqual(inst.identifier[0].system, "http://www.bmc.nl/zorgportal/identifiers/encounters") + self.assertEqual(inst.hospitalization.preAdmissionIdentifier.value, "93042") + self.assertEqual(inst.id, "f001") + self.assertEqual(inst.identifier[0].system, "http://www.amc.nl/zorgportal/identifiers/visits") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "v3251") + self.assertEqual(inst.identifier[0].value, "v1451") self.assertEqual(inst.length.code, "min") self.assertEqual(inst.length.system, "http://unitsofmeasure.org") self.assertEqual(inst.length.unit, "min") @@ -446,11 +446,11 @@ def implEncounter10(self, inst): self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority.coding[0].code, "103391001") - self.assertEqual(inst.priority.coding[0].display, "Urgent") + self.assertEqual(inst.priority.coding[0].code, "310361003") + self.assertEqual(inst.priority.coding[0].display, "Non-urgent cardiological admission") self.assertEqual(inst.priority.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.reasonCode[0].coding[0].code, "34068001") - self.assertEqual(inst.reasonCode[0].coding[0].display, "Partial lobectomy of lung") + self.assertEqual(inst.reasonCode[0].coding[0].display, "Heart valve replacement") self.assertEqual(inst.reasonCode[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.status, "finished") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/endpoint_test.py b/tests/models/endpoint_test.py index 360fdd4b..ba1fd95a 100644 --- a/tests/models/endpoint_test.py +++ b/tests/models/endpoint_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return endpoint.Endpoint(js) def testEndpoint1(self): - inst = self.instantiate_from("endpoint-example.json") + inst = self.instantiate_from("endpoint-example-iid.json") self.assertIsNotNone(inst, "Must have instantiated a Endpoint instance") self.implEndpoint1(inst) @@ -30,30 +30,20 @@ def testEndpoint1(self): self.implEndpoint1(inst2) def implEndpoint1(self, inst): - self.assertEqual(inst.address, "http://fhir3.healthintersections.com.au/open/CarePlan") - self.assertEqual(inst.connectionType.code, "hl7-fhir-rest") + self.assertEqual(inst.address, "https://pacs.hospital.org/IHEInvokeImageDisplay") + self.assertEqual(inst.connectionType.code, "ihe-iid") self.assertEqual(inst.connectionType.system, "http://terminology.hl7.org/CodeSystem/endpoint-connection-type") - self.assertEqual(inst.contact[0].system, "email") - self.assertEqual(inst.contact[0].use, "work") - self.assertEqual(inst.contact[0].value, "endpointmanager@example.org") - self.assertEqual(inst.header[0], "bearer-code BASGS534s4") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "http://example.org/enpoint-identifier") - self.assertEqual(inst.identifier[0].value, "epcp12") + self.assertEqual(inst.id, "example-iid") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Health Intersections CarePlan Hub") - self.assertEqual(inst.payloadMimeType[0], "application/fhir+xml") - self.assertEqual(inst.payloadType[0].coding[0].code, "CarePlan") - self.assertEqual(inst.payloadType[0].coding[0].system, "http://hl7.org/fhir/resource-types") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2014-09-01").datetime) - self.assertEqual(inst.period.start.as_json(), "2014-09-01") + self.assertEqual(inst.name, "PACS Hospital Invoke Image Display endpoint") + self.assertEqual(inst.payloadType[0].text, "DICOM IID") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") def testEndpoint2(self): - inst = self.instantiate_from("endpoint-example-iid.json") + inst = self.instantiate_from("endpoint-example-direct.json") self.assertIsNotNone(inst, "Must have instantiated a Endpoint instance") self.implEndpoint2(inst) @@ -63,15 +53,15 @@ def testEndpoint2(self): self.implEndpoint2(inst2) def implEndpoint2(self, inst): - self.assertEqual(inst.address, "https://pacs.hospital.org/IHEInvokeImageDisplay") - self.assertEqual(inst.connectionType.code, "ihe-iid") - self.assertEqual(inst.connectionType.system, "http://terminology.hl7.org/CodeSystem/endpoint-connection-type") - self.assertEqual(inst.id, "example-iid") + self.assertEqual(inst.address, "mailto:MARTIN.SMIETANKA@directnppes.com") + self.assertEqual(inst.connectionType.code, "direct-project") + self.assertEqual(inst.id, "direct-endpoint") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "PACS Hospital Invoke Image Display endpoint") - self.assertEqual(inst.payloadType[0].text, "DICOM IID") + self.assertEqual(inst.name, "MARTIN SMIETANKA") + self.assertEqual(inst.payloadType[0].coding[0].code, "urn:hl7-org:sdwg:ccda-structuredBody:1.1") + self.assertEqual(inst.payloadType[0].coding[0].system, "urn:oid:1.3.6.1.4.1.19376.1.2.3") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") @@ -100,7 +90,7 @@ def implEndpoint3(self, inst): self.assertEqual(inst.text.status, "generated") def testEndpoint4(self): - inst = self.instantiate_from("endpoint-example-direct.json") + inst = self.instantiate_from("endpoint-example.json") self.assertIsNotNone(inst, "Must have instantiated a Endpoint instance") self.implEndpoint4(inst) @@ -110,15 +100,25 @@ def testEndpoint4(self): self.implEndpoint4(inst2) def implEndpoint4(self, inst): - self.assertEqual(inst.address, "mailto:MARTIN.SMIETANKA@directnppes.com") - self.assertEqual(inst.connectionType.code, "direct-project") - self.assertEqual(inst.id, "direct-endpoint") + self.assertEqual(inst.address, "http://fhir3.healthintersections.com.au/open/CarePlan") + self.assertEqual(inst.connectionType.code, "hl7-fhir-rest") + self.assertEqual(inst.connectionType.system, "http://terminology.hl7.org/CodeSystem/endpoint-connection-type") + self.assertEqual(inst.contact[0].system, "email") + self.assertEqual(inst.contact[0].use, "work") + self.assertEqual(inst.contact[0].value, "endpointmanager@example.org") + self.assertEqual(inst.header[0], "bearer-code BASGS534s4") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "http://example.org/enpoint-identifier") + self.assertEqual(inst.identifier[0].value, "epcp12") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "MARTIN SMIETANKA") - self.assertEqual(inst.payloadType[0].coding[0].code, "urn:hl7-org:sdwg:ccda-structuredBody:1.1") - self.assertEqual(inst.payloadType[0].coding[0].system, "urn:oid:1.3.6.1.4.1.19376.1.2.3") + self.assertEqual(inst.name, "Health Intersections CarePlan Hub") + self.assertEqual(inst.payloadMimeType[0], "application/fhir+xml") + self.assertEqual(inst.payloadType[0].coding[0].code, "CarePlan") + self.assertEqual(inst.payloadType[0].coding[0].system, "http://hl7.org/fhir/resource-types") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2014-09-01").datetime) + self.assertEqual(inst.period.start.as_json(), "2014-09-01") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/explanationofbenefit_test.py b/tests/models/explanationofbenefit_test.py index 16d2674d..6203792e 100644 --- a/tests/models/explanationofbenefit_test.py +++ b/tests/models/explanationofbenefit_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return explanationofbenefit.ExplanationOfBenefit(js) def testExplanationOfBenefit1(self): - inst = self.instantiate_from("explanationofbenefit-example-2.json") + inst = self.instantiate_from("explanationofbenefit-example.json") self.assertIsNotNone(inst, "Must have instantiated a ExplanationOfBenefit instance") self.implExplanationOfBenefit1(inst) @@ -30,79 +30,6 @@ def testExplanationOfBenefit1(self): self.implExplanationOfBenefit1(inst2) def implExplanationOfBenefit1(self, inst): - self.assertEqual(inst.accident.date.date, FHIRDate("2014-02-14").date) - self.assertEqual(inst.accident.date.as_json(), "2014-02-14") - self.assertEqual(inst.accident.type.coding[0].code, "SPT") - self.assertEqual(inst.accident.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") - self.assertEqual(inst.billablePeriod.end.datetime, FHIRDateTime("2014-03-01").datetime) - self.assertEqual(inst.billablePeriod.end.as_json(), "2014-03-01") - self.assertEqual(inst.billablePeriod.start.datetime, FHIRDateTime("2014-02-01").datetime) - self.assertEqual(inst.billablePeriod.start.as_json(), "2014-02-01") - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.created.as_json(), "2014-08-16") - self.assertEqual(inst.disposition, "Could not process.") - self.assertEqual(inst.formCode.coding[0].code, "2") - self.assertEqual(inst.formCode.coding[0].system, "http://terminology.hl7.org/CodeSystem/forms-codes") - self.assertEqual(inst.id, "EB3501") - self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/explanationofbenefit") - self.assertEqual(inst.identifier[0].value, "error-1") - self.assertTrue(inst.insurance[0].focal) - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome, "error") - self.assertEqual(inst.precedence, 2) - self.assertEqual(inst.procedure[0].date.datetime, FHIRDateTime("2014-02-14").datetime) - self.assertEqual(inst.procedure[0].date.as_json(), "2014-02-14") - self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].code, "123001") - self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/ex-icd-10-procedures") - self.assertEqual(inst.procedure[0].sequence, 1) - self.assertEqual(inst.processNote[0].language.coding[0].code, "en-CA") - self.assertEqual(inst.processNote[0].language.coding[0].system, "urn:ietf:bcp:47") - self.assertEqual(inst.processNote[0].number, 1) - self.assertEqual(inst.processNote[0].text, "Invalid claim") - self.assertEqual(inst.processNote[0].type, "display") - self.assertEqual(inst.related[0].reference.system, "http://www.BenefitsInc.com/case-number") - self.assertEqual(inst.related[0].reference.value, "23-56Tu-XX-47-20150M14") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.subType.coding[0].code, "emergency") - self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") - self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "employmentimpacted") - self.assertEqual(inst.supportingInfo[0].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") - self.assertEqual(inst.supportingInfo[0].sequence, 1) - self.assertEqual(inst.supportingInfo[0].timingPeriod.end.datetime, FHIRDateTime("2014-02-28").datetime) - self.assertEqual(inst.supportingInfo[0].timingPeriod.end.as_json(), "2014-02-28") - self.assertEqual(inst.supportingInfo[0].timingPeriod.start.datetime, FHIRDateTime("2014-02-14").datetime) - self.assertEqual(inst.supportingInfo[0].timingPeriod.start.as_json(), "2014-02-14") - self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "hospitalized") - self.assertEqual(inst.supportingInfo[1].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") - self.assertEqual(inst.supportingInfo[1].sequence, 2) - self.assertEqual(inst.supportingInfo[1].timingPeriod.end.datetime, FHIRDateTime("2014-02-16").datetime) - self.assertEqual(inst.supportingInfo[1].timingPeriod.end.as_json(), "2014-02-16") - self.assertEqual(inst.supportingInfo[1].timingPeriod.start.datetime, FHIRDateTime("2014-02-14").datetime) - self.assertEqual(inst.supportingInfo[1].timingPeriod.start.as_json(), "2014-02-14") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.total[0].amount.currency, "USD") - self.assertEqual(inst.total[0].amount.value, 2478.57) - self.assertEqual(inst.total[0].category.coding[0].code, "submitted") - self.assertEqual(inst.total[1].amount.currency, "USD") - self.assertEqual(inst.total[1].amount.value, 0.0) - self.assertEqual(inst.total[1].category.coding[0].code, "benefit") - self.assertEqual(inst.type.coding[0].code, "oral") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") - self.assertEqual(inst.use, "claim") - - def testExplanationOfBenefit2(self): - inst = self.instantiate_from("explanationofbenefit-example.json") - self.assertIsNotNone(inst, "Must have instantiated a ExplanationOfBenefit instance") - self.implExplanationOfBenefit2(inst) - - js = inst.as_json() - self.assertEqual("ExplanationOfBenefit", js["resourceType"]) - inst2 = explanationofbenefit.ExplanationOfBenefit(js) - self.implExplanationOfBenefit2(inst2) - - def implExplanationOfBenefit2(self, inst): self.assertEqual(inst.careTeam[0].sequence, 1) self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) self.assertEqual(inst.created.as_json(), "2014-08-16") @@ -179,4 +106,77 @@ def implExplanationOfBenefit2(self, inst): self.assertEqual(inst.type.coding[0].code, "oral") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") self.assertEqual(inst.use, "claim") + + def testExplanationOfBenefit2(self): + inst = self.instantiate_from("explanationofbenefit-example-2.json") + self.assertIsNotNone(inst, "Must have instantiated a ExplanationOfBenefit instance") + self.implExplanationOfBenefit2(inst) + + js = inst.as_json() + self.assertEqual("ExplanationOfBenefit", js["resourceType"]) + inst2 = explanationofbenefit.ExplanationOfBenefit(js) + self.implExplanationOfBenefit2(inst2) + + def implExplanationOfBenefit2(self, inst): + self.assertEqual(inst.accident.date.date, FHIRDate("2014-02-14").date) + self.assertEqual(inst.accident.date.as_json(), "2014-02-14") + self.assertEqual(inst.accident.type.coding[0].code, "SPT") + self.assertEqual(inst.accident.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActCode") + self.assertEqual(inst.billablePeriod.end.datetime, FHIRDateTime("2014-03-01").datetime) + self.assertEqual(inst.billablePeriod.end.as_json(), "2014-03-01") + self.assertEqual(inst.billablePeriod.start.datetime, FHIRDateTime("2014-02-01").datetime) + self.assertEqual(inst.billablePeriod.start.as_json(), "2014-02-01") + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.created.as_json(), "2014-08-16") + self.assertEqual(inst.disposition, "Could not process.") + self.assertEqual(inst.formCode.coding[0].code, "2") + self.assertEqual(inst.formCode.coding[0].system, "http://terminology.hl7.org/CodeSystem/forms-codes") + self.assertEqual(inst.id, "EB3501") + self.assertEqual(inst.identifier[0].system, "http://www.BenefitsInc.com/fhir/explanationofbenefit") + self.assertEqual(inst.identifier[0].value, "error-1") + self.assertTrue(inst.insurance[0].focal) + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.outcome, "error") + self.assertEqual(inst.precedence, 2) + self.assertEqual(inst.procedure[0].date.datetime, FHIRDateTime("2014-02-14").datetime) + self.assertEqual(inst.procedure[0].date.as_json(), "2014-02-14") + self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].code, "123001") + self.assertEqual(inst.procedure[0].procedureCodeableConcept.coding[0].system, "http://hl7.org/fhir/sid/ex-icd-10-procedures") + self.assertEqual(inst.procedure[0].sequence, 1) + self.assertEqual(inst.processNote[0].language.coding[0].code, "en-CA") + self.assertEqual(inst.processNote[0].language.coding[0].system, "urn:ietf:bcp:47") + self.assertEqual(inst.processNote[0].number, 1) + self.assertEqual(inst.processNote[0].text, "Invalid claim") + self.assertEqual(inst.processNote[0].type, "display") + self.assertEqual(inst.related[0].reference.system, "http://www.BenefitsInc.com/case-number") + self.assertEqual(inst.related[0].reference.value, "23-56Tu-XX-47-20150M14") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.subType.coding[0].code, "emergency") + self.assertEqual(inst.subType.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-claimsubtype") + self.assertEqual(inst.supportingInfo[0].category.coding[0].code, "employmentimpacted") + self.assertEqual(inst.supportingInfo[0].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[0].sequence, 1) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.datetime, FHIRDateTime("2014-02-28").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.end.as_json(), "2014-02-28") + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.datetime, FHIRDateTime("2014-02-14").datetime) + self.assertEqual(inst.supportingInfo[0].timingPeriod.start.as_json(), "2014-02-14") + self.assertEqual(inst.supportingInfo[1].category.coding[0].code, "hospitalized") + self.assertEqual(inst.supportingInfo[1].category.coding[0].system, "http://terminology.hl7.org/CodeSystem/claiminformationcategory") + self.assertEqual(inst.supportingInfo[1].sequence, 2) + self.assertEqual(inst.supportingInfo[1].timingPeriod.end.datetime, FHIRDateTime("2014-02-16").datetime) + self.assertEqual(inst.supportingInfo[1].timingPeriod.end.as_json(), "2014-02-16") + self.assertEqual(inst.supportingInfo[1].timingPeriod.start.datetime, FHIRDateTime("2014-02-14").datetime) + self.assertEqual(inst.supportingInfo[1].timingPeriod.start.as_json(), "2014-02-14") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.total[0].amount.currency, "USD") + self.assertEqual(inst.total[0].amount.value, 2478.57) + self.assertEqual(inst.total[0].category.coding[0].code, "submitted") + self.assertEqual(inst.total[1].amount.currency, "USD") + self.assertEqual(inst.total[1].amount.value, 0.0) + self.assertEqual(inst.total[1].category.coding[0].code, "benefit") + self.assertEqual(inst.type.coding[0].code, "oral") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/claim-type") + self.assertEqual(inst.use, "claim") diff --git a/tests/models/group_test.py b/tests/models/group_test.py index bf763299..754febcf 100644 --- a/tests/models/group_test.py +++ b/tests/models/group_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return group.Group(js) def testGroup1(self): - inst = self.instantiate_from("group-example-herd1.json") + inst = self.instantiate_from("group-example.json") self.assertIsNotNone(inst, "Must have instantiated a Group instance") self.implGroup1(inst) @@ -30,41 +30,6 @@ def testGroup1(self): self.implGroup1(inst2) def implGroup1(self, inst): - self.assertTrue(inst.active) - self.assertTrue(inst.actual) - self.assertEqual(inst.characteristic[0].code.text, "gender") - self.assertFalse(inst.characteristic[0].exclude) - self.assertEqual(inst.characteristic[0].valueCodeableConcept.text, "female") - self.assertEqual(inst.code.coding[0].code, "388393002") - self.assertEqual(inst.code.coding[0].display, "Genus Sus (organism)") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[1].code, "POR") - self.assertEqual(inst.code.coding[1].display, "porcine") - self.assertEqual(inst.code.coding[1].system, "https://www.aphis.usda.gov") - self.assertEqual(inst.code.text, "Porcine") - self.assertEqual(inst.extension[0].url, "http://example.org/fhir/StructureDefinition/owner") - self.assertEqual(inst.id, "herd1") - self.assertEqual(inst.identifier[0].system, "https://vetmed.iastate.edu/vdl") - self.assertEqual(inst.identifier[0].value, "20171120-1234") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Breeding herd") - self.assertEqual(inst.quantity, 2500) - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type, "animal") - - def testGroup2(self): - inst = self.instantiate_from("group-example.json") - self.assertIsNotNone(inst, "Must have instantiated a Group instance") - self.implGroup2(inst) - - js = inst.as_json() - self.assertEqual("Group", js["resourceType"]) - inst2 = group.Group(js) - self.implGroup2(inst2) - - def implGroup2(self, inst): self.assertTrue(inst.actual) self.assertEqual(inst.characteristic[0].code.text, "gender") self.assertFalse(inst.characteristic[0].exclude) @@ -84,17 +49,17 @@ def implGroup2(self, inst): self.assertEqual(inst.text.status, "additional") self.assertEqual(inst.type, "animal") - def testGroup3(self): + def testGroup2(self): inst = self.instantiate_from("group-example-member.json") self.assertIsNotNone(inst, "Must have instantiated a Group instance") - self.implGroup3(inst) + self.implGroup2(inst) js = inst.as_json() self.assertEqual("Group", js["resourceType"]) inst2 = group.Group(js) - self.implGroup3(inst2) + self.implGroup2(inst2) - def implGroup3(self, inst): + def implGroup2(self, inst): self.assertTrue(inst.actual) self.assertEqual(inst.id, "102") self.assertEqual(inst.member[0].period.start.datetime, FHIRDateTime("2014-10-08").datetime) @@ -112,17 +77,17 @@ def implGroup3(self, inst): self.assertEqual(inst.text.status, "additional") self.assertEqual(inst.type, "person") - def testGroup4(self): + def testGroup3(self): inst = self.instantiate_from("group-example-patientlist.json") self.assertIsNotNone(inst, "Must have instantiated a Group instance") - self.implGroup4(inst) + self.implGroup3(inst) js = inst.as_json() self.assertEqual("Group", js["resourceType"]) inst2 = group.Group(js) - self.implGroup4(inst2) + self.implGroup3(inst2) - def implGroup4(self, inst): + def implGroup3(self, inst): self.assertTrue(inst.actual) self.assertEqual(inst.characteristic[0].code.coding[0].code, "attributed-to") self.assertEqual(inst.characteristic[0].code.coding[0].system, "http://example.org") @@ -134,4 +99,39 @@ def implGroup4(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "additional") self.assertEqual(inst.type, "person") + + def testGroup4(self): + inst = self.instantiate_from("group-example-herd1.json") + self.assertIsNotNone(inst, "Must have instantiated a Group instance") + self.implGroup4(inst) + + js = inst.as_json() + self.assertEqual("Group", js["resourceType"]) + inst2 = group.Group(js) + self.implGroup4(inst2) + + def implGroup4(self, inst): + self.assertTrue(inst.active) + self.assertTrue(inst.actual) + self.assertEqual(inst.characteristic[0].code.text, "gender") + self.assertFalse(inst.characteristic[0].exclude) + self.assertEqual(inst.characteristic[0].valueCodeableConcept.text, "female") + self.assertEqual(inst.code.coding[0].code, "388393002") + self.assertEqual(inst.code.coding[0].display, "Genus Sus (organism)") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.coding[1].code, "POR") + self.assertEqual(inst.code.coding[1].display, "porcine") + self.assertEqual(inst.code.coding[1].system, "https://www.aphis.usda.gov") + self.assertEqual(inst.code.text, "Porcine") + self.assertEqual(inst.extension[0].url, "http://example.org/fhir/StructureDefinition/owner") + self.assertEqual(inst.id, "herd1") + self.assertEqual(inst.identifier[0].system, "https://vetmed.iastate.edu/vdl") + self.assertEqual(inst.identifier[0].value, "20171120-1234") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.name, "Breeding herd") + self.assertEqual(inst.quantity, 2500) + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type, "animal") diff --git a/tests/models/imagingstudy_test.py b/tests/models/imagingstudy_test.py index 0afcd1fc..e8b4385f 100644 --- a/tests/models/imagingstudy_test.py +++ b/tests/models/imagingstudy_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return imagingstudy.ImagingStudy(js) def testImagingStudy1(self): - inst = self.instantiate_from("imagingstudy-example.json") + inst = self.instantiate_from("imagingstudy-example-xr.json") self.assertIsNotNone(inst, "Must have instantiated a ImagingStudy instance") self.implImagingStudy1(inst) @@ -30,44 +30,6 @@ def testImagingStudy1(self): self.implImagingStudy1(inst2) def implImagingStudy1(self, inst): - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "urn:dicom:uid") - self.assertEqual(inst.identifier[0].value, "urn:oid:2.16.124.113543.6003.1154777499.30246.19789.3503430045") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.numberOfInstances, 1) - self.assertEqual(inst.numberOfSeries, 1) - self.assertEqual(inst.series[0].bodySite.code, "67734004") - self.assertEqual(inst.series[0].bodySite.display, "Upper Trunk Structure") - self.assertEqual(inst.series[0].bodySite.system, "http://snomed.info/sct") - self.assertEqual(inst.series[0].description, "CT Surview 180") - self.assertEqual(inst.series[0].instance[0].number, 1) - self.assertEqual(inst.series[0].instance[0].sopClass.code, "urn:oid:1.2.840.10008.5.1.4.1.1.2") - self.assertEqual(inst.series[0].instance[0].sopClass.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.series[0].instance[0].uid, "2.16.124.113543.6003.189642796.63084.16748.2599092903") - self.assertEqual(inst.series[0].modality.code, "CT") - self.assertEqual(inst.series[0].modality.system, "http://dicom.nema.org/resources/ontology/DCM") - self.assertEqual(inst.series[0].number, 3) - self.assertEqual(inst.series[0].numberOfInstances, 1) - self.assertEqual(inst.series[0].uid, "2.16.124.113543.6003.2588828330.45298.17418.2723805630") - self.assertEqual(inst.started.datetime, FHIRDateTime("2011-01-01T11:01:20+03:00").datetime) - self.assertEqual(inst.started.as_json(), "2011-01-01T11:01:20+03:00") - self.assertEqual(inst.status, "available") - self.assertEqual(inst.text.div, "
CT Chest. John Smith (MRN: 09236). Accession: W12342398. Performed: 2011-01-01. 3 series, 12 images.
") - self.assertEqual(inst.text.status, "generated") - - def testImagingStudy2(self): - inst = self.instantiate_from("imagingstudy-example-xr.json") - self.assertIsNotNone(inst, "Must have instantiated a ImagingStudy instance") - self.implImagingStudy2(inst) - - js = inst.as_json() - self.assertEqual("ImagingStudy", js["resourceType"]) - inst2 = imagingstudy.ImagingStudy(js) - self.implImagingStudy2(inst2) - - def implImagingStudy2(self, inst): self.assertEqual(inst.id, "example-xr") self.assertEqual(inst.identifier[0].system, "urn:dicom:uid") self.assertEqual(inst.identifier[0].use, "official") @@ -124,4 +86,42 @@ def implImagingStudy2(self, inst): self.assertEqual(inst.status, "available") self.assertEqual(inst.text.div, "
XR Wrist 3+ Views. John Smith (MRN: 09236). Accession: W12342398. Performed: 2017-01-01. 1 series, 2 images.
") self.assertEqual(inst.text.status, "generated") + + def testImagingStudy2(self): + inst = self.instantiate_from("imagingstudy-example.json") + self.assertIsNotNone(inst, "Must have instantiated a ImagingStudy instance") + self.implImagingStudy2(inst) + + js = inst.as_json() + self.assertEqual("ImagingStudy", js["resourceType"]) + inst2 = imagingstudy.ImagingStudy(js) + self.implImagingStudy2(inst2) + + def implImagingStudy2(self, inst): + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "urn:dicom:uid") + self.assertEqual(inst.identifier[0].value, "urn:oid:2.16.124.113543.6003.1154777499.30246.19789.3503430045") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.numberOfInstances, 1) + self.assertEqual(inst.numberOfSeries, 1) + self.assertEqual(inst.series[0].bodySite.code, "67734004") + self.assertEqual(inst.series[0].bodySite.display, "Upper Trunk Structure") + self.assertEqual(inst.series[0].bodySite.system, "http://snomed.info/sct") + self.assertEqual(inst.series[0].description, "CT Surview 180") + self.assertEqual(inst.series[0].instance[0].number, 1) + self.assertEqual(inst.series[0].instance[0].sopClass.code, "urn:oid:1.2.840.10008.5.1.4.1.1.2") + self.assertEqual(inst.series[0].instance[0].sopClass.system, "urn:ietf:rfc:3986") + self.assertEqual(inst.series[0].instance[0].uid, "2.16.124.113543.6003.189642796.63084.16748.2599092903") + self.assertEqual(inst.series[0].modality.code, "CT") + self.assertEqual(inst.series[0].modality.system, "http://dicom.nema.org/resources/ontology/DCM") + self.assertEqual(inst.series[0].number, 3) + self.assertEqual(inst.series[0].numberOfInstances, 1) + self.assertEqual(inst.series[0].uid, "2.16.124.113543.6003.2588828330.45298.17418.2723805630") + self.assertEqual(inst.started.datetime, FHIRDateTime("2011-01-01T11:01:20+03:00").datetime) + self.assertEqual(inst.started.as_json(), "2011-01-01T11:01:20+03:00") + self.assertEqual(inst.status, "available") + self.assertEqual(inst.text.div, "
CT Chest. John Smith (MRN: 09236). Accession: W12342398. Performed: 2011-01-01. 3 series, 12 images.
") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/immunization_test.py b/tests/models/immunization_test.py index 4fae28cf..2995caf0 100644 --- a/tests/models/immunization_test.py +++ b/tests/models/immunization_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return immunization.Immunization(js) def testImmunization1(self): - inst = self.instantiate_from("immunization-example-protocol.json") + inst = self.instantiate_from("immunization-example.json") self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") self.implImmunization1(inst) @@ -33,20 +33,26 @@ def implImmunization1(self, inst): self.assertEqual(inst.doseQuantity.code, "mg") self.assertEqual(inst.doseQuantity.system, "http://unitsofmeasure.org") self.assertEqual(inst.doseQuantity.value, 5) - self.assertEqual(inst.expirationDate.date, FHIRDate("2018-12-15").date) - self.assertEqual(inst.expirationDate.as_json(), "2018-12-15") + self.assertEqual(inst.education[0].documentType, "253088698300010311120702") + self.assertEqual(inst.education[0].presentationDate.datetime, FHIRDateTime("2013-01-10").datetime) + self.assertEqual(inst.education[0].presentationDate.as_json(), "2013-01-10") + self.assertEqual(inst.education[0].publicationDate.datetime, FHIRDateTime("2012-07-02").datetime) + self.assertEqual(inst.education[0].publicationDate.as_json(), "2012-07-02") + self.assertEqual(inst.expirationDate.date, FHIRDate("2015-02-15").date) + self.assertEqual(inst.expirationDate.as_json(), "2015-02-15") self.assertEqual(inst.fundingSource.coding[0].code, "private") self.assertEqual(inst.fundingSource.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-funding-source") - self.assertEqual(inst.id, "protocol") + self.assertEqual(inst.id, "example") self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") - self.assertFalse(inst.isSubpotent) - self.assertEqual(inst.lotNumber, "PT123F") + self.assertTrue(inst.isSubpotent) + self.assertEqual(inst.lotNumber, "AAJN11K") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2018-06-18").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2018-06-18") + self.assertEqual(inst.note[0].text, "Notes on adminstration of vaccine") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2013-01-10").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2013-01-10") self.assertEqual(inst.performer[0].function.coding[0].code, "OP") self.assertEqual(inst.performer[0].function.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0443") self.assertEqual(inst.performer[1].function.coding[0].code, "AP") @@ -54,14 +60,8 @@ def implImmunization1(self, inst): self.assertTrue(inst.primarySource) self.assertEqual(inst.programEligibility[0].coding[0].code, "ineligible") self.assertEqual(inst.programEligibility[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-program-eligibility") - self.assertEqual(inst.protocolApplied[0].doseNumberPositiveInt, 1) - self.assertEqual(inst.protocolApplied[0].series, "2-dose") - self.assertEqual(inst.protocolApplied[0].targetDisease[0].coding[0].code, "40468003") - self.assertEqual(inst.protocolApplied[0].targetDisease[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.protocolApplied[1].doseNumberPositiveInt, 2) - self.assertEqual(inst.protocolApplied[1].series, "3-dose") - self.assertEqual(inst.protocolApplied[1].targetDisease[0].coding[0].code, "66071002") - self.assertEqual(inst.protocolApplied[1].targetDisease[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.reasonCode[0].coding[0].code, "429060002") + self.assertEqual(inst.reasonCode[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.route.coding[0].code, "IM") self.assertEqual(inst.route.coding[0].display, "Injection, intramuscular") self.assertEqual(inst.route.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration") @@ -70,12 +70,12 @@ def implImmunization1(self, inst): self.assertEqual(inst.site.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActSite") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.vaccineCode.coding[0].code, "104") - self.assertEqual(inst.vaccineCode.coding[0].system, "http://hl7.org/fhir/sid/cvx") - self.assertEqual(inst.vaccineCode.text, "Twinrix (HepA/HepB)") + self.assertEqual(inst.vaccineCode.coding[0].code, "FLUVAX") + self.assertEqual(inst.vaccineCode.coding[0].system, "urn:oid:1.2.36.1.2001.1005.17") + self.assertEqual(inst.vaccineCode.text, "Fluvax (Influenza)") def testImmunization2(self): - inst = self.instantiate_from("immunization-example-subpotent.json") + inst = self.instantiate_from("immunization-example-historical.json") self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") self.implImmunization2(inst) @@ -85,29 +85,52 @@ def testImmunization2(self): self.implImmunization2(inst2) def implImmunization2(self, inst): - self.assertEqual(inst.doseQuantity.code, "ml") + self.assertEqual(inst.id, "historical") + self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") + self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.note[0].text, "Notes on adminstration of a historical vaccine") + self.assertEqual(inst.occurrenceString, "January 2012") + self.assertFalse(inst.primarySource) + self.assertEqual(inst.reportOrigin.coding[0].code, "record") + self.assertEqual(inst.reportOrigin.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-origin") + self.assertEqual(inst.reportOrigin.text, "Written Record") + self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.vaccineCode.coding[0].code, "GNFLU") + self.assertEqual(inst.vaccineCode.coding[0].system, "urn:oid:1.2.36.1.2001.1005.17") + self.assertEqual(inst.vaccineCode.text, "Influenza") + + def testImmunization3(self): + inst = self.instantiate_from("immunization-example-protocol.json") + self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") + self.implImmunization3(inst) + + js = inst.as_json() + self.assertEqual("Immunization", js["resourceType"]) + inst2 = immunization.Immunization(js) + self.implImmunization3(inst2) + + def implImmunization3(self, inst): + self.assertEqual(inst.doseQuantity.code, "mg") self.assertEqual(inst.doseQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.doseQuantity.value, 0.5) - self.assertEqual(inst.education[0].documentType, "253088698300010311120702") - self.assertEqual(inst.education[0].presentationDate.datetime, FHIRDateTime("2013-01-10").datetime) - self.assertEqual(inst.education[0].presentationDate.as_json(), "2013-01-10") - self.assertEqual(inst.education[0].publicationDate.datetime, FHIRDateTime("2012-07-02").datetime) - self.assertEqual(inst.education[0].publicationDate.as_json(), "2012-07-02") - self.assertEqual(inst.expirationDate.date, FHIRDate("2015-02-28").date) - self.assertEqual(inst.expirationDate.as_json(), "2015-02-28") + self.assertEqual(inst.doseQuantity.value, 5) + self.assertEqual(inst.expirationDate.date, FHIRDate("2018-12-15").date) + self.assertEqual(inst.expirationDate.as_json(), "2018-12-15") self.assertEqual(inst.fundingSource.coding[0].code, "private") self.assertEqual(inst.fundingSource.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-funding-source") - self.assertEqual(inst.id, "subpotent") + self.assertEqual(inst.id, "protocol") self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") self.assertFalse(inst.isSubpotent) - self.assertEqual(inst.lotNumber, "AAJN11K") + self.assertEqual(inst.lotNumber, "PT123F") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Notes on adminstration of vaccine") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2015-01-15").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2015-01-15") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2018-06-18").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2018-06-18") self.assertEqual(inst.performer[0].function.coding[0].code, "OP") self.assertEqual(inst.performer[0].function.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0443") self.assertEqual(inst.performer[1].function.coding[0].code, "AP") @@ -115,31 +138,37 @@ def implImmunization2(self, inst): self.assertTrue(inst.primarySource) self.assertEqual(inst.programEligibility[0].coding[0].code, "ineligible") self.assertEqual(inst.programEligibility[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-program-eligibility") + self.assertEqual(inst.protocolApplied[0].doseNumberPositiveInt, 1) + self.assertEqual(inst.protocolApplied[0].series, "2-dose") + self.assertEqual(inst.protocolApplied[0].targetDisease[0].coding[0].code, "40468003") + self.assertEqual(inst.protocolApplied[0].targetDisease[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.protocolApplied[1].doseNumberPositiveInt, 2) + self.assertEqual(inst.protocolApplied[1].series, "3-dose") + self.assertEqual(inst.protocolApplied[1].targetDisease[0].coding[0].code, "66071002") + self.assertEqual(inst.protocolApplied[1].targetDisease[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.route.coding[0].code, "IM") self.assertEqual(inst.route.coding[0].display, "Injection, intramuscular") self.assertEqual(inst.route.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration") - self.assertEqual(inst.site.coding[0].code, "LT") - self.assertEqual(inst.site.coding[0].display, "left thigh") + self.assertEqual(inst.site.coding[0].code, "LA") + self.assertEqual(inst.site.coding[0].display, "left arm") self.assertEqual(inst.site.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActSite") self.assertEqual(inst.status, "completed") - self.assertEqual(inst.subpotentReason[0].coding[0].code, "partial") - self.assertEqual(inst.subpotentReason[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-subpotent-reason") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.vaccineCode.coding[0].code, "GNHEP") - self.assertEqual(inst.vaccineCode.coding[0].system, "urn:oid:1.2.36.1.2001.1005.17") - self.assertEqual(inst.vaccineCode.text, "Hepatitis B") + self.assertEqual(inst.vaccineCode.coding[0].code, "104") + self.assertEqual(inst.vaccineCode.coding[0].system, "http://hl7.org/fhir/sid/cvx") + self.assertEqual(inst.vaccineCode.text, "Twinrix (HepA/HepB)") - def testImmunization3(self): + def testImmunization4(self): inst = self.instantiate_from("immunization-example-refused.json") self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") - self.implImmunization3(inst) + self.implImmunization4(inst) js = inst.as_json() self.assertEqual("Immunization", js["resourceType"]) inst2 = immunization.Immunization(js) - self.implImmunization3(inst2) + self.implImmunization4(inst2) - def implImmunization3(self, inst): + def implImmunization4(self, inst): self.assertEqual(inst.id, "notGiven") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") @@ -156,37 +185,8 @@ def implImmunization3(self, inst): self.assertEqual(inst.vaccineCode.coding[0].display, "DTP") self.assertEqual(inst.vaccineCode.coding[0].system, "http://hl7.org/fhir/sid/cvx") - def testImmunization4(self): - inst = self.instantiate_from("immunization-example-historical.json") - self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") - self.implImmunization4(inst) - - js = inst.as_json() - self.assertEqual("Immunization", js["resourceType"]) - inst2 = immunization.Immunization(js) - self.implImmunization4(inst2) - - def implImmunization4(self, inst): - self.assertEqual(inst.id, "historical") - self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Notes on adminstration of a historical vaccine") - self.assertEqual(inst.occurrenceString, "January 2012") - self.assertFalse(inst.primarySource) - self.assertEqual(inst.reportOrigin.coding[0].code, "record") - self.assertEqual(inst.reportOrigin.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-origin") - self.assertEqual(inst.reportOrigin.text, "Written Record") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.vaccineCode.coding[0].code, "GNFLU") - self.assertEqual(inst.vaccineCode.coding[0].system, "urn:oid:1.2.36.1.2001.1005.17") - self.assertEqual(inst.vaccineCode.text, "Influenza") - def testImmunization5(self): - inst = self.instantiate_from("immunization-example.json") + inst = self.instantiate_from("immunization-example-subpotent.json") self.assertIsNotNone(inst, "Must have instantiated a Immunization instance") self.implImmunization5(inst) @@ -196,29 +196,29 @@ def testImmunization5(self): self.implImmunization5(inst2) def implImmunization5(self, inst): - self.assertEqual(inst.doseQuantity.code, "mg") + self.assertEqual(inst.doseQuantity.code, "ml") self.assertEqual(inst.doseQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.doseQuantity.value, 5) + self.assertEqual(inst.doseQuantity.value, 0.5) self.assertEqual(inst.education[0].documentType, "253088698300010311120702") self.assertEqual(inst.education[0].presentationDate.datetime, FHIRDateTime("2013-01-10").datetime) self.assertEqual(inst.education[0].presentationDate.as_json(), "2013-01-10") self.assertEqual(inst.education[0].publicationDate.datetime, FHIRDateTime("2012-07-02").datetime) self.assertEqual(inst.education[0].publicationDate.as_json(), "2012-07-02") - self.assertEqual(inst.expirationDate.date, FHIRDate("2015-02-15").date) - self.assertEqual(inst.expirationDate.as_json(), "2015-02-15") + self.assertEqual(inst.expirationDate.date, FHIRDate("2015-02-28").date) + self.assertEqual(inst.expirationDate.as_json(), "2015-02-28") self.assertEqual(inst.fundingSource.coding[0].code, "private") self.assertEqual(inst.fundingSource.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-funding-source") - self.assertEqual(inst.id, "example") + self.assertEqual(inst.id, "subpotent") self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") - self.assertTrue(inst.isSubpotent) + self.assertFalse(inst.isSubpotent) self.assertEqual(inst.lotNumber, "AAJN11K") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.note[0].text, "Notes on adminstration of vaccine") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2013-01-10").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2013-01-10") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2015-01-15").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2015-01-15") self.assertEqual(inst.performer[0].function.coding[0].code, "OP") self.assertEqual(inst.performer[0].function.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0443") self.assertEqual(inst.performer[1].function.coding[0].code, "AP") @@ -226,17 +226,17 @@ def implImmunization5(self, inst): self.assertTrue(inst.primarySource) self.assertEqual(inst.programEligibility[0].coding[0].code, "ineligible") self.assertEqual(inst.programEligibility[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-program-eligibility") - self.assertEqual(inst.reasonCode[0].coding[0].code, "429060002") - self.assertEqual(inst.reasonCode[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.route.coding[0].code, "IM") self.assertEqual(inst.route.coding[0].display, "Injection, intramuscular") self.assertEqual(inst.route.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration") - self.assertEqual(inst.site.coding[0].code, "LA") - self.assertEqual(inst.site.coding[0].display, "left arm") + self.assertEqual(inst.site.coding[0].code, "LT") + self.assertEqual(inst.site.coding[0].display, "left thigh") self.assertEqual(inst.site.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActSite") self.assertEqual(inst.status, "completed") + self.assertEqual(inst.subpotentReason[0].coding[0].code, "partial") + self.assertEqual(inst.subpotentReason[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-subpotent-reason") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.vaccineCode.coding[0].code, "FLUVAX") + self.assertEqual(inst.vaccineCode.coding[0].code, "GNHEP") self.assertEqual(inst.vaccineCode.coding[0].system, "urn:oid:1.2.36.1.2001.1005.17") - self.assertEqual(inst.vaccineCode.text, "Fluvax (Influenza)") + self.assertEqual(inst.vaccineCode.text, "Hepatitis B") diff --git a/tests/models/immunizationevaluation_test.py b/tests/models/immunizationevaluation_test.py index ec6cdb19..d1e6081c 100644 --- a/tests/models/immunizationevaluation_test.py +++ b/tests/models/immunizationevaluation_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return immunizationevaluation.ImmunizationEvaluation(js) def testImmunizationEvaluation1(self): - inst = self.instantiate_from("immunizationevaluation-example-notvalid.json") + inst = self.instantiate_from("immunizationevaluation-example.json") self.assertIsNotNone(inst, "Must have instantiated a ImmunizationEvaluation instance") self.implImmunizationEvaluation1(inst) @@ -32,14 +32,11 @@ def testImmunizationEvaluation1(self): def implImmunizationEvaluation1(self, inst): self.assertEqual(inst.date.datetime, FHIRDateTime("2013-01-10").datetime) self.assertEqual(inst.date.as_json(), "2013-01-10") - self.assertEqual(inst.doseNumberPositiveInt, 2) - self.assertEqual(inst.doseStatus.coding[0].code, "notvalid") - self.assertEqual(inst.doseStatus.coding[0].display, "Not Valid") + self.assertEqual(inst.doseNumberPositiveInt, 1) + self.assertEqual(inst.doseStatus.coding[0].code, "valid") + self.assertEqual(inst.doseStatus.coding[0].display, "Valid") self.assertEqual(inst.doseStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status") - self.assertEqual(inst.doseStatusReason[0].coding[0].code, "outsidesched") - self.assertEqual(inst.doseStatusReason[0].coding[0].display, "Administered outside recommended schedule") - self.assertEqual(inst.doseStatusReason[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status-reason") - self.assertEqual(inst.id, "notValid") + self.assertEqual(inst.id, "example") self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") self.assertEqual(inst.meta.tag[0].code, "HTEST") @@ -53,7 +50,7 @@ def implImmunizationEvaluation1(self, inst): self.assertEqual(inst.text.status, "generated") def testImmunizationEvaluation2(self): - inst = self.instantiate_from("immunizationevaluation-example.json") + inst = self.instantiate_from("immunizationevaluation-example-notvalid.json") self.assertIsNotNone(inst, "Must have instantiated a ImmunizationEvaluation instance") self.implImmunizationEvaluation2(inst) @@ -65,11 +62,14 @@ def testImmunizationEvaluation2(self): def implImmunizationEvaluation2(self, inst): self.assertEqual(inst.date.datetime, FHIRDateTime("2013-01-10").datetime) self.assertEqual(inst.date.as_json(), "2013-01-10") - self.assertEqual(inst.doseNumberPositiveInt, 1) - self.assertEqual(inst.doseStatus.coding[0].code, "valid") - self.assertEqual(inst.doseStatus.coding[0].display, "Valid") + self.assertEqual(inst.doseNumberPositiveInt, 2) + self.assertEqual(inst.doseStatus.coding[0].code, "notvalid") + self.assertEqual(inst.doseStatus.coding[0].display, "Not Valid") self.assertEqual(inst.doseStatus.coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status") - self.assertEqual(inst.id, "example") + self.assertEqual(inst.doseStatusReason[0].coding[0].code, "outsidesched") + self.assertEqual(inst.doseStatusReason[0].coding[0].display, "Administered outside recommended schedule") + self.assertEqual(inst.doseStatusReason[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status-reason") + self.assertEqual(inst.id, "notValid") self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") self.assertEqual(inst.identifier[0].value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234") self.assertEqual(inst.meta.tag[0].code, "HTEST") diff --git a/tests/models/library_test.py b/tests/models/library_test.py index a3f43933..34cc7ec9 100644 --- a/tests/models/library_test.py +++ b/tests/models/library_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return library.Library(js) def testLibrary1(self): - inst = self.instantiate_from("library-cms146-example.json") + inst = self.instantiate_from("library-predecessor-example.json") self.assertIsNotNone(inst, "Must have instantiated a Library instance") self.implLibrary1(inst) @@ -30,6 +30,41 @@ def testLibrary1(self): self.implLibrary1(inst2) def implLibrary1(self, inst): + self.assertEqual(inst.content[0].contentType, "text/cql") + self.assertEqual(inst.content[0].title, "FHIR Helpers") + self.assertEqual(inst.content[0].url, "library-fhir-helpers-content.cql") + self.assertEqual(inst.date.datetime, FHIRDateTime("2016-11-14").datetime) + self.assertEqual(inst.date.as_json(), "2016-11-14") + self.assertEqual(inst.description, "FHIR Helpers") + self.assertTrue(inst.experimental) + self.assertEqual(inst.id, "library-fhir-helpers-predecessor") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "FHIRHelpers") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.relatedArtifact[0].resource, "Library/fhir-model-definition") + self.assertEqual(inst.relatedArtifact[0].type, "depends-on") + self.assertEqual(inst.relatedArtifact[1].resource, "Library/library-fhir-helpers") + self.assertEqual(inst.relatedArtifact[1].type, "successor") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "FHIR Helpers") + self.assertEqual(inst.topic[0].text, "FHIR Helpers") + self.assertEqual(inst.type.coding[0].code, "logic-library") + self.assertEqual(inst.version, "1.6") + + def testLibrary2(self): + inst = self.instantiate_from("library-cms146-example.json") + self.assertIsNotNone(inst, "Must have instantiated a Library instance") + self.implLibrary2(inst) + + js = inst.as_json() + self.assertEqual("Library", js["resourceType"]) + inst2 = library.Library(js) + self.implLibrary2(inst2) + + def implLibrary2(self, inst): self.assertEqual(inst.content[0].contentType, "text/cql") self.assertEqual(inst.content[0].url, "library-cms146-example-content.cql") self.assertEqual(inst.dataRequirement[0].type, "Patient") @@ -87,52 +122,51 @@ def implLibrary1(self, inst): self.assertEqual(inst.type.coding[0].code, "logic-library") self.assertEqual(inst.version, "2.0.0") - def testLibrary2(self): - inst = self.instantiate_from("library-predecessor-example.json") + def testLibrary3(self): + inst = self.instantiate_from("library-example.json") self.assertIsNotNone(inst, "Must have instantiated a Library instance") - self.implLibrary2(inst) + self.implLibrary3(inst) js = inst.as_json() self.assertEqual("Library", js["resourceType"]) inst2 = library.Library(js) - self.implLibrary2(inst2) + self.implLibrary3(inst2) - def implLibrary2(self, inst): + def implLibrary3(self, inst): self.assertEqual(inst.content[0].contentType, "text/cql") - self.assertEqual(inst.content[0].title, "FHIR Helpers") - self.assertEqual(inst.content[0].url, "library-fhir-helpers-content.cql") - self.assertEqual(inst.date.datetime, FHIRDateTime("2016-11-14").datetime) - self.assertEqual(inst.date.as_json(), "2016-11-14") - self.assertEqual(inst.description, "FHIR Helpers") - self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "library-fhir-helpers-predecessor") + self.assertEqual(inst.content[0].url, "library-example-content.cql") + self.assertEqual(inst.dataRequirement[0].codeFilter[0].path, "code") + self.assertEqual(inst.dataRequirement[0].codeFilter[0].valueSet, "urn:oid:2.16.840.1.113883.3.464.1003.111.12.1006") + self.assertEqual(inst.dataRequirement[0].type, "Condition") + self.assertEqual(inst.date.datetime, FHIRDateTime("2015-07-22").datetime) + self.assertEqual(inst.date.as_json(), "2015-07-22") + self.assertEqual(inst.description, "Common Logic for adherence to Chlamydia Screening guidelines") + self.assertEqual(inst.id, "example") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "FHIRHelpers") + self.assertEqual(inst.identifier[0].value, "ChalmydiaScreening_Common") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.relatedArtifact[0].resource, "Library/fhir-model-definition") + self.assertEqual(inst.relatedArtifact[0].resource, "Library/library-quick-model-definition") self.assertEqual(inst.relatedArtifact[0].type, "depends-on") - self.assertEqual(inst.relatedArtifact[1].resource, "Library/library-fhir-helpers") - self.assertEqual(inst.relatedArtifact[1].type, "successor") - self.assertEqual(inst.status, "active") + self.assertEqual(inst.status, "draft") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "FHIR Helpers") - self.assertEqual(inst.topic[0].text, "FHIR Helpers") + self.assertEqual(inst.title, "Chlamydia Screening Common Library") + self.assertEqual(inst.topic[0].text, "Chlamydia Screening") self.assertEqual(inst.type.coding[0].code, "logic-library") - self.assertEqual(inst.version, "1.6") + self.assertEqual(inst.version, "2.0.0") - def testLibrary3(self): + def testLibrary4(self): inst = self.instantiate_from("library-composition-example.json") self.assertIsNotNone(inst, "Must have instantiated a Library instance") - self.implLibrary3(inst) + self.implLibrary4(inst) js = inst.as_json() self.assertEqual("Library", js["resourceType"]) inst2 = library.Library(js) - self.implLibrary3(inst2) + self.implLibrary4(inst2) - def implLibrary3(self, inst): + def implLibrary4(self, inst): self.assertEqual(inst.date.datetime, FHIRDateTime("2017-03-10").datetime) self.assertEqual(inst.date.as_json(), "2017-03-10") self.assertEqual(inst.description, "Artifacts required for implementation of Zika Virus Management") @@ -163,38 +197,4 @@ def implLibrary3(self, inst): self.assertEqual(inst.topic[0].text, "Zika Virus Management") self.assertEqual(inst.type.coding[0].code, "asset-collection") self.assertEqual(inst.version, "1.0.0") - - def testLibrary4(self): - inst = self.instantiate_from("library-example.json") - self.assertIsNotNone(inst, "Must have instantiated a Library instance") - self.implLibrary4(inst) - - js = inst.as_json() - self.assertEqual("Library", js["resourceType"]) - inst2 = library.Library(js) - self.implLibrary4(inst2) - - def implLibrary4(self, inst): - self.assertEqual(inst.content[0].contentType, "text/cql") - self.assertEqual(inst.content[0].url, "library-example-content.cql") - self.assertEqual(inst.dataRequirement[0].codeFilter[0].path, "code") - self.assertEqual(inst.dataRequirement[0].codeFilter[0].valueSet, "urn:oid:2.16.840.1.113883.3.464.1003.111.12.1006") - self.assertEqual(inst.dataRequirement[0].type, "Condition") - self.assertEqual(inst.date.datetime, FHIRDateTime("2015-07-22").datetime) - self.assertEqual(inst.date.as_json(), "2015-07-22") - self.assertEqual(inst.description, "Common Logic for adherence to Chlamydia Screening guidelines") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "ChalmydiaScreening_Common") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.relatedArtifact[0].resource, "Library/library-quick-model-definition") - self.assertEqual(inst.relatedArtifact[0].type, "depends-on") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Chlamydia Screening Common Library") - self.assertEqual(inst.topic[0].text, "Chlamydia Screening") - self.assertEqual(inst.type.coding[0].code, "logic-library") - self.assertEqual(inst.version, "2.0.0") diff --git a/tests/models/list_test.py b/tests/models/list_test.py index 9aacd2bb..9d5386e7 100644 --- a/tests/models/list_test.py +++ b/tests/models/list_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return list.List(js) def testList1(self): - inst = self.instantiate_from("list-example-familyhistory-genetics-profile.json") + inst = self.instantiate_from("list-example-medlist.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList1(inst) @@ -30,27 +30,29 @@ def testList1(self): self.implList1(inst2) def implList1(self, inst): - self.assertEqual(inst.code.coding[0].code, "8670-2") - self.assertEqual(inst.code.coding[0].display, "History of family member diseases") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.contained[0].id, "1") - self.assertEqual(inst.contained[1].id, "2") - self.assertEqual(inst.contained[2].id, "3") - self.assertEqual(inst.contained[3].id, "4") - self.assertEqual(inst.contained[4].id, "5") - self.assertEqual(inst.contained[5].id, "6") - self.assertEqual(inst.contained[6].id, "7") - self.assertEqual(inst.contained[7].id, "8") - self.assertEqual(inst.id, "genetic") + self.assertEqual(inst.code.coding[0].code, "182836005") + self.assertEqual(inst.code.coding[0].display, "Review of medication") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.text, "Medication Review") + self.assertEqual(inst.date.datetime, FHIRDateTime("2013-11-20T23:10:23+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2013-11-20T23:10:23+11:00") + self.assertEqual(inst.entry[0].flag.coding[0].code, "01") + self.assertEqual(inst.entry[0].flag.coding[0].display, "Prescribed") + self.assertEqual(inst.entry[0].flag.coding[0].system, "http://nehta.gov.au/codes/medications/changetype") + self.assertTrue(inst.entry[1].deleted) + self.assertEqual(inst.entry[1].flag.coding[0].code, "02") + self.assertEqual(inst.entry[1].flag.coding[0].display, "Cancelled") + self.assertEqual(inst.entry[1].flag.coding[0].system, "http://nehta.gov.au/codes/medications/changetype") + self.assertEqual(inst.id, "med-list") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "snapshot") + self.assertEqual(inst.mode, "changes") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") def testList2(self): - inst = self.instantiate_from("list-example-familyhistory-f201-roel.json") + inst = self.instantiate_from("list-example-familyhistory-genetics-profile-annie.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList2(inst) @@ -63,19 +65,26 @@ def implList2(self, inst): self.assertEqual(inst.code.coding[0].code, "8670-2") self.assertEqual(inst.code.coding[0].display, "History of family member diseases") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.contained[0].id, "fmh-1") - self.assertEqual(inst.contained[1].id, "fmh-2") - self.assertEqual(inst.id, "f201") + self.assertEqual(inst.contained[0].id, "image") + self.assertEqual(inst.contained[1].id, "1") + self.assertEqual(inst.contained[2].id, "2") + self.assertEqual(inst.contained[3].id, "3") + self.assertEqual(inst.contained[4].id, "4") + self.assertEqual(inst.contained[5].id, "5") + self.assertEqual(inst.contained[6].id, "6") + self.assertEqual(inst.contained[7].id, "7") + self.assertEqual(inst.contained[8].id, "8") + self.assertEqual(inst.contained[9].id, "9") + self.assertEqual(inst.id, "prognosis") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.mode, "snapshot") - self.assertEqual(inst.note[0].text, "Both parents, both brothers and both children (twin) are still alive.") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") def testList3(self): - inst = self.instantiate_from("list-example-double-cousin-relationship-pedigree.json") + inst = self.instantiate_from("list-example-simple-empty.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList3(inst) @@ -85,17 +94,12 @@ def testList3(self): self.implList3(inst2) def implList3(self, inst): - self.assertEqual(inst.code.coding[0].code, "80738-8") - self.assertEqual(inst.code.coding[0].display, "TPMT gene mutations found [Identifier] in Blood or Tissue by Sequencing Nominal") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "TPMT gene mutations found [Identifier] in Blood or Tissue by Sequencing Nominal") - self.assertEqual(inst.contained[0].id, "1") - self.assertEqual(inst.contained[1].id, "2") - self.assertEqual(inst.contained[2].id, "3") - self.assertEqual(inst.contained[3].id, "4") - self.assertEqual(inst.contained[4].id, "5") - self.assertEqual(inst.contained[5].id, "6") - self.assertEqual(inst.id, "example-double-cousin-relationship") + self.assertEqual(inst.code.coding[0].code, "346638") + self.assertEqual(inst.code.coding[0].display, "Patient Admission List") + self.assertEqual(inst.code.coding[0].system, "http://acme.com/list-codes") + self.assertEqual(inst.date.datetime, FHIRDateTime("2016-07-14T11:54:05+10:00").datetime) + self.assertEqual(inst.date.as_json(), "2016-07-14T11:54:05+10:00") + self.assertEqual(inst.id, "example-simple-empty") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -104,7 +108,7 @@ def implList3(self, inst): self.assertEqual(inst.text.status, "generated") def testList4(self): - inst = self.instantiate_from("list-example-simple-empty.json") + inst = self.instantiate_from("list-example-empty.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList4(inst) @@ -114,12 +118,17 @@ def testList4(self): self.implList4(inst2) def implList4(self, inst): - self.assertEqual(inst.code.coding[0].code, "346638") - self.assertEqual(inst.code.coding[0].display, "Patient Admission List") - self.assertEqual(inst.code.coding[0].system, "http://acme.com/list-codes") - self.assertEqual(inst.date.datetime, FHIRDateTime("2016-07-14T11:54:05+10:00").datetime) - self.assertEqual(inst.date.as_json(), "2016-07-14T11:54:05+10:00") - self.assertEqual(inst.id, "example-simple-empty") + self.assertEqual(inst.code.coding[0].code, "182836005") + self.assertEqual(inst.code.coding[0].display, "Review of medication") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.text, "Medication Review") + self.assertEqual(inst.date.datetime, FHIRDateTime("2012-11-26T07:30:23+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2012-11-26T07:30:23+11:00") + self.assertEqual(inst.emptyReason.coding[0].code, "nilknown") + self.assertEqual(inst.emptyReason.coding[0].display, "Nil Known") + self.assertEqual(inst.emptyReason.coding[0].system, "http://terminology.hl7.org/CodeSystem/list-empty-reason") + self.assertEqual(inst.emptyReason.text, "The patient is not on any medications") + self.assertEqual(inst.id, "example-empty") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -128,7 +137,7 @@ def implList4(self, inst): self.assertEqual(inst.text.status, "generated") def testList5(self): - inst = self.instantiate_from("list-example-long.json") + inst = self.instantiate_from("list-example-familyhistory-genetics-profile.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList5(inst) @@ -138,18 +147,27 @@ def testList5(self): self.implList5(inst2) def implList5(self, inst): - self.assertEqual(inst.date.datetime, FHIRDateTime("2018-02-21T12:17:00+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2018-02-21T12:17:00+11:00") - self.assertEqual(inst.id, "long") + self.assertEqual(inst.code.coding[0].code, "8670-2") + self.assertEqual(inst.code.coding[0].display, "History of family member diseases") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.contained[0].id, "1") + self.assertEqual(inst.contained[1].id, "2") + self.assertEqual(inst.contained[2].id, "3") + self.assertEqual(inst.contained[3].id, "4") + self.assertEqual(inst.contained[4].id, "5") + self.assertEqual(inst.contained[5].id, "6") + self.assertEqual(inst.contained[6].id, "7") + self.assertEqual(inst.contained[7].id, "8") + self.assertEqual(inst.id, "genetic") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "changes") + self.assertEqual(inst.mode, "snapshot") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") def testList6(self): - inst = self.instantiate_from("list-example.json") + inst = self.instantiate_from("list-example-familyhistory-f201-roel.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList6(inst) @@ -159,23 +177,22 @@ def testList6(self): self.implList6(inst2) def implList6(self, inst): - self.assertEqual(inst.date.datetime, FHIRDateTime("2012-11-25T22:17:00+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2012-11-25T22:17:00+11:00") - self.assertTrue(inst.entry[0].deleted) - self.assertEqual(inst.entry[0].flag.text, "Deleted due to error") - self.assertEqual(inst.entry[1].flag.text, "Added") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "urn:uuid:a9fcea7c-fcdf-4d17-a5e0-f26dda030b59") - self.assertEqual(inst.identifier[0].value, "23974652") + self.assertEqual(inst.code.coding[0].code, "8670-2") + self.assertEqual(inst.code.coding[0].display, "History of family member diseases") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.contained[0].id, "fmh-1") + self.assertEqual(inst.contained[1].id, "fmh-2") + self.assertEqual(inst.id, "f201") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "changes") + self.assertEqual(inst.mode, "snapshot") + self.assertEqual(inst.note[0].text, "Both parents, both brothers and both children (twin) are still alive.") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") def testList7(self): - inst = self.instantiate_from("list-example-empty.json") + inst = self.instantiate_from("list-example.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList7(inst) @@ -185,26 +202,23 @@ def testList7(self): self.implList7(inst2) def implList7(self, inst): - self.assertEqual(inst.code.coding[0].code, "182836005") - self.assertEqual(inst.code.coding[0].display, "Review of medication") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Medication Review") - self.assertEqual(inst.date.datetime, FHIRDateTime("2012-11-26T07:30:23+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2012-11-26T07:30:23+11:00") - self.assertEqual(inst.emptyReason.coding[0].code, "nilknown") - self.assertEqual(inst.emptyReason.coding[0].display, "Nil Known") - self.assertEqual(inst.emptyReason.coding[0].system, "http://terminology.hl7.org/CodeSystem/list-empty-reason") - self.assertEqual(inst.emptyReason.text, "The patient is not on any medications") - self.assertEqual(inst.id, "example-empty") + self.assertEqual(inst.date.datetime, FHIRDateTime("2012-11-25T22:17:00+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2012-11-25T22:17:00+11:00") + self.assertTrue(inst.entry[0].deleted) + self.assertEqual(inst.entry[0].flag.text, "Deleted due to error") + self.assertEqual(inst.entry[1].flag.text, "Added") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "urn:uuid:a9fcea7c-fcdf-4d17-a5e0-f26dda030b59") + self.assertEqual(inst.identifier[0].value, "23974652") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "snapshot") + self.assertEqual(inst.mode, "changes") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") def testList8(self): - inst = self.instantiate_from("list-example-medlist.json") + inst = self.instantiate_from("list-example-allergies.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList8(inst) @@ -214,29 +228,25 @@ def testList8(self): self.implList8(inst2) def implList8(self, inst): - self.assertEqual(inst.code.coding[0].code, "182836005") - self.assertEqual(inst.code.coding[0].display, "Review of medication") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Medication Review") - self.assertEqual(inst.date.datetime, FHIRDateTime("2013-11-20T23:10:23+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2013-11-20T23:10:23+11:00") - self.assertEqual(inst.entry[0].flag.coding[0].code, "01") - self.assertEqual(inst.entry[0].flag.coding[0].display, "Prescribed") - self.assertEqual(inst.entry[0].flag.coding[0].system, "http://nehta.gov.au/codes/medications/changetype") - self.assertTrue(inst.entry[1].deleted) - self.assertEqual(inst.entry[1].flag.coding[0].code, "02") - self.assertEqual(inst.entry[1].flag.coding[0].display, "Cancelled") - self.assertEqual(inst.entry[1].flag.coding[0].system, "http://nehta.gov.au/codes/medications/changetype") - self.assertEqual(inst.id, "med-list") + self.assertEqual(inst.code.coding[0].code, "52472-8") + self.assertEqual(inst.code.coding[0].display, "Allergies and Adverse Drug Reactions") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.code.text, "Current Allergy List") + self.assertEqual(inst.date.datetime, FHIRDateTime("2015-07-14T23:10:23+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2015-07-14T23:10:23+11:00") + self.assertEqual(inst.id, "current-allergies") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "changes") + self.assertEqual(inst.mode, "working") + self.assertEqual(inst.orderedBy.coding[0].code, "entry-date") + self.assertEqual(inst.orderedBy.coding[0].system, "http://terminology.hl7.org/CodeSystem/list-order") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "Current Allergy List") def testList9(self): - inst = self.instantiate_from("list-example-familyhistory-genetics-profile-annie.json") + inst = self.instantiate_from("list-example-double-cousin-relationship-pedigree.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList9(inst) @@ -246,20 +256,17 @@ def testList9(self): self.implList9(inst2) def implList9(self, inst): - self.assertEqual(inst.code.coding[0].code, "8670-2") - self.assertEqual(inst.code.coding[0].display, "History of family member diseases") + self.assertEqual(inst.code.coding[0].code, "80738-8") + self.assertEqual(inst.code.coding[0].display, "TPMT gene mutations found [Identifier] in Blood or Tissue by Sequencing Nominal") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.contained[0].id, "image") - self.assertEqual(inst.contained[1].id, "1") - self.assertEqual(inst.contained[2].id, "2") - self.assertEqual(inst.contained[3].id, "3") - self.assertEqual(inst.contained[4].id, "4") - self.assertEqual(inst.contained[5].id, "5") - self.assertEqual(inst.contained[6].id, "6") - self.assertEqual(inst.contained[7].id, "7") - self.assertEqual(inst.contained[8].id, "8") - self.assertEqual(inst.contained[9].id, "9") - self.assertEqual(inst.id, "prognosis") + self.assertEqual(inst.code.text, "TPMT gene mutations found [Identifier] in Blood or Tissue by Sequencing Nominal") + self.assertEqual(inst.contained[0].id, "1") + self.assertEqual(inst.contained[1].id, "2") + self.assertEqual(inst.contained[2].id, "3") + self.assertEqual(inst.contained[3].id, "4") + self.assertEqual(inst.contained[4].id, "5") + self.assertEqual(inst.contained[5].id, "6") + self.assertEqual(inst.id, "example-double-cousin-relationship") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -268,7 +275,7 @@ def implList9(self, inst): self.assertEqual(inst.text.status, "generated") def testList10(self): - inst = self.instantiate_from("list-example-allergies.json") + inst = self.instantiate_from("list-example-long.json") self.assertIsNotNone(inst, "Must have instantiated a List instance") self.implList10(inst) @@ -278,20 +285,13 @@ def testList10(self): self.implList10(inst2) def implList10(self, inst): - self.assertEqual(inst.code.coding[0].code, "52472-8") - self.assertEqual(inst.code.coding[0].display, "Allergies and Adverse Drug Reactions") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Current Allergy List") - self.assertEqual(inst.date.datetime, FHIRDateTime("2015-07-14T23:10:23+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2015-07-14T23:10:23+11:00") - self.assertEqual(inst.id, "current-allergies") + self.assertEqual(inst.date.datetime, FHIRDateTime("2018-02-21T12:17:00+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2018-02-21T12:17:00+11:00") + self.assertEqual(inst.id, "long") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "working") - self.assertEqual(inst.orderedBy.coding[0].code, "entry-date") - self.assertEqual(inst.orderedBy.coding[0].system, "http://terminology.hl7.org/CodeSystem/list-order") + self.assertEqual(inst.mode, "changes") self.assertEqual(inst.status, "current") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Current Allergy List") diff --git a/tests/models/location_test.py b/tests/models/location_test.py index 7318d9f4..1d3dbe2d 100644 --- a/tests/models/location_test.py +++ b/tests/models/location_test.py @@ -67,7 +67,7 @@ def implLocation1(self, inst): self.assertEqual(inst.text.status, "generated") def testLocation2(self): - inst = self.instantiate_from("location-example-ambulance.json") + inst = self.instantiate_from("location-example-room.json") self.assertIsNotNone(inst, "Must have instantiated a Location instance") self.implLocation2(inst) @@ -77,28 +77,33 @@ def testLocation2(self): self.implLocation2(inst2) def implLocation2(self, inst): - self.assertEqual(inst.description, "Ambulance provided by Burgers University Medical Center") - self.assertEqual(inst.id, "amb") + self.assertEqual(inst.alias[0], "South Wing OR 5") + self.assertEqual(inst.alias[1], "Main Wing OR 2") + self.assertEqual(inst.description, "Old South Wing, Neuro Radiology Operation Room 1 on second floor") + self.assertEqual(inst.id, "2") + self.assertEqual(inst.identifier[0].value, "B1-S.F2.1.00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "kind") - self.assertEqual(inst.name, "BUMC Ambulance") - self.assertEqual(inst.physicalType.coding[0].code, "ve") - self.assertEqual(inst.physicalType.coding[0].display, "Vehicle") + self.assertEqual(inst.mode, "instance") + self.assertEqual(inst.name, "South Wing Neuro OR 1") + self.assertEqual(inst.operationalStatus.code, "H") + self.assertEqual(inst.operationalStatus.display, "Housekeeping") + self.assertEqual(inst.operationalStatus.system, "http://terminology.hl7.org/CodeSystem/v2-0116") + self.assertEqual(inst.physicalType.coding[0].code, "ro") + self.assertEqual(inst.physicalType.coding[0].display, "Room") self.assertEqual(inst.physicalType.coding[0].system, "http://terminology.hl7.org/CodeSystem/location-physical-type") - self.assertEqual(inst.status, "active") + self.assertEqual(inst.status, "suspended") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "mobile") self.assertEqual(inst.telecom[0].value, "2329") - self.assertEqual(inst.text.div, "
Mobile Clinic
") + self.assertEqual(inst.text.div, "
Burgers UMC, South Wing, second floor, Neuro Radiology Operation Room 1
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "AMB") - self.assertEqual(inst.type[0].coding[0].display, "Ambulance") + self.assertEqual(inst.type[0].coding[0].code, "RNEU") + self.assertEqual(inst.type[0].coding[0].display, "Neuroradiology unit") self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") def testLocation3(self): - inst = self.instantiate_from("location-example-hl7hq.json") + inst = self.instantiate_from("location-example-ambulance.json") self.assertIsNotNone(inst, "Must have instantiated a Location instance") self.implLocation3(inst) @@ -108,37 +113,28 @@ def testLocation3(self): self.implLocation3(inst2) def implLocation3(self, inst): - self.assertEqual(inst.address.city, "Ann Arbor") - self.assertEqual(inst.address.country, "USA") - self.assertEqual(inst.address.line[0], "3300 Washtenaw Avenue, Suite 227") - self.assertEqual(inst.address.postalCode, "48104") - self.assertEqual(inst.address.state, "MI") - self.assertEqual(inst.description, "HL7 Headquarters") - self.assertEqual(inst.id, "hl7") + self.assertEqual(inst.description, "Ambulance provided by Burgers University Medical Center") + self.assertEqual(inst.id, "amb") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "instance") - self.assertEqual(inst.name, "Health Level Seven International") - self.assertEqual(inst.physicalType.coding[0].code, "bu") - self.assertEqual(inst.physicalType.coding[0].display, "Building") + self.assertEqual(inst.mode, "kind") + self.assertEqual(inst.name, "BUMC Ambulance") + self.assertEqual(inst.physicalType.coding[0].code, "ve") + self.assertEqual(inst.physicalType.coding[0].display, "Vehicle") self.assertEqual(inst.physicalType.coding[0].system, "http://terminology.hl7.org/CodeSystem/location-physical-type") - self.assertEqual(inst.position.latitude, -83.69471) - self.assertEqual(inst.position.longitude, 42.2565) self.assertEqual(inst.status, "active") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].value, "(+1) 734-677-7777") - self.assertEqual(inst.telecom[1].system, "fax") - self.assertEqual(inst.telecom[1].value, "(+1) 734-677-6622") - self.assertEqual(inst.telecom[2].system, "email") - self.assertEqual(inst.telecom[2].value, "hq@HL7.org") + self.assertEqual(inst.telecom[0].use, "mobile") + self.assertEqual(inst.telecom[0].value, "2329") + self.assertEqual(inst.text.div, "
Mobile Clinic
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "SLEEP") - self.assertEqual(inst.type[0].coding[0].display, "Sleep disorders unit") + self.assertEqual(inst.type[0].coding[0].code, "AMB") + self.assertEqual(inst.type[0].coding[0].display, "Ambulance") self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") def testLocation4(self): - inst = self.instantiate_from("location-example-room.json") + inst = self.instantiate_from("location-example-ukpharmacy.json") self.assertIsNotNone(inst, "Must have instantiated a Location instance") self.implLocation4(inst) @@ -148,29 +144,21 @@ def testLocation4(self): self.implLocation4(inst2) def implLocation4(self, inst): - self.assertEqual(inst.alias[0], "South Wing OR 5") - self.assertEqual(inst.alias[1], "Main Wing OR 2") - self.assertEqual(inst.description, "Old South Wing, Neuro Radiology Operation Room 1 on second floor") - self.assertEqual(inst.id, "2") - self.assertEqual(inst.identifier[0].value, "B1-S.F2.1.00") + self.assertEqual(inst.description, "All Pharmacies in the United Kingdom covered by the National Pharmacy Association") + self.assertEqual(inst.id, "ukp") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "instance") - self.assertEqual(inst.name, "South Wing Neuro OR 1") - self.assertEqual(inst.operationalStatus.code, "H") - self.assertEqual(inst.operationalStatus.display, "Housekeeping") - self.assertEqual(inst.operationalStatus.system, "http://terminology.hl7.org/CodeSystem/v2-0116") - self.assertEqual(inst.physicalType.coding[0].code, "ro") - self.assertEqual(inst.physicalType.coding[0].display, "Room") + self.assertEqual(inst.mode, "kind") + self.assertEqual(inst.name, "UK Pharmacies") + self.assertEqual(inst.physicalType.coding[0].code, "jdn") + self.assertEqual(inst.physicalType.coding[0].display, "Jurisdiction") self.assertEqual(inst.physicalType.coding[0].system, "http://terminology.hl7.org/CodeSystem/location-physical-type") - self.assertEqual(inst.status, "suspended") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].value, "2329") - self.assertEqual(inst.text.div, "
Burgers UMC, South Wing, second floor, Neuro Radiology Operation Room 1
") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.div, "
UK Pharmacies
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "RNEU") - self.assertEqual(inst.type[0].coding[0].display, "Neuroradiology unit") + self.assertEqual(inst.type[0].coding[0].code, "PHARM") + self.assertEqual(inst.type[0].coding[0].display, "Pharmacy") self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") def testLocation5(self): @@ -202,7 +190,7 @@ def implLocation5(self, inst): self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") def testLocation6(self): - inst = self.instantiate_from("location-example-ukpharmacy.json") + inst = self.instantiate_from("location-example-hl7hq.json") self.assertIsNotNone(inst, "Must have instantiated a Location instance") self.implLocation6(inst) @@ -212,20 +200,32 @@ def testLocation6(self): self.implLocation6(inst2) def implLocation6(self, inst): - self.assertEqual(inst.description, "All Pharmacies in the United Kingdom covered by the National Pharmacy Association") - self.assertEqual(inst.id, "ukp") + self.assertEqual(inst.address.city, "Ann Arbor") + self.assertEqual(inst.address.country, "USA") + self.assertEqual(inst.address.line[0], "3300 Washtenaw Avenue, Suite 227") + self.assertEqual(inst.address.postalCode, "48104") + self.assertEqual(inst.address.state, "MI") + self.assertEqual(inst.description, "HL7 Headquarters") + self.assertEqual(inst.id, "hl7") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.mode, "kind") - self.assertEqual(inst.name, "UK Pharmacies") - self.assertEqual(inst.physicalType.coding[0].code, "jdn") - self.assertEqual(inst.physicalType.coding[0].display, "Jurisdiction") + self.assertEqual(inst.mode, "instance") + self.assertEqual(inst.name, "Health Level Seven International") + self.assertEqual(inst.physicalType.coding[0].code, "bu") + self.assertEqual(inst.physicalType.coding[0].display, "Building") self.assertEqual(inst.physicalType.coding[0].system, "http://terminology.hl7.org/CodeSystem/location-physical-type") + self.assertEqual(inst.position.latitude, -83.69471) + self.assertEqual(inst.position.longitude, 42.2565) self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.div, "
UK Pharmacies
") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].value, "(+1) 734-677-7777") + self.assertEqual(inst.telecom[1].system, "fax") + self.assertEqual(inst.telecom[1].value, "(+1) 734-677-6622") + self.assertEqual(inst.telecom[2].system, "email") + self.assertEqual(inst.telecom[2].value, "hq@HL7.org") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "PHARM") - self.assertEqual(inst.type[0].coding[0].display, "Pharmacy") + self.assertEqual(inst.type[0].coding[0].code, "SLEEP") + self.assertEqual(inst.type[0].coding[0].display, "Sleep disorders unit") self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") diff --git a/tests/models/measure_test.py b/tests/models/measure_test.py index 97c12e15..ba656e70 100644 --- a/tests/models/measure_test.py +++ b/tests/models/measure_test.py @@ -50,7 +50,7 @@ def implMeasure1(self, inst): self.assertEqual(inst.title, "Screening for Depression") def testMeasure2(self): - inst = self.instantiate_from("measure-cms146-example.json") + inst = self.instantiate_from("measure-predecessor-example.json") self.assertIsNotNone(inst, "Must have instantiated a Measure instance") self.implMeasure2(inst) @@ -60,6 +60,77 @@ def testMeasure2(self): self.implMeasure2(inst2) def implMeasure2(self, inst): + self.assertEqual(inst.date.datetime, FHIRDateTime("2014-03-08").datetime) + self.assertEqual(inst.date.as_json(), "2014-03-08") + self.assertEqual(inst.description, "Exclusive breastfeeding measure of outcomes for exclusive breastmilk feeding of newborns.") + self.assertEqual(inst.group[0].id, "PopulationGroup1") + self.assertEqual(inst.group[0].population[0].code.coding[0].code, "initial-population") + self.assertEqual(inst.group[0].population[0].criteria.expression, "InitialPopulation1") + self.assertEqual(inst.group[0].population[0].criteria.language, "text/cql") + self.assertEqual(inst.group[0].population[1].code.coding[0].code, "denominator") + self.assertEqual(inst.group[0].population[1].criteria.expression, "Denominator1") + self.assertEqual(inst.group[0].population[1].criteria.language, "text/cql") + self.assertEqual(inst.group[0].population[2].code.coding[0].code, "denominator-exclusions") + self.assertEqual(inst.group[0].population[2].criteria.expression, "DenominatorExclusions1") + self.assertEqual(inst.group[0].population[2].criteria.language, "text/cql") + self.assertEqual(inst.group[0].population[3].code.coding[0].code, "numerator") + self.assertEqual(inst.group[0].population[3].criteria.expression, "Numerator1") + self.assertEqual(inst.group[0].population[3].criteria.language, "text/cql") + self.assertEqual(inst.group[1].id, "PopulationGroup2") + self.assertEqual(inst.group[1].population[0].code.coding[0].code, "initial-population") + self.assertEqual(inst.group[1].population[0].criteria.expression, "InitialPopulation2") + self.assertEqual(inst.group[1].population[0].criteria.language, "text/cql") + self.assertEqual(inst.group[1].population[1].code.coding[0].code, "denominator") + self.assertEqual(inst.group[1].population[1].criteria.expression, "Denominator2") + self.assertEqual(inst.group[1].population[1].criteria.language, "text/cql") + self.assertEqual(inst.group[1].population[2].code.coding[0].code, "denominator-exclusion") + self.assertEqual(inst.group[1].population[2].criteria.expression, "DenominatorExclusions2") + self.assertEqual(inst.group[1].population[2].criteria.language, "text/cql") + self.assertEqual(inst.group[1].population[3].code.coding[0].code, "numerator") + self.assertEqual(inst.group[1].population[3].criteria.expression, "Numerator2") + self.assertEqual(inst.group[1].population[3].criteria.language, "text/cql") + self.assertEqual(inst.id, "measure-predecessor-example") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "exclusive-breastfeeding-measure") + self.assertEqual(inst.improvementNotation.coding[0].code, "increase") + self.assertEqual(inst.improvementNotation.coding[0].system, "http://terminology.hl7.org/CodeSystem/measure-improvement-notation") + self.assertEqual(inst.library[0], "Library/library-exclusive-breastfeeding-cqm-logic") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.purpose, "Measure of newborns who were fed breast milk only since birth") + self.assertEqual(inst.relatedArtifact[0].citation, "American Academy of Pediatrics. (2005). Section on Breastfeeding. Policy Statement:Breastfeeding and the Use of Human Milk. Pediatrics.115:496-506.") + self.assertEqual(inst.relatedArtifact[0].type, "documentation") + self.assertEqual(inst.relatedArtifact[1].type, "documentation") + self.assertEqual(inst.relatedArtifact[2].type, "documentation") + self.assertEqual(inst.relatedArtifact[3].type, "documentation") + self.assertEqual(inst.relatedArtifact[4].type, "documentation") + self.assertEqual(inst.relatedArtifact[5].type, "documentation") + self.assertEqual(inst.relatedArtifact[6].citation, "Kramer, M.S. & Kakuma, R. (2002).Optimal duration of exclusive breastfeeding. [107 refs] Cochrane Database of Systematic Reviews. (1):CD003517.") + self.assertEqual(inst.relatedArtifact[6].type, "documentation") + self.assertEqual(inst.relatedArtifact[7].citation, "Petrova, A., Hegyi, T., & Mehta, R. (2007). Maternal race/ethnicity and one-month exclusive breastfeeding in association with the in-hospital feeding modality. Breastfeeding Medicine. 2(2):92-8.") + self.assertEqual(inst.relatedArtifact[7].type, "documentation") + self.assertEqual(inst.relatedArtifact[8].type, "documentation") + self.assertEqual(inst.relatedArtifact[9].type, "documentation") + self.assertEqual(inst.scoring.coding[0].code, "proportion") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "Exclusive Breastfeeding Measure") + self.assertEqual(inst.topic[0].text, "Exclusive Breastfeeding") + self.assertEqual(inst.type[0].coding[0].code, "process") + self.assertEqual(inst.version, "4.0.1") + + def testMeasure3(self): + inst = self.instantiate_from("measure-cms146-example.json") + self.assertIsNotNone(inst, "Must have instantiated a Measure instance") + self.implMeasure3(inst) + + js = inst.as_json() + self.assertEqual("Measure", js["resourceType"]) + inst2 = measure.Measure(js) + self.implMeasure3(inst2) + + def implMeasure3(self, inst): self.assertEqual(inst.approvalDate.date, FHIRDate("2016-01-01").date) self.assertEqual(inst.approvalDate.as_json(), "2016-01-01") self.assertEqual(inst.author[0].name, "National Committee for Quality Assurance") @@ -142,17 +213,17 @@ def implMeasure2(self, inst): self.assertEqual(inst.useContext[1].valueRange.low.value, 3) self.assertEqual(inst.version, "1.0.0") - def testMeasure3(self): + def testMeasure4(self): inst = self.instantiate_from("measure-component-a-example.json") self.assertIsNotNone(inst, "Must have instantiated a Measure instance") - self.implMeasure3(inst) + self.implMeasure4(inst) js = inst.as_json() self.assertEqual("Measure", js["resourceType"]) inst2 = measure.Measure(js) - self.implMeasure3(inst2) + self.implMeasure4(inst2) - def implMeasure3(self, inst): + def implMeasure4(self, inst): self.assertEqual(inst.group[0].id, "Main") self.assertEqual(inst.group[0].population[0].code.coding[0].code, "initial-population") self.assertEqual(inst.group[0].population[0].criteria.expression, "Initial Population") @@ -172,77 +243,6 @@ def implMeasure3(self, inst): self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.title, "Screening for Alcohol Misuse") - def testMeasure4(self): - inst = self.instantiate_from("measure-predecessor-example.json") - self.assertIsNotNone(inst, "Must have instantiated a Measure instance") - self.implMeasure4(inst) - - js = inst.as_json() - self.assertEqual("Measure", js["resourceType"]) - inst2 = measure.Measure(js) - self.implMeasure4(inst2) - - def implMeasure4(self, inst): - self.assertEqual(inst.date.datetime, FHIRDateTime("2014-03-08").datetime) - self.assertEqual(inst.date.as_json(), "2014-03-08") - self.assertEqual(inst.description, "Exclusive breastfeeding measure of outcomes for exclusive breastmilk feeding of newborns.") - self.assertEqual(inst.group[0].id, "PopulationGroup1") - self.assertEqual(inst.group[0].population[0].code.coding[0].code, "initial-population") - self.assertEqual(inst.group[0].population[0].criteria.expression, "InitialPopulation1") - self.assertEqual(inst.group[0].population[0].criteria.language, "text/cql") - self.assertEqual(inst.group[0].population[1].code.coding[0].code, "denominator") - self.assertEqual(inst.group[0].population[1].criteria.expression, "Denominator1") - self.assertEqual(inst.group[0].population[1].criteria.language, "text/cql") - self.assertEqual(inst.group[0].population[2].code.coding[0].code, "denominator-exclusions") - self.assertEqual(inst.group[0].population[2].criteria.expression, "DenominatorExclusions1") - self.assertEqual(inst.group[0].population[2].criteria.language, "text/cql") - self.assertEqual(inst.group[0].population[3].code.coding[0].code, "numerator") - self.assertEqual(inst.group[0].population[3].criteria.expression, "Numerator1") - self.assertEqual(inst.group[0].population[3].criteria.language, "text/cql") - self.assertEqual(inst.group[1].id, "PopulationGroup2") - self.assertEqual(inst.group[1].population[0].code.coding[0].code, "initial-population") - self.assertEqual(inst.group[1].population[0].criteria.expression, "InitialPopulation2") - self.assertEqual(inst.group[1].population[0].criteria.language, "text/cql") - self.assertEqual(inst.group[1].population[1].code.coding[0].code, "denominator") - self.assertEqual(inst.group[1].population[1].criteria.expression, "Denominator2") - self.assertEqual(inst.group[1].population[1].criteria.language, "text/cql") - self.assertEqual(inst.group[1].population[2].code.coding[0].code, "denominator-exclusion") - self.assertEqual(inst.group[1].population[2].criteria.expression, "DenominatorExclusions2") - self.assertEqual(inst.group[1].population[2].criteria.language, "text/cql") - self.assertEqual(inst.group[1].population[3].code.coding[0].code, "numerator") - self.assertEqual(inst.group[1].population[3].criteria.expression, "Numerator2") - self.assertEqual(inst.group[1].population[3].criteria.language, "text/cql") - self.assertEqual(inst.id, "measure-predecessor-example") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "exclusive-breastfeeding-measure") - self.assertEqual(inst.improvementNotation.coding[0].code, "increase") - self.assertEqual(inst.improvementNotation.coding[0].system, "http://terminology.hl7.org/CodeSystem/measure-improvement-notation") - self.assertEqual(inst.library[0], "Library/library-exclusive-breastfeeding-cqm-logic") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.purpose, "Measure of newborns who were fed breast milk only since birth") - self.assertEqual(inst.relatedArtifact[0].citation, "American Academy of Pediatrics. (2005). Section on Breastfeeding. Policy Statement:Breastfeeding and the Use of Human Milk. Pediatrics.115:496-506.") - self.assertEqual(inst.relatedArtifact[0].type, "documentation") - self.assertEqual(inst.relatedArtifact[1].type, "documentation") - self.assertEqual(inst.relatedArtifact[2].type, "documentation") - self.assertEqual(inst.relatedArtifact[3].type, "documentation") - self.assertEqual(inst.relatedArtifact[4].type, "documentation") - self.assertEqual(inst.relatedArtifact[5].type, "documentation") - self.assertEqual(inst.relatedArtifact[6].citation, "Kramer, M.S. & Kakuma, R. (2002).Optimal duration of exclusive breastfeeding. [107 refs] Cochrane Database of Systematic Reviews. (1):CD003517.") - self.assertEqual(inst.relatedArtifact[6].type, "documentation") - self.assertEqual(inst.relatedArtifact[7].citation, "Petrova, A., Hegyi, T., & Mehta, R. (2007). Maternal race/ethnicity and one-month exclusive breastfeeding in association with the in-hospital feeding modality. Breastfeeding Medicine. 2(2):92-8.") - self.assertEqual(inst.relatedArtifact[7].type, "documentation") - self.assertEqual(inst.relatedArtifact[8].type, "documentation") - self.assertEqual(inst.relatedArtifact[9].type, "documentation") - self.assertEqual(inst.scoring.coding[0].code, "proportion") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Exclusive Breastfeeding Measure") - self.assertEqual(inst.topic[0].text, "Exclusive Breastfeeding") - self.assertEqual(inst.type[0].coding[0].code, "process") - self.assertEqual(inst.version, "4.0.1") - def testMeasure5(self): inst = self.instantiate_from("measure-composite-example.json") self.assertIsNotNone(inst, "Must have instantiated a Measure instance") diff --git a/tests/models/media_test.py b/tests/models/media_test.py index f425cdd6..940cee9b 100644 --- a/tests/models/media_test.py +++ b/tests/models/media_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return media.Media(js) def testMedia1(self): - inst = self.instantiate_from("media-example-xray.json") + inst = self.instantiate_from("media-example.json") self.assertIsNotNone(inst, "Must have instantiated a Media instance") self.implMedia1(inst) @@ -30,28 +30,28 @@ def testMedia1(self): self.implMedia1(inst2) def implMedia1(self, inst): - self.assertEqual(inst.bodySite.coding[0].code, "85151006") - self.assertEqual(inst.bodySite.coding[0].display, "Structure of left hand (body structure)") - self.assertEqual(inst.bodySite.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.content.contentType, "image/jpeg") - self.assertEqual(inst.content.creation.datetime, FHIRDateTime("2016-03-15").datetime) - self.assertEqual(inst.content.creation.as_json(), "2016-03-15") + self.assertEqual(inst.content.contentType, "image/gif") + self.assertEqual(inst.content.creation.datetime, FHIRDateTime("2009-09-03").datetime) + self.assertEqual(inst.content.creation.as_json(), "2009-09-03") self.assertEqual(inst.content.id, "a1") - self.assertEqual(inst.content.url, "http://someimagingcenter.org/fhir/Binary/A12345") - self.assertEqual(inst.createdDateTime.datetime, FHIRDateTime("2016-03-15").datetime) - self.assertEqual(inst.createdDateTime.as_json(), "2016-03-15") - self.assertEqual(inst.height, 432) - self.assertEqual(inst.id, "xray") + self.assertEqual(inst.createdDateTime.datetime, FHIRDateTime("2017-12-17").datetime) + self.assertEqual(inst.createdDateTime.as_json(), "2017-12-17") + self.assertEqual(inst.frames, 1) + self.assertEqual(inst.height, 145) + self.assertEqual(inst.id, "example") + self.assertEqual(inst.issued.datetime, FHIRInstant("2017-12-17T14:56:18Z").datetime) + self.assertEqual(inst.issued.as_json(), "2017-12-17T14:56:18Z") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.modality.coding[0].code, "39714003") - self.assertEqual(inst.modality.coding[0].display, "Skeletal X-ray of wrist and hand") - self.assertEqual(inst.modality.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.modality.coding[0].code, "diagram") + self.assertEqual(inst.modality.coding[0].system, "http://terminology.hl7.org/CodeSystem/media-modality") self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
Xray of left hand for Patient Henry Levin (MRN 12345) 2016-03-15
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.width, 640) + self.assertEqual(inst.type.coding[0].code, "image") + self.assertEqual(inst.type.coding[0].display, "Image") + self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/media-type") + self.assertEqual(inst.width, 126) def testMedia2(self): inst = self.instantiate_from("media-example-dicom.json") @@ -95,7 +95,7 @@ def implMedia2(self, inst): self.assertEqual(inst.width, 640) def testMedia3(self): - inst = self.instantiate_from("media-example.json") + inst = self.instantiate_from("media-example-xray.json") self.assertIsNotNone(inst, "Must have instantiated a Media instance") self.implMedia3(inst) @@ -105,28 +105,28 @@ def testMedia3(self): self.implMedia3(inst2) def implMedia3(self, inst): - self.assertEqual(inst.content.contentType, "image/gif") - self.assertEqual(inst.content.creation.datetime, FHIRDateTime("2009-09-03").datetime) - self.assertEqual(inst.content.creation.as_json(), "2009-09-03") + self.assertEqual(inst.bodySite.coding[0].code, "85151006") + self.assertEqual(inst.bodySite.coding[0].display, "Structure of left hand (body structure)") + self.assertEqual(inst.bodySite.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.content.contentType, "image/jpeg") + self.assertEqual(inst.content.creation.datetime, FHIRDateTime("2016-03-15").datetime) + self.assertEqual(inst.content.creation.as_json(), "2016-03-15") self.assertEqual(inst.content.id, "a1") - self.assertEqual(inst.createdDateTime.datetime, FHIRDateTime("2017-12-17").datetime) - self.assertEqual(inst.createdDateTime.as_json(), "2017-12-17") - self.assertEqual(inst.frames, 1) - self.assertEqual(inst.height, 145) - self.assertEqual(inst.id, "example") - self.assertEqual(inst.issued.datetime, FHIRInstant("2017-12-17T14:56:18Z").datetime) - self.assertEqual(inst.issued.as_json(), "2017-12-17T14:56:18Z") + self.assertEqual(inst.content.url, "http://someimagingcenter.org/fhir/Binary/A12345") + self.assertEqual(inst.createdDateTime.datetime, FHIRDateTime("2016-03-15").datetime) + self.assertEqual(inst.createdDateTime.as_json(), "2016-03-15") + self.assertEqual(inst.height, 432) + self.assertEqual(inst.id, "xray") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.modality.coding[0].code, "diagram") - self.assertEqual(inst.modality.coding[0].system, "http://terminology.hl7.org/CodeSystem/media-modality") + self.assertEqual(inst.modality.coding[0].code, "39714003") + self.assertEqual(inst.modality.coding[0].display, "Skeletal X-ray of wrist and hand") + self.assertEqual(inst.modality.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.div, "
Xray of left hand for Patient Henry Levin (MRN 12345) 2016-03-15
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "image") - self.assertEqual(inst.type.coding[0].display, "Image") - self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/media-type") - self.assertEqual(inst.width, 126) + self.assertEqual(inst.width, 640) def testMedia4(self): inst = self.instantiate_from("media-example-sound.json") diff --git a/tests/models/molecularsequence_test.py b/tests/models/molecularsequence_test.py index 5d4361d3..66b46ffb 100644 --- a/tests/models/molecularsequence_test.py +++ b/tests/models/molecularsequence_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return molecularsequence.MolecularSequence(js) def testMolecularSequence1(self): - inst = self.instantiate_from("sequence-graphic-example-2.json") + inst = self.instantiate_from("sequence-genetics-example-breastcancer.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence1(inst) @@ -31,19 +31,24 @@ def testMolecularSequence1(self): def implMolecularSequence1(self, inst): self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "graphic-example-2") + self.assertEqual(inst.id, "breastcancer") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.referenceSeqString, "CGCCATTG") - self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 8) - self.assertEqual(inst.referenceSeq.windowStart, 0) + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NM_000059.3") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].display, "Homo sapiens BRCA2, DNA repair associated (BRCA2), mRNA") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore/") + self.assertEqual(inst.referenceSeq.windowEnd, 101499444) + self.assertEqual(inst.referenceSeq.windowStart, 101488058) self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type, "dna") + self.assertEqual(inst.type, "rna") + self.assertEqual(inst.variant[0].end, 32316187) + self.assertEqual(inst.variant[0].observedAllele, "A") + self.assertEqual(inst.variant[0].referenceAllele, "C") + self.assertEqual(inst.variant[0].start, 32316186) def testMolecularSequence2(self): - inst = self.instantiate_from("sequence-genetics-example-breastcancer.json") + inst = self.instantiate_from("sequence-graphic-example-1.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence2(inst) @@ -54,24 +59,25 @@ def testMolecularSequence2(self): def implMolecularSequence2(self, inst): self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "breastcancer") + self.assertEqual(inst.id, "graphic-example-1") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NM_000059.3") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].display, "Homo sapiens BRCA2, DNA repair associated (BRCA2), mRNA") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore/") - self.assertEqual(inst.referenceSeq.windowEnd, 101499444) - self.assertEqual(inst.referenceSeq.windowStart, 101488058) + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000002.12") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") + self.assertEqual(inst.referenceSeq.strand, "watson") + self.assertEqual(inst.referenceSeq.windowEnd, 128273732) + self.assertEqual(inst.referenceSeq.windowStart, 128273724) self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type, "rna") - self.assertEqual(inst.variant[0].end, 32316187) - self.assertEqual(inst.variant[0].observedAllele, "A") - self.assertEqual(inst.variant[0].referenceAllele, "C") - self.assertEqual(inst.variant[0].start, 32316186) + self.assertEqual(inst.type, "dna") + self.assertEqual(inst.variant[0].cigar, "1M") + self.assertEqual(inst.variant[0].end, 128273726) + self.assertEqual(inst.variant[0].observedAllele, "G") + self.assertEqual(inst.variant[0].referenceAllele, "T") + self.assertEqual(inst.variant[0].start, 128273725) def testMolecularSequence3(self): - inst = self.instantiate_from("sequence-graphic-example-5.json") + inst = self.instantiate_from("sequence-example-fda-vcfeval.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence3(inst) @@ -81,21 +87,55 @@ def testMolecularSequence3(self): self.implMolecularSequence3(inst2) def implMolecularSequence3(self, inst): - self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "graphic-example-5") + self.assertEqual(inst.coordinateSystem, 1) + self.assertEqual(inst.id, "fda-vcfeval-comparison") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000002.12") + self.assertEqual(inst.quality[0].end, 101770080) + self.assertEqual(inst.quality[0].gtFP, 2186) + self.assertEqual(inst.quality[0].method.coding[0].code, "app-BxfGF8j02pBZzZxbzZxP725P") + self.assertEqual(inst.quality[0].method.coding[0].system, "https://precision.fda.gov/apps/") + self.assertEqual(inst.quality[0].method.text, "Vcfeval + Hap.py Comparison") + self.assertEqual(inst.quality[0].precision, 0.428005) + self.assertEqual(inst.quality[0].queryFP, 10670) + self.assertEqual(inst.quality[0].recall, 0.752111) + self.assertEqual(inst.quality[0].standardSequence.coding[0].code, "file-BkZxBZ00bpJVk2q6x43b1YBx") + self.assertEqual(inst.quality[0].standardSequence.coding[0].system, "https://precision.fda.gov/files/") + self.assertEqual(inst.quality[0].start, 10453) + self.assertEqual(inst.quality[0].truthFN, 2554) + self.assertEqual(inst.quality[0].truthTP, 7749) + self.assertEqual(inst.quality[0].type, "indel") + self.assertEqual(inst.quality[1].end, 101770080) + self.assertEqual(inst.quality[1].gtFP, 493) + self.assertEqual(inst.quality[1].method.coding[0].code, "app-BxfGF8j02pBZzZxbzZxP725P") + self.assertEqual(inst.quality[1].method.coding[0].system, "https://precision.fda.gov/apps/") + self.assertEqual(inst.quality[1].method.text, "Vcfeval + Hap.py Comparison") + self.assertEqual(inst.quality[1].precision, 0.808602) + self.assertEqual(inst.quality[1].queryFP, 21744) + self.assertEqual(inst.quality[1].recall, 0.986642) + self.assertEqual(inst.quality[1].standardSequence.coding[0].code, "file-BkZxBZ00bpJVk2q6x43b1YBx") + self.assertEqual(inst.quality[1].standardSequence.coding[0].system, "https://precision.fda.gov/files/") + self.assertEqual(inst.quality[1].start, 10453) + self.assertEqual(inst.quality[1].truthFN, 1247) + self.assertEqual(inst.quality[1].truthTP, 92106) + self.assertEqual(inst.quality[1].type, "snp") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000001.11") self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 128273736) - self.assertEqual(inst.referenceSeq.windowStart, 128273732) + self.assertEqual(inst.referenceSeq.windowEnd, 101770080) + self.assertEqual(inst.referenceSeq.windowStart, 10453) + self.assertEqual(inst.repository[0].name, "FDA") + self.assertEqual(inst.repository[0].type, "login") + self.assertEqual(inst.repository[0].url, "https://precision.fda.gov/jobs/job-ByxYPx809jFVy21KJG74Jg3Y") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type, "dna") + self.assertEqual(inst.variant[0].end, 13117) + self.assertEqual(inst.variant[0].observedAllele, "T") + self.assertEqual(inst.variant[0].referenceAllele, "G") + self.assertEqual(inst.variant[0].start, 13116) def testMolecularSequence4(self): - inst = self.instantiate_from("sequence-graphic-example-3.json") + inst = self.instantiate_from("sequence-example-TPMT-one.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence4(inst) @@ -105,24 +145,26 @@ def testMolecularSequence4(self): self.implMolecularSequence4(inst2) def implMolecularSequence4(self, inst): - self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "graphic-example-3") + self.assertEqual(inst.coordinateSystem, 1) + self.assertEqual(inst.id, "example-TPMT-one") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.observedSeq, "T-C-C-C-A-C-C-C") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NT_007592.15") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 128273736) - self.assertEqual(inst.referenceSeq.windowStart, 128273732) + self.assertEqual(inst.referenceSeq.windowEnd, 18143955) + self.assertEqual(inst.referenceSeq.windowStart, 18130918) self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].cigar, "2M") - self.assertEqual(inst.variant[0].end, 128273736) - self.assertEqual(inst.variant[0].observedAllele, "GA") - self.assertEqual(inst.variant[0].referenceAllele, "AT") - self.assertEqual(inst.variant[0].start, 1282737234) + self.assertEqual(inst.variant[0].end, 18139214) + self.assertEqual(inst.variant[0].observedAllele, "A") + self.assertEqual(inst.variant[0].referenceAllele, "G") + self.assertEqual(inst.variant[0].start, 18139214) def testMolecularSequence5(self): - inst = self.instantiate_from("coord-1base-example.json") + inst = self.instantiate_from("sequence-example-pgx-2.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence5(inst) @@ -132,36 +174,26 @@ def testMolecularSequence5(self): self.implMolecularSequence5(inst2) def implMolecularSequence5(self, inst): - self.assertEqual(inst.coordinateSystem, 1) - self.assertEqual(inst.id, "coord-1-base") + self.assertEqual(inst.coordinateSystem, 0) + self.assertEqual(inst.id, "example-pgx-2") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.observedSeq, "ACATGGTAGC") - self.assertEqual(inst.referenceSeq.referenceSeqString, "ACGTAGTC") + self.assertEqual(inst.referenceSeq.orientation, "sense") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NG_007726.3") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 8) - self.assertEqual(inst.referenceSeq.windowStart, 1) + self.assertEqual(inst.referenceSeq.windowEnd, 55227980) + self.assertEqual(inst.referenceSeq.windowStart, 55227970) self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].cigar, "3I") - self.assertEqual(inst.variant[0].end, 3) - self.assertEqual(inst.variant[0].observedAllele, "ATG") - self.assertEqual(inst.variant[0].referenceAllele, "-") - self.assertEqual(inst.variant[0].start, 2) - self.assertEqual(inst.variant[1].cigar, "3I") - self.assertEqual(inst.variant[1].end, 5) - self.assertEqual(inst.variant[1].observedAllele, "T") - self.assertEqual(inst.variant[1].referenceAllele, "A") - self.assertEqual(inst.variant[1].start, 5) - self.assertEqual(inst.variant[2].cigar, "1D") - self.assertEqual(inst.variant[2].end, 7) - self.assertEqual(inst.variant[2].observedAllele, "-") - self.assertEqual(inst.variant[2].referenceAllele, "T") - self.assertEqual(inst.variant[2].start, 7) + self.assertEqual(inst.variant[0].end, 55227979) + self.assertEqual(inst.variant[0].observedAllele, "G") + self.assertEqual(inst.variant[0].referenceAllele, "T") + self.assertEqual(inst.variant[0].start, 55227978) def testMolecularSequence6(self): - inst = self.instantiate_from("sequence-graphic-example-4.json") + inst = self.instantiate_from("molecularsequence-example.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence6(inst) @@ -172,22 +204,28 @@ def testMolecularSequence6(self): def implMolecularSequence6(self, inst): self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "graphic-example-4") + self.assertEqual(inst.id, "example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.chromosome.coding[0].code, "2") - self.assertEqual(inst.referenceSeq.chromosome.coding[0].display, "chromosome 2") - self.assertEqual(inst.referenceSeq.chromosome.coding[0].system, "http://terminology.hl7.org/CodeSystem/chromosome-human") - self.assertEqual(inst.referenceSeq.genomeBuild, "GRCh 38") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000009.11") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 128273740) - self.assertEqual(inst.referenceSeq.windowStart, 128273736) + self.assertEqual(inst.referenceSeq.windowEnd, 22125510) + self.assertEqual(inst.referenceSeq.windowStart, 22125500) + self.assertEqual(inst.repository[0].name, "GA4GH API") + self.assertEqual(inst.repository[0].type, "openapi") + self.assertEqual(inst.repository[0].url, "http://grch37.rest.ensembl.org/ga4gh/variants/3:rs1333049?content-type=application/json") + self.assertEqual(inst.repository[0].variantsetId, "3:rs1333049") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") + self.assertEqual(inst.variant[0].end, 22125504) + self.assertEqual(inst.variant[0].observedAllele, "C") + self.assertEqual(inst.variant[0].referenceAllele, "G") + self.assertEqual(inst.variant[0].start, 22125503) def testMolecularSequence7(self): - inst = self.instantiate_from("sequence-example-TPMT-one.json") + inst = self.instantiate_from("sequence-example-fda.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence7(inst) @@ -198,25 +236,44 @@ def testMolecularSequence7(self): def implMolecularSequence7(self, inst): self.assertEqual(inst.coordinateSystem, 1) - self.assertEqual(inst.id, "example-TPMT-one") + self.assertEqual(inst.id, "fda-example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.observedSeq, "T-C-C-C-A-C-C-C") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NT_007592.15") + self.assertEqual(inst.quality[0].end, 101770080) + self.assertEqual(inst.quality[0].fScore, 0.545551) + self.assertEqual(inst.quality[0].gtFP, 2186) + self.assertEqual(inst.quality[0].method.coding[0].code, "job-ByxYPx809jFVy21KJG74Jg3Y") + self.assertEqual(inst.quality[0].method.coding[0].system, "https://precision.fda.gov/jobs/") + self.assertEqual(inst.quality[0].method.text, "Vcfeval + Hap.py Comparison") + self.assertEqual(inst.quality[0].precision, 0.428005) + self.assertEqual(inst.quality[0].queryFP, 10670) + self.assertEqual(inst.quality[0].queryTP, 7984) + self.assertEqual(inst.quality[0].recall, 0.752111) + self.assertEqual(inst.quality[0].standardSequence.coding[0].code, "file-Bk50V4Q0qVb65P0v2VPbfYPZ") + self.assertEqual(inst.quality[0].standardSequence.coding[0].system, "https://precision.fda.gov/files/") + self.assertEqual(inst.quality[0].start, 10453) + self.assertEqual(inst.quality[0].truthFN, 2554) + self.assertEqual(inst.quality[0].truthTP, 7749) + self.assertEqual(inst.quality[0].type, "snp") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000001.11") self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 18143955) - self.assertEqual(inst.referenceSeq.windowStart, 18130918) + self.assertEqual(inst.referenceSeq.windowEnd, 101770080) + self.assertEqual(inst.referenceSeq.windowStart, 10453) + self.assertEqual(inst.repository[0].name, "FDA") + self.assertEqual(inst.repository[0].type, "login") + self.assertEqual(inst.repository[0].url, "https://precision.fda.gov/files/file-Bx37ZK009P4bX5g3qjkFZV38") + self.assertEqual(inst.repository[0].variantsetId, "file-Bx37ZK009P4bX5g3qjkFZV38") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].end, 18139214) - self.assertEqual(inst.variant[0].observedAllele, "A") + self.assertEqual(inst.variant[0].end, 13117) + self.assertEqual(inst.variant[0].observedAllele, "T") self.assertEqual(inst.variant[0].referenceAllele, "G") - self.assertEqual(inst.variant[0].start, 18139214) + self.assertEqual(inst.variant[0].start, 13116) def testMolecularSequence8(self): - inst = self.instantiate_from("sequence-graphic-example-1.json") + inst = self.instantiate_from("coord-1base-example.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence8(inst) @@ -226,26 +283,36 @@ def testMolecularSequence8(self): self.implMolecularSequence8(inst2) def implMolecularSequence8(self, inst): - self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "graphic-example-1") + self.assertEqual(inst.coordinateSystem, 1) + self.assertEqual(inst.id, "coord-1-base") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000002.12") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") + self.assertEqual(inst.observedSeq, "ACATGGTAGC") + self.assertEqual(inst.referenceSeq.referenceSeqString, "ACGTAGTC") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 128273732) - self.assertEqual(inst.referenceSeq.windowStart, 128273724) + self.assertEqual(inst.referenceSeq.windowEnd, 8) + self.assertEqual(inst.referenceSeq.windowStart, 1) self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].cigar, "1M") - self.assertEqual(inst.variant[0].end, 128273726) - self.assertEqual(inst.variant[0].observedAllele, "G") - self.assertEqual(inst.variant[0].referenceAllele, "T") - self.assertEqual(inst.variant[0].start, 128273725) + self.assertEqual(inst.variant[0].cigar, "3I") + self.assertEqual(inst.variant[0].end, 3) + self.assertEqual(inst.variant[0].observedAllele, "ATG") + self.assertEqual(inst.variant[0].referenceAllele, "-") + self.assertEqual(inst.variant[0].start, 2) + self.assertEqual(inst.variant[1].cigar, "3I") + self.assertEqual(inst.variant[1].end, 5) + self.assertEqual(inst.variant[1].observedAllele, "T") + self.assertEqual(inst.variant[1].referenceAllele, "A") + self.assertEqual(inst.variant[1].start, 5) + self.assertEqual(inst.variant[2].cigar, "1D") + self.assertEqual(inst.variant[2].end, 7) + self.assertEqual(inst.variant[2].observedAllele, "-") + self.assertEqual(inst.variant[2].referenceAllele, "T") + self.assertEqual(inst.variant[2].start, 7) def testMolecularSequence9(self): - inst = self.instantiate_from("sequence-example-fda.json") + inst = self.instantiate_from("sequence-graphic-example-4.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence9(inst) @@ -255,45 +322,23 @@ def testMolecularSequence9(self): self.implMolecularSequence9(inst2) def implMolecularSequence9(self, inst): - self.assertEqual(inst.coordinateSystem, 1) - self.assertEqual(inst.id, "fda-example") + self.assertEqual(inst.coordinateSystem, 0) + self.assertEqual(inst.id, "graphic-example-4") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.quality[0].end, 101770080) - self.assertEqual(inst.quality[0].fScore, 0.545551) - self.assertEqual(inst.quality[0].gtFP, 2186) - self.assertEqual(inst.quality[0].method.coding[0].code, "job-ByxYPx809jFVy21KJG74Jg3Y") - self.assertEqual(inst.quality[0].method.coding[0].system, "https://precision.fda.gov/jobs/") - self.assertEqual(inst.quality[0].method.text, "Vcfeval + Hap.py Comparison") - self.assertEqual(inst.quality[0].precision, 0.428005) - self.assertEqual(inst.quality[0].queryFP, 10670) - self.assertEqual(inst.quality[0].queryTP, 7984) - self.assertEqual(inst.quality[0].recall, 0.752111) - self.assertEqual(inst.quality[0].standardSequence.coding[0].code, "file-Bk50V4Q0qVb65P0v2VPbfYPZ") - self.assertEqual(inst.quality[0].standardSequence.coding[0].system, "https://precision.fda.gov/files/") - self.assertEqual(inst.quality[0].start, 10453) - self.assertEqual(inst.quality[0].truthFN, 2554) - self.assertEqual(inst.quality[0].truthTP, 7749) - self.assertEqual(inst.quality[0].type, "snp") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000001.11") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") + self.assertEqual(inst.referenceSeq.chromosome.coding[0].code, "2") + self.assertEqual(inst.referenceSeq.chromosome.coding[0].display, "chromosome 2") + self.assertEqual(inst.referenceSeq.chromosome.coding[0].system, "http://terminology.hl7.org/CodeSystem/chromosome-human") + self.assertEqual(inst.referenceSeq.genomeBuild, "GRCh 38") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 101770080) - self.assertEqual(inst.referenceSeq.windowStart, 10453) - self.assertEqual(inst.repository[0].name, "FDA") - self.assertEqual(inst.repository[0].type, "login") - self.assertEqual(inst.repository[0].url, "https://precision.fda.gov/files/file-Bx37ZK009P4bX5g3qjkFZV38") - self.assertEqual(inst.repository[0].variantsetId, "file-Bx37ZK009P4bX5g3qjkFZV38") + self.assertEqual(inst.referenceSeq.windowEnd, 128273740) + self.assertEqual(inst.referenceSeq.windowStart, 128273736) self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].end, 13117) - self.assertEqual(inst.variant[0].observedAllele, "T") - self.assertEqual(inst.variant[0].referenceAllele, "G") - self.assertEqual(inst.variant[0].start, 13116) def testMolecularSequence10(self): - inst = self.instantiate_from("molecularsequence-example.json") + inst = self.instantiate_from("sequence-graphic-example-5.json") self.assertIsNotNone(inst, "Must have instantiated a MolecularSequence instance") self.implMolecularSequence10(inst) @@ -304,23 +349,15 @@ def testMolecularSequence10(self): def implMolecularSequence10(self, inst): self.assertEqual(inst.coordinateSystem, 0) - self.assertEqual(inst.id, "example") + self.assertEqual(inst.id, "graphic-example-5") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000009.11") + self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].code, "NC_000002.12") self.assertEqual(inst.referenceSeq.referenceSeqId.coding[0].system, "http://www.ncbi.nlm.nih.gov/nuccore") self.assertEqual(inst.referenceSeq.strand, "watson") - self.assertEqual(inst.referenceSeq.windowEnd, 22125510) - self.assertEqual(inst.referenceSeq.windowStart, 22125500) - self.assertEqual(inst.repository[0].name, "GA4GH API") - self.assertEqual(inst.repository[0].type, "openapi") - self.assertEqual(inst.repository[0].url, "http://grch37.rest.ensembl.org/ga4gh/variants/3:rs1333049?content-type=application/json") - self.assertEqual(inst.repository[0].variantsetId, "3:rs1333049") + self.assertEqual(inst.referenceSeq.windowEnd, 128273736) + self.assertEqual(inst.referenceSeq.windowStart, 128273732) self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "dna") - self.assertEqual(inst.variant[0].end, 22125504) - self.assertEqual(inst.variant[0].observedAllele, "C") - self.assertEqual(inst.variant[0].referenceAllele, "G") - self.assertEqual(inst.variant[0].start, 22125503) diff --git a/tests/models/namingsystem_test.py b/tests/models/namingsystem_test.py index c956adc6..a142ab6c 100644 --- a/tests/models/namingsystem_test.py +++ b/tests/models/namingsystem_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return namingsystem.NamingSystem(js) def testNamingSystem1(self): - inst = self.instantiate_from("namingsystem-example.json") + inst = self.instantiate_from("namingsystem-example-id.json") self.assertIsNotNone(inst, "Must have instantiated a NamingSystem instance") self.implNamingSystem1(inst) @@ -30,38 +30,6 @@ def testNamingSystem1(self): self.implNamingSystem1(inst2) def implNamingSystem1(self, inst): - self.assertEqual(inst.contact[0].name, "FHIR project team") - self.assertEqual(inst.contact[0].telecom[0].system, "url") - self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.date.datetime, FHIRDateTime("2014-12-13").datetime) - self.assertEqual(inst.date.as_json(), "2014-12-13") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.kind, "codesystem") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "SNOMED CT") - self.assertEqual(inst.publisher, "HL7 International on behalf of IHTSDO") - self.assertEqual(inst.responsible, "IHTSDO & affiliates") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.uniqueId[0].type, "oid") - self.assertEqual(inst.uniqueId[0].value, "2.16.840.1.113883.6.96") - self.assertTrue(inst.uniqueId[1].preferred) - self.assertEqual(inst.uniqueId[1].type, "uri") - self.assertEqual(inst.uniqueId[1].value, "http://snomed.info/sct") - - def testNamingSystem2(self): - inst = self.instantiate_from("namingsystem-example-id.json") - self.assertIsNotNone(inst, "Must have instantiated a NamingSystem instance") - self.implNamingSystem2(inst) - - js = inst.as_json() - self.assertEqual("NamingSystem", js["resourceType"]) - inst2 = namingsystem.NamingSystem(js) - self.implNamingSystem2(inst2) - - def implNamingSystem2(self, inst): self.assertEqual(inst.contact[0].name, "HL7 Australia FHIR Team") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7-australia.wikispaces.com/FHIR+Australia") @@ -93,4 +61,36 @@ def implNamingSystem2(self, inst): self.assertEqual(inst.uniqueId[1].type, "uri") self.assertEqual(inst.uniqueId[1].value, "http://ns.electronichealth.net.au/id/hi/ihi/1.0") self.assertEqual(inst.usage, "Used in Australia for identifying patients") + + def testNamingSystem2(self): + inst = self.instantiate_from("namingsystem-example.json") + self.assertIsNotNone(inst, "Must have instantiated a NamingSystem instance") + self.implNamingSystem2(inst) + + js = inst.as_json() + self.assertEqual("NamingSystem", js["resourceType"]) + inst2 = namingsystem.NamingSystem(js) + self.implNamingSystem2(inst2) + + def implNamingSystem2(self, inst): + self.assertEqual(inst.contact[0].name, "FHIR project team") + self.assertEqual(inst.contact[0].telecom[0].system, "url") + self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") + self.assertEqual(inst.date.datetime, FHIRDateTime("2014-12-13").datetime) + self.assertEqual(inst.date.as_json(), "2014-12-13") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.kind, "codesystem") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.name, "SNOMED CT") + self.assertEqual(inst.publisher, "HL7 International on behalf of IHTSDO") + self.assertEqual(inst.responsible, "IHTSDO & affiliates") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.uniqueId[0].type, "oid") + self.assertEqual(inst.uniqueId[0].value, "2.16.840.1.113883.6.96") + self.assertTrue(inst.uniqueId[1].preferred) + self.assertEqual(inst.uniqueId[1].type, "uri") + self.assertEqual(inst.uniqueId[1].value, "http://snomed.info/sct") diff --git a/tests/models/nutritionorder_test.py b/tests/models/nutritionorder_test.py index ece7c333..9f2b87b2 100644 --- a/tests/models/nutritionorder_test.py +++ b/tests/models/nutritionorder_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return nutritionorder.NutritionOrder(js) def testNutritionOrder1(self): - inst = self.instantiate_from("nutritionorder-example-texture-modified.json") + inst = self.instantiate_from("nutritionorder-example-diabeticsupplement.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") self.implNutritionOrder1(inst) @@ -30,49 +30,6 @@ def testNutritionOrder1(self): self.implNutritionOrder1(inst2) def implNutritionOrder1(self, inst): - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) - self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.id, "texturemodified") - self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") - self.assertEqual(inst.identifier[0].value, "123") - self.assertEqual(inst.intent, "order") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) - self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") - self.assertEqual(inst.oralDiet.schedule[0].repeat.frequency, 3) - self.assertEqual(inst.oralDiet.schedule[0].repeat.period, 1) - self.assertEqual(inst.oralDiet.schedule[0].repeat.periodUnit, "d") - self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].code, "28647000") - self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].display, "Meat") - self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.texture[0].foodType.text, "Regular, Chopped Meat") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].code, "228049004") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].display, "Chopped food") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.texture[0].modifier.text, "Regular, Chopped Meat") - self.assertEqual(inst.oralDiet.type[0].coding[0].code, "435801000124108") - self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Texture modified diet") - self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1010") - self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Texture modified diet") - self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[0].text, "Texture modified diet") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - - def testNutritionOrder2(self): - inst = self.instantiate_from("nutritionorder-example-diabeticsupplement.json") - self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder2(inst) - - js = inst.as_json() - self.assertEqual("NutritionOrder", js["resourceType"]) - inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder2(inst2) - - def implNutritionOrder2(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") @@ -109,114 +66,75 @@ def implNutritionOrder2(self, inst): self.assertEqual(inst.supplement[0].type.text, "Adult diabetic formula") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder3(self): - inst = self.instantiate_from("nutritionorder-example-proteinsupplement.json") - self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder3(inst) - - js = inst.as_json() - self.assertEqual("NutritionOrder", js["resourceType"]) - inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder3(inst2) - - def implNutritionOrder3(self, inst): - self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) - self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.id, "proteinsupplement") - self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") - self.assertEqual(inst.identifier[0].value, "123") - self.assertEqual(inst.intent, "order") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.supplement[0].instruction, "Beneprotein 1 scoop TID with meal.starting on 2015-02-10") - self.assertEqual(inst.supplement[0].productName, "Beneprotein") - self.assertEqual(inst.supplement[0].quantity.code, "{scoop}") - self.assertEqual(inst.supplement[0].quantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.supplement[0].quantity.unit, "scoop") - self.assertEqual(inst.supplement[0].quantity.value, 1) - self.assertEqual(inst.supplement[0].schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) - self.assertEqual(inst.supplement[0].schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") - self.assertEqual(inst.supplement[0].schedule[0].repeat.when[0], "C") - self.assertEqual(inst.supplement[0].type.coding[0].code, "442991000124104") - self.assertEqual(inst.supplement[0].type.coding[0].display, "Adult high protein formula") - self.assertEqual(inst.supplement[0].type.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.supplement[0].type.coding[1].code, "1000") - self.assertEqual(inst.supplement[0].type.coding[1].display, "High Protein Powder") - self.assertEqual(inst.supplement[0].type.coding[1].system, "http://goodhealthhospital.org/supplement-type-codes") - self.assertEqual(inst.supplement[0].type.text, "High Protein Powder") - self.assertEqual(inst.text.status, "generated") - - def testNutritionOrder4(self): - inst = self.instantiate_from("nutritionorder-example-cardiacdiet.json") + def testNutritionOrder2(self): + inst = self.instantiate_from("nutritionorder-example-enteralbolus.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder4(inst) + self.implNutritionOrder2(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder4(inst2) + self.implNutritionOrder2(inst2) - def implNutritionOrder4(self, inst): + def implNutritionOrder2(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") + self.assertEqual(inst.enteralFormula.additiveProductName, "Acme Lipid Additive") + self.assertEqual(inst.enteralFormula.additiveType.coding[0].code, "lipid") + self.assertEqual(inst.enteralFormula.additiveType.coding[0].display, "Lipid") + self.assertEqual(inst.enteralFormula.additiveType.coding[0].system, "http://terminology.hl7.org/CodeSystem/entformula-additive") + self.assertEqual(inst.enteralFormula.administrationInstruction, "240 mls every 4hrs ") + self.assertEqual(inst.enteralFormula.administration[0].quantity.code, "mL") + self.assertEqual(inst.enteralFormula.administration[0].quantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.enteralFormula.administration[0].quantity.unit, "milliliters") + self.assertEqual(inst.enteralFormula.administration[0].quantity.value, 240) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.datetime, FHIRDateTime("2014-09-17T16:00:00Z").datetime) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.as_json(), "2014-09-17T16:00:00Z") + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.frequency, 1) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.period, 4) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.periodUnit, "h") + self.assertEqual(inst.enteralFormula.baseFormulaProductName, "Acme High Protein Formula") + self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].code, "442991000124104") + self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].display, "Adult high protein formula") + self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.enteralFormula.caloricDensity.code, "cal/mL") + self.assertEqual(inst.enteralFormula.caloricDensity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.enteralFormula.caloricDensity.unit, "calories per milliliter") + self.assertEqual(inst.enteralFormula.caloricDensity.value, 1.5) + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.code, "mL/d") + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.system, "http://unitsofmeasure.org") + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.unit, "milliliter/day") + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.value, 1440) + self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].code, "GT") + self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].display, "Instillation, gastrostomy tube") + self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration") self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") - self.assertEqual(inst.id, "cardiacdiet") - self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") + self.assertEqual(inst.id, "enteralbolus") + self.assertEqual(inst.identifier[0].system, "http://www.acme.org/nutritionorders") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.oralDiet.instruction, "Starting on 2/10 breakfast, maximum 400 ml fluids per meal") - self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") - self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") - self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 2) - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "39972003") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Sodium") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.nutrient[1].amount.code, "mL") - self.assertEqual(inst.oralDiet.nutrient[1].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[1].amount.unit, "milliliter") - self.assertEqual(inst.oralDiet.nutrient[1].amount.value, 1500) - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].code, "33463005") - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].display, "Fluid") - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[0].code, "386619000") - self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Low sodium diet") - self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1040") - self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Low Sodium Diet") - self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[0].text, "Low sodium diet") - self.assertEqual(inst.oralDiet.type[1].coding[0].code, "226208002") - self.assertEqual(inst.oralDiet.type[1].coding[0].display, "Fluid restricted diet") - self.assertEqual(inst.oralDiet.type[1].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[1].coding[1].code, "1040") - self.assertEqual(inst.oralDiet.type[1].coding[1].display, "Fluid restricted diet") - self.assertEqual(inst.oralDiet.type[1].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[1].text, "Fluid restricted diet") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder5(self): - inst = self.instantiate_from("nutritionorder-example-pureeddiet.json") + def testNutritionOrder3(self): + inst = self.instantiate_from("nutritionorder-example-fiberrestricteddiet.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder5(inst) + self.implNutritionOrder3(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder5(inst2) + self.implNutritionOrder3(inst2) - def implNutritionOrder5(self, inst): + def implNutritionOrder3(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") @@ -225,195 +143,181 @@ def implNutritionOrder5(self, inst): self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") - self.assertEqual(inst.id, "pureeddiet") + self.assertEqual(inst.id, "fiberrestricteddiet") self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].code, "439021000124105") - self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].display, "Dietary liquid consistency - nectar thick liquid") - self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.fluidConsistencyType[0].text, "Nectar thick liquids") + self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") + self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") + self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") + self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 50) + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "256674009") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Fat") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") self.assertEqual(inst.oralDiet.schedule[0].repeat.frequency, 3) self.assertEqual(inst.oralDiet.schedule[0].repeat.period, 1) self.assertEqual(inst.oralDiet.schedule[0].repeat.periodUnit, "d") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].code, "228055009") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].display, "Liquidized food") - self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.texture[0].modifier.text, "Pureed") - self.assertEqual(inst.oralDiet.type[0].coding[0].code, "226211001") - self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Pureed diet") + self.assertEqual(inst.oralDiet.type[0].coding[0].code, "15108003") + self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Restricted fiber diet") self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1010") - self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Pureed diet") + self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1000") + self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Fiber restricted") self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[0].text, "Pureed diet") + self.assertEqual(inst.oralDiet.type[0].text, "Fiber restricted diet") + self.assertEqual(inst.oralDiet.type[1].coding[0].code, "16208003") + self.assertEqual(inst.oralDiet.type[1].coding[0].display, "Low fat diet") + self.assertEqual(inst.oralDiet.type[1].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.type[1].coding[1].code, "1100") + self.assertEqual(inst.oralDiet.type[1].coding[1].display, "Low Fat") + self.assertEqual(inst.oralDiet.type[1].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") + self.assertEqual(inst.oralDiet.type[1].text, "Low fat diet") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder6(self): - inst = self.instantiate_from("nutritionorder-example-diabeticdiet.json") + def testNutritionOrder4(self): + inst = self.instantiate_from("nutritionorder-example-texture-modified.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder6(inst) + self.implNutritionOrder4(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder6(inst2) + self.implNutritionOrder4(inst2) - def implNutritionOrder6(self, inst): + def implNutritionOrder4(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") - self.assertEqual(inst.id, "diabeticdiet") + self.assertEqual(inst.id, "texturemodified") self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") - self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") - self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 75) - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "2331003") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Carbohydrate") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") self.assertEqual(inst.oralDiet.schedule[0].repeat.frequency, 3) self.assertEqual(inst.oralDiet.schedule[0].repeat.period, 1) self.assertEqual(inst.oralDiet.schedule[0].repeat.periodUnit, "d") - self.assertEqual(inst.oralDiet.type[0].coding[0].code, "160670007") - self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Diabetic diet") + self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].code, "28647000") + self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].display, "Meat") + self.assertEqual(inst.oralDiet.texture[0].foodType.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.texture[0].foodType.text, "Regular, Chopped Meat") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].code, "228049004") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].display, "Chopped food") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.texture[0].modifier.text, "Regular, Chopped Meat") + self.assertEqual(inst.oralDiet.type[0].coding[0].code, "435801000124108") + self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Texture modified diet") self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1030") - self.assertEqual(inst.oralDiet.type[0].coding[1].display, "DD - Diabetic diet") + self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1010") + self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Texture modified diet") self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[0].text, "DD - Diabetic diet") + self.assertEqual(inst.oralDiet.type[0].text, "Texture modified diet") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder7(self): - inst = self.instantiate_from("nutritionorder-example-renaldiet.json") + def testNutritionOrder5(self): + inst = self.instantiate_from("nutritionorder-example-pureeddiet-simple.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder7(inst) + self.implNutritionOrder5(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder7(inst2) + self.implNutritionOrder5(inst2) - def implNutritionOrder7(self, inst): + def implNutritionOrder5(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") - self.assertEqual(inst.id, "renaldiet") + self.assertEqual(inst.id, "pureeddiet-simple") self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") - self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") - self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 2) - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "39972003") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Sodium") - self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.nutrient[1].amount.code, "mg") - self.assertEqual(inst.oralDiet.nutrient[1].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[1].amount.unit, "milligrams") - self.assertEqual(inst.oralDiet.nutrient[1].amount.value, 1000) - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].code, "30820000") - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].display, "Phosphorus") - self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.nutrient[2].amount.code, "g") - self.assertEqual(inst.oralDiet.nutrient[2].amount.system, "http://unitsofmeasure.org") - self.assertEqual(inst.oralDiet.nutrient[2].amount.unit, "grams") - self.assertEqual(inst.oralDiet.nutrient[2].amount.value, 2) - self.assertEqual(inst.oralDiet.nutrient[2].modifier.coding[0].code, "88480006") - self.assertEqual(inst.oralDiet.nutrient[2].modifier.coding[0].display, "Potassium") - self.assertEqual(inst.oralDiet.nutrient[2].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].code, "439021000124105") + self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].display, "Dietary liquid consistency - nectar thick liquid") + self.assertEqual(inst.oralDiet.fluidConsistencyType[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.fluidConsistencyType[0].text, "Nectar thick liquids") self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") self.assertEqual(inst.oralDiet.schedule[0].repeat.frequency, 3) self.assertEqual(inst.oralDiet.schedule[0].repeat.period, 1) self.assertEqual(inst.oralDiet.schedule[0].repeat.periodUnit, "d") - self.assertEqual(inst.oralDiet.type[0].coding[0].code, "33489005") - self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Renal diet") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].code, "228055009") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].display, "Liquidized food") + self.assertEqual(inst.oralDiet.texture[0].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.texture[0].modifier.text, "Pureed") + self.assertEqual(inst.oralDiet.type[0].coding[0].code, "226211001") + self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Pureed diet") self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1050") - self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Renal") + self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1010") + self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Pureed diet") self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") - self.assertEqual(inst.oralDiet.type[0].text, "Renal Diet") + self.assertEqual(inst.oralDiet.type[0].text, "Pureed diet") self.assertEqual(inst.status, "active") + self.assertEqual(inst.supplement[0].instruction, "Ensure Pudding at breakfast, lunch, supper") + self.assertEqual(inst.supplement[0].productName, "Ensure Pudding 4 oz container") + self.assertEqual(inst.supplement[0].type.coding[0].code, "442971000124100") + self.assertEqual(inst.supplement[0].type.coding[0].display, "Adult high energy formula") + self.assertEqual(inst.supplement[0].type.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.supplement[0].type.coding[1].code, "1040") + self.assertEqual(inst.supplement[0].type.coding[1].display, "Adult high energy pudding") + self.assertEqual(inst.supplement[0].type.coding[1].system, "http://goodhealthhospital.org/supplement-type-codes") + self.assertEqual(inst.supplement[0].type.text, "Adult high energy pudding") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder8(self): - inst = self.instantiate_from("nutritionorder-example-enteralbolus.json") + def testNutritionOrder6(self): + inst = self.instantiate_from("nutritionorder-example-infantenteral.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder8(inst) + self.implNutritionOrder6(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder8(inst2) + self.implNutritionOrder6(inst2) - def implNutritionOrder8(self, inst): + def implNutritionOrder6(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.enteralFormula.additiveProductName, "Acme Lipid Additive") - self.assertEqual(inst.enteralFormula.additiveType.coding[0].code, "lipid") - self.assertEqual(inst.enteralFormula.additiveType.coding[0].display, "Lipid") + self.assertEqual(inst.enteralFormula.additiveProductName, "Acme High Carbohydrate Additive") + self.assertEqual(inst.enteralFormula.additiveType.coding[0].code, "carbohydrate") + self.assertEqual(inst.enteralFormula.additiveType.coding[0].display, "Carbohydrate") self.assertEqual(inst.enteralFormula.additiveType.coding[0].system, "http://terminology.hl7.org/CodeSystem/entformula-additive") - self.assertEqual(inst.enteralFormula.administrationInstruction, "240 mls every 4hrs ") - self.assertEqual(inst.enteralFormula.administration[0].quantity.code, "mL") + self.assertEqual(inst.enteralFormula.administrationInstruction, "Add high calorie high carbohydrate additive to increase cal/oz from 24 cal/oz to 27 cal/oz.") + self.assertEqual(inst.enteralFormula.administration[0].quantity.code, "[foz_us]") self.assertEqual(inst.enteralFormula.administration[0].quantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.enteralFormula.administration[0].quantity.unit, "milliliters") - self.assertEqual(inst.enteralFormula.administration[0].quantity.value, 240) - self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.datetime, FHIRDateTime("2014-09-17T16:00:00Z").datetime) - self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.as_json(), "2014-09-17T16:00:00Z") + self.assertEqual(inst.enteralFormula.administration[0].quantity.unit, "ounces") + self.assertEqual(inst.enteralFormula.administration[0].quantity.value, 4) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.datetime, FHIRDateTime("2014-09-17").datetime) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.boundsPeriod.start.as_json(), "2014-09-17") self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.frequency, 1) - self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.period, 4) + self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.period, 3) self.assertEqual(inst.enteralFormula.administration[0].schedule.repeat.periodUnit, "h") - self.assertEqual(inst.enteralFormula.baseFormulaProductName, "Acme High Protein Formula") - self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].code, "442991000124104") - self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].display, "Adult high protein formula") + self.assertEqual(inst.enteralFormula.baseFormulaProductName, "Acme Infant Formula + Iron") + self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].code, "412414007") + self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].display, "infant formula + iron") self.assertEqual(inst.enteralFormula.baseFormulaType.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.enteralFormula.caloricDensity.code, "cal/mL") + self.assertEqual(inst.enteralFormula.caloricDensity.code, "cal/[foz_us]") self.assertEqual(inst.enteralFormula.caloricDensity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.enteralFormula.caloricDensity.unit, "calories per milliliter") - self.assertEqual(inst.enteralFormula.caloricDensity.value, 1.5) - self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.code, "mL/d") + self.assertEqual(inst.enteralFormula.caloricDensity.unit, "calories per ounce") + self.assertEqual(inst.enteralFormula.caloricDensity.value, 20) + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.code, "[foz_us]") self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.system, "http://unitsofmeasure.org") - self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.unit, "milliliter/day") - self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.value, 1440) - self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].code, "GT") - self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].display, "Instillation, gastrostomy tube") + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.unit, "ounces") + self.assertEqual(inst.enteralFormula.maxVolumeToDeliver.value, 32) + self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].code, "PO") + self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].display, "Swallow, oral") self.assertEqual(inst.enteralFormula.routeofAdministration.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") - self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") - self.assertEqual(inst.id, "enteralbolus") + self.assertTrue(inst.enteralFormula.routeofAdministration.coding[0].userSelected) + self.assertEqual(inst.id, "infantenteral") self.assertEqual(inst.identifier[0].system, "http://www.acme.org/nutritionorders") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") @@ -423,17 +327,17 @@ def implNutritionOrder8(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder9(self): + def testNutritionOrder7(self): inst = self.instantiate_from("nutritionorder-example-enteralcontinuous.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder9(inst) + self.implNutritionOrder7(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder9(inst2) + self.implNutritionOrder7(inst2) - def implNutritionOrder9(self, inst): + def implNutritionOrder7(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") self.assertEqual(inst.enteralFormula.administrationInstruction, "Hold feedings from 7 pm to 7 am. Add MCT oil to increase calories from 1.0 cal/mL to 1.5 cal/mL") @@ -480,20 +384,84 @@ def implNutritionOrder9(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") - def testNutritionOrder10(self): - inst = self.instantiate_from("nutritionorder-example-pureeddiet-simple.json") + def testNutritionOrder8(self): + inst = self.instantiate_from("nutritionorder-example-cardiacdiet.json") self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") - self.implNutritionOrder10(inst) + self.implNutritionOrder8(inst) js = inst.as_json() self.assertEqual("NutritionOrder", js["resourceType"]) inst2 = nutritionorder.NutritionOrder(js) - self.implNutritionOrder10(inst2) + self.implNutritionOrder8(inst2) - def implNutritionOrder10(self, inst): + def implNutritionOrder8(self, inst): self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) self.assertEqual(inst.dateTime.as_json(), "2014-09-17") - self.assertEqual(inst.id, "pureeddiet-simple") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") + self.assertEqual(inst.id, "cardiacdiet") + self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") + self.assertEqual(inst.identifier[0].value, "123") + self.assertEqual(inst.intent, "order") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.oralDiet.instruction, "Starting on 2/10 breakfast, maximum 400 ml fluids per meal") + self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") + self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") + self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") + self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 2) + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "39972003") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Sodium") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.nutrient[1].amount.code, "mL") + self.assertEqual(inst.oralDiet.nutrient[1].amount.system, "http://unitsofmeasure.org") + self.assertEqual(inst.oralDiet.nutrient[1].amount.unit, "milliliter") + self.assertEqual(inst.oralDiet.nutrient[1].amount.value, 1500) + self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].code, "33463005") + self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].display, "Fluid") + self.assertEqual(inst.oralDiet.nutrient[1].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.type[0].coding[0].code, "386619000") + self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Low sodium diet") + self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1040") + self.assertEqual(inst.oralDiet.type[0].coding[1].display, "Low Sodium Diet") + self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") + self.assertEqual(inst.oralDiet.type[0].text, "Low sodium diet") + self.assertEqual(inst.oralDiet.type[1].coding[0].code, "226208002") + self.assertEqual(inst.oralDiet.type[1].coding[0].display, "Fluid restricted diet") + self.assertEqual(inst.oralDiet.type[1].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.type[1].coding[1].code, "1040") + self.assertEqual(inst.oralDiet.type[1].coding[1].display, "Fluid restricted diet") + self.assertEqual(inst.oralDiet.type[1].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") + self.assertEqual(inst.oralDiet.type[1].text, "Fluid restricted diet") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + + def testNutritionOrder9(self): + inst = self.instantiate_from("nutritionorder-example-pureeddiet.json") + self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") + self.implNutritionOrder9(inst) + + js = inst.as_json() + self.assertEqual("NutritionOrder", js["resourceType"]) + inst2 = nutritionorder.NutritionOrder(js) + self.implNutritionOrder9(inst2) + + def implNutritionOrder9(self, inst): + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) + self.assertEqual(inst.dateTime.as_json(), "2014-09-17") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") + self.assertEqual(inst.id, "pureeddiet") self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") self.assertEqual(inst.identifier[0].value, "123") self.assertEqual(inst.intent, "order") @@ -521,14 +489,53 @@ def implNutritionOrder10(self, inst): self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") self.assertEqual(inst.oralDiet.type[0].text, "Pureed diet") self.assertEqual(inst.status, "active") - self.assertEqual(inst.supplement[0].instruction, "Ensure Pudding at breakfast, lunch, supper") - self.assertEqual(inst.supplement[0].productName, "Ensure Pudding 4 oz container") - self.assertEqual(inst.supplement[0].type.coding[0].code, "442971000124100") - self.assertEqual(inst.supplement[0].type.coding[0].display, "Adult high energy formula") - self.assertEqual(inst.supplement[0].type.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.supplement[0].type.coding[1].code, "1040") - self.assertEqual(inst.supplement[0].type.coding[1].display, "Adult high energy pudding") - self.assertEqual(inst.supplement[0].type.coding[1].system, "http://goodhealthhospital.org/supplement-type-codes") - self.assertEqual(inst.supplement[0].type.text, "Adult high energy pudding") + self.assertEqual(inst.text.status, "generated") + + def testNutritionOrder10(self): + inst = self.instantiate_from("nutritionorder-example-diabeticdiet.json") + self.assertIsNotNone(inst, "Must have instantiated a NutritionOrder instance") + self.implNutritionOrder10(inst) + + js = inst.as_json() + self.assertEqual("NutritionOrder", js["resourceType"]) + inst2 = nutritionorder.NutritionOrder(js) + self.implNutritionOrder10(inst2) + + def implNutritionOrder10(self, inst): + self.assertEqual(inst.dateTime.datetime, FHIRDateTime("2014-09-17").datetime) + self.assertEqual(inst.dateTime.as_json(), "2014-09-17") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].code, "227493005") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].display, "Cashew Nut") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.excludeFoodModifier[0].coding[0].version, "20140730") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].code, "dairy-free") + self.assertEqual(inst.foodPreferenceModifier[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/diet") + self.assertEqual(inst.id, "diabeticdiet") + self.assertEqual(inst.identifier[0].system, "http://goodhealthhospital.org/nutrition-requests") + self.assertEqual(inst.identifier[0].value, "123") + self.assertEqual(inst.intent, "order") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.oralDiet.nutrient[0].amount.code, "g") + self.assertEqual(inst.oralDiet.nutrient[0].amount.system, "http://unitsofmeasure.org") + self.assertEqual(inst.oralDiet.nutrient[0].amount.unit, "grams") + self.assertEqual(inst.oralDiet.nutrient[0].amount.value, 75) + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].code, "2331003") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].display, "Carbohydrate") + self.assertEqual(inst.oralDiet.nutrient[0].modifier.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.datetime, FHIRDateTime("2015-02-10").datetime) + self.assertEqual(inst.oralDiet.schedule[0].repeat.boundsPeriod.start.as_json(), "2015-02-10") + self.assertEqual(inst.oralDiet.schedule[0].repeat.frequency, 3) + self.assertEqual(inst.oralDiet.schedule[0].repeat.period, 1) + self.assertEqual(inst.oralDiet.schedule[0].repeat.periodUnit, "d") + self.assertEqual(inst.oralDiet.type[0].coding[0].code, "160670007") + self.assertEqual(inst.oralDiet.type[0].coding[0].display, "Diabetic diet") + self.assertEqual(inst.oralDiet.type[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.oralDiet.type[0].coding[1].code, "1030") + self.assertEqual(inst.oralDiet.type[0].coding[1].display, "DD - Diabetic diet") + self.assertEqual(inst.oralDiet.type[0].coding[1].system, "http://goodhealthhospital.org/diet-type-codes") + self.assertEqual(inst.oralDiet.type[0].text, "DD - Diabetic diet") + self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/observation_test.py b/tests/models/observation_test.py index 7513b2c3..f20aa24c 100644 --- a/tests/models/observation_test.py +++ b/tests/models/observation_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return observation.Observation(js) def testObservation1(self): - inst = self.instantiate_from("observation-example-body-temperature.json") + inst = self.instantiate_from("observation-example-genetics-1.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation1(inst) @@ -30,30 +30,33 @@ def testObservation1(self): self.implObservation1(inst2) def implObservation1(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "vital-signs") - self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.category[0].text, "Vital Signs") - self.assertEqual(inst.code.coding[0].code, "8310-5") - self.assertEqual(inst.code.coding[0].display, "Body temperature") + self.assertEqual(inst.code.coding[0].code, "55233-1") + self.assertEqual(inst.code.coding[0].display, "Genetic analysis master panel-- This is the parent OBR for the panel holding all of the associated observations that can be reported with a molecular genetics analysis result.") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Body temperature") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") - self.assertEqual(inst.id, "body-temperature") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGene") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].code, "3236") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].display, "EGFR") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].system, "http://www.genenames.org") + self.assertEqual(inst.extension[1].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsDNARegionName") + self.assertEqual(inst.extension[1].valueString, "Exon 21") + self.assertEqual(inst.extension[2].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGenomicSourceClass") + self.assertEqual(inst.extension[2].valueCodeableConcept.coding[0].code, "LA6684-0") + self.assertEqual(inst.extension[2].valueCodeableConcept.coding[0].display, "somatic") + self.assertEqual(inst.extension[2].valueCodeableConcept.coding[0].system, "http://loinc.org") + self.assertEqual(inst.id, "example-genetics-1") + self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-03T15:30:10+01:00").datetime) + self.assertEqual(inst.issued.as_json(), "2013-04-03T15:30:10+01:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueQuantity.code, "Cel") - self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.valueQuantity.unit, "C") - self.assertEqual(inst.valueQuantity.value, 36.5) + self.assertEqual(inst.valueCodeableConcept.coding[0].code, "10828004") + self.assertEqual(inst.valueCodeableConcept.coding[0].display, "Positive") + self.assertEqual(inst.valueCodeableConcept.coding[0].system, "http://snomed.info/sct") def testObservation2(self): - inst = self.instantiate_from("observation-example-bgpanel.json") + inst = self.instantiate_from("observation-example-bmd.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation2(inst) @@ -63,25 +66,26 @@ def testObservation2(self): self.implObservation2(inst2) def implObservation2(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "laboratory") - self.assertEqual(inst.category[0].coding[0].display, "Laboratory") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.category[0].text, "Laboratory") - self.assertEqual(inst.code.coding[0].code, "34532-2") - self.assertEqual(inst.code.coding[0].display, " Blood type and Indirect antibody screen panel - Blood") + self.assertEqual(inst.bodySite.coding[0].code, "71341001:272741003=7771000") + self.assertEqual(inst.bodySite.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.bodySite.text, "Left Femur") + self.assertEqual(inst.code.coding[0].code, "24701-5") + self.assertEqual(inst.code.coding[0].display, "Femur DXA Bone density") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Blood Group Panel") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2018-03-11T16:07:54+00:00").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2018-03-11T16:07:54+00:00") - self.assertEqual(inst.id, "bgpanel") + self.assertEqual(inst.code.text, "BMD - Left Femur") + self.assertEqual(inst.id, "bmd") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.valueQuantity.code, "g/cm-2") + self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.valueQuantity.unit, "g/cm²") + self.assertEqual(inst.valueQuantity.value, 0.887) def testObservation3(self): - inst = self.instantiate_from("observation-example-f002-excess.json") + inst = self.instantiate_from("observation-example-respiratory-rate.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation3(inst) @@ -91,42 +95,30 @@ def testObservation3(self): self.implObservation3(inst2) def implObservation3(self, inst): - self.assertEqual(inst.code.coding[0].code, "11555-0") - self.assertEqual(inst.code.coding[0].display, "Base excess in Blood by calculation") + self.assertEqual(inst.category[0].coding[0].code, "vital-signs") + self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") + self.assertEqual(inst.category[0].text, "Vital Signs") + self.assertEqual(inst.code.coding[0].code, "9279-1") + self.assertEqual(inst.code.coding[0].display, "Respiratory rate") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.effectivePeriod.end.datetime, FHIRDateTime("2013-04-05T10:30:10+01:00").datetime) - self.assertEqual(inst.effectivePeriod.end.as_json(), "2013-04-05T10:30:10+01:00") - self.assertEqual(inst.effectivePeriod.start.datetime, FHIRDateTime("2013-04-02T10:30:10+01:00").datetime) - self.assertEqual(inst.effectivePeriod.start.as_json(), "2013-04-02T10:30:10+01:00") - self.assertEqual(inst.id, "f002") - self.assertEqual(inst.identifier[0].system, "http://www.bmc.nl/zorgportal/identifiers/observations") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "6324") - self.assertEqual(inst.interpretation[0].coding[0].code, "H") - self.assertEqual(inst.interpretation[0].coding[0].display, "High") - self.assertEqual(inst.interpretation[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation") - self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-03T15:30:10+01:00").datetime) - self.assertEqual(inst.issued.as_json(), "2013-04-03T15:30:10+01:00") + self.assertEqual(inst.code.text, "Respiratory rate") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") + self.assertEqual(inst.id, "respiratory-rate") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.referenceRange[0].high.code, "mmol/L") - self.assertEqual(inst.referenceRange[0].high.system, "http://unitsofmeasure.org") - self.assertEqual(inst.referenceRange[0].high.unit, "mmol/l") - self.assertEqual(inst.referenceRange[0].high.value, 11.2) - self.assertEqual(inst.referenceRange[0].low.code, "mmol/L") - self.assertEqual(inst.referenceRange[0].low.system, "http://unitsofmeasure.org") - self.assertEqual(inst.referenceRange[0].low.unit, "mmol/l") - self.assertEqual(inst.referenceRange[0].low.value, 7.1) self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueQuantity.code, "mmol/L") + self.assertEqual(inst.valueQuantity.code, "/min") self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.valueQuantity.unit, "mmol/l") - self.assertEqual(inst.valueQuantity.value, 12.6) + self.assertEqual(inst.valueQuantity.unit, "breaths/minute") + self.assertEqual(inst.valueQuantity.value, 26) def testObservation4(self): - inst = self.instantiate_from("observation-example-heart-rate.json") + inst = self.instantiate_from("observation-example.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation4(inst) @@ -139,27 +131,33 @@ def implObservation4(self, inst): self.assertEqual(inst.category[0].coding[0].code, "vital-signs") self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.category[0].text, "Vital Signs") - self.assertEqual(inst.code.coding[0].code, "8867-4") - self.assertEqual(inst.code.coding[0].display, "Heart rate") + self.assertEqual(inst.code.coding[0].code, "29463-7") + self.assertEqual(inst.code.coding[0].display, "Body Weight") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Heart rate") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") - self.assertEqual(inst.id, "heart-rate") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") + self.assertEqual(inst.code.coding[1].code, "3141-9") + self.assertEqual(inst.code.coding[1].display, "Body weight Measured") + self.assertEqual(inst.code.coding[1].system, "http://loinc.org") + self.assertEqual(inst.code.coding[2].code, "27113001") + self.assertEqual(inst.code.coding[2].display, "Body weight") + self.assertEqual(inst.code.coding[2].system, "http://snomed.info/sct") + self.assertEqual(inst.code.coding[3].code, "body-weight") + self.assertEqual(inst.code.coding[3].display, "Body Weight") + self.assertEqual(inst.code.coding[3].system, "http://acme.org/devices/clinical-codes") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2016-03-28").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "2016-03-28") + self.assertEqual(inst.id, "example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueQuantity.code, "/min") + self.assertEqual(inst.valueQuantity.code, "[lb_av]") self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.valueQuantity.unit, "beats/minute") - self.assertEqual(inst.valueQuantity.value, 44) + self.assertEqual(inst.valueQuantity.unit, "lbs") + self.assertEqual(inst.valueQuantity.value, 185) def testObservation5(self): - inst = self.instantiate_from("observation-example-secondsmoke.json") + inst = self.instantiate_from("observation-example-haplotype2.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation5(inst) @@ -169,32 +167,27 @@ def testObservation5(self): self.implObservation5(inst2) def implObservation5(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "social-history") - self.assertEqual(inst.category[0].coding[0].display, "Social History") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.category[0].text, "Social History") - self.assertEqual(inst.code.coding[0].code, "39243-1") - self.assertEqual(inst.code.coding[0].display, "Second hand smoke exposure CPHS") + self.assertEqual(inst.code.coding[0].code, "55233-1") + self.assertEqual(inst.code.coding[0].display, "Genetic analysis master panel-- This is the parent OBR for the panel holding all of the associated observations that can be reported with a molecular genetics analysis result.") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.coding[1].code, "102409004") - self.assertEqual(inst.code.coding[1].display, "Second hand cigarette smoke (substance)") - self.assertEqual(inst.code.coding[1].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Second hand smoke exposure") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2016-05-18T22:33:22Z").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2016-05-18T22:33:22Z") - self.assertEqual(inst.id, "secondsmoke") + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGene") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].code, "2623") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].display, "CYP2C9") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].system, "http://www.genenames.org") + self.assertEqual(inst.id, "example-haplotype2") + self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-03T15:30:10+01:00").datetime) + self.assertEqual(inst.issued.as_json(), "2013-04-03T15:30:10+01:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "final") + self.assertEqual(inst.status, "unknown") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueCodeableConcept.coding[0].code, "373066001") - self.assertEqual(inst.valueCodeableConcept.coding[0].display, "Yes (qualifier value)") - self.assertEqual(inst.valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.valueCodeableConcept.text, "YES") + self.assertEqual(inst.valueCodeableConcept.coding[0].code, "PA16581679") + self.assertEqual(inst.valueCodeableConcept.coding[0].display, "*4") + self.assertEqual(inst.valueCodeableConcept.coding[0].system, "http://pharmakb.org") def testObservation6(self): - inst = self.instantiate_from("observation-example-bloodpressure-dar.json") + inst = self.instantiate_from("observation-example-mbp.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation6(inst) @@ -204,53 +197,29 @@ def testObservation6(self): self.implObservation6(inst2) def implObservation6(self, inst): - self.assertEqual(inst.bodySite.coding[0].code, "368209003") - self.assertEqual(inst.bodySite.coding[0].display, "Right arm") - self.assertEqual(inst.bodySite.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.category[0].coding[0].code, "vital-signs") self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.code.coding[0].code, "85354-9") - self.assertEqual(inst.code.coding[0].display, "Blood pressure panel with all children optional") + self.assertEqual(inst.category[0].text, "Vital Signs") + self.assertEqual(inst.code.coding[0].code, "8478-0") + self.assertEqual(inst.code.coding[0].display, "Mean blood pressure") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Blood pressure systolic & diastolic") - self.assertEqual(inst.component[0].code.coding[0].code, "8480-6") - self.assertEqual(inst.component[0].code.coding[0].display, "Systolic blood pressure") - self.assertEqual(inst.component[0].code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.component[0].code.coding[1].code, "271649006") - self.assertEqual(inst.component[0].code.coding[1].display, "Systolic blood pressure") - self.assertEqual(inst.component[0].code.coding[1].system, "http://snomed.info/sct") - self.assertEqual(inst.component[0].code.coding[2].code, "bp-s") - self.assertEqual(inst.component[0].code.coding[2].display, "Systolic Blood pressure") - self.assertEqual(inst.component[0].code.coding[2].system, "http://acme.org/devices/clinical-codes") - self.assertEqual(inst.component[0].valueQuantity.code, "mm[Hg]") - self.assertEqual(inst.component[0].valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.component[0].valueQuantity.unit, "mmHg") - self.assertEqual(inst.component[0].valueQuantity.value, 107) - self.assertEqual(inst.component[1].code.coding[0].code, "8462-4") - self.assertEqual(inst.component[1].code.coding[0].display, "Diastolic blood pressure") - self.assertEqual(inst.component[1].code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.component[1].dataAbsentReason.coding[0].code, "not-performed") - self.assertEqual(inst.component[1].dataAbsentReason.coding[0].display, "Not Performed") - self.assertEqual(inst.component[1].dataAbsentReason.coding[0].system, "http://terminology.hl7.org/CodeSystem/data-absent-reason") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2012-09-17").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "2012-09-17") - self.assertEqual(inst.id, "blood-pressure-dar") - self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier[0].value, "urn:uuid:187e0c12-8dd2-67e2-99b2-bf273c878281") - self.assertEqual(inst.interpretation[0].coding[0].code, "L") - self.assertEqual(inst.interpretation[0].coding[0].display, "low") - self.assertEqual(inst.interpretation[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation") - self.assertEqual(inst.interpretation[0].text, "Below low normal") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") + self.assertEqual(inst.code.text, "Mean blood pressure") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") + self.assertEqual(inst.id, "mbp") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.valueQuantity.code, "mm[Hg]") + self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.valueQuantity.unit, "mm[Hg]") + self.assertEqual(inst.valueQuantity.value, 80) def testObservation7(self): - inst = self.instantiate_from("observation-example-respiratory-rate.json") + inst = self.instantiate_from("observation-example-genetics-brcapat.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation7(inst) @@ -260,30 +229,26 @@ def testObservation7(self): self.implObservation7(inst2) def implObservation7(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "vital-signs") - self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") - self.assertEqual(inst.category[0].text, "Vital Signs") - self.assertEqual(inst.code.coding[0].code, "9279-1") - self.assertEqual(inst.code.coding[0].display, "Respiratory rate") + self.assertEqual(inst.code.coding[0].code, "59041-4") + self.assertEqual(inst.code.coding[0].display, "BRCA1+BRCA2 gene mutations tested for in Blood or Tissue by Molecular genetics method Nominal") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Respiratory rate") - self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) - self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") - self.assertEqual(inst.id, "respiratory-rate") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGene") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].code, "KX470182.1") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].display, "BRCA") + self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].system, "https://www.ncbi.nlm.nih.gov/nuccore") + self.assertEqual(inst.extension[1].url, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity") + self.assertEqual(inst.extension[1].valueCodeableConcept.coding[0].code, "413581001") + self.assertEqual(inst.extension[1].valueCodeableConcept.coding[0].display, "Unknown racial group") + self.assertEqual(inst.extension[1].valueCodeableConcept.coding[0].system, "http://browser.ihtsdotools.org/") + self.assertEqual(inst.id, "example-genetics-brcapat") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueQuantity.code, "/min") - self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.valueQuantity.unit, "breaths/minute") - self.assertEqual(inst.valueQuantity.value, 26) def testObservation8(self): - inst = self.instantiate_from("observation-example-f203-bicarbonate.json") + inst = self.instantiate_from("observation-example-bmi.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation8(inst) @@ -293,40 +258,30 @@ def testObservation8(self): self.implObservation8(inst2) def implObservation8(self, inst): - self.assertEqual(inst.code.coding[0].code, "1963-8") - self.assertEqual(inst.code.coding[0].display, "Bicarbonate [Moles/?volume] in Serum") + self.assertEqual(inst.category[0].coding[0].code, "vital-signs") + self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") + self.assertEqual(inst.category[0].text, "Vital Signs") + self.assertEqual(inst.code.coding[0].code, "39156-5") + self.assertEqual(inst.code.coding[0].display, "Body mass index (BMI) [Ratio]") self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.coding[1].code, "365722008") - self.assertEqual(inst.code.coding[1].display, "Bicarbonate level") - self.assertEqual(inst.code.coding[1].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f203") - self.assertEqual(inst.identifier[0].system, "https://intranet.aumc.nl/labvalues") - self.assertEqual(inst.identifier[0].value, "1304-03720-Bicarbonate") - self.assertEqual(inst.interpretation[0].coding[0].code, "166698001") - self.assertEqual(inst.interpretation[0].coding[0].display, "Serum bicarbonate level normal") - self.assertEqual(inst.interpretation[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.interpretation[0].coding[1].code, "N") - self.assertEqual(inst.interpretation[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation") - self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-04T14:34:00+01:00").datetime) - self.assertEqual(inst.issued.as_json(), "2013-04-04T14:34:00+01:00") + self.assertEqual(inst.code.text, "BMI") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") + self.assertEqual(inst.id, "bmi") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.method.text, "enzymatic method") - self.assertEqual(inst.referenceRange[0].high.value, 29) - self.assertEqual(inst.referenceRange[0].low.value, 22) - self.assertEqual(inst.referenceRange[0].type.coding[0].code, "normal") - self.assertEqual(inst.referenceRange[0].type.coding[0].display, "Normal Range") - self.assertEqual(inst.referenceRange[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/referencerange-meaning") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueQuantity.code, "258813002") - self.assertEqual(inst.valueQuantity.system, "http://snomed.info/sct") - self.assertEqual(inst.valueQuantity.unit, "mmol/L") - self.assertEqual(inst.valueQuantity.value, 28) + self.assertEqual(inst.valueQuantity.code, "kg/m2") + self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.valueQuantity.unit, "kg/m2") + self.assertEqual(inst.valueQuantity.value, 16.2) def testObservation9(self): - inst = self.instantiate_from("observation-example-diplotype1.json") + inst = self.instantiate_from("observation-example-body-height.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation9(inst) @@ -336,25 +291,30 @@ def testObservation9(self): self.implObservation9(inst2) def implObservation9(self, inst): - self.assertEqual(inst.code.coding[0].code, "363779003") - self.assertEqual(inst.code.coding[0].display, "Genotype determination") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Diplotype Call") - self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGene") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].code, "2623") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].display, "CYP2C9") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].system, "http://www.genenames.org") - self.assertEqual(inst.id, "example-diplotype1") - self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-03T15:30:10+01:00").datetime) - self.assertEqual(inst.issued.as_json(), "2013-04-03T15:30:10+01:00") + self.assertEqual(inst.category[0].coding[0].code, "vital-signs") + self.assertEqual(inst.category[0].coding[0].display, "Vital Signs") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/observation-category") + self.assertEqual(inst.category[0].text, "Vital Signs") + self.assertEqual(inst.code.coding[0].code, "8302-2") + self.assertEqual(inst.code.coding[0].display, "Body height") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.code.text, "Body height") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("1999-07-02").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "1999-07-02") + self.assertEqual(inst.id, "body-height") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/vitalsigns") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.valueQuantity.code, "[in_i]") + self.assertEqual(inst.valueQuantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.valueQuantity.unit, "in") + self.assertEqual(inst.valueQuantity.value, 66.89999999999999) def testObservation10(self): - inst = self.instantiate_from("observation-example-TPMT-haplotype-one.json") + inst = self.instantiate_from("observation-example-eye-color.json") self.assertIsNotNone(inst, "Must have instantiated a Observation instance") self.implObservation10(inst) @@ -364,23 +324,14 @@ def testObservation10(self): self.implObservation10(inst2) def implObservation10(self, inst): - self.assertEqual(inst.code.coding[0].code, "363779003") - self.assertEqual(inst.code.coding[0].display, "Genotype determination") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Haplotype Call") - self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/observation-geneticsGene") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].code, "12014") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].display, "TPMT") - self.assertEqual(inst.extension[0].valueCodeableConcept.coding[0].system, "http://www.genenames.org") - self.assertEqual(inst.id, "example-TPMT-haplotype-one") - self.assertEqual(inst.issued.datetime, FHIRInstant("2013-04-03T15:30:10+01:00").datetime) - self.assertEqual(inst.issued.as_json(), "2013-04-03T15:30:10+01:00") + self.assertEqual(inst.code.text, "eye color") + self.assertEqual(inst.effectiveDateTime.datetime, FHIRDateTime("2016-05-18").datetime) + self.assertEqual(inst.effectiveDateTime.as_json(), "2016-05-18") + self.assertEqual(inst.id, "eye-color") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "unknown") + self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.valueCodeableConcept.coding[0].code, "PA166128347") - self.assertEqual(inst.valueCodeableConcept.coding[0].display, "*1") - self.assertEqual(inst.valueCodeableConcept.coding[0].system, "http://pharmakb.org") + self.assertEqual(inst.valueString, "blue") diff --git a/tests/models/operationoutcome_test.py b/tests/models/operationoutcome_test.py index bd2a2175..e47e2234 100644 --- a/tests/models/operationoutcome_test.py +++ b/tests/models/operationoutcome_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return operationoutcome.OperationOutcome(js) def testOperationOutcome1(self): - inst = self.instantiate_from("operationoutcome-example-searchfail.json") + inst = self.instantiate_from("operationoutcome-example-validationfail.json") self.assertIsNotNone(inst, "Must have instantiated a OperationOutcome instance") self.implOperationOutcome1(inst) @@ -30,18 +30,19 @@ def testOperationOutcome1(self): self.implOperationOutcome1(inst2) def implOperationOutcome1(self, inst): - self.assertEqual(inst.id, "searchfail") - self.assertEqual(inst.issue[0].code, "code-invalid") - self.assertEqual(inst.issue[0].details.text, "The \"name\" parameter has the modifier \"exact\" which is not supported by this server") - self.assertEqual(inst.issue[0].location[0], "http.name:exact") - self.assertEqual(inst.issue[0].severity, "fatal") + self.assertEqual(inst.id, "validationfail") + self.assertEqual(inst.issue[0].code, "structure") + self.assertEqual(inst.issue[0].details.text, "Error parsing resource XML (Unknown Content \"label\"") + self.assertEqual(inst.issue[0].expression[0], "Patient.identifier") + self.assertEqual(inst.issue[0].location[0], "/f:Patient/f:identifier") + self.assertEqual(inst.issue[0].severity, "error") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") def testOperationOutcome2(self): - inst = self.instantiate_from("operationoutcome-example-validationfail.json") + inst = self.instantiate_from("operationoutcome-example-break-the-glass.json") self.assertIsNotNone(inst, "Must have instantiated a OperationOutcome instance") self.implOperationOutcome2(inst) @@ -51,19 +52,20 @@ def testOperationOutcome2(self): self.implOperationOutcome2(inst2) def implOperationOutcome2(self, inst): - self.assertEqual(inst.id, "validationfail") - self.assertEqual(inst.issue[0].code, "structure") - self.assertEqual(inst.issue[0].details.text, "Error parsing resource XML (Unknown Content \"label\"") - self.assertEqual(inst.issue[0].expression[0], "Patient.identifier") - self.assertEqual(inst.issue[0].location[0], "/f:Patient/f:identifier") - self.assertEqual(inst.issue[0].severity, "error") + self.assertEqual(inst.id, "break-the-glass") + self.assertEqual(inst.issue[0].code, "suppressed") + self.assertEqual(inst.issue[0].details.coding[0].code, "ETREAT") + self.assertEqual(inst.issue[0].details.coding[0].display, "Emergency Treatment") + self.assertEqual(inst.issue[0].details.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.issue[0].details.text, "Additional information may be available using the Break-The-Glass Protocol") + self.assertEqual(inst.issue[0].severity, "information") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") def testOperationOutcome3(self): - inst = self.instantiate_from("operationoutcome-example-allok.json") + inst = self.instantiate_from("operationoutcome-example-searchfail.json") self.assertIsNotNone(inst, "Must have instantiated a OperationOutcome instance") self.implOperationOutcome3(inst) @@ -73,10 +75,11 @@ def testOperationOutcome3(self): self.implOperationOutcome3(inst2) def implOperationOutcome3(self, inst): - self.assertEqual(inst.id, "allok") - self.assertEqual(inst.issue[0].code, "informational") - self.assertEqual(inst.issue[0].details.text, "All OK") - self.assertEqual(inst.issue[0].severity, "information") + self.assertEqual(inst.id, "searchfail") + self.assertEqual(inst.issue[0].code, "code-invalid") + self.assertEqual(inst.issue[0].details.text, "The \"name\" parameter has the modifier \"exact\" which is not supported by this server") + self.assertEqual(inst.issue[0].location[0], "http.name:exact") + self.assertEqual(inst.issue[0].severity, "fatal") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -126,7 +129,7 @@ def implOperationOutcome5(self, inst): self.assertEqual(inst.text.status, "generated") def testOperationOutcome6(self): - inst = self.instantiate_from("operationoutcome-example-break-the-glass.json") + inst = self.instantiate_from("operationoutcome-example-allok.json") self.assertIsNotNone(inst, "Must have instantiated a OperationOutcome instance") self.implOperationOutcome6(inst) @@ -136,12 +139,9 @@ def testOperationOutcome6(self): self.implOperationOutcome6(inst2) def implOperationOutcome6(self, inst): - self.assertEqual(inst.id, "break-the-glass") - self.assertEqual(inst.issue[0].code, "suppressed") - self.assertEqual(inst.issue[0].details.coding[0].code, "ETREAT") - self.assertEqual(inst.issue[0].details.coding[0].display, "Emergency Treatment") - self.assertEqual(inst.issue[0].details.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.issue[0].details.text, "Additional information may be available using the Break-The-Glass Protocol") + self.assertEqual(inst.id, "allok") + self.assertEqual(inst.issue[0].code, "informational") + self.assertEqual(inst.issue[0].details.text, "All OK") self.assertEqual(inst.issue[0].severity, "information") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") diff --git a/tests/models/organization_test.py b/tests/models/organization_test.py index 5148320b..d0ebc466 100644 --- a/tests/models/organization_test.py +++ b/tests/models/organization_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return organization.Organization(js) def testOrganization1(self): - inst = self.instantiate_from("organization-example-f201-aumc.json") + inst = self.instantiate_from("organization-example.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization1(inst) @@ -30,46 +30,24 @@ def testOrganization1(self): self.implOrganization1(inst2) def implOrganization1(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.address[0].city, "Den Helder") - self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") - self.assertEqual(inst.address[0].postalCode, "2333ZA") - self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.contact[0].address.city, "Den helder") - self.assertEqual(inst.contact[0].address.country, "NLD") - self.assertEqual(inst.contact[0].address.line[0], "Walvisbaai 3") - self.assertEqual(inst.contact[0].address.line[1], "Gebouw 2") - self.assertEqual(inst.contact[0].address.postalCode, "2333ZA") - self.assertEqual(inst.contact[0].name.family, "Brand") - self.assertEqual(inst.contact[0].name.given[0], "Ronald") - self.assertEqual(inst.contact[0].name.prefix[0], "Prof.Dr.") - self.assertEqual(inst.contact[0].name.text, "Professor Brand") - self.assertEqual(inst.contact[0].name.use, "official") - self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].use, "work") - self.assertEqual(inst.contact[0].telecom[0].value, "+31715269702") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.identifier[0].system, "http://www.zorgkaartnederland.nl/") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "Artis University Medical Center") + self.assertEqual(inst.address[0].city, "Ann Arbor") + self.assertEqual(inst.address[0].country, "USA") + self.assertEqual(inst.address[0].line[0], "3300 Washtenaw Avenue, Suite 227") + self.assertEqual(inst.address[0].postalCode, "48104") + self.assertEqual(inst.address[0].state, "MI") + self.assertEqual(inst.alias[0], "HL7 International") + self.assertEqual(inst.id, "hl7") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Artis University Medical Center (AUMC)") + self.assertEqual(inst.name, "Health Level Seven International") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "+31715269111") + self.assertEqual(inst.telecom[0].value, "(+1) 734-677-7777") + self.assertEqual(inst.telecom[1].system, "fax") + self.assertEqual(inst.telecom[1].value, "(+1) 734-677-6622") + self.assertEqual(inst.telecom[2].system, "email") + self.assertEqual(inst.telecom[2].value, "hq@HL7.org") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "405608006") - self.assertEqual(inst.type[0].coding[0].display, "Academic Medical Center") - self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.type[0].coding[1].code, "V6") - self.assertEqual(inst.type[0].coding[1].display, "University Medical Hospital") - self.assertEqual(inst.type[0].coding[1].system, "urn:oid:2.16.840.1.113883.2.4.15.1060") - self.assertEqual(inst.type[0].coding[2].code, "prov") - self.assertEqual(inst.type[0].coding[2].display, "Healthcare Provider") - self.assertEqual(inst.type[0].coding[2].system, "http://terminology.hl7.org/CodeSystem/organization-type") def testOrganization2(self): inst = self.instantiate_from("organization-example-mmanu.json") @@ -92,7 +70,7 @@ def implOrganization2(self, inst): self.assertEqual(inst.text.status, "generated") def testOrganization3(self): - inst = self.instantiate_from("organization-example-good-health-care.json") + inst = self.instantiate_from("organization-example-gastro.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization3(inst) @@ -102,17 +80,23 @@ def testOrganization3(self): self.implOrganization3(inst2) def implOrganization3(self, inst): - self.assertEqual(inst.id, "2.16.840.1.113883.19.5") - self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier[0].value, "2.16.840.1.113883.19.5") + self.assertEqual(inst.id, "1") + self.assertEqual(inst.identifier[0].system, "http://www.acme.org.au/units") + self.assertEqual(inst.identifier[0].value, "Gastro") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Good Health Clinic") + self.assertEqual(inst.name, "Gastroenterology") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].use, "mobile") + self.assertEqual(inst.telecom[0].value, "+1 555 234 3523") + self.assertEqual(inst.telecom[1].system, "email") + self.assertEqual(inst.telecom[1].use, "work") + self.assertEqual(inst.telecom[1].value, "gastro@acme.org") self.assertEqual(inst.text.status, "generated") def testOrganization4(self): - inst = self.instantiate_from("organization-example-gastro.json") + inst = self.instantiate_from("organization-example-mihealth.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization4(inst) @@ -122,23 +106,18 @@ def testOrganization4(self): self.implOrganization4(inst2) def implOrganization4(self, inst): - self.assertEqual(inst.id, "1") - self.assertEqual(inst.identifier[0].system, "http://www.acme.org.au/units") - self.assertEqual(inst.identifier[0].value, "Gastro") + self.assertEqual(inst.alias[0], "Michigan State Department of Health") + self.assertEqual(inst.id, "3") + self.assertEqual(inst.identifier[0].system, "http://michigan.gov/state-dept-ids") + self.assertEqual(inst.identifier[0].value, "25") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Gastroenterology") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "mobile") - self.assertEqual(inst.telecom[0].value, "+1 555 234 3523") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "gastro@acme.org") + self.assertEqual(inst.name, "Michigan Health") self.assertEqual(inst.text.status, "generated") def testOrganization5(self): - inst = self.instantiate_from("organization-example-mihealth.json") + inst = self.instantiate_from("organization-example-lab.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization5(inst) @@ -148,18 +127,23 @@ def testOrganization5(self): self.implOrganization5(inst2) def implOrganization5(self, inst): - self.assertEqual(inst.alias[0], "Michigan State Department of Health") - self.assertEqual(inst.id, "3") - self.assertEqual(inst.identifier[0].system, "http://michigan.gov/state-dept-ids") - self.assertEqual(inst.identifier[0].value, "25") + self.assertEqual(inst.id, "1832473e-2fe0-452d-abe9-3cdb9879522f") + self.assertEqual(inst.identifier[0].system, "http://www.acme.org.au/units") + self.assertEqual(inst.identifier[0].value, "ClinLab") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Michigan Health") + self.assertEqual(inst.name, "Clinical Lab") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "+1 555 234 1234") + self.assertEqual(inst.telecom[1].system, "email") + self.assertEqual(inst.telecom[1].use, "work") + self.assertEqual(inst.telecom[1].value, "contact@labs.acme.org") self.assertEqual(inst.text.status, "generated") def testOrganization6(self): - inst = self.instantiate_from("organization-example-insurer.json") + inst = self.instantiate_from("organization-example-f002-burgers-card.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization6(inst) @@ -169,18 +153,32 @@ def testOrganization6(self): self.implOrganization6(inst2) def implOrganization6(self, inst): - self.assertEqual(inst.alias[0], "ABC Insurance") - self.assertEqual(inst.id, "2") - self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.840.1.113883.3.19.2.3") - self.assertEqual(inst.identifier[0].value, "666666") + self.assertTrue(inst.active) + self.assertEqual(inst.address[0].line[0], "South Wing, floor 2") + self.assertEqual(inst.contact[0].address.line[0], "South Wing, floor 2") + self.assertEqual(inst.contact[0].name.text, "mevr. D. de Haan") + self.assertEqual(inst.contact[0].purpose.coding[0].code, "ADMIN") + self.assertEqual(inst.contact[0].purpose.coding[0].system, "http://terminology.hl7.org/CodeSystem/contactentity-type") + self.assertEqual(inst.contact[0].telecom[0].system, "phone") + self.assertEqual(inst.contact[0].telecom[0].value, "022-655 2321") + self.assertEqual(inst.contact[0].telecom[1].system, "email") + self.assertEqual(inst.contact[0].telecom[1].value, "cardio@burgersumc.nl") + self.assertEqual(inst.contact[0].telecom[2].system, "fax") + self.assertEqual(inst.contact[0].telecom[2].value, "022-655 2322") + self.assertEqual(inst.id, "f002") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "XYZ Insurance") + self.assertEqual(inst.name, "Burgers UMC Cardiology unit") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].value, "022-655 2320") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type[0].coding[0].code, "dept") + self.assertEqual(inst.type[0].coding[0].display, "Hospital Department") + self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/organization-type") def testOrganization7(self): - inst = self.instantiate_from("organization-example-f003-burgers-ENT.json") + inst = self.instantiate_from("organization-example-f201-aumc.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization7(inst) @@ -191,31 +189,48 @@ def testOrganization7(self): def implOrganization7(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.address[0].line[0], "West Wing, floor 5") - self.assertEqual(inst.contact[0].address.line[0], "West Wing, floor 5") - self.assertEqual(inst.contact[0].name.text, "mr. F. de Hond") - self.assertEqual(inst.contact[0].purpose.coding[0].code, "ADMIN") - self.assertEqual(inst.contact[0].purpose.coding[0].system, "http://terminology.hl7.org/CodeSystem/contactentity-type") + self.assertEqual(inst.address[0].city, "Den Helder") + self.assertEqual(inst.address[0].country, "NLD") + self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") + self.assertEqual(inst.address[0].postalCode, "2333ZA") + self.assertEqual(inst.address[0].use, "work") + self.assertEqual(inst.contact[0].address.city, "Den helder") + self.assertEqual(inst.contact[0].address.country, "NLD") + self.assertEqual(inst.contact[0].address.line[0], "Walvisbaai 3") + self.assertEqual(inst.contact[0].address.line[1], "Gebouw 2") + self.assertEqual(inst.contact[0].address.postalCode, "2333ZA") + self.assertEqual(inst.contact[0].name.family, "Brand") + self.assertEqual(inst.contact[0].name.given[0], "Ronald") + self.assertEqual(inst.contact[0].name.prefix[0], "Prof.Dr.") + self.assertEqual(inst.contact[0].name.text, "Professor Brand") + self.assertEqual(inst.contact[0].name.use, "official") self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].value, "022-655 7654") - self.assertEqual(inst.contact[0].telecom[1].system, "email") - self.assertEqual(inst.contact[0].telecom[1].value, "KNO@burgersumc.nl") - self.assertEqual(inst.contact[0].telecom[2].system, "fax") - self.assertEqual(inst.contact[0].telecom[2].value, "022-655 0998") - self.assertEqual(inst.id, "f003") + self.assertEqual(inst.contact[0].telecom[0].use, "work") + self.assertEqual(inst.contact[0].telecom[0].value, "+31715269702") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.identifier[0].system, "http://www.zorgkaartnederland.nl/") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "Artis University Medical Center") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Burgers UMC Ear,Nose,Throat unit") + self.assertEqual(inst.name, "Artis University Medical Center (AUMC)") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].value, "022-655 6780") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "+31715269111") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "dept") - self.assertEqual(inst.type[0].coding[0].display, "Hospital Department") - self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/organization-type") + self.assertEqual(inst.type[0].coding[0].code, "405608006") + self.assertEqual(inst.type[0].coding[0].display, "Academic Medical Center") + self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.type[0].coding[1].code, "V6") + self.assertEqual(inst.type[0].coding[1].display, "University Medical Hospital") + self.assertEqual(inst.type[0].coding[1].system, "urn:oid:2.16.840.1.113883.2.4.15.1060") + self.assertEqual(inst.type[0].coding[2].code, "prov") + self.assertEqual(inst.type[0].coding[2].display, "Healthcare Provider") + self.assertEqual(inst.type[0].coding[2].system, "http://terminology.hl7.org/CodeSystem/organization-type") def testOrganization8(self): - inst = self.instantiate_from("organization-example-f002-burgers-card.json") + inst = self.instantiate_from("organization-example-good-health-care.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization8(inst) @@ -225,32 +240,17 @@ def testOrganization8(self): self.implOrganization8(inst2) def implOrganization8(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.address[0].line[0], "South Wing, floor 2") - self.assertEqual(inst.contact[0].address.line[0], "South Wing, floor 2") - self.assertEqual(inst.contact[0].name.text, "mevr. D. de Haan") - self.assertEqual(inst.contact[0].purpose.coding[0].code, "ADMIN") - self.assertEqual(inst.contact[0].purpose.coding[0].system, "http://terminology.hl7.org/CodeSystem/contactentity-type") - self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].value, "022-655 2321") - self.assertEqual(inst.contact[0].telecom[1].system, "email") - self.assertEqual(inst.contact[0].telecom[1].value, "cardio@burgersumc.nl") - self.assertEqual(inst.contact[0].telecom[2].system, "fax") - self.assertEqual(inst.contact[0].telecom[2].value, "022-655 2322") - self.assertEqual(inst.id, "f002") + self.assertEqual(inst.id, "2.16.840.1.113883.19.5") + self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") + self.assertEqual(inst.identifier[0].value, "2.16.840.1.113883.19.5") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Burgers UMC Cardiology unit") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].value, "022-655 2320") + self.assertEqual(inst.name, "Good Health Clinic") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "dept") - self.assertEqual(inst.type[0].coding[0].display, "Hospital Department") - self.assertEqual(inst.type[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/organization-type") def testOrganization9(self): - inst = self.instantiate_from("organization-example-lab.json") + inst = self.instantiate_from("organization-example-f001-burgers.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization9(inst) @@ -260,23 +260,48 @@ def testOrganization9(self): self.implOrganization9(inst2) def implOrganization9(self, inst): - self.assertEqual(inst.id, "1832473e-2fe0-452d-abe9-3cdb9879522f") - self.assertEqual(inst.identifier[0].system, "http://www.acme.org.au/units") - self.assertEqual(inst.identifier[0].value, "ClinLab") + self.assertEqual(inst.address[0].city, "Den Burg") + self.assertEqual(inst.address[0].country, "NLD") + self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") + self.assertEqual(inst.address[0].postalCode, "9105 PZ") + self.assertEqual(inst.address[0].use, "work") + self.assertEqual(inst.address[1].city, "Den Burg") + self.assertEqual(inst.address[1].country, "NLD") + self.assertEqual(inst.address[1].line[0], "PO Box 2311") + self.assertEqual(inst.address[1].postalCode, "9100 AA") + self.assertEqual(inst.address[1].use, "work") + self.assertEqual(inst.contact[0].purpose.coding[0].code, "PRESS") + self.assertEqual(inst.contact[0].purpose.coding[0].system, "http://terminology.hl7.org/CodeSystem/contactentity-type") + self.assertEqual(inst.contact[0].telecom[0].system, "phone") + self.assertEqual(inst.contact[0].telecom[0].value, "022-655 2334") + self.assertEqual(inst.contact[1].purpose.coding[0].code, "PATINF") + self.assertEqual(inst.contact[1].purpose.coding[0].system, "http://terminology.hl7.org/CodeSystem/contactentity-type") + self.assertEqual(inst.contact[1].telecom[0].system, "phone") + self.assertEqual(inst.contact[1].telecom[0].value, "022-655 2335") + self.assertEqual(inst.id, "f001") + self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "91654") + self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.1") + self.assertEqual(inst.identifier[1].use, "usual") + self.assertEqual(inst.identifier[1].value, "17-0112278") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Clinical Lab") + self.assertEqual(inst.name, "Burgers University Medical Center") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "+1 555 234 1234") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "contact@labs.acme.org") + self.assertEqual(inst.telecom[0].value, "022-655 2300") self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type[0].coding[0].code, "V6") + self.assertEqual(inst.type[0].coding[0].display, "University Medical Hospital") + self.assertEqual(inst.type[0].coding[0].system, "urn:oid:2.16.840.1.113883.2.4.15.1060") + self.assertEqual(inst.type[0].coding[1].code, "prov") + self.assertEqual(inst.type[0].coding[1].display, "Healthcare Provider") + self.assertEqual(inst.type[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/organization-type") def testOrganization10(self): - inst = self.instantiate_from("organization-example-f203-bumc.json") + inst = self.instantiate_from("organization-example-insurer.json") self.assertIsNotNone(inst, "Must have instantiated a Organization instance") self.implOrganization10(inst) @@ -286,28 +311,13 @@ def testOrganization10(self): self.implOrganization10(inst2) def implOrganization10(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.address[0].city, "Blijdorp") - self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "apenrots 230") - self.assertEqual(inst.address[0].postalCode, "3056BE") - self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.id, "f203") - self.assertEqual(inst.identifier[0].system, "http://www.zorgkaartnederland.nl/") - self.assertEqual(inst.identifier[0].type.text, "Zorginstelling naam") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "Blijdorp MC") + self.assertEqual(inst.alias[0], "ABC Insurance") + self.assertEqual(inst.id, "2") + self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.840.1.113883.3.19.2.3") + self.assertEqual(inst.identifier[0].value, "666666") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name, "Blijdorp Medisch Centrum (BUMC)") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "+31107040704") + self.assertEqual(inst.name, "XYZ Insurance") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type[0].coding[0].code, "405608006") - self.assertEqual(inst.type[0].coding[0].display, "Academic Medical Center") - self.assertEqual(inst.type[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.type[0].coding[1].code, "prov") - self.assertEqual(inst.type[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/organization-type") diff --git a/tests/models/patient_test.py b/tests/models/patient_test.py index 43bdcf77..a974c541 100644 --- a/tests/models/patient_test.py +++ b/tests/models/patient_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return patient.Patient(js) def testPatient1(self): - inst = self.instantiate_from("patient-example-a.json") + inst = self.instantiate_from("patient-example-xds.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") self.implPatient1(inst) @@ -31,23 +31,25 @@ def testPatient1(self): def implPatient1(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.contact[0].relationship[0].coding[0].code, "E") - self.assertEqual(inst.contact[0].relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") + self.assertEqual(inst.address[0].city, "Metropolis") + self.assertEqual(inst.address[0].country, "USA") + self.assertEqual(inst.address[0].line[0], "100 Main St") + self.assertEqual(inst.address[0].postalCode, "44130") + self.assertEqual(inst.address[0].state, "Il") + self.assertEqual(inst.birthDate.date, FHIRDate("1956-05-27").date) + self.assertEqual(inst.birthDate.as_json(), "1956-05-27") self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "pat1") - self.assertEqual(inst.identifier[0].system, "urn:oid:0.1.2.3.4.5.6.7") + self.assertEqual(inst.id, "xds") + self.assertEqual(inst.identifier[0].system, "urn:oid:1.2.3.4.5") self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "654321") - self.assertEqual(inst.link[0].type, "seealso") + self.assertEqual(inst.identifier[0].value, "89765a87b") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Donald") - self.assertEqual(inst.name[0].given[0], "Duck") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.photo[0].contentType, "image/gif") + self.assertEqual(inst.name[0].family, "Doe") + self.assertEqual(inst.name[0].given[0], "John") self.assertEqual(inst.text.status, "generated") def testPatient2(self): @@ -111,7 +113,7 @@ def implPatient2(self, inst): self.assertEqual(inst.text.status, "generated") def testPatient3(self): - inst = self.instantiate_from("patient-example-xcda.json") + inst = self.instantiate_from("patient-example-d.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") self.implPatient3(inst) @@ -122,24 +124,26 @@ def testPatient3(self): def implPatient3(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.birthDate.date, FHIRDate("1932-09-24").date) - self.assertEqual(inst.birthDate.as_json(), "1932-09-24") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "xcda") - self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.840.1.113883.19.5") + self.assertEqual(inst.birthDate.date, FHIRDate("1982-08-02").date) + self.assertEqual(inst.birthDate.as_json(), "1982-08-02") + self.assertTrue(inst.deceasedBoolean) + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "pat4") + self.assertEqual(inst.identifier[0].system, "urn:oid:0.1.2.3.4.5.6.7") self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.identifier[0].value, "123458") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Levin") - self.assertEqual(inst.name[0].given[0], "Henry") + self.assertEqual(inst.name[0].family, "Notsowell") + self.assertEqual(inst.name[0].given[0], "Sandy") + self.assertEqual(inst.name[0].use, "official") self.assertEqual(inst.text.status, "generated") def testPatient4(self): - inst = self.instantiate_from("patient-example-newborn.json") + inst = self.instantiate_from("patient-example-infant-twin-1.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") self.implPatient4(inst) @@ -149,20 +153,42 @@ def testPatient4(self): self.implPatient4(inst2) def implPatient4(self, inst): - self.assertEqual(inst.birthDate.date, FHIRDate("2017-09-05").date) - self.assertEqual(inst.birthDate.as_json(), "2017-09-05") + self.assertEqual(inst.birthDate.date, FHIRDate("2017-05-15").date) + self.assertEqual(inst.birthDate.as_json(), "2017-05-15") + self.assertEqual(inst.contact[0].name.family, "Organa") + self.assertEqual(inst.contact[0].name.given[0], "Leia") + self.assertEqual(inst.contact[0].name.use, "maiden") + self.assertEqual(inst.contact[0].relationship[0].coding[0].code, "72705000") + self.assertEqual(inst.contact[0].relationship[0].coding[0].display, "Mother") + self.assertEqual(inst.contact[0].relationship[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.contact[0].relationship[0].coding[1].code, "N") + self.assertEqual(inst.contact[0].relationship[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v2-0131") + self.assertEqual(inst.contact[0].relationship[0].coding[2].code, "MTH") + self.assertEqual(inst.contact[0].relationship[0].coding[2].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") + self.assertEqual(inst.contact[0].telecom[0].system, "phone") + self.assertEqual(inst.contact[0].telecom[0].use, "mobile") + self.assertEqual(inst.contact[0].telecom[0].value, "+31201234567") self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName") - self.assertEqual(inst.extension[0].valueString, "Everywoman") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "newborn") + self.assertEqual(inst.extension[0].valueString, "Organa") + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "infant-twin-1") + self.assertEqual(inst.identifier[0].system, "http://coruscanthealth.org/main-hospital/patient-identifier") + self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") + self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") + self.assertEqual(inst.identifier[0].value, "MRN7465737865") + self.assertEqual(inst.identifier[1].system, "http://new-republic.gov/galactic-citizen-identifier") + self.assertEqual(inst.identifier[1].value, "7465737865") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.multipleBirthInteger, 2) + self.assertEqual(inst.multipleBirthInteger, 1) + self.assertEqual(inst.name[0].family, "Solo") + self.assertEqual(inst.name[0].given[0], "Jaina") + self.assertEqual(inst.name[0].use, "official") self.assertEqual(inst.text.status, "generated") def testPatient5(self): - inst = self.instantiate_from("patient-example-animal.json") + inst = self.instantiate_from("patient-example-infant-mom.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") self.implPatient5(inst) @@ -172,57 +198,6 @@ def testPatient5(self): self.implPatient5(inst2) def implPatient5(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.birthDate.date, FHIRDate("2010-03-23").date) - self.assertEqual(inst.birthDate.as_json(), "2010-03-23") - self.assertEqual(inst.contact[0].name.family, "Chalmers") - self.assertEqual(inst.contact[0].name.given[0], "Peter") - self.assertEqual(inst.contact[0].name.given[1], "James") - self.assertEqual(inst.contact[0].relationship[0].coding[0].code, "C") - self.assertEqual(inst.contact[0].relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") - self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].use, "work") - self.assertEqual(inst.contact[0].telecom[0].value, "(03) 5555 6473") - self.assertEqual(inst.extension[0].extension[0].url, "species") - self.assertEqual(inst.extension[0].extension[0].valueCodeableConcept.coding[0].code, "canislf") - self.assertEqual(inst.extension[0].extension[0].valueCodeableConcept.coding[0].display, "Dog") - self.assertEqual(inst.extension[0].extension[0].valueCodeableConcept.coding[0].system, "http://hl7.org/fhir/animal-species") - self.assertEqual(inst.extension[0].extension[1].url, "breed") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[0].code, "58108001") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[0].display, "Golden retriever") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[1].code, "gret") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[1].display, "Golden Retriever") - self.assertEqual(inst.extension[0].extension[1].valueCodeableConcept.coding[1].system, "http://example.org/fhir/CodeSystem/animal-breed") - self.assertEqual(inst.extension[0].extension[2].url, "genderStatus") - self.assertEqual(inst.extension[0].extension[2].valueCodeableConcept.coding[0].code, "neutered") - self.assertEqual(inst.extension[0].extension[2].valueCodeableConcept.coding[0].system, "http://hl7.org/fhir/animal-genderstatus") - self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/patient-animal") - self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "animal") - self.assertEqual(inst.identifier[0].period.start.datetime, FHIRDateTime("2010-05-31").datetime) - self.assertEqual(inst.identifier[0].period.start.as_json(), "2010-05-31") - self.assertEqual(inst.identifier[0].system, "http://www.maroondah.vic.gov.au/AnimalRegFees.aspx") - self.assertEqual(inst.identifier[0].type.text, "Dog Tag") - self.assertEqual(inst.identifier[0].value, "1234123") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].given[0], "Kenzi") - self.assertEqual(inst.name[0].use, "usual") - self.assertEqual(inst.text.status, "generated") - - def testPatient6(self): - inst = self.instantiate_from("patient-example-infant-mom.json") - self.assertIsNotNone(inst, "Must have instantiated a Patient instance") - self.implPatient6(inst) - - js = inst.as_json() - self.assertEqual("Patient", js["resourceType"]) - inst2 = patient.Patient(js) - self.implPatient6(inst2) - - def implPatient6(self, inst): self.assertEqual(inst.birthDate.date, FHIRDate("1995-10-12").date) self.assertEqual(inst.birthDate.as_json(), "1995-10-12") self.assertEqual(inst.gender, "female") @@ -241,102 +216,40 @@ def implPatient6(self, inst): self.assertEqual(inst.name[1].use, "maiden") self.assertEqual(inst.text.status, "generated") - def testPatient7(self): - inst = self.instantiate_from("patient-example.json") + def testPatient6(self): + inst = self.instantiate_from("patient-example-newborn.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") - self.implPatient7(inst) + self.implPatient6(inst) js = inst.as_json() self.assertEqual("Patient", js["resourceType"]) inst2 = patient.Patient(js) - self.implPatient7(inst2) + self.implPatient6(inst2) - def implPatient7(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.address[0].city, "PleasantVille") - self.assertEqual(inst.address[0].district, "Rainbow") - self.assertEqual(inst.address[0].line[0], "534 Erewhon St") - self.assertEqual(inst.address[0].period.start.datetime, FHIRDateTime("1974-12-25").datetime) - self.assertEqual(inst.address[0].period.start.as_json(), "1974-12-25") - self.assertEqual(inst.address[0].postalCode, "3999") - self.assertEqual(inst.address[0].state, "Vic") - self.assertEqual(inst.address[0].text, "534 Erewhon St PeasantVille, Rainbow, Vic 3999") - self.assertEqual(inst.address[0].type, "both") - self.assertEqual(inst.address[0].use, "home") - self.assertEqual(inst.birthDate.date, FHIRDate("1974-12-25").date) - self.assertEqual(inst.birthDate.as_json(), "1974-12-25") - self.assertEqual(inst.contact[0].address.city, "PleasantVille") - self.assertEqual(inst.contact[0].address.district, "Rainbow") - self.assertEqual(inst.contact[0].address.line[0], "534 Erewhon St") - self.assertEqual(inst.contact[0].address.period.start.datetime, FHIRDateTime("1974-12-25").datetime) - self.assertEqual(inst.contact[0].address.period.start.as_json(), "1974-12-25") - self.assertEqual(inst.contact[0].address.postalCode, "3999") - self.assertEqual(inst.contact[0].address.state, "Vic") - self.assertEqual(inst.contact[0].address.type, "both") - self.assertEqual(inst.contact[0].address.use, "home") - self.assertEqual(inst.contact[0].gender, "female") - self.assertEqual(inst.contact[0].name.family, "du Marché") - self.assertEqual(inst.contact[0].name.given[0], "Bénédicte") - self.assertEqual(inst.contact[0].period.start.datetime, FHIRDateTime("2012").datetime) - self.assertEqual(inst.contact[0].period.start.as_json(), "2012") - self.assertEqual(inst.contact[0].relationship[0].coding[0].code, "N") - self.assertEqual(inst.contact[0].relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") - self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].value, "+33 (237) 998327") - self.assertFalse(inst.deceasedBoolean) + def implPatient6(self, inst): + self.assertEqual(inst.birthDate.date, FHIRDate("2017-09-05").date) + self.assertEqual(inst.birthDate.as_json(), "2017-09-05") + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName") + self.assertEqual(inst.extension[0].valueString, "Everywoman") self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].period.start.datetime, FHIRDateTime("2001-05-06").datetime) - self.assertEqual(inst.identifier[0].period.start.as_json(), "2001-05-06") - self.assertEqual(inst.identifier[0].system, "urn:oid:1.2.36.146.595.217.0.1") - self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") - self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") - self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "12345") + self.assertEqual(inst.id, "newborn") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Chalmers") - self.assertEqual(inst.name[0].given[0], "Peter") - self.assertEqual(inst.name[0].given[1], "James") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.name[1].given[0], "Jim") - self.assertEqual(inst.name[1].use, "usual") - self.assertEqual(inst.name[2].family, "Windsor") - self.assertEqual(inst.name[2].given[0], "Peter") - self.assertEqual(inst.name[2].given[1], "James") - self.assertEqual(inst.name[2].period.end.datetime, FHIRDateTime("2002").datetime) - self.assertEqual(inst.name[2].period.end.as_json(), "2002") - self.assertEqual(inst.name[2].use, "maiden") - self.assertEqual(inst.telecom[0].use, "home") - self.assertEqual(inst.telecom[1].rank, 1) - self.assertEqual(inst.telecom[1].system, "phone") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "(03) 5555 6473") - self.assertEqual(inst.telecom[2].rank, 2) - self.assertEqual(inst.telecom[2].system, "phone") - self.assertEqual(inst.telecom[2].use, "mobile") - self.assertEqual(inst.telecom[2].value, "(03) 3410 5613") - self.assertEqual(inst.telecom[3].period.end.datetime, FHIRDateTime("2014").datetime) - self.assertEqual(inst.telecom[3].period.end.as_json(), "2014") - self.assertEqual(inst.telecom[3].system, "phone") - self.assertEqual(inst.telecom[3].use, "old") - self.assertEqual(inst.telecom[3].value, "(03) 5555 8834") + self.assertEqual(inst.multipleBirthInteger, 2) self.assertEqual(inst.text.status, "generated") - def testPatient8(self): - inst = self.instantiate_from("patient-example-infant-twin-1.json") + def testPatient7(self): + inst = self.instantiate_from("patient-example-infant-fetal.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") - self.implPatient8(inst) + self.implPatient7(inst) js = inst.as_json() self.assertEqual("Patient", js["resourceType"]) inst2 = patient.Patient(js) - self.implPatient8(inst2) + self.implPatient7(inst2) - def implPatient8(self, inst): - self.assertEqual(inst.birthDate.date, FHIRDate("2017-05-15").date) - self.assertEqual(inst.birthDate.as_json(), "2017-05-15") + def implPatient7(self, inst): self.assertEqual(inst.contact[0].name.family, "Organa") self.assertEqual(inst.contact[0].name.given[0], "Leia") self.assertEqual(inst.contact[0].name.use, "maiden") @@ -352,25 +265,54 @@ def implPatient8(self, inst): self.assertEqual(inst.contact[0].telecom[0].value, "+31201234567") self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName") self.assertEqual(inst.extension[0].valueString, "Organa") - self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "infant-twin-1") + self.assertEqual(inst.gender, "male") + self.assertEqual(inst.id, "infant-fetal") self.assertEqual(inst.identifier[0].system, "http://coruscanthealth.org/main-hospital/patient-identifier") self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") - self.assertEqual(inst.identifier[0].value, "MRN7465737865") - self.assertEqual(inst.identifier[1].system, "http://new-republic.gov/galactic-citizen-identifier") - self.assertEqual(inst.identifier[1].value, "7465737865") + self.assertEqual(inst.identifier[0].value, "MRN657865757378") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.multipleBirthInteger, 1) - self.assertEqual(inst.name[0].family, "Solo") - self.assertEqual(inst.name[0].given[0], "Jaina") + self.assertEqual(inst.text.status, "generated") + + def testPatient8(self): + inst = self.instantiate_from("patient-genetics-example1.json") + self.assertIsNotNone(inst, "Must have instantiated a Patient instance") + self.implPatient8(inst) + + js = inst.as_json() + self.assertEqual("Patient", js["resourceType"]) + inst2 = patient.Patient(js) + self.implPatient8(inst2) + + def implPatient8(self, inst): + self.assertTrue(inst.active) + self.assertEqual(inst.address[0].line[0], "2222 Home Street") + self.assertEqual(inst.address[0].use, "home") + self.assertEqual(inst.birthDate.date, FHIRDate("1973-05-31").date) + self.assertEqual(inst.birthDate.as_json(), "1973-05-31") + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "genetics-example1") + self.assertEqual(inst.identifier[0].system, "http://hl7.org/fhir/sid/us-ssn") + self.assertEqual(inst.identifier[0].type.coding[0].code, "SS") + self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") + self.assertEqual(inst.identifier[0].value, "444222222") + self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2012-05-29T23:45:32Z").datetime) + self.assertEqual(inst.meta.lastUpdated.as_json(), "2012-05-29T23:45:32Z") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.name[0].family, "Everywoman") + self.assertEqual(inst.name[0].given[0], "Eve") self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "555-555-2003") self.assertEqual(inst.text.status, "generated") def testPatient9(self): - inst = self.instantiate_from("patient-example-dicom.json") + inst = self.instantiate_from("patient-example-b.json") self.assertIsNotNone(inst, "Must have instantiated a Patient instance") self.implPatient9(inst) @@ -381,23 +323,22 @@ def testPatient9(self): def implPatient9(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.extension[0].url, "http://nema.org/fhir/extensions#0010:1010") - self.assertEqual(inst.extension[0].valueQuantity.unit, "Y") - self.assertEqual(inst.extension[0].valueQuantity.value, 56) - self.assertEqual(inst.extension[1].url, "http://nema.org/fhir/extensions#0010:1020") - self.assertEqual(inst.extension[1].valueQuantity.unit, "m") - self.assertEqual(inst.extension[1].valueQuantity.value, 1.83) - self.assertEqual(inst.extension[2].url, "http://nema.org/fhir/extensions#0010:1030") - self.assertEqual(inst.extension[2].valueQuantity.unit, "kg") - self.assertEqual(inst.extension[2].valueQuantity.value, 72.58) - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "dicom") - self.assertEqual(inst.identifier[0].system, "http://nema.org/examples/patients") - self.assertEqual(inst.identifier[0].value, "MINT1234") + self.assertEqual(inst.gender, "other") + self.assertEqual(inst.id, "pat2") + self.assertEqual(inst.identifier[0].system, "urn:oid:0.1.2.3.4.5.6.7") + self.assertEqual(inst.identifier[0].type.coding[0].code, "MR") + self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") + self.assertEqual(inst.identifier[0].use, "usual") + self.assertEqual(inst.identifier[0].value, "123456") + self.assertEqual(inst.link[0].type, "seealso") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "MINT_TEST") + self.assertEqual(inst.name[0].family, "Donald") + self.assertEqual(inst.name[0].given[0], "Duck") + self.assertEqual(inst.name[0].given[1], "D") + self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.photo[0].contentType, "image/gif") self.assertEqual(inst.text.status, "generated") def testPatient10(self): diff --git a/tests/models/plandefinition_test.py b/tests/models/plandefinition_test.py index f63c77e0..f4b14eb1 100644 --- a/tests/models/plandefinition_test.py +++ b/tests/models/plandefinition_test.py @@ -114,7 +114,7 @@ def implPlanDefinition1(self, inst): self.assertEqual(inst.version, "1") def testPlanDefinition2(self): - inst = self.instantiate_from("plandefinition-predecessor-example.json") + inst = self.instantiate_from("plandefinition-options-example.json") self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") self.implPlanDefinition2(inst) @@ -124,235 +124,6 @@ def testPlanDefinition2(self): self.implPlanDefinition2(inst2) def implPlanDefinition2(self, inst): - self.assertEqual(inst.action[0].action[0].condition[0].expression.expression, "Should Administer Zika Virus Exposure Assessment") - self.assertEqual(inst.action[0].action[0].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].action[0].definitionCanonical, "ActivityDefinition/administer-zika-virus-exposure-assessment") - self.assertEqual(inst.action[0].action[1].condition[0].expression.expression, "Should Order Serum + Urine rRT-PCR Test") - self.assertEqual(inst.action[0].action[1].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].action[1].definitionCanonical, "ActivityDefinition/order-serum-urine-rrt-pcr-test") - self.assertEqual(inst.action[0].action[2].condition[0].expression.expression, "Should Order Serum Zika Virus IgM + Dengue Virus IgM") - self.assertEqual(inst.action[0].action[2].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[2].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].action[2].definitionCanonical, "ActivityDefinition/order-serum-zika-dengue-virus-igm") - self.assertEqual(inst.action[0].action[3].condition[0].expression.expression, "Should Consider IgM Antibody Testing") - self.assertEqual(inst.action[0].action[3].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[3].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].action[3].definitionCanonical, "ActivityDefinition/consider-igm-antibody-testing") - self.assertEqual(inst.action[0].action[4].action[0].definitionCanonical, "ActivityDefinition/provide-mosquito-prevention-advice") - self.assertEqual(inst.action[0].action[4].action[1].definitionCanonical, "ActivityDefinition/provide-contraception-advice") - self.assertEqual(inst.action[0].action[4].condition[0].expression.expression, "Should Provide Mosquito Prevention and Contraception Advice") - self.assertEqual(inst.action[0].action[4].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[4].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].condition[0].expression.expression, "Is Patient Pregnant") - self.assertEqual(inst.action[0].condition[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].condition[0].kind, "applicability") - self.assertEqual(inst.action[0].title, "Zika Virus Assessment") - self.assertEqual(inst.action[0].trigger[0].name, "patient-view") - self.assertEqual(inst.action[0].trigger[0].type, "named-event") - self.assertEqual(inst.date.datetime, FHIRDateTime("2016-11-14").datetime) - self.assertEqual(inst.date.as_json(), "2016-11-14") - self.assertEqual(inst.description, "Zika Virus Management intervention describing the CDC Guidelines for Zika Virus Reporting and Management.") - self.assertEqual(inst.id, "zika-virus-intervention-initial") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "zika-virus-intervention") - self.assertEqual(inst.library[0], "Library/zika-virus-intervention-logic") - self.assertEqual(inst.relatedArtifact[0].type, "derived-from") - self.assertEqual(inst.relatedArtifact[0].url, "https://www.cdc.gov/mmwr/volumes/65/wr/mm6539e1.htm?s_cid=mm6539e1_w") - self.assertEqual(inst.relatedArtifact[1].resource, "PlanDefinition/zika-virus-intervention") - self.assertEqual(inst.relatedArtifact[1].type, "successor") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Example Zika Virus Intervention") - self.assertEqual(inst.topic[0].text, "Zika Virus Management") - self.assertEqual(inst.url, "http://example.org/PlanDefinition/zika-virus-intervention") - self.assertEqual(inst.version, "1.0.0") - - def testPlanDefinition3(self): - inst = self.instantiate_from("plandefinition-example.json") - self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") - self.implPlanDefinition3(inst) - - js = inst.as_json() - self.assertEqual("PlanDefinition", js["resourceType"]) - inst2 = plandefinition.PlanDefinition(js) - self.implPlanDefinition3(inst2) - - def implPlanDefinition3(self, inst): - self.assertEqual(inst.action[0].action[0].action[0].definitionCanonical, "#referralToMentalHealthCare") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.expression, "Now()") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].path, "timing.event") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].expression.expression, "Code '261QM0850X' from SuicideRiskLogic.\"NUCC Provider Taxonomy\" display 'Adult Mental Health'") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].path, "specialty") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].expression.expression, "SuicideRiskLogic.ServiceRequestFulfillmentTime") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].path, "occurrenceDateTime") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].expression.expression, "SuicideRiskLogic.Patient") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].path, "subject") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].expression.expression, "SuicideRiskLogic.Practitioner") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].path, "requester.agent") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].expression.expression, "SuicideRiskLogic.RiskAssessmentScore") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].path, "reasonCode") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].expression.expression, "SuicideRiskLogic.RiskAssessment") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].path, "reasonReference") - self.assertEqual(inst.action[0].action[0].action[0].textEquivalent, "Refer to outpatient mental health program for evaluation and treatment of mental health conditions now") - self.assertEqual(inst.action[0].action[0].groupingBehavior, "logical-group") - self.assertEqual(inst.action[0].action[0].selectionBehavior, "any") - self.assertEqual(inst.action[0].action[0].title, "Consults and Referrals") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].definitionCanonical, "#citalopramPrescription") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].expression.expression, "'draft'") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].path, "status") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].expression.expression, "SuicideRiskLogic.Patient") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].path, "patient") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].expression.expression, "SuicideRiskLogic.Practitioner") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].path, "prescriber") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].expression.expression, "SuicideRiskLogic.RiskAssessmentScore") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].path, "reasonCode") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].expression.expression, "SuicideRiskLogic.RiskAssessment") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].expression.language, "text/cql") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].path, "reasonReference") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].textEquivalent, "citalopram 20 mg tablet 1 tablet oral 1 time daily now (30 table; 3 refills)") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[1].textEquivalent, "escitalopram 10 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[2].textEquivalent, "fluoxetine 20 mg capsule 1 capsule oral 1 time daily now (30 tablet; 3 refills)") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[3].textEquivalent, "paroxetine 20 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") - self.assertEqual(inst.action[0].action[1].action[0].action[0].action[4].textEquivalent, "sertraline 50 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") - self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.contentType, "text/html") - self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.title, "National Library of Medicine. DailyMed website. CITALOPRAM- citalopram hydrobromide tablet, film coated.") - self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.url, "http://dailymed.nlm.nih.gov/dailymed/drugInfo.cfm?setid=6daeb45c-451d-b135-bf8f-2d6dff4b6b01") - self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].type, "citation") - self.assertEqual(inst.action[0].action[1].action[0].action[0].groupingBehavior, "logical-group") - self.assertEqual(inst.action[0].action[1].action[0].action[0].selectionBehavior, "at-most-one") - self.assertEqual(inst.action[0].action[1].action[0].action[0].title, "Selective Serotonin Reuptake Inhibitors (Choose a mazimum of one or document reasons for exception)") - self.assertEqual(inst.action[0].action[1].action[0].action[1].textEquivalent, "Dopamine Norepinephrine Reuptake Inhibitors (Choose a maximum of one or document reasons for exception)") - self.assertEqual(inst.action[0].action[1].action[0].action[2].textEquivalent, "Serotonin Norepinephrine Reuptake Inhibitors (Choose a maximum of one or doument reasons for exception)") - self.assertEqual(inst.action[0].action[1].action[0].action[3].textEquivalent, "Norepinephrine-Serotonin Modulators (Choose a maximum of one or document reasons for exception)") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.contentType, "text/html") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-qualityOfEvidence") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.coding[0].code, "high") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.coding[0].system, "http://terminology.hl7.org/CodeSystem/evidence-quality") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.text, "High Quality") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.title, "Practice Guideline for the Treatment of Patients with Major Depressive Disorder") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.url, "http://psychiatryonline.org/pb/assets/raw/sitewide/practice_guidelines/guidelines/mdd.pdf") - self.assertEqual(inst.action[0].action[1].action[0].documentation[0].type, "citation") - self.assertEqual(inst.action[0].action[1].action[0].groupingBehavior, "logical-group") - self.assertEqual(inst.action[0].action[1].action[0].selectionBehavior, "at-most-one") - self.assertEqual(inst.action[0].action[1].action[0].title, "First-Line Antidepressants") - self.assertEqual(inst.action[0].action[1].groupingBehavior, "logical-group") - self.assertEqual(inst.action[0].action[1].selectionBehavior, "at-most-one") - self.assertEqual(inst.action[0].action[1].title, "Medications") - self.assertEqual(inst.action[0].title, "Suicide Risk Assessment and Outpatient Management") - self.assertEqual(inst.approvalDate.date, FHIRDate("2016-03-12").date) - self.assertEqual(inst.approvalDate.as_json(), "2016-03-12") - self.assertEqual(inst.author[0].name, "Motive Medical Intelligence") - self.assertEqual(inst.author[0].telecom[0].system, "phone") - self.assertEqual(inst.author[0].telecom[0].use, "work") - self.assertEqual(inst.author[0].telecom[0].value, "415-362-4007") - self.assertEqual(inst.author[0].telecom[1].system, "email") - self.assertEqual(inst.author[0].telecom[1].use, "work") - self.assertEqual(inst.author[0].telecom[1].value, "info@motivemi.com") - self.assertEqual(inst.contact[0].telecom[0].system, "phone") - self.assertEqual(inst.contact[0].telecom[0].use, "work") - self.assertEqual(inst.contact[0].telecom[0].value, "415-362-4007") - self.assertEqual(inst.contact[0].telecom[1].system, "email") - self.assertEqual(inst.contact[0].telecom[1].use, "work") - self.assertEqual(inst.contact[0].telecom[1].value, "info@motivemi.com") - self.assertEqual(inst.contained[0].id, "referralToMentalHealthCare") - self.assertEqual(inst.contained[1].id, "citalopramPrescription") - self.assertEqual(inst.contained[2].id, "citalopramMedication") - self.assertEqual(inst.contained[3].id, "citalopramSubstance") - self.assertEqual(inst.copyright, "© Copyright 2016 Motive Medical Intelligence. All rights reserved.") - self.assertEqual(inst.date.datetime, FHIRDateTime("2015-08-15").datetime) - self.assertEqual(inst.date.as_json(), "2015-08-15") - self.assertEqual(inst.description, "Orders to be applied to a patient characterized as low suicide risk.") - self.assertEqual(inst.effectivePeriod.end.datetime, FHIRDateTime("2017-12-31").datetime) - self.assertEqual(inst.effectivePeriod.end.as_json(), "2017-12-31") - self.assertEqual(inst.effectivePeriod.start.datetime, FHIRDateTime("2016-01-01").datetime) - self.assertEqual(inst.effectivePeriod.start.as_json(), "2016-01-01") - self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "low-suicide-risk-order-set") - self.assertEqual(inst.identifier[0].system, "http://motivemi.com/artifacts") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "mmi:low-suicide-risk-order-set") - self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") - self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") - self.assertEqual(inst.lastReviewDate.date, FHIRDate("2016-08-15").date) - self.assertEqual(inst.lastReviewDate.as_json(), "2016-08-15") - self.assertEqual(inst.library[0], "Library/suiciderisk-orderset-logic") - self.assertEqual(inst.name, "LowSuicideRiskOrderSet") - self.assertEqual(inst.publisher, "Motive Medical Intelligence") - self.assertEqual(inst.purpose, "This order set helps ensure consistent application of appropriate orders for the care of low suicide risk patients.") - self.assertEqual(inst.relatedArtifact[0].display, "Practice Guideline for the Treatment of Patients with Major Depressive Disorder") - self.assertEqual(inst.relatedArtifact[0].type, "derived-from") - self.assertEqual(inst.relatedArtifact[0].url, "http://psychiatryonline.org/pb/assets/raw/sitewide/practice_guidelines/guidelines/mdd.pdf") - self.assertEqual(inst.relatedArtifact[1].resource, "ActivityDefinition/referralPrimaryCareMentalHealth") - self.assertEqual(inst.relatedArtifact[1].type, "composed-of") - self.assertEqual(inst.relatedArtifact[2].resource, "ActivityDefinition/citalopramPrescription") - self.assertEqual(inst.relatedArtifact[2].type, "composed-of") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Low Suicide Risk Order Set") - self.assertEqual(inst.topic[0].text, "Suicide risk assessment") - self.assertEqual(inst.url, "http://motivemi.com/artifacts/PlanDefinition/low-suicide-risk-order-set") - self.assertEqual(inst.usage, "This order set should be applied after assessing a patient for suicide risk, when the findings of that assessment indicate the patient has low suicide risk.") - self.assertEqual(inst.useContext[0].code.code, "age") - self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "D000328") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Adult") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "https://meshb.nlm.nih.gov") - self.assertEqual(inst.useContext[1].code.code, "focus") - self.assertEqual(inst.useContext[1].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].code, "87512008") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].display, "Mild major depression") - self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[2].code.code, "focus") - self.assertEqual(inst.useContext[2].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].code, "40379007") - self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].display, "Major depression, recurrent, mild") - self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[3].code.code, "focus") - self.assertEqual(inst.useContext[3].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].code, "394687007") - self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].display, "Low suicide risk") - self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[4].code.code, "focus") - self.assertEqual(inst.useContext[4].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].code, "225337009") - self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].display, "Suicide risk assessment") - self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[5].code.code, "user") - self.assertEqual(inst.useContext[5].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].code, "309343006") - self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].display, "Physician") - self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.useContext[6].code.code, "venue") - self.assertEqual(inst.useContext[6].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].code, "440655000") - self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].display, "Outpatient environment") - self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.version, "1.0.0") - - def testPlanDefinition4(self): - inst = self.instantiate_from("plandefinition-options-example.json") - self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") - self.implPlanDefinition4(inst) - - js = inst.as_json() - self.assertEqual("PlanDefinition", js["resourceType"]) - inst2 = plandefinition.PlanDefinition(js) - self.implPlanDefinition4(inst2) - - def implPlanDefinition4(self, inst): self.assertEqual(inst.action[0].action[0].definitionCanonical, "#activitydefinition-medicationrequest-1") self.assertEqual(inst.action[0].action[0].id, "medication-action-1") self.assertEqual(inst.action[0].action[0].title, "Administer Medication 1") @@ -376,17 +147,17 @@ def implPlanDefinition4(self, inst): self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.title, "This example illustrates relationships between actions.") - def testPlanDefinition5(self): + def testPlanDefinition3(self): inst = self.instantiate_from("plandefinition-example-cardiology-os.json") self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") - self.implPlanDefinition5(inst) + self.implPlanDefinition3(inst) js = inst.as_json() self.assertEqual("PlanDefinition", js["resourceType"]) inst2 = plandefinition.PlanDefinition(js) - self.implPlanDefinition5(inst2) + self.implPlanDefinition3(inst2) - def implPlanDefinition5(self, inst): + def implPlanDefinition3(self, inst): self.assertEqual(inst.action[0].action[0].action[0].definitionCanonical, "#referralToCardiologyConsult") self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.expression, "Now()") self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.language, "text/cql") @@ -540,17 +311,17 @@ def implPlanDefinition5(self, inst): self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.version, "0.1") - def testPlanDefinition6(self): + def testPlanDefinition4(self): inst = self.instantiate_from("plandefinition-protocol-example.json") self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") - self.implPlanDefinition6(inst) + self.implPlanDefinition4(inst) js = inst.as_json() self.assertEqual("PlanDefinition", js["resourceType"]) inst2 = plandefinition.PlanDefinition(js) - self.implPlanDefinition6(inst2) + self.implPlanDefinition4(inst2) - def implPlanDefinition6(self, inst): + def implPlanDefinition4(self, inst): self.assertEqual(inst.action[0].cardinalityBehavior, "single") self.assertEqual(inst.action[0].condition[0].expression.expression, "exists ([Condition: Obesity]) or not exists ([Observation: BMI] O where O.effectiveDateTime 2 years or less before Today())") self.assertEqual(inst.action[0].condition[0].expression.language, "text/cql") @@ -600,4 +371,233 @@ def implPlanDefinition6(self, inst): self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "414916001") self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Obesity (disorder)") self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + + def testPlanDefinition5(self): + inst = self.instantiate_from("plandefinition-example.json") + self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") + self.implPlanDefinition5(inst) + + js = inst.as_json() + self.assertEqual("PlanDefinition", js["resourceType"]) + inst2 = plandefinition.PlanDefinition(js) + self.implPlanDefinition5(inst2) + + def implPlanDefinition5(self, inst): + self.assertEqual(inst.action[0].action[0].action[0].definitionCanonical, "#referralToMentalHealthCare") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.expression, "Now()") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[0].path, "timing.event") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].expression.expression, "Code '261QM0850X' from SuicideRiskLogic.\"NUCC Provider Taxonomy\" display 'Adult Mental Health'") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[1].path, "specialty") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].expression.expression, "SuicideRiskLogic.ServiceRequestFulfillmentTime") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[2].path, "occurrenceDateTime") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].expression.expression, "SuicideRiskLogic.Patient") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[3].path, "subject") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].expression.expression, "SuicideRiskLogic.Practitioner") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[4].path, "requester.agent") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].expression.expression, "SuicideRiskLogic.RiskAssessmentScore") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[5].path, "reasonCode") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].expression.expression, "SuicideRiskLogic.RiskAssessment") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].action[0].dynamicValue[6].path, "reasonReference") + self.assertEqual(inst.action[0].action[0].action[0].textEquivalent, "Refer to outpatient mental health program for evaluation and treatment of mental health conditions now") + self.assertEqual(inst.action[0].action[0].groupingBehavior, "logical-group") + self.assertEqual(inst.action[0].action[0].selectionBehavior, "any") + self.assertEqual(inst.action[0].action[0].title, "Consults and Referrals") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].definitionCanonical, "#citalopramPrescription") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].expression.expression, "'draft'") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[0].path, "status") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].expression.expression, "SuicideRiskLogic.Patient") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[1].path, "patient") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].expression.expression, "SuicideRiskLogic.Practitioner") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[2].path, "prescriber") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].expression.expression, "SuicideRiskLogic.RiskAssessmentScore") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[3].path, "reasonCode") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].expression.expression, "SuicideRiskLogic.RiskAssessment") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].dynamicValue[4].path, "reasonReference") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[0].textEquivalent, "citalopram 20 mg tablet 1 tablet oral 1 time daily now (30 table; 3 refills)") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[1].textEquivalent, "escitalopram 10 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[2].textEquivalent, "fluoxetine 20 mg capsule 1 capsule oral 1 time daily now (30 tablet; 3 refills)") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[3].textEquivalent, "paroxetine 20 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") + self.assertEqual(inst.action[0].action[1].action[0].action[0].action[4].textEquivalent, "sertraline 50 mg tablet 1 tablet oral 1 time daily now (30 tablet; 3 refills)") + self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.contentType, "text/html") + self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.title, "National Library of Medicine. DailyMed website. CITALOPRAM- citalopram hydrobromide tablet, film coated.") + self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].document.url, "http://dailymed.nlm.nih.gov/dailymed/drugInfo.cfm?setid=6daeb45c-451d-b135-bf8f-2d6dff4b6b01") + self.assertEqual(inst.action[0].action[1].action[0].action[0].documentation[0].type, "citation") + self.assertEqual(inst.action[0].action[1].action[0].action[0].groupingBehavior, "logical-group") + self.assertEqual(inst.action[0].action[1].action[0].action[0].selectionBehavior, "at-most-one") + self.assertEqual(inst.action[0].action[1].action[0].action[0].title, "Selective Serotonin Reuptake Inhibitors (Choose a mazimum of one or document reasons for exception)") + self.assertEqual(inst.action[0].action[1].action[0].action[1].textEquivalent, "Dopamine Norepinephrine Reuptake Inhibitors (Choose a maximum of one or document reasons for exception)") + self.assertEqual(inst.action[0].action[1].action[0].action[2].textEquivalent, "Serotonin Norepinephrine Reuptake Inhibitors (Choose a maximum of one or doument reasons for exception)") + self.assertEqual(inst.action[0].action[1].action[0].action[3].textEquivalent, "Norepinephrine-Serotonin Modulators (Choose a maximum of one or document reasons for exception)") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.contentType, "text/html") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-qualityOfEvidence") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.coding[0].code, "high") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.coding[0].system, "http://terminology.hl7.org/CodeSystem/evidence-quality") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.extension[0].valueCodeableConcept.text, "High Quality") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.title, "Practice Guideline for the Treatment of Patients with Major Depressive Disorder") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].document.url, "http://psychiatryonline.org/pb/assets/raw/sitewide/practice_guidelines/guidelines/mdd.pdf") + self.assertEqual(inst.action[0].action[1].action[0].documentation[0].type, "citation") + self.assertEqual(inst.action[0].action[1].action[0].groupingBehavior, "logical-group") + self.assertEqual(inst.action[0].action[1].action[0].selectionBehavior, "at-most-one") + self.assertEqual(inst.action[0].action[1].action[0].title, "First-Line Antidepressants") + self.assertEqual(inst.action[0].action[1].groupingBehavior, "logical-group") + self.assertEqual(inst.action[0].action[1].selectionBehavior, "at-most-one") + self.assertEqual(inst.action[0].action[1].title, "Medications") + self.assertEqual(inst.action[0].title, "Suicide Risk Assessment and Outpatient Management") + self.assertEqual(inst.approvalDate.date, FHIRDate("2016-03-12").date) + self.assertEqual(inst.approvalDate.as_json(), "2016-03-12") + self.assertEqual(inst.author[0].name, "Motive Medical Intelligence") + self.assertEqual(inst.author[0].telecom[0].system, "phone") + self.assertEqual(inst.author[0].telecom[0].use, "work") + self.assertEqual(inst.author[0].telecom[0].value, "415-362-4007") + self.assertEqual(inst.author[0].telecom[1].system, "email") + self.assertEqual(inst.author[0].telecom[1].use, "work") + self.assertEqual(inst.author[0].telecom[1].value, "info@motivemi.com") + self.assertEqual(inst.contact[0].telecom[0].system, "phone") + self.assertEqual(inst.contact[0].telecom[0].use, "work") + self.assertEqual(inst.contact[0].telecom[0].value, "415-362-4007") + self.assertEqual(inst.contact[0].telecom[1].system, "email") + self.assertEqual(inst.contact[0].telecom[1].use, "work") + self.assertEqual(inst.contact[0].telecom[1].value, "info@motivemi.com") + self.assertEqual(inst.contained[0].id, "referralToMentalHealthCare") + self.assertEqual(inst.contained[1].id, "citalopramPrescription") + self.assertEqual(inst.contained[2].id, "citalopramMedication") + self.assertEqual(inst.contained[3].id, "citalopramSubstance") + self.assertEqual(inst.copyright, "© Copyright 2016 Motive Medical Intelligence. All rights reserved.") + self.assertEqual(inst.date.datetime, FHIRDateTime("2015-08-15").datetime) + self.assertEqual(inst.date.as_json(), "2015-08-15") + self.assertEqual(inst.description, "Orders to be applied to a patient characterized as low suicide risk.") + self.assertEqual(inst.effectivePeriod.end.datetime, FHIRDateTime("2017-12-31").datetime) + self.assertEqual(inst.effectivePeriod.end.as_json(), "2017-12-31") + self.assertEqual(inst.effectivePeriod.start.datetime, FHIRDateTime("2016-01-01").datetime) + self.assertEqual(inst.effectivePeriod.start.as_json(), "2016-01-01") + self.assertTrue(inst.experimental) + self.assertEqual(inst.id, "low-suicide-risk-order-set") + self.assertEqual(inst.identifier[0].system, "http://motivemi.com/artifacts") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "mmi:low-suicide-risk-order-set") + self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") + self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") + self.assertEqual(inst.lastReviewDate.date, FHIRDate("2016-08-15").date) + self.assertEqual(inst.lastReviewDate.as_json(), "2016-08-15") + self.assertEqual(inst.library[0], "Library/suiciderisk-orderset-logic") + self.assertEqual(inst.name, "LowSuicideRiskOrderSet") + self.assertEqual(inst.publisher, "Motive Medical Intelligence") + self.assertEqual(inst.purpose, "This order set helps ensure consistent application of appropriate orders for the care of low suicide risk patients.") + self.assertEqual(inst.relatedArtifact[0].display, "Practice Guideline for the Treatment of Patients with Major Depressive Disorder") + self.assertEqual(inst.relatedArtifact[0].type, "derived-from") + self.assertEqual(inst.relatedArtifact[0].url, "http://psychiatryonline.org/pb/assets/raw/sitewide/practice_guidelines/guidelines/mdd.pdf") + self.assertEqual(inst.relatedArtifact[1].resource, "ActivityDefinition/referralPrimaryCareMentalHealth") + self.assertEqual(inst.relatedArtifact[1].type, "composed-of") + self.assertEqual(inst.relatedArtifact[2].resource, "ActivityDefinition/citalopramPrescription") + self.assertEqual(inst.relatedArtifact[2].type, "composed-of") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "Low Suicide Risk Order Set") + self.assertEqual(inst.topic[0].text, "Suicide risk assessment") + self.assertEqual(inst.url, "http://motivemi.com/artifacts/PlanDefinition/low-suicide-risk-order-set") + self.assertEqual(inst.usage, "This order set should be applied after assessing a patient for suicide risk, when the findings of that assessment indicate the patient has low suicide risk.") + self.assertEqual(inst.useContext[0].code.code, "age") + self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "D000328") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].display, "Adult") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "https://meshb.nlm.nih.gov") + self.assertEqual(inst.useContext[1].code.code, "focus") + self.assertEqual(inst.useContext[1].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].code, "87512008") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].display, "Mild major depression") + self.assertEqual(inst.useContext[1].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[2].code.code, "focus") + self.assertEqual(inst.useContext[2].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].code, "40379007") + self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].display, "Major depression, recurrent, mild") + self.assertEqual(inst.useContext[2].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[3].code.code, "focus") + self.assertEqual(inst.useContext[3].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].code, "394687007") + self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].display, "Low suicide risk") + self.assertEqual(inst.useContext[3].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[4].code.code, "focus") + self.assertEqual(inst.useContext[4].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].code, "225337009") + self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].display, "Suicide risk assessment") + self.assertEqual(inst.useContext[4].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[5].code.code, "user") + self.assertEqual(inst.useContext[5].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].code, "309343006") + self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].display, "Physician") + self.assertEqual(inst.useContext[5].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.useContext[6].code.code, "venue") + self.assertEqual(inst.useContext[6].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].code, "440655000") + self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].display, "Outpatient environment") + self.assertEqual(inst.useContext[6].valueCodeableConcept.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.version, "1.0.0") + + def testPlanDefinition6(self): + inst = self.instantiate_from("plandefinition-predecessor-example.json") + self.assertIsNotNone(inst, "Must have instantiated a PlanDefinition instance") + self.implPlanDefinition6(inst) + + js = inst.as_json() + self.assertEqual("PlanDefinition", js["resourceType"]) + inst2 = plandefinition.PlanDefinition(js) + self.implPlanDefinition6(inst2) + + def implPlanDefinition6(self, inst): + self.assertEqual(inst.action[0].action[0].condition[0].expression.expression, "Should Administer Zika Virus Exposure Assessment") + self.assertEqual(inst.action[0].action[0].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[0].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].action[0].definitionCanonical, "ActivityDefinition/administer-zika-virus-exposure-assessment") + self.assertEqual(inst.action[0].action[1].condition[0].expression.expression, "Should Order Serum + Urine rRT-PCR Test") + self.assertEqual(inst.action[0].action[1].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[1].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].action[1].definitionCanonical, "ActivityDefinition/order-serum-urine-rrt-pcr-test") + self.assertEqual(inst.action[0].action[2].condition[0].expression.expression, "Should Order Serum Zika Virus IgM + Dengue Virus IgM") + self.assertEqual(inst.action[0].action[2].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[2].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].action[2].definitionCanonical, "ActivityDefinition/order-serum-zika-dengue-virus-igm") + self.assertEqual(inst.action[0].action[3].condition[0].expression.expression, "Should Consider IgM Antibody Testing") + self.assertEqual(inst.action[0].action[3].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[3].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].action[3].definitionCanonical, "ActivityDefinition/consider-igm-antibody-testing") + self.assertEqual(inst.action[0].action[4].action[0].definitionCanonical, "ActivityDefinition/provide-mosquito-prevention-advice") + self.assertEqual(inst.action[0].action[4].action[1].definitionCanonical, "ActivityDefinition/provide-contraception-advice") + self.assertEqual(inst.action[0].action[4].condition[0].expression.expression, "Should Provide Mosquito Prevention and Contraception Advice") + self.assertEqual(inst.action[0].action[4].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].action[4].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].condition[0].expression.expression, "Is Patient Pregnant") + self.assertEqual(inst.action[0].condition[0].expression.language, "text/cql") + self.assertEqual(inst.action[0].condition[0].kind, "applicability") + self.assertEqual(inst.action[0].title, "Zika Virus Assessment") + self.assertEqual(inst.action[0].trigger[0].name, "patient-view") + self.assertEqual(inst.action[0].trigger[0].type, "named-event") + self.assertEqual(inst.date.datetime, FHIRDateTime("2016-11-14").datetime) + self.assertEqual(inst.date.as_json(), "2016-11-14") + self.assertEqual(inst.description, "Zika Virus Management intervention describing the CDC Guidelines for Zika Virus Reporting and Management.") + self.assertEqual(inst.id, "zika-virus-intervention-initial") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "zika-virus-intervention") + self.assertEqual(inst.library[0], "Library/zika-virus-intervention-logic") + self.assertEqual(inst.relatedArtifact[0].type, "derived-from") + self.assertEqual(inst.relatedArtifact[0].url, "https://www.cdc.gov/mmwr/volumes/65/wr/mm6539e1.htm?s_cid=mm6539e1_w") + self.assertEqual(inst.relatedArtifact[1].resource, "PlanDefinition/zika-virus-intervention") + self.assertEqual(inst.relatedArtifact[1].type, "successor") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "Example Zika Virus Intervention") + self.assertEqual(inst.topic[0].text, "Zika Virus Management") + self.assertEqual(inst.url, "http://example.org/PlanDefinition/zika-virus-intervention") + self.assertEqual(inst.version, "1.0.0") diff --git a/tests/models/practitioner_test.py b/tests/models/practitioner_test.py index 2c1da9cc..22b2c3f3 100644 --- a/tests/models/practitioner_test.py +++ b/tests/models/practitioner_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return practitioner.Practitioner(js) def testPractitioner1(self): - inst = self.instantiate_from("practitioner-example-f202-lm.json") + inst = self.instantiate_from("practitioner-example-f203-jvg.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner1(inst) @@ -34,28 +34,24 @@ def implPractitioner1(self, inst): self.assertEqual(inst.address[0].city, "Den helder") self.assertEqual(inst.address[0].country, "NLD") self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") - self.assertEqual(inst.address[0].line[1], "C4 - Automatisering") self.assertEqual(inst.address[0].postalCode, "2333ZA") self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1960-06-12").date) - self.assertEqual(inst.birthDate.as_json(), "1960-06-12") + self.assertEqual(inst.birthDate.date, FHIRDate("1983-04-20").date) + self.assertEqual(inst.birthDate.as_json(), "1983-04-20") self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f202") + self.assertEqual(inst.id, "f203") self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "12345678902") + self.assertEqual(inst.identifier[0].value, "12345678903") self.assertEqual(inst.identifier[1].system, "https://www.bigregister.nl/") self.assertEqual(inst.identifier[1].type.text, "BIG-nummer") self.assertEqual(inst.identifier[1].use, "official") - self.assertEqual(inst.identifier[1].value, "12345678902") + self.assertEqual(inst.identifier[1].value, "12345678903") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Maas") - self.assertEqual(inst.name[0].given[0], "Luigi") - self.assertEqual(inst.name[0].prefix[0], "Dr.") - self.assertEqual(inst.name[0].text, "Luigi Maas") + self.assertEqual(inst.name[0].text, "Juri van Gelder") self.assertEqual(inst.name[0].use, "official") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") @@ -63,7 +59,7 @@ def implPractitioner1(self, inst): self.assertEqual(inst.text.status, "generated") def testPractitioner2(self): - inst = self.instantiate_from("practitioner-example-f001-evdb.json") + inst = self.instantiate_from("practitioner-example-f201-ab.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner2(inst) @@ -73,41 +69,39 @@ def testPractitioner2(self): self.implPractitioner2(inst2) def implPractitioner2(self, inst): - self.assertEqual(inst.address[0].city, "Den Burg") + self.assertTrue(inst.active) + self.assertEqual(inst.address[0].city, "Den helder") self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") - self.assertEqual(inst.address[0].postalCode, "9105 PZ") + self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") + self.assertEqual(inst.address[0].line[1], "C4 - Automatisering") + self.assertEqual(inst.address[0].postalCode, "2333ZA") self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1975-12-07").date) - self.assertEqual(inst.birthDate.as_json(), "1975-12-07") + self.assertEqual(inst.birthDate.date, FHIRDate("1956-12-24").date) + self.assertEqual(inst.birthDate.as_json(), "1956-12-24") self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f001") + self.assertEqual(inst.id, "f201") self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") + self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "938273695") - self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") - self.assertEqual(inst.identifier[1].use, "usual") - self.assertEqual(inst.identifier[1].value, "129IDH4OP733") + self.assertEqual(inst.identifier[0].value, "12345678901") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "van den broek") - self.assertEqual(inst.name[0].given[0], "Eric") - self.assertEqual(inst.name[0].suffix[0], "MD") + self.assertEqual(inst.name[0].family, "Bronsig") + self.assertEqual(inst.name[0].given[0], "Arend") + self.assertEqual(inst.name[0].prefix[0], "Dr.") + self.assertEqual(inst.name[0].text, "Dokter Bronsig") self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.qualification[0].code.coding[0].code, "41672002") + self.assertEqual(inst.qualification[0].code.coding[0].display, "Pulmonologist") + self.assertEqual(inst.qualification[0].code.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "0205568263") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "E.M.vandenbroek@bmc.nl") - self.assertEqual(inst.telecom[2].system, "fax") - self.assertEqual(inst.telecom[2].use, "work") - self.assertEqual(inst.telecom[2].value, "0205664440") + self.assertEqual(inst.telecom[0].value, "+31715269111") self.assertEqual(inst.text.status, "generated") def testPractitioner3(self): - inst = self.instantiate_from("practitioner-example-xcda1.json") + inst = self.instantiate_from("practitioner-example-f202-lm.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner3(inst) @@ -117,21 +111,40 @@ def testPractitioner3(self): self.implPractitioner3(inst2) def implPractitioner3(self, inst): - self.assertEqual(inst.id, "xcda1") - self.assertEqual(inst.identifier[0].system, "http://healthcare.example.org/identifiers/staff") + self.assertTrue(inst.active) + self.assertEqual(inst.address[0].city, "Den helder") + self.assertEqual(inst.address[0].country, "NLD") + self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") + self.assertEqual(inst.address[0].line[1], "C4 - Automatisering") + self.assertEqual(inst.address[0].postalCode, "2333ZA") + self.assertEqual(inst.address[0].use, "work") + self.assertEqual(inst.birthDate.date, FHIRDate("1960-06-12").date) + self.assertEqual(inst.birthDate.as_json(), "1960-06-12") + self.assertEqual(inst.gender, "male") + self.assertEqual(inst.id, "f202") + self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") + self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "D234123") + self.assertEqual(inst.identifier[0].value, "12345678902") + self.assertEqual(inst.identifier[1].system, "https://www.bigregister.nl/") + self.assertEqual(inst.identifier[1].type.text, "BIG-nummer") + self.assertEqual(inst.identifier[1].use, "official") + self.assertEqual(inst.identifier[1].value, "12345678902") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Dopplemeyer") - self.assertEqual(inst.name[0].given[0], "Sherry") - self.assertEqual(inst.telecom[0].system, "email") - self.assertEqual(inst.telecom[0].value, "john.doe@healthcare.example.org") + self.assertEqual(inst.name[0].family, "Maas") + self.assertEqual(inst.name[0].given[0], "Luigi") + self.assertEqual(inst.name[0].prefix[0], "Dr.") + self.assertEqual(inst.name[0].text, "Luigi Maas") + self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "+31715269111") self.assertEqual(inst.text.status, "generated") def testPractitioner4(self): - inst = self.instantiate_from("practitioner-example-f007-sh.json") + inst = self.instantiate_from("practitioner-example-xcda-author.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner4(inst) @@ -141,41 +154,17 @@ def testPractitioner4(self): self.implPractitioner4(inst2) def implPractitioner4(self, inst): - self.assertEqual(inst.address[0].city, "Den Burg") - self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") - self.assertEqual(inst.address[0].postalCode, "9105 PZ") - self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1971-11-07").date) - self.assertEqual(inst.birthDate.as_json(), "1971-11-07") - self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "f007") - self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "874635264") - self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") - self.assertEqual(inst.identifier[1].use, "usual") - self.assertEqual(inst.identifier[1].value, "567IUI51C154") + self.assertEqual(inst.id, "xcda-author") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Heps") - self.assertEqual(inst.name[0].given[0], "Simone") + self.assertEqual(inst.name[0].family, "Hippocrates") + self.assertEqual(inst.name[0].given[0], "Harold") self.assertEqual(inst.name[0].suffix[0], "MD") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "020556936") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "S.M.Heps@bmc.nl") - self.assertEqual(inst.telecom[2].system, "fax") - self.assertEqual(inst.telecom[2].use, "work") - self.assertEqual(inst.telecom[2].value, "0205669283") self.assertEqual(inst.text.status, "generated") def testPractitioner5(self): - inst = self.instantiate_from("practitioner-example-f204-ce.json") + inst = self.instantiate_from("practitioner-example-f003-mv.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner5(inst) @@ -185,31 +174,44 @@ def testPractitioner5(self): self.implPractitioner5(inst2) def implPractitioner5(self, inst): - self.assertEqual(inst.address[0].city, "Den helder") + self.assertEqual(inst.address[0].city, "Amsterdam") self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") - self.assertEqual(inst.address[0].postalCode, "2333ZA") + self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") + self.assertEqual(inst.address[0].postalCode, "1105 AZ") self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1967-11-05").date) - self.assertEqual(inst.birthDate.as_json(), "1967-11-05") - self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "f204") + self.assertEqual(inst.birthDate.date, FHIRDate("1963-07-01").date) + self.assertEqual(inst.birthDate.as_json(), "1963-07-01") + self.assertEqual(inst.communication[0].coding[0].code, "nl") + self.assertEqual(inst.communication[0].coding[0].display, "Dutch") + self.assertEqual(inst.communication[0].coding[0].system, "urn:ietf:bcp:47") + self.assertEqual(inst.gender, "male") + self.assertEqual(inst.id, "f003") self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") - self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "12345678904") + self.assertEqual(inst.identifier[0].value, "846100293") + self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") + self.assertEqual(inst.identifier[1].use, "usual") + self.assertEqual(inst.identifier[1].value, "243HID3RT938") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].text, "Carla Espinosa") - self.assertEqual(inst.name[0].use, "usual") + self.assertEqual(inst.name[0].family, "Versteegh") + self.assertEqual(inst.name[0].given[0], "Marc") + self.assertEqual(inst.name[0].suffix[0], "MD") + self.assertEqual(inst.name[0].use, "official") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "+31715262169") + self.assertEqual(inst.telecom[0].value, "0205562431") + self.assertEqual(inst.telecom[1].system, "email") + self.assertEqual(inst.telecom[1].use, "work") + self.assertEqual(inst.telecom[1].value, "m.versteegh@bmc.nl") + self.assertEqual(inst.telecom[2].system, "fax") + self.assertEqual(inst.telecom[2].use, "work") + self.assertEqual(inst.telecom[2].value, "0205662948") self.assertEqual(inst.text.status, "generated") def testPractitioner6(self): - inst = self.instantiate_from("practitioner-example-xcda-author.json") + inst = self.instantiate_from("practitioner-example-f002-pv.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner6(inst) @@ -219,17 +221,41 @@ def testPractitioner6(self): self.implPractitioner6(inst2) def implPractitioner6(self, inst): - self.assertEqual(inst.id, "xcda-author") + self.assertEqual(inst.address[0].city, "Den Burg") + self.assertEqual(inst.address[0].country, "NLD") + self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") + self.assertEqual(inst.address[0].postalCode, "9105 PZ") + self.assertEqual(inst.address[0].use, "work") + self.assertEqual(inst.birthDate.date, FHIRDate("1979-04-29").date) + self.assertEqual(inst.birthDate.as_json(), "1979-04-29") + self.assertEqual(inst.gender, "male") + self.assertEqual(inst.id, "f002") + self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "730291637") + self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") + self.assertEqual(inst.identifier[1].use, "usual") + self.assertEqual(inst.identifier[1].value, "174BIP3JH438") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Hippocrates") - self.assertEqual(inst.name[0].given[0], "Harold") + self.assertEqual(inst.name[0].family, "Voigt") + self.assertEqual(inst.name[0].given[0], "Pieter") self.assertEqual(inst.name[0].suffix[0], "MD") + self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.telecom[0].system, "phone") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "0205569336") + self.assertEqual(inst.telecom[1].system, "email") + self.assertEqual(inst.telecom[1].use, "work") + self.assertEqual(inst.telecom[1].value, "p.voigt@bmc.nl") + self.assertEqual(inst.telecom[2].system, "fax") + self.assertEqual(inst.telecom[2].use, "work") + self.assertEqual(inst.telecom[2].value, "0205669382") self.assertEqual(inst.text.status, "generated") def testPractitioner7(self): - inst = self.instantiate_from("practitioner-example-f201-ab.json") + inst = self.instantiate_from("practitioner-example.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner7(inst) @@ -240,38 +266,32 @@ def testPractitioner7(self): def implPractitioner7(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.address[0].city, "Den helder") - self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") - self.assertEqual(inst.address[0].line[1], "C4 - Automatisering") - self.assertEqual(inst.address[0].postalCode, "2333ZA") - self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1956-12-24").date) - self.assertEqual(inst.birthDate.as_json(), "1956-12-24") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") - self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "12345678901") + self.assertEqual(inst.address[0].city, "PleasantVille") + self.assertEqual(inst.address[0].line[0], "534 Erewhon St") + self.assertEqual(inst.address[0].postalCode, "3999") + self.assertEqual(inst.address[0].state, "Vic") + self.assertEqual(inst.address[0].use, "home") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "http://www.acme.org/practitioners") + self.assertEqual(inst.identifier[0].value, "23") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Bronsig") - self.assertEqual(inst.name[0].given[0], "Arend") - self.assertEqual(inst.name[0].prefix[0], "Dr.") - self.assertEqual(inst.name[0].text, "Dokter Bronsig") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.qualification[0].code.coding[0].code, "41672002") - self.assertEqual(inst.qualification[0].code.coding[0].display, "Pulmonologist") - self.assertEqual(inst.qualification[0].code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "+31715269111") + self.assertEqual(inst.name[0].family, "Careful") + self.assertEqual(inst.name[0].given[0], "Adam") + self.assertEqual(inst.name[0].prefix[0], "Dr") + self.assertEqual(inst.qualification[0].code.coding[0].code, "BS") + self.assertEqual(inst.qualification[0].code.coding[0].display, "Bachelor of Science") + self.assertEqual(inst.qualification[0].code.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0360/2.7") + self.assertEqual(inst.qualification[0].code.text, "Bachelor of Science") + self.assertEqual(inst.qualification[0].identifier[0].system, "http://example.org/UniversityIdentifier") + self.assertEqual(inst.qualification[0].identifier[0].value, "12345") + self.assertEqual(inst.qualification[0].period.start.datetime, FHIRDateTime("1995").datetime) + self.assertEqual(inst.qualification[0].period.start.as_json(), "1995") self.assertEqual(inst.text.status, "generated") def testPractitioner8(self): - inst = self.instantiate_from("practitioner-example-f004-rb.json") + inst = self.instantiate_from("practitioner-example-f007-sh.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner8(inst) @@ -281,45 +301,41 @@ def testPractitioner8(self): self.implPractitioner8(inst2) def implPractitioner8(self, inst): - self.assertEqual(inst.address[0].city, "Amsterdam") + self.assertEqual(inst.address[0].city, "Den Burg") self.assertEqual(inst.address[0].country, "NLD") self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") - self.assertEqual(inst.address[0].postalCode, "1105 AZ") + self.assertEqual(inst.address[0].postalCode, "9105 PZ") self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1980-02-04").date) - self.assertEqual(inst.birthDate.as_json(), "1980-02-04") - self.assertEqual(inst.communication[0].coding[0].code, "nl") - self.assertEqual(inst.communication[0].coding[0].display, "Netherlands") - self.assertEqual(inst.communication[0].coding[0].system, "urn:ietf:bcp:47") - self.assertEqual(inst.communication[0].text, "Language") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f004") + self.assertEqual(inst.birthDate.date, FHIRDate("1971-11-07").date) + self.assertEqual(inst.birthDate.as_json(), "1971-11-07") + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "f007") self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "118265112") + self.assertEqual(inst.identifier[0].value, "874635264") self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") self.assertEqual(inst.identifier[1].use, "usual") - self.assertEqual(inst.identifier[1].value, "523ASA1LK927") + self.assertEqual(inst.identifier[1].value, "567IUI51C154") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Briet") - self.assertEqual(inst.name[0].given[0], "Ronald") + self.assertEqual(inst.name[0].family, "Heps") + self.assertEqual(inst.name[0].given[0], "Simone") self.assertEqual(inst.name[0].suffix[0], "MD") self.assertEqual(inst.name[0].use, "official") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "0205569273") + self.assertEqual(inst.telecom[0].value, "020556936") self.assertEqual(inst.telecom[1].system, "email") self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "r.briet@bmc.nl") + self.assertEqual(inst.telecom[1].value, "S.M.Heps@bmc.nl") self.assertEqual(inst.telecom[2].system, "fax") self.assertEqual(inst.telecom[2].use, "work") - self.assertEqual(inst.telecom[2].value, "0205664440") + self.assertEqual(inst.telecom[2].value, "0205669283") self.assertEqual(inst.text.status, "generated") def testPractitioner9(self): - inst = self.instantiate_from("practitioner-example-f002-pv.json") + inst = self.instantiate_from("practitioner-example-f204-ce.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner9(inst) @@ -329,41 +345,31 @@ def testPractitioner9(self): self.implPractitioner9(inst2) def implPractitioner9(self, inst): - self.assertEqual(inst.address[0].city, "Den Burg") + self.assertEqual(inst.address[0].city, "Den helder") self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") - self.assertEqual(inst.address[0].postalCode, "9105 PZ") + self.assertEqual(inst.address[0].line[0], "Walvisbaai 3") + self.assertEqual(inst.address[0].postalCode, "2333ZA") self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1979-04-29").date) - self.assertEqual(inst.birthDate.as_json(), "1979-04-29") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f002") + self.assertEqual(inst.birthDate.date, FHIRDate("1967-11-05").date) + self.assertEqual(inst.birthDate.as_json(), "1967-11-05") + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "f204") self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") + self.assertEqual(inst.identifier[0].type.text, "UZI-nummer") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "730291637") - self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") - self.assertEqual(inst.identifier[1].use, "usual") - self.assertEqual(inst.identifier[1].value, "174BIP3JH438") + self.assertEqual(inst.identifier[0].value, "12345678904") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Voigt") - self.assertEqual(inst.name[0].given[0], "Pieter") - self.assertEqual(inst.name[0].suffix[0], "MD") - self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.name[0].text, "Carla Espinosa") + self.assertEqual(inst.name[0].use, "usual") self.assertEqual(inst.telecom[0].system, "phone") self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "0205569336") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "p.voigt@bmc.nl") - self.assertEqual(inst.telecom[2].system, "fax") - self.assertEqual(inst.telecom[2].use, "work") - self.assertEqual(inst.telecom[2].value, "0205669382") + self.assertEqual(inst.telecom[0].value, "+31715262169") self.assertEqual(inst.text.status, "generated") def testPractitioner10(self): - inst = self.instantiate_from("practitioner-example-f006-rvdb.json") + inst = self.instantiate_from("practitioner-example-xcda1.json") self.assertIsNotNone(inst, "Must have instantiated a Practitioner instance") self.implPractitioner10(inst) @@ -373,36 +379,16 @@ def testPractitioner10(self): self.implPractitioner10(inst2) def implPractitioner10(self, inst): - self.assertEqual(inst.address[0].city, "Den Burg") - self.assertEqual(inst.address[0].country, "NLD") - self.assertEqual(inst.address[0].line[0], "Galapagosweg 91") - self.assertEqual(inst.address[0].postalCode, "9105 PZ") - self.assertEqual(inst.address[0].use, "work") - self.assertEqual(inst.birthDate.date, FHIRDate("1975-12-07").date) - self.assertEqual(inst.birthDate.as_json(), "1975-12-07") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "f006") - self.assertEqual(inst.identifier[0].system, "urn:oid:2.16.528.1.1007.3.1") + self.assertEqual(inst.id, "xcda1") + self.assertEqual(inst.identifier[0].system, "http://healthcare.example.org/identifiers/staff") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "937223645") - self.assertEqual(inst.identifier[1].system, "urn:oid:2.16.840.1.113883.2.4.6.3") - self.assertEqual(inst.identifier[1].use, "usual") - self.assertEqual(inst.identifier[1].value, "134IDY41W988") + self.assertEqual(inst.identifier[0].value, "D234123") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "van den Berk") - self.assertEqual(inst.name[0].given[0], "Rob") - self.assertEqual(inst.name[0].suffix[0], "MD") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "0205569288") - self.assertEqual(inst.telecom[1].system, "email") - self.assertEqual(inst.telecom[1].use, "work") - self.assertEqual(inst.telecom[1].value, "R.A.vandenberk@bmc.nl") - self.assertEqual(inst.telecom[2].system, "fax") - self.assertEqual(inst.telecom[2].use, "work") - self.assertEqual(inst.telecom[2].value, "0205664987") + self.assertEqual(inst.name[0].family, "Dopplemeyer") + self.assertEqual(inst.name[0].given[0], "Sherry") + self.assertEqual(inst.telecom[0].system, "email") + self.assertEqual(inst.telecom[0].value, "john.doe@healthcare.example.org") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/primitiveextension_test.py b/tests/models/primitiveextension_test.py new file mode 100644 index 00000000..7b347f56 --- /dev/null +++ b/tests/models/primitiveextension_test.py @@ -0,0 +1,156 @@ +import unittest + +from fhirclient.models.patient import Patient +from fhirclient.models.encounter import Encounter + + +class PrimitiveExtensionTests(unittest.TestCase): + + def test_patient(self): + json = { + "id": "1234", + "name": [{ + "family": "Smith", + "given": ["John"] + }], + "birthDate": "2000-01-01", + "_birthDate": { + "extension": [{ + "url": "http://example.com/patient-birthdate-descriptor", + "valueString": "Y2K baby" + }] + }, + "gender": "male", + "_gender": { + "extension": [{ + "url": "http://example.com/patient-gender-descriptor", + "valueString": "XY" + }] + }, + "resourceType": "Patient" + } + + fhir_patient = Patient(json) + assert fhir_patient.as_json() == json + + def test_encounter(self): + encounter_json = { + "resourceType": + "Encounter", + "id": + "example-mother-encounter", + "meta": { + "profile": [ + "https://fhir-ig.curaihealth.com/StructureDefinition/CuraiEncounter" + ] + }, + "text": { + "status": + "extensions", + "div": + "

Generated Narrative: Encounter example-mother-encounter

Reason for Encounter Extension: My tooth aches

Dynamic Charting Fields Order: [{"type": "hpi", "childEncounterIds": ["example-child-encounter"]}]

Designated for return Extension: false

status: Finished

class: ActCode VR: virtual

type: Encounter by electronic text-based asynchronous communication (procedure)

subject: John Doe Female, DoB: 1984-01-01 ( https://fhir-ig.curaihealth.com/user-id#123456789)

episodeOfCare: Identifier: example-episodeofcare-medical-history-finished

Participants

-TypeIndividual
*Primary PerformerEncounter/example-curai-practitioner

period: 2022-08-03 00:00:00+0000 --> 2022-08-03 01:00:00+0000

Locations

-Location
*Location Curai State

Generated Narrative: Location #example-encounter-location

identifier: http://exampleoflocation.com/curai\u00a0(use:\u00a0temp,\u00a0)

name: Curai State

address: GA

" + }, + "contained": [{ + "resourceType": + "Location", + "id": + "example-encounter-location", + "meta": { + "profile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-location" + ] + }, + "identifier": [{ + "use": "temp", + "system": "http://exampleoflocation.com", + "value": "curai" + }], + "name": + "Curai State", + "address": { + "state": "GA" + } + }], + "extension": [{ + "url": + "https://fhir-ig.curaihealth.com/StructureDefinition/reason-for-encounter", + "valueString": "My tooth aches", + "_valueString": { + "extension": [{ + "url": + "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [{ + "url": "lang", + "valueCode": "es" + }, { + "url": "content", + "valueString": "Me duele el diente" + }] + }] + } + }, { + "url": + "https://fhir-ig.curaihealth.com/StructureDefinition/dynamic-charting-fields-order", + "valueString": + "[{\"type\": \"hpi\", \"childEncounterIds\": [\"example-child-encounter\"]}]" + }, { + "url": + "https://fhir-ig.curaihealth.com/StructureDefinition/designated-for-return", + "valueBoolean": False + }], + "status": + "finished", + "class": { + "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", + "code": "VR", + "display": "virtual" + }, + "type": [{ + "coding": [{ + "system": + "http://snomed.info/sct", + "code": + "1197766005", + "display": + "Encounter by electronic text-based asynchronous communication (procedure)" + }] + }], + "subject": { + "reference": "Patient/example-curai-patient", + "identifier": { + "value": "example-curai-patient" + } + }, + "episodeOfCare": [{ + "identifier": { + "value": "example-episodeofcare-medical-history-finished" + } + }], + "participant": [{ + "type": [{ + "coding": [{ + "system": + "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", + "code": "PPRF", + "display": "primary performer" + }], + "text": + "Primary Performer" + }], + "individual": { + "reference": "Encounter/example-curai-practitioner" + } + }], + "period": { + "start": "2022-08-03T00:00:00.000Z", + "end": "2022-08-03T01:00:00.000Z" + }, + "location": [{ + "location": { + "reference": "#example-encounter-location" + } + }] + } + + fhir_encounter = Encounter(encounter_json) + assert fhir_encounter.as_json() == encounter_json diff --git a/tests/models/procedure_test.py b/tests/models/procedure_test.py index 8600db0c..42f03084 100644 --- a/tests/models/procedure_test.py +++ b/tests/models/procedure_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return procedure.Procedure(js) def testProcedure1(self): - inst = self.instantiate_from("procedure-example-ambulation.json") + inst = self.instantiate_from("procedure-example-f201-tpf.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") self.implProcedure1(inst) @@ -30,6 +30,40 @@ def testProcedure1(self): self.implProcedure1(inst2) def implProcedure1(self, inst): + self.assertEqual(inst.bodySite[0].coding[0].code, "272676008") + self.assertEqual(inst.bodySite[0].coding[0].display, "Sphenoid bone") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.coding[0].code, "367336001") + self.assertEqual(inst.code.coding[0].display, "Chemotherapy") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.instantiatesCanonical[0], "PlanDefinition/KDN5") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.note[0].text, "Eerste neo-adjuvante TPF-kuur bij groot proces in sphenoid met intracraniale uitbreiding.") + self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2013-01-28T14:27:00+01:00").datetime) + self.assertEqual(inst.performedPeriod.end.as_json(), "2013-01-28T14:27:00+01:00") + self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2013-01-28T13:31:00+01:00").datetime) + self.assertEqual(inst.performedPeriod.start.as_json(), "2013-01-28T13:31:00+01:00") + self.assertEqual(inst.performer[0].function.coding[0].code, "310512001") + self.assertEqual(inst.performer[0].function.coding[0].display, "Medical oncologist") + self.assertEqual(inst.performer[0].function.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.reasonCode[0].text, "DiagnosticReport/f201") + self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.status, "generated") + + def testProcedure2(self): + inst = self.instantiate_from("procedure-example-ambulation.json") + self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") + self.implProcedure2(inst) + + js = inst.as_json() + self.assertEqual("Procedure", js["resourceType"]) + inst2 = procedure.Procedure(js) + self.implProcedure2(inst2) + + def implProcedure2(self, inst): self.assertEqual(inst.code.coding[0].code, "62013009") self.assertEqual(inst.code.coding[0].display, "Ambulating patient (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") @@ -48,115 +82,105 @@ def implProcedure1(self, inst): self.assertEqual(inst.text.div, "
Ambulation procedure was not done
") self.assertEqual(inst.text.status, "generated") - def testProcedure2(self): - inst = self.instantiate_from("procedure-example-biopsy.json") + def testProcedure3(self): + inst = self.instantiate_from("procedure-example-implant.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure2(inst) + self.implProcedure3(inst) js = inst.as_json() self.assertEqual("Procedure", js["resourceType"]) inst2 = procedure.Procedure(js) - self.implProcedure2(inst2) + self.implProcedure3(inst2) - def implProcedure2(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "368225008") - self.assertEqual(inst.bodySite[0].coding[0].display, "Entire Left Forearm") - self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.bodySite[0].text, "Left forearm") - self.assertEqual(inst.category.coding[0].code, "103693007") - self.assertEqual(inst.category.coding[0].display, "Diagnostic procedure (procedure)") - self.assertEqual(inst.category.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category.text, "Diagnostic procedure") - self.assertEqual(inst.code.coding[0].code, "90105005") - self.assertEqual(inst.code.coding[0].display, "Biopsy of soft tissue of forearm (Procedure)") + def implProcedure3(self, inst): + self.assertEqual(inst.code.coding[0].code, "25267002") + self.assertEqual(inst.code.coding[0].display, "Insertion of intracardiac pacemaker (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Biopsy of suspected melanoma L) arm") - self.assertEqual(inst.complication[0].coding[0].code, "67750007") - self.assertEqual(inst.complication[0].coding[0].display, "Ineffective airway clearance (finding)") - self.assertEqual(inst.complication[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.complication[0].text, "Ineffective airway clearance") - self.assertEqual(inst.followUp[0].text, "Review in clinic") - self.assertEqual(inst.id, "biopsy") + self.assertEqual(inst.code.text, "Implant Pacemaker") + self.assertEqual(inst.focalDevice[0].action.coding[0].code, "implanted") + self.assertEqual(inst.focalDevice[0].action.coding[0].system, "http://hl7.org/fhir/device-action") + self.assertEqual(inst.followUp[0].text, "ROS 5 days - 2013-04-10") + self.assertEqual(inst.id, "example-implant") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Standard Biopsy") - self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2014-02-03").datetime) - self.assertEqual(inst.performedDateTime.as_json(), "2014-02-03") - self.assertEqual(inst.reasonCode[0].text, "Dark lesion l) forearm. getting darker last 3 months.") + self.assertEqual(inst.note[0].text, "Routine Appendectomy. Appendix was inflamed and in retro-caecal position") + self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2015-04-05").datetime) + self.assertEqual(inst.performedDateTime.as_json(), "2015-04-05") + self.assertEqual(inst.reasonCode[0].text, "Bradycardia") self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
Biopsy of suspected melanoma L) arm
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.usedCode[0].coding[0].code, "79068005") - self.assertEqual(inst.usedCode[0].coding[0].display, "Needle, device (physical object)") - self.assertEqual(inst.usedCode[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.usedCode[0].text, "30-guage needle") - def testProcedure3(self): - inst = self.instantiate_from("procedure-example-appendectomy-narrative.json") + def testProcedure4(self): + inst = self.instantiate_from("procedure-example-colon-biopsy.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure3(inst) + self.implProcedure4(inst) js = inst.as_json() self.assertEqual("Procedure", js["resourceType"]) inst2 = procedure.Procedure(js) - self.implProcedure3(inst2) + self.implProcedure4(inst2) - def implProcedure3(self, inst): - self.assertEqual(inst.id, "appendectomy-narrative") + def implProcedure4(self, inst): + self.assertEqual(inst.code.coding[0].code, "76164006") + self.assertEqual(inst.code.coding[0].display, "Biopsy of colon (procedure)") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.text, "Biopsy of colon") + self.assertEqual(inst.id, "colon-biopsy") + self.assertEqual(inst.identifier[0].value, "12345") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
Routine Appendectomy in April 2013 performed by Dr Cecil Surgeon
") - self.assertEqual(inst.text.status, "additional") + self.assertEqual(inst.text.div, "
Biopsy of colon, which was part of colonoscopy
") + self.assertEqual(inst.text.status, "generated") - def testProcedure4(self): - inst = self.instantiate_from("procedure-example-f003-abscess.json") + def testProcedure5(self): + inst = self.instantiate_from("procedure-example-f004-tracheotomy.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure4(inst) + self.implProcedure5(inst) js = inst.as_json() self.assertEqual("Procedure", js["resourceType"]) inst2 = procedure.Procedure(js) - self.implProcedure4(inst2) + self.implProcedure5(inst2) - def implProcedure4(self, inst): + def implProcedure5(self, inst): self.assertEqual(inst.bodySite[0].coding[0].code, "83030008") self.assertEqual(inst.bodySite[0].coding[0].display, "Retropharyngeal area") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[0].code, "172960003") - self.assertEqual(inst.code.coding[0].display, "Incision of retropharyngeal abscess") + self.assertEqual(inst.code.coding[0].code, "48387007") + self.assertEqual(inst.code.coding[0].display, "Tracheotomy") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.followUp[0].text, "described in care plan") - self.assertEqual(inst.id, "f003") + self.assertEqual(inst.id, "f004") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome.text, "removal of the retropharyngeal abscess") - self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2013-03-24T10:30:10+01:00").datetime) - self.assertEqual(inst.performedPeriod.end.as_json(), "2013-03-24T10:30:10+01:00") - self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2013-03-24T09:30:10+01:00").datetime) - self.assertEqual(inst.performedPeriod.start.as_json(), "2013-03-24T09:30:10+01:00") + self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2013-03-22T10:30:10+01:00").datetime) + self.assertEqual(inst.performedPeriod.end.as_json(), "2013-03-22T10:30:10+01:00") + self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2013-03-22T09:30:10+01:00").datetime) + self.assertEqual(inst.performedPeriod.start.as_json(), "2013-03-22T09:30:10+01:00") self.assertEqual(inst.performer[0].function.coding[0].code, "01.000") self.assertEqual(inst.performer[0].function.coding[0].display, "Arts") self.assertEqual(inst.performer[0].function.coding[0].system, "urn:oid:2.16.840.1.113883.2.4.15.111") self.assertEqual(inst.performer[0].function.text, "Care role") - self.assertEqual(inst.reasonCode[0].text, "abcess in retropharyngeal area") + self.assertEqual(inst.reasonCode[0].text, "ensure breathing during surgery") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") - def testProcedure5(self): + def testProcedure6(self): inst = self.instantiate_from("procedure-example-education.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure5(inst) + self.implProcedure6(inst) js = inst.as_json() self.assertEqual("Procedure", js["resourceType"]) inst2 = procedure.Procedure(js) - self.implProcedure5(inst2) + self.implProcedure6(inst2) - def implProcedure5(self, inst): + def implProcedure6(self, inst): self.assertEqual(inst.category.coding[0].code, "311401005") self.assertEqual(inst.category.coding[0].display, "Patient education (procedure)") self.assertEqual(inst.category.coding[0].system, "http://snomed.info/sct") @@ -176,17 +200,17 @@ def implProcedure5(self, inst): self.assertEqual(inst.text.div, "
Health education - breast examination for early detection of breast mass
") self.assertEqual(inst.text.status, "generated") - def testProcedure6(self): + def testProcedure7(self): inst = self.instantiate_from("procedure-example-colonoscopy.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure6(inst) + self.implProcedure7(inst) js = inst.as_json() self.assertEqual("Procedure", js["resourceType"]) inst2 = procedure.Procedure(js) - self.implProcedure6(inst2) + self.implProcedure7(inst2) - def implProcedure6(self, inst): + def implProcedure7(self, inst): self.assertEqual(inst.code.coding[0].code, "73761001") self.assertEqual(inst.code.coding[0].display, "Colonoscopy (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") @@ -200,39 +224,8 @@ def implProcedure6(self, inst): self.assertEqual(inst.text.div, "
Colonoscopy with complication
") self.assertEqual(inst.text.status, "generated") - def testProcedure7(self): - inst = self.instantiate_from("procedure-example-ob.json") - self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") - self.implProcedure7(inst) - - js = inst.as_json() - self.assertEqual("Procedure", js["resourceType"]) - inst2 = procedure.Procedure(js) - self.implProcedure7(inst2) - - def implProcedure7(self, inst): - self.assertEqual(inst.category.coding[0].code, "386637004") - self.assertEqual(inst.category.coding[0].display, "Obstetric procedure (procedure)") - self.assertEqual(inst.category.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category.text, "OB") - self.assertEqual(inst.code.coding[0].code, "22633006") - self.assertEqual(inst.code.coding[0].display, "Vaginal delivery, medical personnel present (procedure)") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Vaginal delivery") - self.assertEqual(inst.id, "ob") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome.text, "delivery of healthy male infant") - self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2012-06-02").datetime) - self.assertEqual(inst.performedDateTime.as_json(), "2012-06-02") - self.assertEqual(inst.reasonCode[0].text, "term pregnancy, active labor") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
Vaginal delivery of healthy male infant on June 2, 2012
") - self.assertEqual(inst.text.status, "generated") - def testProcedure8(self): - inst = self.instantiate_from("procedure-example-f001-heart.json") + inst = self.instantiate_from("procedure-example-physical-therapy.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") self.implProcedure8(inst) @@ -242,32 +235,31 @@ def testProcedure8(self): self.implProcedure8(inst2) def implProcedure8(self, inst): - self.assertEqual(inst.bodySite[0].coding[0].code, "17401000") - self.assertEqual(inst.bodySite[0].coding[0].display, "Heart valve structure") + self.assertEqual(inst.bodySite[0].coding[0].code, "36701003") + self.assertEqual(inst.bodySite[0].coding[0].display, "Both knees (body structure)") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[0].code, "34068001") - self.assertEqual(inst.code.coding[0].display, "Heart valve replacement") + self.assertEqual(inst.bodySite[0].text, "Both knees") + self.assertEqual(inst.category.coding[0].code, "386053000") + self.assertEqual(inst.category.coding[0].display, "Evaluation procedure (procedure)") + self.assertEqual(inst.category.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category.text, "Evaluation") + self.assertEqual(inst.code.coding[0].code, "710830005") + self.assertEqual(inst.code.coding[0].display, "Assessment of passive range of motion (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.followUp[0].text, "described in care plan") - self.assertEqual(inst.id, "f001") + self.assertEqual(inst.code.text, "Assessment of passive range of motion") + self.assertEqual(inst.id, "physical-therapy") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.outcome.text, "improved blood circulation") - self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2011-06-27").datetime) - self.assertEqual(inst.performedPeriod.end.as_json(), "2011-06-27") - self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2011-06-26").datetime) - self.assertEqual(inst.performedPeriod.start.as_json(), "2011-06-26") - self.assertEqual(inst.performer[0].function.coding[0].code, "01.000") - self.assertEqual(inst.performer[0].function.coding[0].display, "Arts") - self.assertEqual(inst.performer[0].function.coding[0].system, "urn:oid:2.16.840.1.113883.2.4.15.111") - self.assertEqual(inst.performer[0].function.text, "Care role") - self.assertEqual(inst.reasonCode[0].text, "Heart valve disorder") + self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2016-09-27").datetime) + self.assertEqual(inst.performedDateTime.as_json(), "2016-09-27") + self.assertEqual(inst.reasonCode[0].text, "assessment of mobility limitations due to osteoarthritis") self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.div, "
Assessment of passive range of motion for both knees on Sept 27, 2016 due to osteoarthritis
") self.assertEqual(inst.text.status, "generated") def testProcedure9(self): - inst = self.instantiate_from("procedure-example-f004-tracheotomy.json") + inst = self.instantiate_from("procedure-example-f003-abscess.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") self.implProcedure9(inst) @@ -280,29 +272,29 @@ def implProcedure9(self, inst): self.assertEqual(inst.bodySite[0].coding[0].code, "83030008") self.assertEqual(inst.bodySite[0].coding[0].display, "Retropharyngeal area") self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[0].code, "48387007") - self.assertEqual(inst.code.coding[0].display, "Tracheotomy") + self.assertEqual(inst.code.coding[0].code, "172960003") + self.assertEqual(inst.code.coding[0].display, "Incision of retropharyngeal abscess") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") self.assertEqual(inst.followUp[0].text, "described in care plan") - self.assertEqual(inst.id, "f004") + self.assertEqual(inst.id, "f003") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.outcome.text, "removal of the retropharyngeal abscess") - self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2013-03-22T10:30:10+01:00").datetime) - self.assertEqual(inst.performedPeriod.end.as_json(), "2013-03-22T10:30:10+01:00") - self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2013-03-22T09:30:10+01:00").datetime) - self.assertEqual(inst.performedPeriod.start.as_json(), "2013-03-22T09:30:10+01:00") + self.assertEqual(inst.performedPeriod.end.datetime, FHIRDateTime("2013-03-24T10:30:10+01:00").datetime) + self.assertEqual(inst.performedPeriod.end.as_json(), "2013-03-24T10:30:10+01:00") + self.assertEqual(inst.performedPeriod.start.datetime, FHIRDateTime("2013-03-24T09:30:10+01:00").datetime) + self.assertEqual(inst.performedPeriod.start.as_json(), "2013-03-24T09:30:10+01:00") self.assertEqual(inst.performer[0].function.coding[0].code, "01.000") self.assertEqual(inst.performer[0].function.coding[0].display, "Arts") self.assertEqual(inst.performer[0].function.coding[0].system, "urn:oid:2.16.840.1.113883.2.4.15.111") self.assertEqual(inst.performer[0].function.text, "Care role") - self.assertEqual(inst.reasonCode[0].text, "ensure breathing during surgery") + self.assertEqual(inst.reasonCode[0].text, "abcess in retropharyngeal area") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testProcedure10(self): - inst = self.instantiate_from("procedure-example-implant.json") + inst = self.instantiate_from("procedure-example.json") self.assertIsNotNone(inst, "Must have instantiated a Procedure instance") self.implProcedure10(inst) @@ -312,21 +304,20 @@ def testProcedure10(self): self.implProcedure10(inst2) def implProcedure10(self, inst): - self.assertEqual(inst.code.coding[0].code, "25267002") - self.assertEqual(inst.code.coding[0].display, "Insertion of intracardiac pacemaker (procedure)") + self.assertEqual(inst.code.coding[0].code, "80146002") + self.assertEqual(inst.code.coding[0].display, "Appendectomy (Procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Implant Pacemaker") - self.assertEqual(inst.focalDevice[0].action.coding[0].code, "implanted") - self.assertEqual(inst.focalDevice[0].action.coding[0].system, "http://hl7.org/fhir/device-action") + self.assertEqual(inst.code.text, "Appendectomy") self.assertEqual(inst.followUp[0].text, "ROS 5 days - 2013-04-10") - self.assertEqual(inst.id, "example-implant") + self.assertEqual(inst.id, "example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.note[0].text, "Routine Appendectomy. Appendix was inflamed and in retro-caecal position") - self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2015-04-05").datetime) - self.assertEqual(inst.performedDateTime.as_json(), "2015-04-05") - self.assertEqual(inst.reasonCode[0].text, "Bradycardia") + self.assertEqual(inst.performedDateTime.datetime, FHIRDateTime("2013-04-05").datetime) + self.assertEqual(inst.performedDateTime.as_json(), "2013-04-05") + self.assertEqual(inst.reasonCode[0].text, "Generalized abdominal pain 24 hours. Localized in RIF with rebound and guarding") self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.div, "
Routine Appendectomy
") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/provenance_test.py b/tests/models/provenance_test.py index 4708b47b..e1ef5780 100644 --- a/tests/models/provenance_test.py +++ b/tests/models/provenance_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return provenance.Provenance(js) def testProvenance1(self): - inst = self.instantiate_from("provenance-example-cwl.json") + inst = self.instantiate_from("provenance-example-sig.json") self.assertIsNotNone(inst, "Must have instantiated a Provenance instance") self.implProvenance1(inst) @@ -30,31 +30,6 @@ def testProvenance1(self): self.implProvenance1(inst2) def implProvenance1(self, inst): - self.assertEqual(inst.agent[0].type.coding[0].code, "AUT") - self.assertEqual(inst.agent[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") - self.assertEqual(inst.entity[0].role, "source") - self.assertEqual(inst.id, "example-cwl") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurredPeriod.start.datetime, FHIRDateTime("2016-11-30").datetime) - self.assertEqual(inst.occurredPeriod.start.as_json(), "2016-11-30") - self.assertEqual(inst.reason[0].text, "profiling Short Tandem Repeats (STRs) from high throughput sequencing data.") - self.assertEqual(inst.recorded.datetime, FHIRInstant("2016-12-01T08:12:14+10:00").datetime) - self.assertEqual(inst.recorded.as_json(), "2016-12-01T08:12:14+10:00") - self.assertEqual(inst.text.status, "generated") - - def testProvenance2(self): - inst = self.instantiate_from("provenance-example-sig.json") - self.assertIsNotNone(inst, "Must have instantiated a Provenance instance") - self.implProvenance2(inst) - - js = inst.as_json() - self.assertEqual("Provenance", js["resourceType"]) - inst2 = provenance.Provenance(js) - self.implProvenance2(inst2) - - def implProvenance2(self, inst): self.assertEqual(inst.activity.coding[0].code, "AU") self.assertEqual(inst.activity.coding[0].display, "authenticated") self.assertEqual(inst.activity.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-DocumentCompletion") @@ -80,6 +55,31 @@ def implProvenance2(self, inst): self.assertEqual(inst.text.div, "
procedure record authored on 27-June 2015 by Harold Hippocrates, MD Content extracted from Referral received 26-June
") self.assertEqual(inst.text.status, "generated") + def testProvenance2(self): + inst = self.instantiate_from("provenance-example-cwl.json") + self.assertIsNotNone(inst, "Must have instantiated a Provenance instance") + self.implProvenance2(inst) + + js = inst.as_json() + self.assertEqual("Provenance", js["resourceType"]) + inst2 = provenance.Provenance(js) + self.implProvenance2(inst2) + + def implProvenance2(self, inst): + self.assertEqual(inst.agent[0].type.coding[0].code, "AUT") + self.assertEqual(inst.agent[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-ParticipationType") + self.assertEqual(inst.entity[0].role, "source") + self.assertEqual(inst.id, "example-cwl") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.occurredPeriod.start.datetime, FHIRDateTime("2016-11-30").datetime) + self.assertEqual(inst.occurredPeriod.start.as_json(), "2016-11-30") + self.assertEqual(inst.reason[0].text, "profiling Short Tandem Repeats (STRs) from high throughput sequencing data.") + self.assertEqual(inst.recorded.datetime, FHIRInstant("2016-12-01T08:12:14+10:00").datetime) + self.assertEqual(inst.recorded.as_json(), "2016-12-01T08:12:14+10:00") + self.assertEqual(inst.text.status, "generated") + def testProvenance3(self): inst = self.instantiate_from("provenance-example-biocompute-object.json") self.assertIsNotNone(inst, "Must have instantiated a Provenance instance") diff --git a/tests/models/questionnaire_test.py b/tests/models/questionnaire_test.py index 1a12d023..b2481d13 100644 --- a/tests/models/questionnaire_test.py +++ b/tests/models/questionnaire_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return questionnaire.Questionnaire(js) def testQuestionnaire1(self): - inst = self.instantiate_from("questionnaire-example-bluebook.json") + inst = self.instantiate_from("questionnaire-cqf-example.json") self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") self.implQuestionnaire1(inst) @@ -30,167 +30,108 @@ def testQuestionnaire1(self): self.implQuestionnaire1(inst2) def implQuestionnaire1(self, inst): - self.assertEqual(inst.date.datetime, FHIRDateTime("2013-02-19").datetime) - self.assertEqual(inst.date.as_json(), "2013-02-19") - self.assertEqual(inst.id, "bb") - self.assertEqual(inst.item[0].item[0].item[0].linkId, "nameOfChild") - self.assertEqual(inst.item[0].item[0].item[0].text, "Name of child") - self.assertEqual(inst.item[0].item[0].item[0].type, "string") - self.assertEqual(inst.item[0].item[0].item[1].answerOption[0].valueCoding.code, "F") - self.assertEqual(inst.item[0].item[0].item[1].answerOption[1].valueCoding.code, "M") - self.assertEqual(inst.item[0].item[0].item[1].linkId, "sex") - self.assertEqual(inst.item[0].item[0].item[1].text, "Sex") - self.assertEqual(inst.item[0].item[0].item[1].type, "choice") - self.assertEqual(inst.item[0].item[0].linkId, "group") - self.assertEqual(inst.item[0].item[0].type, "group") - self.assertEqual(inst.item[0].item[1].item[0].linkId, "birthWeight") - self.assertEqual(inst.item[0].item[1].item[0].text, "Birth weight (kg)") - self.assertEqual(inst.item[0].item[1].item[0].type, "decimal") - self.assertEqual(inst.item[0].item[1].item[1].linkId, "birthLength") - self.assertEqual(inst.item[0].item[1].item[1].text, "Birth length (cm)") - self.assertEqual(inst.item[0].item[1].item[1].type, "decimal") - self.assertEqual(inst.item[0].item[1].item[2].answerOption[0].valueCoding.code, "INJECTION") - self.assertEqual(inst.item[0].item[1].item[2].answerOption[1].valueCoding.code, "INTRAVENOUS") - self.assertEqual(inst.item[0].item[1].item[2].answerOption[2].valueCoding.code, "ORAL") - self.assertTrue(inst.item[0].item[1].item[2].item[0].enableWhen[0].answerBoolean) - self.assertEqual(inst.item[0].item[1].item[2].item[0].enableWhen[0].operator, "exists") - self.assertEqual(inst.item[0].item[1].item[2].item[0].enableWhen[0].question, "vitaminKgiven") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].linkId, "vitaminiKDose1") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].text, "1st dose") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].type, "dateTime") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].linkId, "vitaminiKDose2") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].text, "2nd dose") - self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].type, "dateTime") - self.assertEqual(inst.item[0].item[1].item[2].item[0].linkId, "vitaminKgivenDoses") - self.assertEqual(inst.item[0].item[1].item[2].item[0].type, "group") - self.assertEqual(inst.item[0].item[1].item[2].linkId, "vitaminKgiven") - self.assertEqual(inst.item[0].item[1].item[2].text, "Vitamin K given") - self.assertEqual(inst.item[0].item[1].item[2].type, "choice") - self.assertEqual(inst.item[0].item[1].item[3].item[0].linkId, "hepBgivenDate") - self.assertEqual(inst.item[0].item[1].item[3].item[0].text, "Date given") - self.assertEqual(inst.item[0].item[1].item[3].item[0].type, "date") - self.assertEqual(inst.item[0].item[1].item[3].linkId, "hepBgiven") - self.assertEqual(inst.item[0].item[1].item[3].text, "Hep B given y / n") - self.assertEqual(inst.item[0].item[1].item[3].type, "boolean") - self.assertEqual(inst.item[0].item[1].item[4].linkId, "abnormalitiesAtBirth") - self.assertEqual(inst.item[0].item[1].item[4].text, "Abnormalities noted at birth") - self.assertEqual(inst.item[0].item[1].item[4].type, "string") - self.assertEqual(inst.item[0].item[1].linkId, "neonatalInformation") - self.assertEqual(inst.item[0].item[1].text, "Neonatal Information") - self.assertEqual(inst.item[0].item[1].type, "group") - self.assertEqual(inst.item[0].linkId, "birthDetails") - self.assertEqual(inst.item[0].text, "Birth details - To be completed by health professional") - self.assertEqual(inst.item[0].type, "group") - self.assertEqual(inst.jurisdiction[0].coding[0].code, "AU") - self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") - self.assertEqual(inst.publisher, "New South Wales Department of Health") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.subjectType[0], "Patient") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "NSW Government My Personal Health Record") - self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/bb") - - def testQuestionnaire2(self): - inst = self.instantiate_from("questionnaire-example-f201-lifelines.json") - self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") - self.implQuestionnaire2(inst) - - js = inst.as_json() - self.assertEqual("Questionnaire", js["resourceType"]) - inst2 = questionnaire.Questionnaire(js) - self.implQuestionnaire2(inst2) - - def implQuestionnaire2(self, inst): - self.assertEqual(inst.code[0].code, "VL 1-1, 18-65_1.2.2") - self.assertEqual(inst.code[0].display, "Lifelines Questionnaire 1 part 1") - self.assertEqual(inst.code[0].system, "http://example.org/system/code/lifelines/nl") - self.assertEqual(inst.date.datetime, FHIRDateTime("2010").datetime) - self.assertEqual(inst.date.as_json(), "2010") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.item[0].linkId, "1") - self.assertEqual(inst.item[0].text, "Do you have allergies?") - self.assertEqual(inst.item[0].type, "boolean") - self.assertEqual(inst.item[1].item[0].linkId, "2.1") - self.assertEqual(inst.item[1].item[0].text, "What is your gender?") - self.assertEqual(inst.item[1].item[0].type, "string") - self.assertEqual(inst.item[1].item[1].linkId, "2.2") - self.assertEqual(inst.item[1].item[1].text, "What is your date of birth?") - self.assertEqual(inst.item[1].item[1].type, "date") - self.assertEqual(inst.item[1].item[2].linkId, "2.3") - self.assertEqual(inst.item[1].item[2].text, "What is your country of birth?") - self.assertEqual(inst.item[1].item[2].type, "string") - self.assertEqual(inst.item[1].item[3].linkId, "2.4") - self.assertEqual(inst.item[1].item[3].text, "What is your marital status?") - self.assertEqual(inst.item[1].item[3].type, "string") - self.assertEqual(inst.item[1].linkId, "2") - self.assertEqual(inst.item[1].text, "General questions") - self.assertEqual(inst.item[1].type, "group") - self.assertEqual(inst.item[2].item[0].linkId, "3.1") - self.assertEqual(inst.item[2].item[0].text, "Do you smoke?") - self.assertEqual(inst.item[2].item[0].type, "boolean") - self.assertEqual(inst.item[2].item[1].linkId, "3.2") - self.assertEqual(inst.item[2].item[1].text, "Do you drink alchohol?") - self.assertEqual(inst.item[2].item[1].type, "boolean") - self.assertEqual(inst.item[2].linkId, "3") - self.assertEqual(inst.item[2].text, "Intoxications") - self.assertEqual(inst.item[2].type, "group") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.subjectType[0], "Patient") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/f201") - - def testQuestionnaire3(self): - inst = self.instantiate_from("questionnaire-example-gcs.json") - self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") - self.implQuestionnaire3(inst) - - js = inst.as_json() - self.assertEqual("Questionnaire", js["resourceType"]) - inst2 = questionnaire.Questionnaire(js) - self.implQuestionnaire3(inst2) - - def implQuestionnaire3(self, inst): - self.assertEqual(inst.code[0].code, "9269-2") + self.assertEqual(inst.code[0].code, "44249-1") + self.assertEqual(inst.code[0].display, "PHQ-9 quick depression assessment panel:-:Pt:^Patient:-:Report.PHQ-9") self.assertEqual(inst.code[0].system, "http://loinc.org") - self.assertEqual(inst.contained[0].id, "motor") - self.assertEqual(inst.contained[1].id, "verbal") - self.assertEqual(inst.contained[2].id, "eye") - self.assertEqual(inst.date.datetime, FHIRDateTime("2015-08-03").datetime) - self.assertEqual(inst.date.as_json(), "2015-08-03") - self.assertEqual(inst.id, "gcs") - self.assertEqual(inst.item[0].answerValueSet, "#verbal") - self.assertEqual(inst.item[0].code[0].code, "9270-0") + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-library") + self.assertEqual(inst.extension[0].valueCanonical, "Library/phq-9-logic") + self.assertEqual(inst.id, "phq-9-questionnaire") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "phq-9") + self.assertEqual(inst.item[0].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[0].code[0].code, "44250-9") self.assertEqual(inst.item[0].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[0].linkId, "1.1") + self.assertEqual(inst.item[0].linkId, "LittleInterest") + self.assertTrue(inst.item[0].required) + self.assertEqual(inst.item[0].text, "Little interest or pleasure in doing things") self.assertEqual(inst.item[0].type, "choice") - self.assertEqual(inst.item[1].answerValueSet, "#motor") - self.assertEqual(inst.item[1].code[0].code, "9268-4") + self.assertEqual(inst.item[1].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[1].code[0].code, "44255-8") self.assertEqual(inst.item[1].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[1].linkId, "1.2") + self.assertEqual(inst.item[1].linkId, "FeelingDown") + self.assertTrue(inst.item[1].required) + self.assertEqual(inst.item[1].text, "Feeling down, depressed, or hopeless") self.assertEqual(inst.item[1].type, "choice") - self.assertEqual(inst.item[2].answerValueSet, "#eye") - self.assertEqual(inst.item[2].code[0].code, "9267-6") + self.assertEqual(inst.item[2].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[2].code[0].code, "44259-0") self.assertEqual(inst.item[2].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[2].linkId, "1.3") + self.assertEqual(inst.item[2].linkId, "TroubleSleeping") + self.assertTrue(inst.item[2].required) + self.assertEqual(inst.item[2].text, "Trouble falling or staying asleep") self.assertEqual(inst.item[2].type, "choice") - self.assertEqual(inst.publisher, "FHIR Project team") + self.assertEqual(inst.item[3].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[3].code[0].code, "44254-1") + self.assertEqual(inst.item[3].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[3].linkId, "FeelingTired") + self.assertTrue(inst.item[3].required) + self.assertEqual(inst.item[3].text, "Feeling tired or having little energy") + self.assertEqual(inst.item[3].type, "choice") + self.assertEqual(inst.item[4].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[4].code[0].code, "44251-7") + self.assertEqual(inst.item[4].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[4].linkId, "BadAppetite") + self.assertTrue(inst.item[4].required) + self.assertEqual(inst.item[4].text, "Poor appetite or overeating") + self.assertEqual(inst.item[4].type, "choice") + self.assertEqual(inst.item[5].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[5].code[0].code, "44258-2") + self.assertEqual(inst.item[5].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[5].linkId, "FeelingBadAboutSelf") + self.assertTrue(inst.item[5].required) + self.assertEqual(inst.item[5].text, "Feeling bad about yourself - or that you are a failure or have let yourself or your family down") + self.assertEqual(inst.item[5].type, "choice") + self.assertEqual(inst.item[6].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[6].code[0].code, "44252-5") + self.assertEqual(inst.item[6].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[6].linkId, "TroubleConcentrating") + self.assertTrue(inst.item[6].required) + self.assertEqual(inst.item[6].text, "Trouble concentrating on things, such as reading the newspaper or watching television") + self.assertEqual(inst.item[6].type, "choice") + self.assertEqual(inst.item[7].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[7].code[0].code, "44253-3") + self.assertEqual(inst.item[7].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[7].linkId, "MovingSpeaking") + self.assertTrue(inst.item[7].required) + self.assertEqual(inst.item[7].text, "Moving or speaking so slowly that other people could have noticed. Or the opposite - being so fidgety or restless that you have been moving around a lot more than usual") + self.assertEqual(inst.item[7].type, "choice") + self.assertEqual(inst.item[8].code[0].code, "44261-6") + self.assertEqual(inst.item[8].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[8].extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-expression") + self.assertEqual(inst.item[8].extension[0].valueExpression.expression, "CalculateTotalScore") + self.assertEqual(inst.item[8].extension[0].valueExpression.language, "text/cql") + self.assertEqual(inst.item[8].linkId, "TotalScore") + self.assertTrue(inst.item[8].required) + self.assertEqual(inst.item[8].text, "Total score") + self.assertEqual(inst.item[8].type, "integer") + self.assertEqual(inst.item[9].answerValueSet, "http://loinc.org/vs/LL358-3") + self.assertEqual(inst.item[9].code[0].code, "44256-6") + self.assertEqual(inst.item[9].code[0].system, "http://loinc.org") + self.assertEqual(inst.item[9].linkId, "Difficulty") + self.assertTrue(inst.item[9].required) + self.assertEqual(inst.item[9].text, "If you checked off any problems, how difficult have these problems made it for you to do your work, take care of things at home, or get along with other people") + self.assertEqual(inst.item[9].type, "choice") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/cqf-questionnaire") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "draft") self.assertEqual(inst.subjectType[0], "Patient") + self.assertEqual(inst.text.div, "
PHQ-9 Questionnaire with dynamic logic
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Glasgow Coma Score") - self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/gcs") + self.assertEqual(inst.title, "Patient Health Questionnaire (PHQ-9)") + self.assertEqual(inst.version, "1.0.0") - def testQuestionnaire4(self): + def testQuestionnaire2(self): inst = self.instantiate_from("questionnaire-example.json") self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") - self.implQuestionnaire4(inst) + self.implQuestionnaire2(inst) js = inst.as_json() self.assertEqual("Questionnaire", js["resourceType"]) inst2 = questionnaire.Questionnaire(js) - self.implQuestionnaire4(inst2) + self.implQuestionnaire2(inst2) - def implQuestionnaire4(self, inst): + def implQuestionnaire2(self, inst): self.assertEqual(inst.date.datetime, FHIRDateTime("2012-01").datetime) self.assertEqual(inst.date.as_json(), "2012-01") self.assertEqual(inst.id, "3141") @@ -260,105 +201,164 @@ def implQuestionnaire4(self, inst): self.assertEqual(inst.title, "Cancer Quality Forum Questionnaire 2012") self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/3141") - def testQuestionnaire5(self): - inst = self.instantiate_from("questionnaire-cqf-example.json") + def testQuestionnaire3(self): + inst = self.instantiate_from("questionnaire-example-f201-lifelines.json") self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") - self.implQuestionnaire5(inst) + self.implQuestionnaire3(inst) js = inst.as_json() self.assertEqual("Questionnaire", js["resourceType"]) inst2 = questionnaire.Questionnaire(js) - self.implQuestionnaire5(inst2) + self.implQuestionnaire3(inst2) - def implQuestionnaire5(self, inst): - self.assertEqual(inst.code[0].code, "44249-1") - self.assertEqual(inst.code[0].display, "PHQ-9 quick depression assessment panel:-:Pt:^Patient:-:Report.PHQ-9") + def implQuestionnaire3(self, inst): + self.assertEqual(inst.code[0].code, "VL 1-1, 18-65_1.2.2") + self.assertEqual(inst.code[0].display, "Lifelines Questionnaire 1 part 1") + self.assertEqual(inst.code[0].system, "http://example.org/system/code/lifelines/nl") + self.assertEqual(inst.date.datetime, FHIRDateTime("2010").datetime) + self.assertEqual(inst.date.as_json(), "2010") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.item[0].linkId, "1") + self.assertEqual(inst.item[0].text, "Do you have allergies?") + self.assertEqual(inst.item[0].type, "boolean") + self.assertEqual(inst.item[1].item[0].linkId, "2.1") + self.assertEqual(inst.item[1].item[0].text, "What is your gender?") + self.assertEqual(inst.item[1].item[0].type, "string") + self.assertEqual(inst.item[1].item[1].linkId, "2.2") + self.assertEqual(inst.item[1].item[1].text, "What is your date of birth?") + self.assertEqual(inst.item[1].item[1].type, "date") + self.assertEqual(inst.item[1].item[2].linkId, "2.3") + self.assertEqual(inst.item[1].item[2].text, "What is your country of birth?") + self.assertEqual(inst.item[1].item[2].type, "string") + self.assertEqual(inst.item[1].item[3].linkId, "2.4") + self.assertEqual(inst.item[1].item[3].text, "What is your marital status?") + self.assertEqual(inst.item[1].item[3].type, "string") + self.assertEqual(inst.item[1].linkId, "2") + self.assertEqual(inst.item[1].text, "General questions") + self.assertEqual(inst.item[1].type, "group") + self.assertEqual(inst.item[2].item[0].linkId, "3.1") + self.assertEqual(inst.item[2].item[0].text, "Do you smoke?") + self.assertEqual(inst.item[2].item[0].type, "boolean") + self.assertEqual(inst.item[2].item[1].linkId, "3.2") + self.assertEqual(inst.item[2].item[1].text, "Do you drink alchohol?") + self.assertEqual(inst.item[2].item[1].type, "boolean") + self.assertEqual(inst.item[2].linkId, "3") + self.assertEqual(inst.item[2].text, "Intoxications") + self.assertEqual(inst.item[2].type, "group") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.subjectType[0], "Patient") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/f201") + + def testQuestionnaire4(self): + inst = self.instantiate_from("questionnaire-example-gcs.json") + self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") + self.implQuestionnaire4(inst) + + js = inst.as_json() + self.assertEqual("Questionnaire", js["resourceType"]) + inst2 = questionnaire.Questionnaire(js) + self.implQuestionnaire4(inst2) + + def implQuestionnaire4(self, inst): + self.assertEqual(inst.code[0].code, "9269-2") self.assertEqual(inst.code[0].system, "http://loinc.org") - self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-library") - self.assertEqual(inst.extension[0].valueCanonical, "Library/phq-9-logic") - self.assertEqual(inst.id, "phq-9-questionnaire") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "phq-9") - self.assertEqual(inst.item[0].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[0].code[0].code, "44250-9") + self.assertEqual(inst.contained[0].id, "motor") + self.assertEqual(inst.contained[1].id, "verbal") + self.assertEqual(inst.contained[2].id, "eye") + self.assertEqual(inst.date.datetime, FHIRDateTime("2015-08-03").datetime) + self.assertEqual(inst.date.as_json(), "2015-08-03") + self.assertEqual(inst.id, "gcs") + self.assertEqual(inst.item[0].answerValueSet, "#verbal") + self.assertEqual(inst.item[0].code[0].code, "9270-0") self.assertEqual(inst.item[0].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[0].linkId, "LittleInterest") - self.assertTrue(inst.item[0].required) - self.assertEqual(inst.item[0].text, "Little interest or pleasure in doing things") + self.assertEqual(inst.item[0].linkId, "1.1") self.assertEqual(inst.item[0].type, "choice") - self.assertEqual(inst.item[1].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[1].code[0].code, "44255-8") + self.assertEqual(inst.item[1].answerValueSet, "#motor") + self.assertEqual(inst.item[1].code[0].code, "9268-4") self.assertEqual(inst.item[1].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[1].linkId, "FeelingDown") - self.assertTrue(inst.item[1].required) - self.assertEqual(inst.item[1].text, "Feeling down, depressed, or hopeless") + self.assertEqual(inst.item[1].linkId, "1.2") self.assertEqual(inst.item[1].type, "choice") - self.assertEqual(inst.item[2].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[2].code[0].code, "44259-0") + self.assertEqual(inst.item[2].answerValueSet, "#eye") + self.assertEqual(inst.item[2].code[0].code, "9267-6") self.assertEqual(inst.item[2].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[2].linkId, "TroubleSleeping") - self.assertTrue(inst.item[2].required) - self.assertEqual(inst.item[2].text, "Trouble falling or staying asleep") + self.assertEqual(inst.item[2].linkId, "1.3") self.assertEqual(inst.item[2].type, "choice") - self.assertEqual(inst.item[3].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[3].code[0].code, "44254-1") - self.assertEqual(inst.item[3].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[3].linkId, "FeelingTired") - self.assertTrue(inst.item[3].required) - self.assertEqual(inst.item[3].text, "Feeling tired or having little energy") - self.assertEqual(inst.item[3].type, "choice") - self.assertEqual(inst.item[4].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[4].code[0].code, "44251-7") - self.assertEqual(inst.item[4].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[4].linkId, "BadAppetite") - self.assertTrue(inst.item[4].required) - self.assertEqual(inst.item[4].text, "Poor appetite or overeating") - self.assertEqual(inst.item[4].type, "choice") - self.assertEqual(inst.item[5].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[5].code[0].code, "44258-2") - self.assertEqual(inst.item[5].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[5].linkId, "FeelingBadAboutSelf") - self.assertTrue(inst.item[5].required) - self.assertEqual(inst.item[5].text, "Feeling bad about yourself - or that you are a failure or have let yourself or your family down") - self.assertEqual(inst.item[5].type, "choice") - self.assertEqual(inst.item[6].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[6].code[0].code, "44252-5") - self.assertEqual(inst.item[6].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[6].linkId, "TroubleConcentrating") - self.assertTrue(inst.item[6].required) - self.assertEqual(inst.item[6].text, "Trouble concentrating on things, such as reading the newspaper or watching television") - self.assertEqual(inst.item[6].type, "choice") - self.assertEqual(inst.item[7].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[7].code[0].code, "44253-3") - self.assertEqual(inst.item[7].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[7].linkId, "MovingSpeaking") - self.assertTrue(inst.item[7].required) - self.assertEqual(inst.item[7].text, "Moving or speaking so slowly that other people could have noticed. Or the opposite - being so fidgety or restless that you have been moving around a lot more than usual") - self.assertEqual(inst.item[7].type, "choice") - self.assertEqual(inst.item[8].code[0].code, "44261-6") - self.assertEqual(inst.item[8].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[8].extension[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-expression") - self.assertEqual(inst.item[8].extension[0].valueExpression.expression, "CalculateTotalScore") - self.assertEqual(inst.item[8].extension[0].valueExpression.language, "text/cql") - self.assertEqual(inst.item[8].linkId, "TotalScore") - self.assertTrue(inst.item[8].required) - self.assertEqual(inst.item[8].text, "Total score") - self.assertEqual(inst.item[8].type, "integer") - self.assertEqual(inst.item[9].answerValueSet, "http://loinc.org/vs/LL358-3") - self.assertEqual(inst.item[9].code[0].code, "44256-6") - self.assertEqual(inst.item[9].code[0].system, "http://loinc.org") - self.assertEqual(inst.item[9].linkId, "Difficulty") - self.assertTrue(inst.item[9].required) - self.assertEqual(inst.item[9].text, "If you checked off any problems, how difficult have these problems made it for you to do your work, take care of things at home, or get along with other people") - self.assertEqual(inst.item[9].type, "choice") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/cqf-questionnaire") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.publisher, "FHIR Project team") self.assertEqual(inst.status, "draft") self.assertEqual(inst.subjectType[0], "Patient") - self.assertEqual(inst.text.div, "
PHQ-9 Questionnaire with dynamic logic
") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Patient Health Questionnaire (PHQ-9)") - self.assertEqual(inst.version, "1.0.0") + self.assertEqual(inst.title, "Glasgow Coma Score") + self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/gcs") + + def testQuestionnaire5(self): + inst = self.instantiate_from("questionnaire-example-bluebook.json") + self.assertIsNotNone(inst, "Must have instantiated a Questionnaire instance") + self.implQuestionnaire5(inst) + + js = inst.as_json() + self.assertEqual("Questionnaire", js["resourceType"]) + inst2 = questionnaire.Questionnaire(js) + self.implQuestionnaire5(inst2) + + def implQuestionnaire5(self, inst): + self.assertEqual(inst.date.datetime, FHIRDateTime("2013-02-19").datetime) + self.assertEqual(inst.date.as_json(), "2013-02-19") + self.assertEqual(inst.id, "bb") + self.assertEqual(inst.item[0].item[0].item[0].linkId, "nameOfChild") + self.assertEqual(inst.item[0].item[0].item[0].text, "Name of child") + self.assertEqual(inst.item[0].item[0].item[0].type, "string") + self.assertEqual(inst.item[0].item[0].item[1].answerOption[0].valueCoding.code, "F") + self.assertEqual(inst.item[0].item[0].item[1].answerOption[1].valueCoding.code, "M") + self.assertEqual(inst.item[0].item[0].item[1].linkId, "sex") + self.assertEqual(inst.item[0].item[0].item[1].text, "Sex") + self.assertEqual(inst.item[0].item[0].item[1].type, "choice") + self.assertEqual(inst.item[0].item[0].linkId, "group") + self.assertEqual(inst.item[0].item[0].type, "group") + self.assertEqual(inst.item[0].item[1].item[0].linkId, "birthWeight") + self.assertEqual(inst.item[0].item[1].item[0].text, "Birth weight (kg)") + self.assertEqual(inst.item[0].item[1].item[0].type, "decimal") + self.assertEqual(inst.item[0].item[1].item[1].linkId, "birthLength") + self.assertEqual(inst.item[0].item[1].item[1].text, "Birth length (cm)") + self.assertEqual(inst.item[0].item[1].item[1].type, "decimal") + self.assertEqual(inst.item[0].item[1].item[2].answerOption[0].valueCoding.code, "INJECTION") + self.assertEqual(inst.item[0].item[1].item[2].answerOption[1].valueCoding.code, "INTRAVENOUS") + self.assertEqual(inst.item[0].item[1].item[2].answerOption[2].valueCoding.code, "ORAL") + self.assertTrue(inst.item[0].item[1].item[2].item[0].enableWhen[0].answerBoolean) + self.assertEqual(inst.item[0].item[1].item[2].item[0].enableWhen[0].operator, "exists") + self.assertEqual(inst.item[0].item[1].item[2].item[0].enableWhen[0].question, "vitaminKgiven") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].linkId, "vitaminiKDose1") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].text, "1st dose") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[0].type, "dateTime") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].linkId, "vitaminiKDose2") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].text, "2nd dose") + self.assertEqual(inst.item[0].item[1].item[2].item[0].item[1].type, "dateTime") + self.assertEqual(inst.item[0].item[1].item[2].item[0].linkId, "vitaminKgivenDoses") + self.assertEqual(inst.item[0].item[1].item[2].item[0].type, "group") + self.assertEqual(inst.item[0].item[1].item[2].linkId, "vitaminKgiven") + self.assertEqual(inst.item[0].item[1].item[2].text, "Vitamin K given") + self.assertEqual(inst.item[0].item[1].item[2].type, "choice") + self.assertEqual(inst.item[0].item[1].item[3].item[0].linkId, "hepBgivenDate") + self.assertEqual(inst.item[0].item[1].item[3].item[0].text, "Date given") + self.assertEqual(inst.item[0].item[1].item[3].item[0].type, "date") + self.assertEqual(inst.item[0].item[1].item[3].linkId, "hepBgiven") + self.assertEqual(inst.item[0].item[1].item[3].text, "Hep B given y / n") + self.assertEqual(inst.item[0].item[1].item[3].type, "boolean") + self.assertEqual(inst.item[0].item[1].item[4].linkId, "abnormalitiesAtBirth") + self.assertEqual(inst.item[0].item[1].item[4].text, "Abnormalities noted at birth") + self.assertEqual(inst.item[0].item[1].item[4].type, "string") + self.assertEqual(inst.item[0].item[1].linkId, "neonatalInformation") + self.assertEqual(inst.item[0].item[1].text, "Neonatal Information") + self.assertEqual(inst.item[0].item[1].type, "group") + self.assertEqual(inst.item[0].linkId, "birthDetails") + self.assertEqual(inst.item[0].text, "Birth details - To be completed by health professional") + self.assertEqual(inst.item[0].type, "group") + self.assertEqual(inst.jurisdiction[0].coding[0].code, "AU") + self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") + self.assertEqual(inst.publisher, "New South Wales Department of Health") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.subjectType[0], "Patient") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "NSW Government My Personal Health Record") + self.assertEqual(inst.url, "http://hl7.org/fhir/Questionnaire/bb") diff --git a/tests/models/questionnaireresponse_test.py b/tests/models/questionnaireresponse_test.py index 023c464a..cccfbffe 100644 --- a/tests/models/questionnaireresponse_test.py +++ b/tests/models/questionnaireresponse_test.py @@ -60,7 +60,7 @@ def implQuestionnaireResponse1(self, inst): self.assertEqual(inst.text.status, "generated") def testQuestionnaireResponse2(self): - inst = self.instantiate_from("questionnaireresponse-example-f201-lifelines.json") + inst = self.instantiate_from("questionnaireresponse-example-ussg-fht-answers.json") self.assertIsNotNone(inst, "Must have instantiated a QuestionnaireResponse instance") self.implQuestionnaireResponse2(inst) @@ -70,53 +70,6 @@ def testQuestionnaireResponse2(self): self.implQuestionnaireResponse2(inst2) def implQuestionnaireResponse2(self, inst): - self.assertEqual(inst.authored.datetime, FHIRDateTime("2013-06-18T00:00:00+01:00").datetime) - self.assertEqual(inst.authored.as_json(), "2013-06-18T00:00:00+01:00") - self.assertEqual(inst.id, "f201") - self.assertEqual(inst.item[0].item[0].answer[0].valueString, "I am allergic to house dust") - self.assertEqual(inst.item[0].item[0].linkId, "1.1") - self.assertEqual(inst.item[0].item[0].text, "Do you have allergies?") - self.assertEqual(inst.item[0].linkId, "1") - self.assertEqual(inst.item[1].item[0].answer[0].valueString, "Male") - self.assertEqual(inst.item[1].item[0].linkId, "2.1") - self.assertEqual(inst.item[1].item[0].text, "What is your gender?") - self.assertEqual(inst.item[1].item[1].answer[0].valueDate.date, FHIRDate("1960-03-13").date) - self.assertEqual(inst.item[1].item[1].answer[0].valueDate.as_json(), "1960-03-13") - self.assertEqual(inst.item[1].item[1].linkId, "2.2") - self.assertEqual(inst.item[1].item[1].text, "What is your date of birth?") - self.assertEqual(inst.item[1].item[2].answer[0].valueString, "The Netherlands") - self.assertEqual(inst.item[1].item[2].linkId, "2.3") - self.assertEqual(inst.item[1].item[2].text, "What is your country of birth?") - self.assertEqual(inst.item[1].item[3].answer[0].valueString, "married") - self.assertEqual(inst.item[1].item[3].linkId, "2.4") - self.assertEqual(inst.item[1].item[3].text, "What is your marital status?") - self.assertEqual(inst.item[1].linkId, "2") - self.assertEqual(inst.item[1].text, "General questions") - self.assertEqual(inst.item[2].item[0].answer[0].valueString, "No") - self.assertEqual(inst.item[2].item[0].linkId, "3.1") - self.assertEqual(inst.item[2].item[0].text, "Do you smoke?") - self.assertEqual(inst.item[2].item[1].answer[0].valueString, "No, but I used to drink") - self.assertEqual(inst.item[2].item[1].linkId, "3.2") - self.assertEqual(inst.item[2].item[1].text, "Do you drink alchohol?") - self.assertEqual(inst.item[2].linkId, "3") - self.assertEqual(inst.item[2].text, "Intoxications") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.status, "generated") - - def testQuestionnaireResponse3(self): - inst = self.instantiate_from("questionnaireresponse-example-ussg-fht-answers.json") - self.assertIsNotNone(inst, "Must have instantiated a QuestionnaireResponse instance") - self.implQuestionnaireResponse3(inst) - - js = inst.as_json() - self.assertEqual("QuestionnaireResponse", js["resourceType"]) - inst2 = questionnaireresponse.QuestionnaireResponse(js) - self.implQuestionnaireResponse3(inst2) - - def implQuestionnaireResponse3(self, inst): self.assertEqual(inst.authored.datetime, FHIRDateTime("2008-01-17").datetime) self.assertEqual(inst.authored.as_json(), "2008-01-17") self.assertEqual(inst.id, "ussg-fht-answers") @@ -673,56 +626,64 @@ def implQuestionnaireResponse3(self, inst): self.assertEqual(inst.status, "in-progress") self.assertEqual(inst.text.status, "generated") - def testQuestionnaireResponse4(self): - inst = self.instantiate_from("questionnaireresponse-example-gcs.json") + def testQuestionnaireResponse3(self): + inst = self.instantiate_from("questionnaireresponse-example-f201-lifelines.json") self.assertIsNotNone(inst, "Must have instantiated a QuestionnaireResponse instance") - self.implQuestionnaireResponse4(inst) + self.implQuestionnaireResponse3(inst) js = inst.as_json() self.assertEqual("QuestionnaireResponse", js["resourceType"]) inst2 = questionnaireresponse.QuestionnaireResponse(js) - self.implQuestionnaireResponse4(inst2) + self.implQuestionnaireResponse3(inst2) - def implQuestionnaireResponse4(self, inst): - self.assertEqual(inst.authored.datetime, FHIRDateTime("2014-12-11T04:44:16Z").datetime) - self.assertEqual(inst.authored.as_json(), "2014-12-11T04:44:16Z") - self.assertEqual(inst.id, "gcs") - self.assertEqual(inst.item[0].answer[0].valueCoding.code, "LA6560-2") - self.assertEqual(inst.item[0].answer[0].valueCoding.display, "Confused") - self.assertEqual(inst.item[0].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") - self.assertEqual(inst.item[0].answer[0].valueCoding.extension[0].valueDecimal, 4) - self.assertEqual(inst.item[0].answer[0].valueCoding.system, "http://loinc.org") - self.assertEqual(inst.item[0].linkId, "1.1") - self.assertEqual(inst.item[1].answer[0].valueCoding.code, "LA6566-9") - self.assertEqual(inst.item[1].answer[0].valueCoding.display, "Localizing pain") - self.assertEqual(inst.item[1].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") - self.assertEqual(inst.item[1].answer[0].valueCoding.extension[0].valueDecimal, 5) - self.assertEqual(inst.item[1].answer[0].valueCoding.system, "http://loinc.org") - self.assertEqual(inst.item[1].linkId, "1.2") - self.assertEqual(inst.item[2].answer[0].valueCoding.code, "LA6556-0") - self.assertEqual(inst.item[2].answer[0].valueCoding.display, "Eyes open spontaneously") - self.assertEqual(inst.item[2].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") - self.assertEqual(inst.item[2].answer[0].valueCoding.extension[0].valueDecimal, 4) - self.assertEqual(inst.item[2].answer[0].valueCoding.system, "http://loinc.org") - self.assertEqual(inst.item[2].linkId, "1.3") + def implQuestionnaireResponse3(self, inst): + self.assertEqual(inst.authored.datetime, FHIRDateTime("2013-06-18T00:00:00+01:00").datetime) + self.assertEqual(inst.authored.as_json(), "2013-06-18T00:00:00+01:00") + self.assertEqual(inst.id, "f201") + self.assertEqual(inst.item[0].item[0].answer[0].valueString, "I am allergic to house dust") + self.assertEqual(inst.item[0].item[0].linkId, "1.1") + self.assertEqual(inst.item[0].item[0].text, "Do you have allergies?") + self.assertEqual(inst.item[0].linkId, "1") + self.assertEqual(inst.item[1].item[0].answer[0].valueString, "Male") + self.assertEqual(inst.item[1].item[0].linkId, "2.1") + self.assertEqual(inst.item[1].item[0].text, "What is your gender?") + self.assertEqual(inst.item[1].item[1].answer[0].valueDate.date, FHIRDate("1960-03-13").date) + self.assertEqual(inst.item[1].item[1].answer[0].valueDate.as_json(), "1960-03-13") + self.assertEqual(inst.item[1].item[1].linkId, "2.2") + self.assertEqual(inst.item[1].item[1].text, "What is your date of birth?") + self.assertEqual(inst.item[1].item[2].answer[0].valueString, "The Netherlands") + self.assertEqual(inst.item[1].item[2].linkId, "2.3") + self.assertEqual(inst.item[1].item[2].text, "What is your country of birth?") + self.assertEqual(inst.item[1].item[3].answer[0].valueString, "married") + self.assertEqual(inst.item[1].item[3].linkId, "2.4") + self.assertEqual(inst.item[1].item[3].text, "What is your marital status?") + self.assertEqual(inst.item[1].linkId, "2") + self.assertEqual(inst.item[1].text, "General questions") + self.assertEqual(inst.item[2].item[0].answer[0].valueString, "No") + self.assertEqual(inst.item[2].item[0].linkId, "3.1") + self.assertEqual(inst.item[2].item[0].text, "Do you smoke?") + self.assertEqual(inst.item[2].item[1].answer[0].valueString, "No, but I used to drink") + self.assertEqual(inst.item[2].item[1].linkId, "3.2") + self.assertEqual(inst.item[2].item[1].text, "Do you drink alchohol?") + self.assertEqual(inst.item[2].linkId, "3") + self.assertEqual(inst.item[2].text, "Intoxications") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.questionnaire, "Questionnaire/gcs") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") - def testQuestionnaireResponse5(self): + def testQuestionnaireResponse4(self): inst = self.instantiate_from("questionnaireresponse-example-bluebook.json") self.assertIsNotNone(inst, "Must have instantiated a QuestionnaireResponse instance") - self.implQuestionnaireResponse5(inst) + self.implQuestionnaireResponse4(inst) js = inst.as_json() self.assertEqual("QuestionnaireResponse", js["resourceType"]) inst2 = questionnaireresponse.QuestionnaireResponse(js) - self.implQuestionnaireResponse5(inst2) + self.implQuestionnaireResponse4(inst2) - def implQuestionnaireResponse5(self, inst): + def implQuestionnaireResponse4(self, inst): self.assertEqual(inst.authored.datetime, FHIRDateTime("2013-02-19T14:15:00+10:00").datetime) self.assertEqual(inst.authored.as_json(), "2013-02-19T14:15:00+10:00") self.assertEqual(inst.id, "bb") @@ -770,4 +731,43 @@ def implQuestionnaireResponse5(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") + + def testQuestionnaireResponse5(self): + inst = self.instantiate_from("questionnaireresponse-example-gcs.json") + self.assertIsNotNone(inst, "Must have instantiated a QuestionnaireResponse instance") + self.implQuestionnaireResponse5(inst) + + js = inst.as_json() + self.assertEqual("QuestionnaireResponse", js["resourceType"]) + inst2 = questionnaireresponse.QuestionnaireResponse(js) + self.implQuestionnaireResponse5(inst2) + + def implQuestionnaireResponse5(self, inst): + self.assertEqual(inst.authored.datetime, FHIRDateTime("2014-12-11T04:44:16Z").datetime) + self.assertEqual(inst.authored.as_json(), "2014-12-11T04:44:16Z") + self.assertEqual(inst.id, "gcs") + self.assertEqual(inst.item[0].answer[0].valueCoding.code, "LA6560-2") + self.assertEqual(inst.item[0].answer[0].valueCoding.display, "Confused") + self.assertEqual(inst.item[0].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") + self.assertEqual(inst.item[0].answer[0].valueCoding.extension[0].valueDecimal, 4) + self.assertEqual(inst.item[0].answer[0].valueCoding.system, "http://loinc.org") + self.assertEqual(inst.item[0].linkId, "1.1") + self.assertEqual(inst.item[1].answer[0].valueCoding.code, "LA6566-9") + self.assertEqual(inst.item[1].answer[0].valueCoding.display, "Localizing pain") + self.assertEqual(inst.item[1].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") + self.assertEqual(inst.item[1].answer[0].valueCoding.extension[0].valueDecimal, 5) + self.assertEqual(inst.item[1].answer[0].valueCoding.system, "http://loinc.org") + self.assertEqual(inst.item[1].linkId, "1.2") + self.assertEqual(inst.item[2].answer[0].valueCoding.code, "LA6556-0") + self.assertEqual(inst.item[2].answer[0].valueCoding.display, "Eyes open spontaneously") + self.assertEqual(inst.item[2].answer[0].valueCoding.extension[0].url, "http://hl7.org/fhir/StructureDefinition/ordinalValue") + self.assertEqual(inst.item[2].answer[0].valueCoding.extension[0].valueDecimal, 4) + self.assertEqual(inst.item[2].answer[0].valueCoding.system, "http://loinc.org") + self.assertEqual(inst.item[2].linkId, "1.3") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.questionnaire, "Questionnaire/gcs") + self.assertEqual(inst.status, "completed") + self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/relatedperson_test.py b/tests/models/relatedperson_test.py index 040bdaf3..308e9af7 100644 --- a/tests/models/relatedperson_test.py +++ b/tests/models/relatedperson_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return relatedperson.RelatedPerson(js) def testRelatedPerson1(self): - inst = self.instantiate_from("relatedperson-example.json") + inst = self.instantiate_from("relatedperson-example-peter.json") self.assertIsNotNone(inst, "Must have instantiated a RelatedPerson instance") self.implRelatedPerson1(inst) @@ -30,30 +30,29 @@ def testRelatedPerson1(self): self.implRelatedPerson1(inst2) def implRelatedPerson1(self, inst): - self.assertTrue(inst.active) - self.assertEqual(inst.address[0].city, "Paris") - self.assertEqual(inst.address[0].country, "FRA") - self.assertEqual(inst.address[0].line[0], "43, Place du Marché Sainte Catherine") - self.assertEqual(inst.address[0].postalCode, "75004") - self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "benedicte") - self.assertEqual(inst.identifier[0].system, "urn:oid:1.2.250.1.61") - self.assertEqual(inst.identifier[0].type.text, "INSEE") - self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "272117510400399") + self.assertEqual(inst.address[0].city, "PleasantVille") + self.assertEqual(inst.address[0].line[0], "534 Erewhon St") + self.assertEqual(inst.address[0].postalCode, "3999") + self.assertEqual(inst.address[0].state, "Vic") + self.assertEqual(inst.address[0].use, "home") + self.assertEqual(inst.gender, "male") + self.assertEqual(inst.id, "peter") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "du Marché") - self.assertEqual(inst.name[0].given[0], "Bénédicte") + self.assertEqual(inst.name[0].family, "Chalmers") + self.assertEqual(inst.name[0].given[0], "Peter") + self.assertEqual(inst.name[0].given[1], "James") + self.assertEqual(inst.name[0].use, "official") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("2012-03-11").datetime) + self.assertEqual(inst.period.start.as_json(), "2012-03-11") self.assertEqual(inst.photo[0].contentType, "image/jpeg") - self.assertEqual(inst.photo[0].url, "Binary/f016") - self.assertEqual(inst.relationship[0].coding[0].code, "N") + self.assertEqual(inst.photo[0].url, "Binary/f012") + self.assertEqual(inst.relationship[0].coding[0].code, "C") self.assertEqual(inst.relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") - self.assertEqual(inst.relationship[0].coding[1].code, "WIFE") - self.assertEqual(inst.relationship[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].value, "+33 (237) 998327") + self.assertEqual(inst.telecom[0].use, "work") + self.assertEqual(inst.telecom[0].value, "(03) 5555 6473") self.assertEqual(inst.text.status, "generated") def testRelatedPerson2(self): @@ -126,7 +125,7 @@ def implRelatedPerson3(self, inst): self.assertEqual(inst.text.status, "generated") def testRelatedPerson4(self): - inst = self.instantiate_from("relatedperson-example-f002-ariadne.json") + inst = self.instantiate_from("relatedperson-example.json") self.assertIsNotNone(inst, "Must have instantiated a RelatedPerson instance") self.implRelatedPerson4(inst) @@ -136,27 +135,34 @@ def testRelatedPerson4(self): self.implRelatedPerson4(inst2) def implRelatedPerson4(self, inst): - self.assertEqual(inst.birthDate.date, FHIRDate("1963").date) - self.assertEqual(inst.birthDate.as_json(), "1963") + self.assertTrue(inst.active) + self.assertEqual(inst.address[0].city, "Paris") + self.assertEqual(inst.address[0].country, "FRA") + self.assertEqual(inst.address[0].line[0], "43, Place du Marché Sainte Catherine") + self.assertEqual(inst.address[0].postalCode, "75004") self.assertEqual(inst.gender, "female") - self.assertEqual(inst.id, "f002") + self.assertEqual(inst.id, "benedicte") + self.assertEqual(inst.identifier[0].system, "urn:oid:1.2.250.1.61") + self.assertEqual(inst.identifier[0].type.text, "INSEE") + self.assertEqual(inst.identifier[0].use, "usual") + self.assertEqual(inst.identifier[0].value, "272117510400399") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].text, "Ariadne Bor-Jansma") - self.assertEqual(inst.name[0].use, "usual") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("1975").datetime) - self.assertEqual(inst.period.start.as_json(), "1975") + self.assertEqual(inst.name[0].family, "du Marché") + self.assertEqual(inst.name[0].given[0], "Bénédicte") self.assertEqual(inst.photo[0].contentType, "image/jpeg") - self.assertEqual(inst.relationship[0].coding[0].code, "SIGOTHR") - self.assertEqual(inst.relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") + self.assertEqual(inst.photo[0].url, "Binary/f016") + self.assertEqual(inst.relationship[0].coding[0].code, "N") + self.assertEqual(inst.relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") + self.assertEqual(inst.relationship[0].coding[1].code, "WIFE") + self.assertEqual(inst.relationship[0].coding[1].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "home") - self.assertEqual(inst.telecom[0].value, "+31201234567") + self.assertEqual(inst.telecom[0].value, "+33 (237) 998327") self.assertEqual(inst.text.status, "generated") def testRelatedPerson5(self): - inst = self.instantiate_from("relatedperson-example-peter.json") + inst = self.instantiate_from("relatedperson-example-f002-ariadne.json") self.assertIsNotNone(inst, "Must have instantiated a RelatedPerson instance") self.implRelatedPerson5(inst) @@ -166,28 +172,22 @@ def testRelatedPerson5(self): self.implRelatedPerson5(inst2) def implRelatedPerson5(self, inst): - self.assertEqual(inst.address[0].city, "PleasantVille") - self.assertEqual(inst.address[0].line[0], "534 Erewhon St") - self.assertEqual(inst.address[0].postalCode, "3999") - self.assertEqual(inst.address[0].state, "Vic") - self.assertEqual(inst.address[0].use, "home") - self.assertEqual(inst.gender, "male") - self.assertEqual(inst.id, "peter") + self.assertEqual(inst.birthDate.date, FHIRDate("1963").date) + self.assertEqual(inst.birthDate.as_json(), "1963") + self.assertEqual(inst.gender, "female") + self.assertEqual(inst.id, "f002") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.name[0].family, "Chalmers") - self.assertEqual(inst.name[0].given[0], "Peter") - self.assertEqual(inst.name[0].given[1], "James") - self.assertEqual(inst.name[0].use, "official") - self.assertEqual(inst.period.start.datetime, FHIRDateTime("2012-03-11").datetime) - self.assertEqual(inst.period.start.as_json(), "2012-03-11") + self.assertEqual(inst.name[0].text, "Ariadne Bor-Jansma") + self.assertEqual(inst.name[0].use, "usual") + self.assertEqual(inst.period.start.datetime, FHIRDateTime("1975").datetime) + self.assertEqual(inst.period.start.as_json(), "1975") self.assertEqual(inst.photo[0].contentType, "image/jpeg") - self.assertEqual(inst.photo[0].url, "Binary/f012") - self.assertEqual(inst.relationship[0].coding[0].code, "C") - self.assertEqual(inst.relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0131") + self.assertEqual(inst.relationship[0].coding[0].code, "SIGOTHR") + self.assertEqual(inst.relationship[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/v3-RoleCode") self.assertEqual(inst.telecom[0].system, "phone") - self.assertEqual(inst.telecom[0].use, "work") - self.assertEqual(inst.telecom[0].value, "(03) 5555 6473") + self.assertEqual(inst.telecom[0].use, "home") + self.assertEqual(inst.telecom[0].value, "+31201234567") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/riskassessment_test.py b/tests/models/riskassessment_test.py index 869dd8fe..13defe6f 100644 --- a/tests/models/riskassessment_test.py +++ b/tests/models/riskassessment_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return riskassessment.RiskAssessment(js) def testRiskAssessment1(self): - inst = self.instantiate_from("riskassessment-example-breastcancer.json") + inst = self.instantiate_from("riskassessment-example-population.json") self.assertIsNotNone(inst, "Must have instantiated a RiskAssessment instance") self.implRiskAssessment1(inst) @@ -30,23 +30,16 @@ def testRiskAssessment1(self): self.implRiskAssessment1(inst2) def implRiskAssessment1(self, inst): - self.assertEqual(inst.code.coding[0].code, "709510001") - self.assertEqual(inst.code.coding[0].display, "Assessment of risk for disease (procedure)") - self.assertEqual(inst.code.coding[0].system, "http://browser.ihtsdotools.org/") - self.assertEqual(inst.id, "breastcancer-risk") - self.assertEqual(inst.identifier[0].system, "http://example.org") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "risk-assessment-breastcancer1") + self.assertEqual(inst.contained[0].id, "group1") + self.assertEqual(inst.id, "population") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "This risk assessment is based on BRCA1 and BRCA2 genetic mutation test") - self.assertEqual(inst.prediction[0].outcome.text, "Unknown risk of developing breast cancer") self.assertEqual(inst.status, "final") - self.assertEqual(inst.text.status, "additional") + self.assertEqual(inst.text.status, "generated") def testRiskAssessment2(self): - inst = self.instantiate_from("riskassessment-example.json") + inst = self.instantiate_from("riskassessment-example-cardiac.json") self.assertIsNotNone(inst, "Must have instantiated a RiskAssessment instance") self.implRiskAssessment2(inst) @@ -56,6 +49,39 @@ def testRiskAssessment2(self): self.implRiskAssessment2(inst2) def implRiskAssessment2(self, inst): + self.assertEqual(inst.id, "cardiac") + self.assertEqual(inst.identifier[0].system, "http://example.org") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "risk-assessment-cardiac") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2014-07-19T16:04:00Z").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2014-07-19T16:04:00Z") + self.assertEqual(inst.prediction[0].outcome.text, "Heart Attack") + self.assertEqual(inst.prediction[0].probabilityDecimal, 0.02) + self.assertEqual(inst.prediction[0].whenRange.high.code, "a") + self.assertEqual(inst.prediction[0].whenRange.high.system, "http://unitsofmeasure.org") + self.assertEqual(inst.prediction[0].whenRange.high.unit, "years") + self.assertEqual(inst.prediction[0].whenRange.high.value, 49) + self.assertEqual(inst.prediction[0].whenRange.low.code, "a") + self.assertEqual(inst.prediction[0].whenRange.low.system, "http://unitsofmeasure.org") + self.assertEqual(inst.prediction[0].whenRange.low.unit, "years") + self.assertEqual(inst.prediction[0].whenRange.low.value, 39) + self.assertEqual(inst.status, "final") + self.assertEqual(inst.text.status, "additional") + + def testRiskAssessment3(self): + inst = self.instantiate_from("riskassessment-example.json") + self.assertIsNotNone(inst, "Must have instantiated a RiskAssessment instance") + self.implRiskAssessment3(inst) + + js = inst.as_json() + self.assertEqual("RiskAssessment", js["resourceType"]) + inst2 = riskassessment.RiskAssessment(js) + self.implRiskAssessment3(inst2) + + def implRiskAssessment3(self, inst): self.assertEqual(inst.id, "genetic") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") @@ -143,27 +169,8 @@ def implRiskAssessment2(self, inst): self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "generated") - def testRiskAssessment3(self): - inst = self.instantiate_from("riskassessment-example-population.json") - self.assertIsNotNone(inst, "Must have instantiated a RiskAssessment instance") - self.implRiskAssessment3(inst) - - js = inst.as_json() - self.assertEqual("RiskAssessment", js["resourceType"]) - inst2 = riskassessment.RiskAssessment(js) - self.implRiskAssessment3(inst2) - - def implRiskAssessment3(self, inst): - self.assertEqual(inst.contained[0].id, "group1") - self.assertEqual(inst.id, "population") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "final") - self.assertEqual(inst.text.status, "generated") - def testRiskAssessment4(self): - inst = self.instantiate_from("riskassessment-example-cardiac.json") + inst = self.instantiate_from("riskassessment-example-breastcancer.json") self.assertIsNotNone(inst, "Must have instantiated a RiskAssessment instance") self.implRiskAssessment4(inst) @@ -173,25 +180,18 @@ def testRiskAssessment4(self): self.implRiskAssessment4(inst2) def implRiskAssessment4(self, inst): - self.assertEqual(inst.id, "cardiac") + self.assertEqual(inst.code.coding[0].code, "709510001") + self.assertEqual(inst.code.coding[0].display, "Assessment of risk for disease (procedure)") + self.assertEqual(inst.code.coding[0].system, "http://browser.ihtsdotools.org/") + self.assertEqual(inst.id, "breastcancer-risk") self.assertEqual(inst.identifier[0].system, "http://example.org") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "risk-assessment-cardiac") + self.assertEqual(inst.identifier[0].value, "risk-assessment-breastcancer1") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2014-07-19T16:04:00Z").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2014-07-19T16:04:00Z") - self.assertEqual(inst.prediction[0].outcome.text, "Heart Attack") - self.assertEqual(inst.prediction[0].probabilityDecimal, 0.02) - self.assertEqual(inst.prediction[0].whenRange.high.code, "a") - self.assertEqual(inst.prediction[0].whenRange.high.system, "http://unitsofmeasure.org") - self.assertEqual(inst.prediction[0].whenRange.high.unit, "years") - self.assertEqual(inst.prediction[0].whenRange.high.value, 49) - self.assertEqual(inst.prediction[0].whenRange.low.code, "a") - self.assertEqual(inst.prediction[0].whenRange.low.system, "http://unitsofmeasure.org") - self.assertEqual(inst.prediction[0].whenRange.low.unit, "years") - self.assertEqual(inst.prediction[0].whenRange.low.value, 39) + self.assertEqual(inst.note[0].text, "This risk assessment is based on BRCA1 and BRCA2 genetic mutation test") + self.assertEqual(inst.prediction[0].outcome.text, "Unknown risk of developing breast cancer") self.assertEqual(inst.status, "final") self.assertEqual(inst.text.status, "additional") diff --git a/tests/models/schedule_test.py b/tests/models/schedule_test.py index 3467d697..67ba17c2 100644 --- a/tests/models/schedule_test.py +++ b/tests/models/schedule_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return schedule.Schedule(js) def testSchedule1(self): - inst = self.instantiate_from("schedule-provider-location2-example.json") + inst = self.instantiate_from("schedule-provider-location1-example.json") self.assertIsNotNone(inst, "Must have instantiated a Schedule instance") self.implSchedule1(inst) @@ -31,11 +31,11 @@ def testSchedule1(self): def implSchedule1(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.comment, "The slots attached to this schedule are for neurosurgery operations at Starfleet HQ only.") - self.assertEqual(inst.id, "exampleloc2") + self.assertEqual(inst.comment, "The slots attached to this schedule are for genetic counselling in the USS Enterprise-D Sickbay.") + self.assertEqual(inst.id, "exampleloc1") self.assertEqual(inst.identifier[0].system, "http://example.org/scheduleid") self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "47") + self.assertEqual(inst.identifier[0].value, "46") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -43,12 +43,12 @@ def implSchedule1(self, inst): self.assertEqual(inst.planningHorizon.end.as_json(), "2017-12-25T09:30:00Z") self.assertEqual(inst.planningHorizon.start.datetime, FHIRDateTime("2017-12-25T09:15:00Z").datetime) self.assertEqual(inst.planningHorizon.start.as_json(), "2017-12-25T09:15:00Z") - self.assertEqual(inst.serviceCategory[0].coding[0].code, "31") - self.assertEqual(inst.serviceCategory[0].coding[0].display, "Specialist Surgical") - self.assertEqual(inst.serviceType[0].coding[0].code, "221") - self.assertEqual(inst.serviceType[0].coding[0].display, "Surgery - General") - self.assertEqual(inst.specialty[0].coding[0].code, "394610002") - self.assertEqual(inst.specialty[0].coding[0].display, "Surgery-Neurosurgery") + self.assertEqual(inst.serviceCategory[0].coding[0].code, "17") + self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") + self.assertEqual(inst.serviceType[0].coding[0].code, "75") + self.assertEqual(inst.serviceType[0].coding[0].display, "Genetic Counselling") + self.assertEqual(inst.specialty[0].coding[0].code, "394580004") + self.assertEqual(inst.specialty[0].coding[0].display, "Clinical genetics") self.assertEqual(inst.text.status, "generated") def testSchedule2(self): @@ -84,7 +84,7 @@ def implSchedule2(self, inst): self.assertEqual(inst.text.status, "generated") def testSchedule3(self): - inst = self.instantiate_from("schedule-provider-location1-example.json") + inst = self.instantiate_from("schedule-provider-location2-example.json") self.assertIsNotNone(inst, "Must have instantiated a Schedule instance") self.implSchedule3(inst) @@ -95,11 +95,11 @@ def testSchedule3(self): def implSchedule3(self, inst): self.assertTrue(inst.active) - self.assertEqual(inst.comment, "The slots attached to this schedule are for genetic counselling in the USS Enterprise-D Sickbay.") - self.assertEqual(inst.id, "exampleloc1") + self.assertEqual(inst.comment, "The slots attached to this schedule are for neurosurgery operations at Starfleet HQ only.") + self.assertEqual(inst.id, "exampleloc2") self.assertEqual(inst.identifier[0].system, "http://example.org/scheduleid") self.assertEqual(inst.identifier[0].use, "usual") - self.assertEqual(inst.identifier[0].value, "46") + self.assertEqual(inst.identifier[0].value, "47") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -107,11 +107,11 @@ def implSchedule3(self, inst): self.assertEqual(inst.planningHorizon.end.as_json(), "2017-12-25T09:30:00Z") self.assertEqual(inst.planningHorizon.start.datetime, FHIRDateTime("2017-12-25T09:15:00Z").datetime) self.assertEqual(inst.planningHorizon.start.as_json(), "2017-12-25T09:15:00Z") - self.assertEqual(inst.serviceCategory[0].coding[0].code, "17") - self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") - self.assertEqual(inst.serviceType[0].coding[0].code, "75") - self.assertEqual(inst.serviceType[0].coding[0].display, "Genetic Counselling") - self.assertEqual(inst.specialty[0].coding[0].code, "394580004") - self.assertEqual(inst.specialty[0].coding[0].display, "Clinical genetics") + self.assertEqual(inst.serviceCategory[0].coding[0].code, "31") + self.assertEqual(inst.serviceCategory[0].coding[0].display, "Specialist Surgical") + self.assertEqual(inst.serviceType[0].coding[0].code, "221") + self.assertEqual(inst.serviceType[0].coding[0].display, "Surgery - General") + self.assertEqual(inst.specialty[0].coding[0].code, "394610002") + self.assertEqual(inst.specialty[0].coding[0].display, "Surgery-Neurosurgery") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/searchparameter_test.py b/tests/models/searchparameter_test.py index 53b2741e..2f9ccfb6 100644 --- a/tests/models/searchparameter_test.py +++ b/tests/models/searchparameter_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return searchparameter.SearchParameter(js) def testSearchParameter1(self): - inst = self.instantiate_from("searchparameter-example-reference.json") + inst = self.instantiate_from("searchparameter-example-extension.json") self.assertIsNotNone(inst, "Must have instantiated a SearchParameter instance") self.implSearchParameter1(inst) @@ -30,32 +30,26 @@ def testSearchParameter1(self): self.implSearchParameter1(inst2) def implSearchParameter1(self, inst): - self.assertEqual(inst.base[0], "Condition") - self.assertEqual(inst.chain[0], "name") - self.assertEqual(inst.chain[1], "identifier") - self.assertEqual(inst.code, "subject") - self.assertEqual(inst.contact[0].name, "[string]") + self.assertEqual(inst.base[0], "Patient") + self.assertEqual(inst.code, "part-agree") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.date.datetime, FHIRDateTime("2013-10-23").datetime) - self.assertEqual(inst.date.as_json(), "2013-10-23") - self.assertEqual(inst.description, "Search by condition subject") + self.assertEqual(inst.description, "Search by url for a participation agreement, which is stored in a DocumentReference") self.assertTrue(inst.experimental) - self.assertEqual(inst.expression, "Condition.subject") - self.assertEqual(inst.id, "example-reference") - self.assertEqual(inst.modifier[0], "missing") - self.assertEqual(inst.name, "Example Search Parameter") + self.assertEqual(inst.expression, "DocumentReference.extension('http://example.org/fhir/StructureDefinition/participation-agreement')") + self.assertEqual(inst.id, "example-extension") + self.assertEqual(inst.name, "Example Search Parameter on an extension") self.assertEqual(inst.publisher, "Health Level Seven International (FHIR Infrastructure)") - self.assertEqual(inst.purpose, "Need to search Condition by subject") self.assertEqual(inst.status, "draft") - self.assertEqual(inst.target[0], "Organization") + self.assertEqual(inst.target[0], "DocumentReference") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "reference") - self.assertEqual(inst.url, "http://hl7.org/fhir/SearchParameter/example-reference") + self.assertEqual(inst.url, "http://hl7.org/fhir/SearchParameter/example-extension") + self.assertEqual(inst.xpath, "f:DocumentReference/f:extension[@url='http://example.org/fhir/StructureDefinition/participation-agreement']") self.assertEqual(inst.xpathUsage, "normal") def testSearchParameter2(self): - inst = self.instantiate_from("searchparameter-example-extension.json") + inst = self.instantiate_from("searchparameter-example-reference.json") self.assertIsNotNone(inst, "Must have instantiated a SearchParameter instance") self.implSearchParameter2(inst) @@ -65,22 +59,28 @@ def testSearchParameter2(self): self.implSearchParameter2(inst2) def implSearchParameter2(self, inst): - self.assertEqual(inst.base[0], "Patient") - self.assertEqual(inst.code, "part-agree") + self.assertEqual(inst.base[0], "Condition") + self.assertEqual(inst.chain[0], "name") + self.assertEqual(inst.chain[1], "identifier") + self.assertEqual(inst.code, "subject") + self.assertEqual(inst.contact[0].name, "[string]") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.description, "Search by url for a participation agreement, which is stored in a DocumentReference") + self.assertEqual(inst.date.datetime, FHIRDateTime("2013-10-23").datetime) + self.assertEqual(inst.date.as_json(), "2013-10-23") + self.assertEqual(inst.description, "Search by condition subject") self.assertTrue(inst.experimental) - self.assertEqual(inst.expression, "DocumentReference.extension('http://example.org/fhir/StructureDefinition/participation-agreement')") - self.assertEqual(inst.id, "example-extension") - self.assertEqual(inst.name, "Example Search Parameter on an extension") + self.assertEqual(inst.expression, "Condition.subject") + self.assertEqual(inst.id, "example-reference") + self.assertEqual(inst.modifier[0], "missing") + self.assertEqual(inst.name, "Example Search Parameter") self.assertEqual(inst.publisher, "Health Level Seven International (FHIR Infrastructure)") + self.assertEqual(inst.purpose, "Need to search Condition by subject") self.assertEqual(inst.status, "draft") - self.assertEqual(inst.target[0], "DocumentReference") + self.assertEqual(inst.target[0], "Organization") self.assertEqual(inst.text.status, "generated") self.assertEqual(inst.type, "reference") - self.assertEqual(inst.url, "http://hl7.org/fhir/SearchParameter/example-extension") - self.assertEqual(inst.xpath, "f:DocumentReference/f:extension[@url='http://example.org/fhir/StructureDefinition/participation-agreement']") + self.assertEqual(inst.url, "http://hl7.org/fhir/SearchParameter/example-reference") self.assertEqual(inst.xpathUsage, "normal") def testSearchParameter3(self): diff --git a/tests/models/servicerequest_test.py b/tests/models/servicerequest_test.py index f27efa3f..4ade3d78 100644 --- a/tests/models/servicerequest_test.py +++ b/tests/models/servicerequest_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return servicerequest.ServiceRequest(js) def testServiceRequest1(self): - inst = self.instantiate_from("servicerequest-example-di.json") + inst = self.instantiate_from("servicerequest-example2.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest1(inst) @@ -30,22 +30,37 @@ def testServiceRequest1(self): self.implServiceRequest1(inst2) def implServiceRequest1(self, inst): - self.assertEqual(inst.code.coding[0].code, "24627-2") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Chest CT") - self.assertEqual(inst.id, "di") - self.assertEqual(inst.intent, "original-order") + self.assertEqual(inst.asNeededCodeableConcept.text, "as needed to clear mucus") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2017-02-01T17:23:07Z").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2017-02-01T17:23:07Z") + self.assertEqual(inst.code.coding[0].code, "34431008") + self.assertEqual(inst.code.coding[0].display, "Physiotherapy of chest (regime/therapy) ") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.contained[0].id, "signature") + self.assertEqual(inst.contained[1].id, "cystic-fibrosis") + self.assertEqual(inst.id, "physiotherapy") + self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/placer-ids") + self.assertEqual(inst.identifier[0].type.coding[0].code, "PLAC") + self.assertEqual(inst.identifier[0].type.coding[0].display, "Placer Identifier") + self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") + self.assertEqual(inst.identifier[0].type.text, "Placer") + self.assertEqual(inst.identifier[0].value, "20170201-0001") + self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2013-05-08T09:33:27+07:00").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2013-05-08T09:33:27+07:00") - self.assertEqual(inst.reasonCode[0].text, "Check for metastatic disease") - self.assertEqual(inst.status, "active") + self.assertEqual(inst.occurrenceTiming.repeat.duration, 15) + self.assertEqual(inst.occurrenceTiming.repeat.durationMax, 25) + self.assertEqual(inst.occurrenceTiming.repeat.durationUnit, "min") + self.assertEqual(inst.occurrenceTiming.repeat.frequency, 1) + self.assertEqual(inst.occurrenceTiming.repeat.frequencyMax, 4) + self.assertEqual(inst.occurrenceTiming.repeat.period, 1) + self.assertEqual(inst.occurrenceTiming.repeat.periodUnit, "d") + self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testServiceRequest2(self): - inst = self.instantiate_from("servicerequest-example.json") + inst = self.instantiate_from("servicerequest-example3.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest2(inst) @@ -55,24 +70,25 @@ def testServiceRequest2(self): self.implServiceRequest2(inst2) def implServiceRequest2(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "103693007") - self.assertEqual(inst.category[0].coding[0].display, "Diagnostic procedure (procedure)") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].text, "Diagnostics Procedure") - self.assertEqual(inst.code.coding[0].code, "303653007") - self.assertEqual(inst.code.coding[0].display, "Computed tomography of head") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2017-02-01T17:23:07Z").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2017-02-01T17:23:07Z") + self.assertEqual(inst.code.coding[0].code, "359962006") + self.assertEqual(inst.code.coding[0].display, "Turning patient in bed (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "example") + self.assertTrue(inst.doNotPerform) + self.assertEqual(inst.id, "do-not-turn") + self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/placer-ids") + self.assertEqual(inst.identifier[0].value, "20170201-0002") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.div, "
To be added
") + self.assertEqual(inst.priority, "stat") + self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") def testServiceRequest3(self): - inst = self.instantiate_from("servicerequest-example-myringotomy.json") + inst = self.instantiate_from("servicerequest-example-lipid.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest3(inst) @@ -82,34 +98,27 @@ def testServiceRequest3(self): self.implServiceRequest3(inst2) def implServiceRequest3(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2014-02-14").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2014-02-14") - self.assertEqual(inst.category[0].coding[0].code, "103696004") - self.assertEqual(inst.category[0].coding[0].display, "Patient referral to specialist") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.coding[0].code, "172676009") - self.assertEqual(inst.code.coding[0].display, "Myringotomy and insertion of tympanic ventilation tube") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Insertion of grommets") - self.assertEqual(inst.id, "myringotomy") - self.assertEqual(inst.identifier[0].system, "http://orionhealth.com/fhir/apps/referralids") - self.assertEqual(inst.identifier[0].value, "ret4421") - self.assertEqual(inst.intent, "order") + self.assertEqual(inst.code.coding[0].code, "LIPID") + self.assertEqual(inst.code.coding[0].system, "http://acme.org/tests") + self.assertEqual(inst.code.text, "Lipid Panel") + self.assertEqual(inst.contained[0].id, "fasting") + self.assertEqual(inst.contained[1].id, "serum") + self.assertEqual(inst.id, "lipid") + self.assertEqual(inst.identifier[0].system, "urn:oid:1.3.4.5.6.7") + self.assertEqual(inst.identifier[0].type.coding[0].code, "PLAC") + self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") + self.assertEqual(inst.identifier[0].type.text, "Placer") + self.assertEqual(inst.identifier[0].value, "2345234234234") + self.assertEqual(inst.intent, "original-order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].authorString, "Serena Shrink") - self.assertEqual(inst.note[0].text, "In the past 2 years Beverly has had 6 instances of rt-sided Otitis media. She is falling behind her peers at school, and displaying some learning difficulties.") - self.assertEqual(inst.note[0].time.datetime, FHIRDateTime("2014-02-14").datetime) - self.assertEqual(inst.note[0].time.as_json(), "2014-02-14") - self.assertEqual(inst.occurrencePeriod.end.datetime, FHIRDateTime("2014-03-14").datetime) - self.assertEqual(inst.occurrencePeriod.end.as_json(), "2014-03-14") - self.assertEqual(inst.performerType.coding[0].code, "ent") - self.assertEqual(inst.performerType.coding[0].display, "ENT") - self.assertEqual(inst.performerType.coding[0].system, "http://orionhealth.com/fhir/apps/specialties") - self.assertEqual(inst.priority, "routine") - self.assertEqual(inst.reasonCode[0].text, "For consideration of Grommets") - self.assertEqual(inst.requisition.value, "1234") + self.assertEqual(inst.note[0].text, "patient is afraid of needles") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2013-05-02T16:16:00-07:00").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2013-05-02T16:16:00-07:00") + self.assertEqual(inst.reasonCode[0].coding[0].code, "V173") + self.assertEqual(inst.reasonCode[0].coding[0].display, "Fam hx-ischem heart dis") + self.assertEqual(inst.reasonCode[0].coding[0].system, "http://hl7.org/fhir/sid/icd-9") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") @@ -142,7 +151,7 @@ def implServiceRequest4(self, inst): self.assertEqual(inst.text.status, "generated") def testServiceRequest5(self): - inst = self.instantiate_from("servicerequest-example-ft4.json") + inst = self.instantiate_from("servicerequest-example4.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest5(inst) @@ -152,21 +161,25 @@ def testServiceRequest5(self): self.implServiceRequest5(inst2) def implServiceRequest5(self, inst): - self.assertEqual(inst.code.coding[0].code, "3024-7") - self.assertEqual(inst.code.coding[0].system, "http://loinc.org") - self.assertEqual(inst.code.text, "Free T4") - self.assertEqual(inst.id, "ft4") - self.assertEqual(inst.intent, "reflex-order") + self.assertEqual(inst.code.coding[0].code, "229115003") + self.assertEqual(inst.code.coding[0].display, "Bench Press (regime/therapy) ") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.id, "benchpress") + self.assertEqual(inst.intent, "plan") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2015-08-27T09:33:27+07:00").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2015-08-27T09:33:27+07:00") + self.assertEqual(inst.occurrenceTiming.repeat.count, 20) + self.assertEqual(inst.occurrenceTiming.repeat.countMax, 30) + self.assertEqual(inst.occurrenceTiming.repeat.frequency, 3) + self.assertEqual(inst.occurrenceTiming.repeat.period, 1) + self.assertEqual(inst.occurrenceTiming.repeat.periodUnit, "wk") + self.assertEqual(inst.patientInstruction, "Start with 30kg 10-15 repetitions for three sets and increase in increments of 5kg when you feel ready") self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") def testServiceRequest6(self): - inst = self.instantiate_from("servicerequest-example2.json") + inst = self.instantiate_from("servicerequest-example-edu.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest6(inst) @@ -176,37 +189,29 @@ def testServiceRequest6(self): self.implServiceRequest6(inst2) def implServiceRequest6(self, inst): - self.assertEqual(inst.asNeededCodeableConcept.text, "as needed to clear mucus") - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2017-02-01T17:23:07Z").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2017-02-01T17:23:07Z") - self.assertEqual(inst.code.coding[0].code, "34431008") - self.assertEqual(inst.code.coding[0].display, "Physiotherapy of chest (regime/therapy) ") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-08-16").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-08-16") + self.assertEqual(inst.category[0].coding[0].code, "311401005") + self.assertEqual(inst.category[0].coding[0].display, "Patient education (procedure)") + self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].text, "Education") + self.assertEqual(inst.code.coding[0].code, "48023004") + self.assertEqual(inst.code.coding[0].display, "Breast self-examination technique education (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.contained[0].id, "signature") - self.assertEqual(inst.contained[1].id, "cystic-fibrosis") - self.assertEqual(inst.id, "physiotherapy") - self.assertEqual(inst.identifier[0].system, "http://goodhealth.org/placer-ids") - self.assertEqual(inst.identifier[0].type.coding[0].code, "PLAC") - self.assertEqual(inst.identifier[0].type.coding[0].display, "Placer Identifier") - self.assertEqual(inst.identifier[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0203") - self.assertEqual(inst.identifier[0].type.text, "Placer") - self.assertEqual(inst.identifier[0].value, "20170201-0001") + self.assertEqual(inst.code.text, "Health education - breast examination") + self.assertEqual(inst.id, "education") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceTiming.repeat.duration, 15) - self.assertEqual(inst.occurrenceTiming.repeat.durationMax, 25) - self.assertEqual(inst.occurrenceTiming.repeat.durationUnit, "min") - self.assertEqual(inst.occurrenceTiming.repeat.frequency, 1) - self.assertEqual(inst.occurrenceTiming.repeat.frequencyMax, 4) - self.assertEqual(inst.occurrenceTiming.repeat.period, 1) - self.assertEqual(inst.occurrenceTiming.repeat.periodUnit, "d") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2014-08-16").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2014-08-16") + self.assertEqual(inst.reasonCode[0].text, "early detection of breast mass") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testServiceRequest7(self): - inst = self.instantiate_from("servicerequest-example-colonoscopy.json") + inst = self.instantiate_from("servicerequest-example-ventilation.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest7(inst) @@ -216,20 +221,23 @@ def testServiceRequest7(self): self.implServiceRequest7(inst2) def implServiceRequest7(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2017-03-05").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2017-03-05") - self.assertEqual(inst.code.coding[0].code, "73761001") - self.assertEqual(inst.code.coding[0].display, "Colonoscopy (procedure)") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-02-20").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2018-02-20") + self.assertEqual(inst.code.coding[0].code, "40617009") + self.assertEqual(inst.code.coding[0].display, "Artificial respiration (procedure)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Colonoscopy") - self.assertEqual(inst.id, "colonoscopy") - self.assertEqual(inst.identifier[0].value, "45678") + self.assertEqual(inst.code.text, "Mechanical Ventilation") + self.assertEqual(inst.id, "vent") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.requisition.system, "http://bumc.org/requisitions") - self.assertEqual(inst.requisition.value, "req12345") + self.assertEqual(inst.orderDetail[0].coding[0].code, "243144002") + self.assertEqual(inst.orderDetail[0].coding[0].display, "Patient triggered inspiratory assistance (procedure)") + self.assertEqual(inst.orderDetail[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.orderDetail[0].text, "IPPB") + self.assertEqual(inst.orderDetail[1].text, " Initial Settings : Sens: -1 cm H20 Pressure 15 cm H2O moderate flow: Monitor VS every 15 minutes x 4 at the start of mechanical ventilation, then routine for unit OR every 5 hr") + self.assertEqual(inst.reasonCode[0].text, "chronic obstructive lung disease (COLD)") self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") @@ -260,7 +268,7 @@ def implServiceRequest8(self, inst): self.assertEqual(inst.text.status, "generated") def testServiceRequest9(self): - inst = self.instantiate_from("servicerequest-example-appendectomy.json") + inst = self.instantiate_from("servicerequest-example-pt.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest9(inst) @@ -270,17 +278,33 @@ def testServiceRequest9(self): self.implServiceRequest9(inst2) def implServiceRequest9(self, inst): - self.assertEqual(inst.code.text, "Appendectomy") - self.assertEqual(inst.id, "appendectomy-narrative") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-09-20").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-09-20") + self.assertEqual(inst.bodySite[0].coding[0].code, "36701003") + self.assertEqual(inst.bodySite[0].coding[0].display, "Both knees (body structure)") + self.assertEqual(inst.bodySite[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.bodySite[0].text, "Both knees") + self.assertEqual(inst.category[0].coding[0].code, "386053000") + self.assertEqual(inst.category[0].coding[0].display, "Evaluation procedure (procedure)") + self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.category[0].text, "Evaluation") + self.assertEqual(inst.code.coding[0].code, "710830005") + self.assertEqual(inst.code.coding[0].display, "Assessment of passive range of motion (procedure)") + self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.code.text, "Assessment of passive range of motion") + self.assertEqual(inst.id, "physical-therapy") self.assertEqual(inst.intent, "order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2016-09-27").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2016-09-27") + self.assertEqual(inst.reasonCode[0].text, "assessment of mobility limitations due to osteoarthritis") self.assertEqual(inst.status, "completed") - self.assertEqual(inst.text.status, "additional") + self.assertEqual(inst.text.status, "generated") def testServiceRequest10(self): - inst = self.instantiate_from("servicerequest-example-edu.json") + inst = self.instantiate_from("servicerequest-example-di.json") self.assertIsNotNone(inst, "Must have instantiated a ServiceRequest instance") self.implServiceRequest10(inst) @@ -290,24 +314,17 @@ def testServiceRequest10(self): self.implServiceRequest10(inst2) def implServiceRequest10(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-08-16").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-08-16") - self.assertEqual(inst.category[0].coding[0].code, "311401005") - self.assertEqual(inst.category[0].coding[0].display, "Patient education (procedure)") - self.assertEqual(inst.category[0].coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.category[0].text, "Education") - self.assertEqual(inst.code.coding[0].code, "48023004") - self.assertEqual(inst.code.coding[0].display, "Breast self-examination technique education (procedure)") - self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.code.text, "Health education - breast examination") - self.assertEqual(inst.id, "education") - self.assertEqual(inst.intent, "order") + self.assertEqual(inst.code.coding[0].code, "24627-2") + self.assertEqual(inst.code.coding[0].system, "http://loinc.org") + self.assertEqual(inst.code.text, "Chest CT") + self.assertEqual(inst.id, "di") + self.assertEqual(inst.intent, "original-order") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2014-08-16").datetime) - self.assertEqual(inst.occurrenceDateTime.as_json(), "2014-08-16") - self.assertEqual(inst.reasonCode[0].text, "early detection of breast mass") - self.assertEqual(inst.status, "completed") + self.assertEqual(inst.occurrenceDateTime.datetime, FHIRDateTime("2013-05-08T09:33:27+07:00").datetime) + self.assertEqual(inst.occurrenceDateTime.as_json(), "2013-05-08T09:33:27+07:00") + self.assertEqual(inst.reasonCode[0].text, "Check for metastatic disease") + self.assertEqual(inst.status, "active") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/slot_test.py b/tests/models/slot_test.py index 68245282..cc4b5f75 100644 --- a/tests/models/slot_test.py +++ b/tests/models/slot_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return slot.Slot(js) def testSlot1(self): - inst = self.instantiate_from("slot-example.json") + inst = self.instantiate_from("slot-example-busy.json") self.assertIsNotNone(inst, "Must have instantiated a Slot instance") self.implSlot1(inst) @@ -30,29 +30,25 @@ def testSlot1(self): self.implSlot1(inst2) def implSlot1(self, inst): - self.assertEqual(inst.appointmentType.coding[0].code, "WALKIN") - self.assertEqual(inst.appointmentType.coding[0].display, "A previously unscheduled walk-in visit") - self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") self.assertEqual(inst.comment, "Assessments should be performed before requesting appointments in this slot.") - self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-25T09:30:00Z").datetime) - self.assertEqual(inst.end.as_json(), "2013-12-25T09:30:00Z") - self.assertEqual(inst.id, "example") + self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-25T09:15:00Z").datetime) + self.assertEqual(inst.end.as_json(), "2013-12-25T09:15:00Z") + self.assertEqual(inst.id, "1") + self.assertEqual(inst.identifier[0].system, "http://example.org/identifiers/slots") + self.assertEqual(inst.identifier[0].value, "123132") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertTrue(inst.overbooked) self.assertEqual(inst.serviceCategory[0].coding[0].code, "17") self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") - self.assertEqual(inst.serviceType[0].coding[0].code, "57") - self.assertEqual(inst.serviceType[0].coding[0].display, "Immunization") - self.assertEqual(inst.specialty[0].coding[0].code, "408480009") - self.assertEqual(inst.specialty[0].coding[0].display, "Clinical immunology") - self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-25T09:15:00Z").datetime) - self.assertEqual(inst.start.as_json(), "2013-12-25T09:15:00Z") - self.assertEqual(inst.status, "free") + self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-25T09:00:00Z").datetime) + self.assertEqual(inst.start.as_json(), "2013-12-25T09:00:00Z") + self.assertEqual(inst.status, "busy") self.assertEqual(inst.text.status, "generated") def testSlot2(self): - inst = self.instantiate_from("slot-example-busy.json") + inst = self.instantiate_from("slot-example.json") self.assertIsNotNone(inst, "Must have instantiated a Slot instance") self.implSlot2(inst) @@ -62,21 +58,25 @@ def testSlot2(self): self.implSlot2(inst2) def implSlot2(self, inst): + self.assertEqual(inst.appointmentType.coding[0].code, "WALKIN") + self.assertEqual(inst.appointmentType.coding[0].display, "A previously unscheduled walk-in visit") + self.assertEqual(inst.appointmentType.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0276") self.assertEqual(inst.comment, "Assessments should be performed before requesting appointments in this slot.") - self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-25T09:15:00Z").datetime) - self.assertEqual(inst.end.as_json(), "2013-12-25T09:15:00Z") - self.assertEqual(inst.id, "1") - self.assertEqual(inst.identifier[0].system, "http://example.org/identifiers/slots") - self.assertEqual(inst.identifier[0].value, "123132") + self.assertEqual(inst.end.datetime, FHIRInstant("2013-12-25T09:30:00Z").datetime) + self.assertEqual(inst.end.as_json(), "2013-12-25T09:30:00Z") + self.assertEqual(inst.id, "example") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertTrue(inst.overbooked) self.assertEqual(inst.serviceCategory[0].coding[0].code, "17") self.assertEqual(inst.serviceCategory[0].coding[0].display, "General Practice") - self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-25T09:00:00Z").datetime) - self.assertEqual(inst.start.as_json(), "2013-12-25T09:00:00Z") - self.assertEqual(inst.status, "busy") + self.assertEqual(inst.serviceType[0].coding[0].code, "57") + self.assertEqual(inst.serviceType[0].coding[0].display, "Immunization") + self.assertEqual(inst.specialty[0].coding[0].code, "408480009") + self.assertEqual(inst.specialty[0].coding[0].display, "Clinical immunology") + self.assertEqual(inst.start.datetime, FHIRInstant("2013-12-25T09:15:00Z").datetime) + self.assertEqual(inst.start.as_json(), "2013-12-25T09:15:00Z") + self.assertEqual(inst.status, "free") self.assertEqual(inst.text.status, "generated") def testSlot3(self): diff --git a/tests/models/specimen_test.py b/tests/models/specimen_test.py index 41491229..7901f6b1 100644 --- a/tests/models/specimen_test.py +++ b/tests/models/specimen_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return specimen.Specimen(js) def testSpecimen1(self): - inst = self.instantiate_from("specimen-example.json") + inst = self.instantiate_from("specimen-example-isolate.json") self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") self.implSpecimen1(inst) @@ -31,42 +31,27 @@ def testSpecimen1(self): def implSpecimen1(self, inst): self.assertEqual(inst.accessionIdentifier.system, "http://lab.acme.org/specimens/2011") - self.assertEqual(inst.accessionIdentifier.value, "X352356") - self.assertEqual(inst.collection.bodySite.coding[0].code, "49852007") - self.assertEqual(inst.collection.bodySite.coding[0].display, "Structure of median cubital vein (body structure)") - self.assertEqual(inst.collection.bodySite.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.collection.bodySite.text, "Right median cubital vein") - self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2011-05-30T06:15:00Z").datetime) - self.assertEqual(inst.collection.collectedDateTime.as_json(), "2011-05-30T06:15:00Z") - self.assertEqual(inst.collection.method.coding[0].code, "LNV") + self.assertEqual(inst.accessionIdentifier.value, "X352356-ISO1") + self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2015-08-16T07:03:00Z").datetime) + self.assertEqual(inst.collection.collectedDateTime.as_json(), "2015-08-16T07:03:00Z") + self.assertEqual(inst.collection.method.coding[0].code, "BAP") self.assertEqual(inst.collection.method.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0488") - self.assertEqual(inst.collection.quantity.unit, "mL") - self.assertEqual(inst.collection.quantity.value, 6) - self.assertEqual(inst.contained[0].id, "hep") - self.assertEqual(inst.container[0].capacity.unit, "mL") - self.assertEqual(inst.container[0].capacity.value, 10) - self.assertEqual(inst.container[0].description, "Green Gel tube") - self.assertEqual(inst.container[0].identifier[0].value, "48736-15394-75465") - self.assertEqual(inst.container[0].specimenQuantity.unit, "mL") - self.assertEqual(inst.container[0].specimenQuantity.value, 6) - self.assertEqual(inst.container[0].type.text, "Vacutainer") - self.assertEqual(inst.id, "101") - self.assertEqual(inst.identifier[0].system, "http://ehr.acme.org/identifiers/collections") - self.assertEqual(inst.identifier[0].value, "23234352356") + self.assertEqual(inst.contained[0].id, "stool") + self.assertEqual(inst.id, "isolate") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Specimen is grossly lipemic") - self.assertEqual(inst.receivedTime.datetime, FHIRDateTime("2011-03-04T07:03:00Z").datetime) - self.assertEqual(inst.receivedTime.as_json(), "2011-03-04T07:03:00Z") + self.assertEqual(inst.note[0].text, "Patient dropped off specimen") + self.assertEqual(inst.receivedTime.datetime, FHIRDateTime("2015-08-18T07:03:00Z").datetime) + self.assertEqual(inst.receivedTime.as_json(), "2015-08-18T07:03:00Z") self.assertEqual(inst.status, "available") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "122555007") - self.assertEqual(inst.type.coding[0].display, "Venous blood specimen") + self.assertEqual(inst.type.coding[0].code, "429951000124103") + self.assertEqual(inst.type.coding[0].display, "Bacterial isolate specimen") self.assertEqual(inst.type.coding[0].system, "http://snomed.info/sct") def testSpecimen2(self): - inst = self.instantiate_from("specimen-example-urine.json") + inst = self.instantiate_from("specimen-example-pooled-serum.json") self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") self.implSpecimen2(inst) @@ -76,6 +61,36 @@ def testSpecimen2(self): self.implSpecimen2(inst2) def implSpecimen2(self, inst): + self.assertEqual(inst.accessionIdentifier.system, "https://vetmed.iastate.edu/vdl") + self.assertEqual(inst.accessionIdentifier.value, "20171120-1234") + self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2017-11-14").datetime) + self.assertEqual(inst.collection.collectedDateTime.as_json(), "2017-11-14") + self.assertEqual(inst.container[0].type.coding[0].code, "RTT") + self.assertEqual(inst.container[0].type.coding[0].display, "Red Top Tube") + self.assertEqual(inst.container[0].type.coding[0].system, "https://vetmed.iastate.edu/vdl") + self.assertEqual(inst.container[0].type.text, "Red Top Blood Collection Tube") + self.assertEqual(inst.id, "pooled-serum") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.note[0].text, "Pooled serum sample from 30 individuals") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.type.coding[0].code, "Serum sample, pooled") + self.assertEqual(inst.type.coding[0].display, "Serum sample, pooled") + self.assertEqual(inst.type.coding[0].system, "https://vetmed.iastate.edu/vdl") + self.assertEqual(inst.type.text, "Pooled serum sample") + + def testSpecimen3(self): + inst = self.instantiate_from("specimen-example-urine.json") + self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") + self.implSpecimen3(inst) + + js = inst.as_json() + self.assertEqual("Specimen", js["resourceType"]) + inst2 = specimen.Specimen(js) + self.implSpecimen3(inst2) + + def implSpecimen3(self, inst): self.assertEqual(inst.accessionIdentifier.system, "http://lab.acme.org/specimens/2015") self.assertEqual(inst.accessionIdentifier.value, "X352356") self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2015-08-18T07:03:00Z").datetime) @@ -102,36 +117,6 @@ def implSpecimen2(self, inst): self.assertEqual(inst.type.coding[0].display, "Urine, Random") self.assertEqual(inst.type.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0487") - def testSpecimen3(self): - inst = self.instantiate_from("specimen-example-pooled-serum.json") - self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") - self.implSpecimen3(inst) - - js = inst.as_json() - self.assertEqual("Specimen", js["resourceType"]) - inst2 = specimen.Specimen(js) - self.implSpecimen3(inst2) - - def implSpecimen3(self, inst): - self.assertEqual(inst.accessionIdentifier.system, "https://vetmed.iastate.edu/vdl") - self.assertEqual(inst.accessionIdentifier.value, "20171120-1234") - self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2017-11-14").datetime) - self.assertEqual(inst.collection.collectedDateTime.as_json(), "2017-11-14") - self.assertEqual(inst.container[0].type.coding[0].code, "RTT") - self.assertEqual(inst.container[0].type.coding[0].display, "Red Top Tube") - self.assertEqual(inst.container[0].type.coding[0].system, "https://vetmed.iastate.edu/vdl") - self.assertEqual(inst.container[0].type.text, "Red Top Blood Collection Tube") - self.assertEqual(inst.id, "pooled-serum") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Pooled serum sample from 30 individuals") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "Serum sample, pooled") - self.assertEqual(inst.type.coding[0].display, "Serum sample, pooled") - self.assertEqual(inst.type.coding[0].system, "https://vetmed.iastate.edu/vdl") - self.assertEqual(inst.type.text, "Pooled serum sample") - def testSpecimen4(self): inst = self.instantiate_from("specimen-example-serum.json") self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") @@ -160,7 +145,7 @@ def implSpecimen4(self, inst): self.assertEqual(inst.type.coding[0].system, "http://snomed.info/sct") def testSpecimen5(self): - inst = self.instantiate_from("specimen-example-isolate.json") + inst = self.instantiate_from("specimen-example.json") self.assertIsNotNone(inst, "Must have instantiated a Specimen instance") self.implSpecimen5(inst) @@ -171,22 +156,37 @@ def testSpecimen5(self): def implSpecimen5(self, inst): self.assertEqual(inst.accessionIdentifier.system, "http://lab.acme.org/specimens/2011") - self.assertEqual(inst.accessionIdentifier.value, "X352356-ISO1") - self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2015-08-16T07:03:00Z").datetime) - self.assertEqual(inst.collection.collectedDateTime.as_json(), "2015-08-16T07:03:00Z") - self.assertEqual(inst.collection.method.coding[0].code, "BAP") + self.assertEqual(inst.accessionIdentifier.value, "X352356") + self.assertEqual(inst.collection.bodySite.coding[0].code, "49852007") + self.assertEqual(inst.collection.bodySite.coding[0].display, "Structure of median cubital vein (body structure)") + self.assertEqual(inst.collection.bodySite.coding[0].system, "http://snomed.info/sct") + self.assertEqual(inst.collection.bodySite.text, "Right median cubital vein") + self.assertEqual(inst.collection.collectedDateTime.datetime, FHIRDateTime("2011-05-30T06:15:00Z").datetime) + self.assertEqual(inst.collection.collectedDateTime.as_json(), "2011-05-30T06:15:00Z") + self.assertEqual(inst.collection.method.coding[0].code, "LNV") self.assertEqual(inst.collection.method.coding[0].system, "http://terminology.hl7.org/CodeSystem/v2-0488") - self.assertEqual(inst.contained[0].id, "stool") - self.assertEqual(inst.id, "isolate") + self.assertEqual(inst.collection.quantity.unit, "mL") + self.assertEqual(inst.collection.quantity.value, 6) + self.assertEqual(inst.contained[0].id, "hep") + self.assertEqual(inst.container[0].capacity.unit, "mL") + self.assertEqual(inst.container[0].capacity.value, 10) + self.assertEqual(inst.container[0].description, "Green Gel tube") + self.assertEqual(inst.container[0].identifier[0].value, "48736-15394-75465") + self.assertEqual(inst.container[0].specimenQuantity.unit, "mL") + self.assertEqual(inst.container[0].specimenQuantity.value, 6) + self.assertEqual(inst.container[0].type.text, "Vacutainer") + self.assertEqual(inst.id, "101") + self.assertEqual(inst.identifier[0].system, "http://ehr.acme.org/identifiers/collections") + self.assertEqual(inst.identifier[0].value, "23234352356") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.note[0].text, "Patient dropped off specimen") - self.assertEqual(inst.receivedTime.datetime, FHIRDateTime("2015-08-18T07:03:00Z").datetime) - self.assertEqual(inst.receivedTime.as_json(), "2015-08-18T07:03:00Z") + self.assertEqual(inst.note[0].text, "Specimen is grossly lipemic") + self.assertEqual(inst.receivedTime.datetime, FHIRDateTime("2011-03-04T07:03:00Z").datetime) + self.assertEqual(inst.receivedTime.as_json(), "2011-03-04T07:03:00Z") self.assertEqual(inst.status, "available") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.type.coding[0].code, "429951000124103") - self.assertEqual(inst.type.coding[0].display, "Bacterial isolate specimen") + self.assertEqual(inst.type.coding[0].code, "122555007") + self.assertEqual(inst.type.coding[0].display, "Venous blood specimen") self.assertEqual(inst.type.coding[0].system, "http://snomed.info/sct") diff --git a/tests/models/substance_test.py b/tests/models/substance_test.py index a49d4f7b..abf3381d 100644 --- a/tests/models/substance_test.py +++ b/tests/models/substance_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return substance.Substance(js) def testSubstance1(self): - inst = self.instantiate_from("substance-example-f202-staphylococcus.json") + inst = self.instantiate_from("substance-example-silver-nitrate-product.json") self.assertIsNotNone(inst, "Must have instantiated a Substance instance") self.implSubstance1(inst) @@ -30,17 +30,31 @@ def testSubstance1(self): self.implSubstance1(inst2) def implSubstance1(self, inst): - self.assertEqual(inst.code.coding[0].code, "3092008") - self.assertEqual(inst.code.coding[0].display, "Staphylococcus Aureus") + self.assertEqual(inst.category[0].coding[0].code, "chemical") + self.assertEqual(inst.category[0].coding[0].display, "Chemical") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") + self.assertEqual(inst.code.coding[0].code, "333346007") + self.assertEqual(inst.code.coding[0].display, "Silver nitrate 20% solution (product)") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.id, "f202") + self.assertEqual(inst.description, "Solution for silver nitrate stain") + self.assertEqual(inst.id, "f204") + self.assertEqual(inst.identifier[0].system, "http://acme.org/identifiers/substances") + self.assertEqual(inst.identifier[0].value, "15970") + self.assertEqual(inst.instance[0].expiry.datetime, FHIRDateTime("2018-01-01").datetime) + self.assertEqual(inst.instance[0].expiry.as_json(), "2018-01-01") + self.assertEqual(inst.instance[0].identifier.system, "http://acme.org/identifiers/substances/lot") + self.assertEqual(inst.instance[0].identifier.value, "AB94687") + self.assertEqual(inst.instance[0].quantity.code, "mL") + self.assertEqual(inst.instance[0].quantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.instance[0].quantity.unit, "mL") + self.assertEqual(inst.instance[0].quantity.value, 100) self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") def testSubstance2(self): - inst = self.instantiate_from("substance-example.json") + inst = self.instantiate_from("substance-example-amoxicillin-clavulanate.json") self.assertIsNotNone(inst, "Must have instantiated a Substance instance") self.implSubstance2(inst) @@ -50,30 +64,6 @@ def testSubstance2(self): self.implSubstance2(inst2) def implSubstance2(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "allergen") - self.assertEqual(inst.category[0].coding[0].display, "Allergen") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") - self.assertEqual(inst.code.text, "apitoxin (Honey Bee Venom)") - self.assertEqual(inst.id, "example") - self.assertEqual(inst.identifier[0].system, "http://acme.org/identifiers/substances") - self.assertEqual(inst.identifier[0].value, "1463") - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - - def testSubstance3(self): - inst = self.instantiate_from("substance-example-amoxicillin-clavulanate.json") - self.assertIsNotNone(inst, "Must have instantiated a Substance instance") - self.implSubstance3(inst) - - js = inst.as_json() - self.assertEqual("Substance", js["resourceType"]) - inst2 = substance.Substance(js) - self.implSubstance3(inst2) - - def implSubstance3(self, inst): self.assertEqual(inst.category[0].coding[0].code, "drug") self.assertEqual(inst.category[0].coding[0].display, "Drug or Medicament") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") @@ -105,17 +95,17 @@ def implSubstance3(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") - def testSubstance4(self): + def testSubstance3(self): inst = self.instantiate_from("substance-example-f203-potassium.json") self.assertIsNotNone(inst, "Must have instantiated a Substance instance") - self.implSubstance4(inst) + self.implSubstance3(inst) js = inst.as_json() self.assertEqual("Substance", js["resourceType"]) inst2 = substance.Substance(js) - self.implSubstance4(inst2) + self.implSubstance3(inst2) - def implSubstance4(self, inst): + def implSubstance3(self, inst): self.assertEqual(inst.category[0].coding[0].code, "chemical") self.assertEqual(inst.category[0].coding[0].display, "Chemical") self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") @@ -130,17 +120,17 @@ def implSubstance4(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") - def testSubstance5(self): + def testSubstance4(self): inst = self.instantiate_from("substance-example-f201-dust.json") self.assertIsNotNone(inst, "Must have instantiated a Substance instance") - self.implSubstance5(inst) + self.implSubstance4(inst) js = inst.as_json() self.assertEqual("Substance", js["resourceType"]) inst2 = substance.Substance(js) - self.implSubstance5(inst2) + self.implSubstance4(inst2) - def implSubstance5(self, inst): + def implSubstance4(self, inst): self.assertEqual(inst.code.coding[0].code, "406466009") self.assertEqual(inst.code.coding[0].display, "House dust allergen") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") @@ -150,8 +140,32 @@ def implSubstance5(self, inst): self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") self.assertEqual(inst.text.status, "generated") + def testSubstance5(self): + inst = self.instantiate_from("substance-example.json") + self.assertIsNotNone(inst, "Must have instantiated a Substance instance") + self.implSubstance5(inst) + + js = inst.as_json() + self.assertEqual("Substance", js["resourceType"]) + inst2 = substance.Substance(js) + self.implSubstance5(inst2) + + def implSubstance5(self, inst): + self.assertEqual(inst.category[0].coding[0].code, "allergen") + self.assertEqual(inst.category[0].coding[0].display, "Allergen") + self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") + self.assertEqual(inst.code.text, "apitoxin (Honey Bee Venom)") + self.assertEqual(inst.id, "example") + self.assertEqual(inst.identifier[0].system, "http://acme.org/identifiers/substances") + self.assertEqual(inst.identifier[0].value, "1463") + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated") + def testSubstance6(self): - inst = self.instantiate_from("substance-example-silver-nitrate-product.json") + inst = self.instantiate_from("substance-example-f202-staphylococcus.json") self.assertIsNotNone(inst, "Must have instantiated a Substance instance") self.implSubstance6(inst) @@ -161,24 +175,10 @@ def testSubstance6(self): self.implSubstance6(inst2) def implSubstance6(self, inst): - self.assertEqual(inst.category[0].coding[0].code, "chemical") - self.assertEqual(inst.category[0].coding[0].display, "Chemical") - self.assertEqual(inst.category[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/substance-category") - self.assertEqual(inst.code.coding[0].code, "333346007") - self.assertEqual(inst.code.coding[0].display, "Silver nitrate 20% solution (product)") + self.assertEqual(inst.code.coding[0].code, "3092008") + self.assertEqual(inst.code.coding[0].display, "Staphylococcus Aureus") self.assertEqual(inst.code.coding[0].system, "http://snomed.info/sct") - self.assertEqual(inst.description, "Solution for silver nitrate stain") - self.assertEqual(inst.id, "f204") - self.assertEqual(inst.identifier[0].system, "http://acme.org/identifiers/substances") - self.assertEqual(inst.identifier[0].value, "15970") - self.assertEqual(inst.instance[0].expiry.datetime, FHIRDateTime("2018-01-01").datetime) - self.assertEqual(inst.instance[0].expiry.as_json(), "2018-01-01") - self.assertEqual(inst.instance[0].identifier.system, "http://acme.org/identifiers/substances/lot") - self.assertEqual(inst.instance[0].identifier.value, "AB94687") - self.assertEqual(inst.instance[0].quantity.code, "mL") - self.assertEqual(inst.instance[0].quantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.instance[0].quantity.unit, "mL") - self.assertEqual(inst.instance[0].quantity.value, 100) + self.assertEqual(inst.id, "f202") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") diff --git a/tests/models/substancespecification_test.py b/tests/models/substancespecification_test.py index 8b4fc14d..2ecc242a 100644 --- a/tests/models/substancespecification_test.py +++ b/tests/models/substancespecification_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return substancespecification.SubstanceSpecification(js) def testSubstanceSpecification1(self): - inst = self.instantiate_from("substancepolymer-example.json") + inst = self.instantiate_from("substancesourcematerial-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification1(inst) @@ -38,7 +38,7 @@ def implSubstanceSpecification1(self, inst): self.assertEqual(inst.text.status, "generated") def testSubstanceSpecification2(self): - inst = self.instantiate_from("substancereferenceinformation-example.json") + inst = self.instantiate_from("substanceprotein-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification2(inst) @@ -56,7 +56,7 @@ def implSubstanceSpecification2(self, inst): self.assertEqual(inst.text.status, "generated") def testSubstanceSpecification3(self): - inst = self.instantiate_from("substancenucleicacid-example.json") + inst = self.instantiate_from("substancepolymer-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification3(inst) @@ -74,7 +74,7 @@ def implSubstanceSpecification3(self, inst): self.assertEqual(inst.text.status, "generated") def testSubstanceSpecification4(self): - inst = self.instantiate_from("substanceprotein-example.json") + inst = self.instantiate_from("substancespecification-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification4(inst) @@ -92,7 +92,7 @@ def implSubstanceSpecification4(self, inst): self.assertEqual(inst.text.status, "generated") def testSubstanceSpecification5(self): - inst = self.instantiate_from("substancespecification-example.json") + inst = self.instantiate_from("substancereferenceinformation-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification5(inst) @@ -110,7 +110,7 @@ def implSubstanceSpecification5(self, inst): self.assertEqual(inst.text.status, "generated") def testSubstanceSpecification6(self): - inst = self.instantiate_from("substancesourcematerial-example.json") + inst = self.instantiate_from("substancenucleicacid-example.json") self.assertIsNotNone(inst, "Must have instantiated a SubstanceSpecification instance") self.implSubstanceSpecification6(inst) diff --git a/tests/models/task_test.py b/tests/models/task_test.py index 313787a8..044cd554 100644 --- a/tests/models/task_test.py +++ b/tests/models/task_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return task.Task(js) def testTask1(self): - inst = self.instantiate_from("task-example2.json") + inst = self.instantiate_from("task-example6.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask1(inst) @@ -30,38 +30,44 @@ def testTask1(self): self.implTask1(inst2) def implTask1(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:45:05+10:00") - self.assertEqual(inst.businessStatus.text, "waiting for patient") - self.assertEqual(inst.code.text, "Specimen Collection") - self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:45:05+10:00") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.businessStatus.text, "test completed and posted") + self.assertEqual(inst.code.text, "Lipid Panel") + self.assertEqual(inst.description, "Create order for getting specimen, Set up inhouse testing, generate order for any sendouts and submit with specimen") + self.assertEqual(inst.executionPeriod.end.datetime, FHIRDateTime("2016-10-31T18:45:05+10:00").datetime) + self.assertEqual(inst.executionPeriod.end.as_json(), "2016-10-31T18:45:05+10:00") + self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:25:05+10:00") self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") self.assertEqual(inst.groupIdentifier.use, "official") self.assertEqual(inst.groupIdentifier.value, "G20170201-001") - self.assertEqual(inst.id, "example2") + self.assertEqual(inst.id, "example6") self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20170201-002") - self.assertEqual(inst.intent, "filler-order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T09:45:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2016-10-31T09:45:05+10:00") + self.assertEqual(inst.identifier[0].value, "20170201-001") + self.assertEqual(inst.intent, "order") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T18:45:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2016-10-31T18:45:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.output[0].type.text, "DiagnosticReport generated") + self.assertEqual(inst.output[1].type.text, "collected specimen") self.assertEqual(inst.performerType[0].coding[0].code, "performer") self.assertEqual(inst.performerType[0].coding[0].display, "Performer") self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") self.assertEqual(inst.performerType[0].text, "Performer") self.assertEqual(inst.priority, "routine") - self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-01T09:45:05+10:00").datetime) - self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-01T09:45:05+10:00") + self.assertEqual(inst.reasonCode.text, "The Task.reason should only be included if there is no Task.focus or if it differs from the reason indicated on the focus") + self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-02T09:45:05+10:00").datetime) + self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-02T09:45:05+10:00") self.assertEqual(inst.restriction.repetitions, 1) - self.assertEqual(inst.status, "accepted") + self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testTask2(self): - inst = self.instantiate_from("task-example4.json") + inst = self.instantiate_from("task-example-fm-poll.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask2(inst) @@ -71,40 +77,35 @@ def testTask2(self): self.implTask2(inst2) def implTask2(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:45:05+10:00") - self.assertEqual(inst.code.text, "Specimen Collection") - self.assertEqual(inst.executionPeriod.end.datetime, FHIRDateTime("2016-10-31T14:45:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.end.as_json(), "2016-10-31T14:45:05+10:00") - self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:45:05+10:00") - self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") - self.assertEqual(inst.groupIdentifier.use, "official") - self.assertEqual(inst.groupIdentifier.value, "G20170201-001") - self.assertEqual(inst.id, "example4") - self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-12T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2018-10-12T08:25:05+10:00") + self.assertEqual(inst.code.coding[0].code, "poll") + self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") + self.assertEqual(inst.id, "fm-example2") + self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20170201-002") - self.assertEqual(inst.intent, "filler-order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T09:45:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2016-10-31T09:45:05+10:00") + self.assertEqual(inst.identifier[0].value, "20181012-005") + self.assertEqual(inst.input[0].type.coding[0].code, "include") + self.assertEqual(inst.input[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[0].valueCode, "ClaimResponse") + self.assertEqual(inst.input[1].type.coding[0].code, "period") + self.assertEqual(inst.input[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[1].valuePeriod.end.datetime, FHIRDateTime("2018-10-12").datetime) + self.assertEqual(inst.input[1].valuePeriod.end.as_json(), "2018-10-12") + self.assertEqual(inst.input[1].valuePeriod.start.datetime, FHIRDateTime("2018-10-01").datetime) + self.assertEqual(inst.input[1].valuePeriod.start.as_json(), "2018-10-01") + self.assertEqual(inst.intent, "order") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-12T08:25:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2018-10-12T08:25:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.output[0].type.text, "collected specimen") - self.assertEqual(inst.performerType[0].coding[0].code, "performer") - self.assertEqual(inst.performerType[0].coding[0].display, "Performer") - self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") - self.assertEqual(inst.performerType[0].text, "Performer") - self.assertEqual(inst.priority, "routine") - self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-01T09:45:05+10:00").datetime) - self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-01T09:45:05+10:00") - self.assertEqual(inst.restriction.repetitions, 1) - self.assertEqual(inst.status, "completed") + self.assertEqual(inst.priority, "stat") + self.assertEqual(inst.status, "requested") self.assertEqual(inst.text.status, "generated") def testTask3(self): - inst = self.instantiate_from("task-example3.json") + inst = self.instantiate_from("task-example1.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask3(inst) @@ -114,21 +115,41 @@ def testTask3(self): self.implTask3(inst2) def implTask3(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-03-10T22:39:32-04:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-03-10T22:39:32-04:00") - self.assertEqual(inst.code.text, "Refill Request") - self.assertEqual(inst.id, "example3") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.businessStatus.text, "waiting for specimen") + self.assertEqual(inst.code.text, "Lipid Panel") + self.assertEqual(inst.contained[0].id, "signature") + self.assertEqual(inst.description, "Create order for getting specimen, Set up inhouse testing, generate order for any sendouts and submit with specimen") + self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") + self.assertEqual(inst.groupIdentifier.use, "official") + self.assertEqual(inst.groupIdentifier.value, "G20170201-001") + self.assertEqual(inst.id, "example1") + self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") + self.assertEqual(inst.identifier[0].use, "official") + self.assertEqual(inst.identifier[0].value, "20170201-001") self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-03-10T22:39:32-04:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2016-03-10T22:39:32-04:00") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T09:45:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2016-10-31T09:45:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "draft") + self.assertEqual(inst.performerType[0].coding[0].code, "performer") + self.assertEqual(inst.performerType[0].coding[0].display, "Performer") + self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") + self.assertEqual(inst.performerType[0].text, "Performer") + self.assertEqual(inst.priority, "routine") + self.assertEqual(inst.reasonCode.text, "The Task.reason should only be included if there is no Task.focus or if it differs from the reason indicated on the focus") + self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-02T09:45:05+10:00").datetime) + self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-02T09:45:05+10:00") + self.assertEqual(inst.restriction.repetitions, 1) + self.assertEqual(inst.status, "in-progress") self.assertEqual(inst.text.status, "generated") def testTask4(self): - inst = self.instantiate_from("task-example-fm-status-resp.json") + inst = self.instantiate_from("task-example-fm-reprocess.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask4(inst) @@ -140,30 +161,35 @@ def testTask4(self): def implTask4(self, inst): self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") - self.assertEqual(inst.code.coding[0].code, "status") + self.assertEqual(inst.code.coding[0].code, "reprocess") self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") - self.assertEqual(inst.id, "fm-example6") + self.assertEqual(inst.id, "fm-example4") self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20181012-001") - self.assertEqual(inst.identifier[1].system, "http://nationalinsurers.com/identifiers/12345") - self.assertEqual(inst.identifier[1].use, "official") - self.assertEqual(inst.identifier[1].value, "123GB5674") + self.assertEqual(inst.identifier[0].value, "20181012-006") + self.assertEqual(inst.input[0].type.coding[0].code, "origresponse") + self.assertEqual(inst.input[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[1].type.coding[0].code, "reference") + self.assertEqual(inst.input[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[1].valueString, "BR12345") + self.assertEqual(inst.input[2].type.coding[0].code, "item") + self.assertEqual(inst.input[2].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[2].valuePositiveInt, 2) + self.assertEqual(inst.input[3].type.coding[0].code, "item") + self.assertEqual(inst.input[3].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") + self.assertEqual(inst.input[3].valuePositiveInt, 3) self.assertEqual(inst.intent, "order") self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.output[0].type.coding[0].code, "status") - self.assertEqual(inst.output[0].type.coding[0].system, "http://hl7.org/financial-taskoutputtype") - self.assertEqual(inst.output[0].valueCode, "complete") self.assertEqual(inst.priority, "stat") - self.assertEqual(inst.status, "completed") + self.assertEqual(inst.status, "requested") self.assertEqual(inst.text.status, "generated") def testTask5(self): - inst = self.instantiate_from("task-example-fm-cancel.json") + inst = self.instantiate_from("task-example3.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask5(inst) @@ -173,26 +199,21 @@ def testTask5(self): self.implTask5(inst2) def implTask5(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") - self.assertEqual(inst.code.coding[0].code, "cancel") - self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") - self.assertEqual(inst.id, "fm-example1") - self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") - self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20181012-001") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-03-10T22:39:32-04:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-03-10T22:39:32-04:00") + self.assertEqual(inst.code.text, "Refill Request") + self.assertEqual(inst.id, "example3") self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-03-10T22:39:32-04:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2016-03-10T22:39:32-04:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority, "stat") - self.assertEqual(inst.status, "requested") + self.assertEqual(inst.status, "draft") self.assertEqual(inst.text.status, "generated") def testTask6(self): - inst = self.instantiate_from("task-example-fm-poll.json") + inst = self.instantiate_from("task-example-fm-status-resp.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask6(inst) @@ -202,35 +223,32 @@ def testTask6(self): self.implTask6(inst2) def implTask6(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-12T08:25:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2018-10-12T08:25:05+10:00") - self.assertEqual(inst.code.coding[0].code, "poll") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") + self.assertEqual(inst.code.coding[0].code, "status") self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") - self.assertEqual(inst.id, "fm-example2") + self.assertEqual(inst.id, "fm-example6") self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20181012-005") - self.assertEqual(inst.input[0].type.coding[0].code, "include") - self.assertEqual(inst.input[0].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") - self.assertEqual(inst.input[0].valueCode, "ClaimResponse") - self.assertEqual(inst.input[1].type.coding[0].code, "period") - self.assertEqual(inst.input[1].type.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskinputtype") - self.assertEqual(inst.input[1].valuePeriod.end.datetime, FHIRDateTime("2018-10-12").datetime) - self.assertEqual(inst.input[1].valuePeriod.end.as_json(), "2018-10-12") - self.assertEqual(inst.input[1].valuePeriod.start.datetime, FHIRDateTime("2018-10-01").datetime) - self.assertEqual(inst.input[1].valuePeriod.start.as_json(), "2018-10-01") + self.assertEqual(inst.identifier[0].value, "20181012-001") + self.assertEqual(inst.identifier[1].system, "http://nationalinsurers.com/identifiers/12345") + self.assertEqual(inst.identifier[1].use, "official") + self.assertEqual(inst.identifier[1].value, "123GB5674") self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-12T08:25:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2018-10-12T08:25:05+10:00") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.output[0].type.coding[0].code, "status") + self.assertEqual(inst.output[0].type.coding[0].system, "http://hl7.org/financial-taskoutputtype") + self.assertEqual(inst.output[0].valueCode, "complete") self.assertEqual(inst.priority, "stat") - self.assertEqual(inst.status, "requested") + self.assertEqual(inst.status, "completed") self.assertEqual(inst.text.status, "generated") def testTask7(self): - inst = self.instantiate_from("task-example6.json") + inst = self.instantiate_from("task-example2.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask7(inst) @@ -240,44 +258,38 @@ def testTask7(self): self.implTask7(inst2) def implTask7(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:25:05+10:00") - self.assertEqual(inst.businessStatus.text, "test completed and posted") - self.assertEqual(inst.code.text, "Lipid Panel") - self.assertEqual(inst.description, "Create order for getting specimen, Set up inhouse testing, generate order for any sendouts and submit with specimen") - self.assertEqual(inst.executionPeriod.end.datetime, FHIRDateTime("2016-10-31T18:45:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.end.as_json(), "2016-10-31T18:45:05+10:00") - self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:45:05+10:00") + self.assertEqual(inst.businessStatus.text, "waiting for patient") + self.assertEqual(inst.code.text, "Specimen Collection") + self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:45:05+10:00").datetime) + self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:45:05+10:00") self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") self.assertEqual(inst.groupIdentifier.use, "official") self.assertEqual(inst.groupIdentifier.value, "G20170201-001") - self.assertEqual(inst.id, "example6") + self.assertEqual(inst.id, "example2") self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20170201-001") - self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T18:45:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2016-10-31T18:45:05+10:00") + self.assertEqual(inst.identifier[0].value, "20170201-002") + self.assertEqual(inst.intent, "filler-order") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T09:45:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2016-10-31T09:45:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.output[0].type.text, "DiagnosticReport generated") - self.assertEqual(inst.output[1].type.text, "collected specimen") self.assertEqual(inst.performerType[0].coding[0].code, "performer") self.assertEqual(inst.performerType[0].coding[0].display, "Performer") self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") self.assertEqual(inst.performerType[0].text, "Performer") self.assertEqual(inst.priority, "routine") - self.assertEqual(inst.reasonCode.text, "The Task.reason should only be included if there is no Task.focus or if it differs from the reason indicated on the focus") - self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-02T09:45:05+10:00").datetime) - self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-02T09:45:05+10:00") + self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-01T09:45:05+10:00").datetime) + self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-01T09:45:05+10:00") self.assertEqual(inst.restriction.repetitions, 1) - self.assertEqual(inst.status, "completed") + self.assertEqual(inst.status, "accepted") self.assertEqual(inst.text.status, "generated") def testTask8(self): - inst = self.instantiate_from("task-example5.json") + inst = self.instantiate_from("task-example-fm-release.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask8(inst) @@ -287,41 +299,28 @@ def testTask8(self): self.implTask8(inst2) def implTask8(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:25:05+10:00") - self.assertEqual(inst.businessStatus.text, "specimen received, test in progress") - self.assertEqual(inst.code.text, "Lipid Panel") - self.assertEqual(inst.description, "Create order for getting specimen, Set up inhouse testing, generate order for any sendouts and submit with specimen") - self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) - self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:25:05+10:00") - self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") - self.assertEqual(inst.groupIdentifier.use, "official") - self.assertEqual(inst.groupIdentifier.value, "G20170201-001") - self.assertEqual(inst.id, "example5") - self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") + self.assertEqual(inst.code.coding[0].code, "release") + self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") + self.assertEqual(inst.id, "fm-example3") + self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20170201-001") + self.assertEqual(inst.identifier[0].value, "20181012-001") + self.assertEqual(inst.input[0].type.coding[0].code, "origresponse") + self.assertEqual(inst.input[0].type.coding[0].system, "http://hl7.org/financial-taskinputtype") self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T16:45:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2016-10-31T16:45:05+10:00") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.output[0].type.text, "collected specimen") - self.assertEqual(inst.performerType[0].coding[0].code, "performer") - self.assertEqual(inst.performerType[0].coding[0].display, "Performer") - self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") - self.assertEqual(inst.performerType[0].text, "Performer") - self.assertEqual(inst.priority, "routine") - self.assertEqual(inst.reasonCode.text, "The Task.reason should only be included if there is no Task.focus or if it differs from the reason indicated on the focus") - self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-02T09:45:05+10:00").datetime) - self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-02T09:45:05+10:00") - self.assertEqual(inst.restriction.repetitions, 1) - self.assertEqual(inst.status, "in-progress") + self.assertEqual(inst.priority, "stat") + self.assertEqual(inst.status, "requested") self.assertEqual(inst.text.status, "generated") def testTask9(self): - inst = self.instantiate_from("task-example-fm-release.json") + inst = self.instantiate_from("task-example-fm-cancel.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask9(inst) @@ -333,14 +332,12 @@ def testTask9(self): def implTask9(self, inst): self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") - self.assertEqual(inst.code.coding[0].code, "release") + self.assertEqual(inst.code.coding[0].code, "cancel") self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") - self.assertEqual(inst.id, "fm-example3") + self.assertEqual(inst.id, "fm-example1") self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") self.assertEqual(inst.identifier[0].use, "official") self.assertEqual(inst.identifier[0].value, "20181012-001") - self.assertEqual(inst.input[0].type.coding[0].code, "origresponse") - self.assertEqual(inst.input[0].type.coding[0].system, "http://hl7.org/financial-taskinputtype") self.assertEqual(inst.intent, "order") self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") @@ -352,7 +349,7 @@ def implTask9(self, inst): self.assertEqual(inst.text.status, "generated") def testTask10(self): - inst = self.instantiate_from("task-example-fm-status.json") + inst = self.instantiate_from("task-example5.json") self.assertIsNotNone(inst, "Must have instantiated a Task instance") self.implTask10(inst) @@ -362,21 +359,36 @@ def testTask10(self): self.implTask10(inst2) def implTask10(self, inst): - self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) - self.assertEqual(inst.authoredOn.as_json(), "2018-10-04T08:25:05+10:00") - self.assertEqual(inst.code.coding[0].code, "status") - self.assertEqual(inst.code.coding[0].system, "http://terminology.hl7.org/CodeSystem/financialtaskcode") - self.assertEqual(inst.id, "fm-example5") - self.assertEqual(inst.identifier[0].system, "http:/happyvalley.com/task") + self.assertEqual(inst.authoredOn.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.authoredOn.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.businessStatus.text, "specimen received, test in progress") + self.assertEqual(inst.code.text, "Lipid Panel") + self.assertEqual(inst.description, "Create order for getting specimen, Set up inhouse testing, generate order for any sendouts and submit with specimen") + self.assertEqual(inst.executionPeriod.start.datetime, FHIRDateTime("2016-10-31T08:25:05+10:00").datetime) + self.assertEqual(inst.executionPeriod.start.as_json(), "2016-10-31T08:25:05+10:00") + self.assertEqual(inst.groupIdentifier.system, "http:/goodhealth.org/accession/identifiers") + self.assertEqual(inst.groupIdentifier.use, "official") + self.assertEqual(inst.groupIdentifier.value, "G20170201-001") + self.assertEqual(inst.id, "example5") + self.assertEqual(inst.identifier[0].system, "http:/goodhealth.org/identifiers") self.assertEqual(inst.identifier[0].use, "official") - self.assertEqual(inst.identifier[0].value, "20181012-001") + self.assertEqual(inst.identifier[0].value, "20170201-001") self.assertEqual(inst.intent, "order") - self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2018-10-04T08:25:05+10:00").datetime) - self.assertEqual(inst.lastModified.as_json(), "2018-10-04T08:25:05+10:00") + self.assertEqual(inst.lastModified.datetime, FHIRDateTime("2016-10-31T16:45:05+10:00").datetime) + self.assertEqual(inst.lastModified.as_json(), "2016-10-31T16:45:05+10:00") self.assertEqual(inst.meta.tag[0].code, "HTEST") self.assertEqual(inst.meta.tag[0].display, "test health data") self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.priority, "stat") - self.assertEqual(inst.status, "requested") + self.assertEqual(inst.output[0].type.text, "collected specimen") + self.assertEqual(inst.performerType[0].coding[0].code, "performer") + self.assertEqual(inst.performerType[0].coding[0].display, "Performer") + self.assertEqual(inst.performerType[0].coding[0].system, "http://terminology.hl7.org/CodeSystem/task-performer-type") + self.assertEqual(inst.performerType[0].text, "Performer") + self.assertEqual(inst.priority, "routine") + self.assertEqual(inst.reasonCode.text, "The Task.reason should only be included if there is no Task.focus or if it differs from the reason indicated on the focus") + self.assertEqual(inst.restriction.period.end.datetime, FHIRDateTime("2016-11-02T09:45:05+10:00").datetime) + self.assertEqual(inst.restriction.period.end.as_json(), "2016-11-02T09:45:05+10:00") + self.assertEqual(inst.restriction.repetitions, 1) + self.assertEqual(inst.status, "in-progress") self.assertEqual(inst.text.status, "generated") diff --git a/tests/models/testscript_test.py b/tests/models/testscript_test.py index 1f0f85d2..f39dd1b4 100644 --- a/tests/models/testscript_test.py +++ b/tests/models/testscript_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return testscript.TestScript(js) def testTestScript1(self): - inst = self.instantiate_from("testscript-example-search.json") + inst = self.instantiate_from("testscript-example-multisystem.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript1(inst) @@ -37,130 +37,118 @@ def implTestScript1(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") - self.assertEqual(inst.description, "TestScript example resource with simple Patient search test. The read tests will utilize user defined dynamic variables that will hold the Patient search parameter values.") + self.assertEqual(inst.destination[0].index, 1) + self.assertEqual(inst.destination[0].profile.code, "FHIR-Server") + self.assertEqual(inst.destination[1].index, 2) + self.assertEqual(inst.destination[1].profile.code, "FHIR-Server") self.assertTrue(inst.experimental) - self.assertFalse(inst.fixture[0].autocreate) - self.assertFalse(inst.fixture[0].autodelete) - self.assertEqual(inst.fixture[0].id, "fixture-patient-create") - self.assertEqual(inst.id, "testscript-example-search") + self.assertEqual(inst.id, "testscript-example-multisystem") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9881") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9878") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Search Operation") - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#search") + self.assertEqual(inst.metadata.capability[0].description, "Patient Read Operation") + self.assertEqual(inst.metadata.capability[0].destination, 1) + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#read") + self.assertEqual(inst.metadata.capability[0].origin[0], 1) self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) + self.assertEqual(inst.metadata.capability[1].capabilities, "CapabilityStatement/example") + self.assertEqual(inst.metadata.capability[1].description, "Patient Read Operation") + self.assertEqual(inst.metadata.capability[1].destination, 2) + self.assertEqual(inst.metadata.capability[1].link[0], "http://hl7.org/fhir/http.html#read") + self.assertEqual(inst.metadata.capability[1].origin[0], 1) + self.assertTrue(inst.metadata.capability[1].required) + self.assertFalse(inst.metadata.capability[1].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "TestScript Example Search") + self.assertEqual(inst.name, "testscript-example-multisystem") + self.assertEqual(inst.origin[0].index, 1) + self.assertEqual(inst.origin[0].profile.code, "FHIR-Client") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient Search Operation") - self.assertEqual(inst.setup.action[0].operation.accept, "xml") - self.assertEqual(inst.setup.action[0].operation.description, "Test simple search to verify server support.") - self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) - self.assertEqual(inst.setup.action[0].operation.params, "?family=DONTEXPECTAMATCH&given=DONTEXPECTAMATCH") - self.assertEqual(inst.setup.action[0].operation.resource, "Patient") - self.assertEqual(inst.setup.action[0].operation.type.code, "search") - self.assertEqual(inst.setup.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.setup.action[1].assert_fhir.description, "Confirm that the request url contains the family search parameter.") - self.assertEqual(inst.setup.action[1].assert_fhir.direction, "request") - self.assertEqual(inst.setup.action[1].assert_fhir.operator, "contains") - self.assertEqual(inst.setup.action[1].assert_fhir.requestURL, "family") - self.assertFalse(inst.setup.action[1].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[2].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.setup.action[2].assert_fhir.direction, "response") - self.assertEqual(inst.setup.action[2].assert_fhir.responseCode, "200") - self.assertFalse(inst.setup.action[2].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[3].assert_fhir.description, "Confirm that the returned resource type is Bundle.") - self.assertEqual(inst.setup.action[3].assert_fhir.resource, "Bundle") - self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[4].assert_fhir.description, "Confirm that the returned Bundle correctly defines the navigation links.") - self.assertTrue(inst.setup.action[4].assert_fhir.navigationLinks) - self.assertFalse(inst.setup.action[4].assert_fhir.warningOnly) + self.assertEqual(inst.purpose, "Patient Read Operation") self.assertEqual(inst.status, "draft") self.assertEqual(inst.test[0].action[0].operation.accept, "xml") self.assertEqual(inst.test[0].action[0].operation.contentType, "xml") - self.assertEqual(inst.test[0].action[0].operation.description, "Create a Patient resource and capture the returned HTTP Header Location.") + self.assertEqual(inst.test[0].action[0].operation.description, "Read a Patient from the first destination test system and perform basic validation.") + self.assertEqual(inst.test[0].action[0].operation.destination, 1) self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[0].action[0].operation.origin, 1) + self.assertEqual(inst.test[0].action[0].operation.params, "/${Dest1PatientResourceId}") + self.assertEqual(inst.test[0].action[0].operation.requestId, "request-read-patient-01") self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.responseId, "PatientCreateResponse") - self.assertEqual(inst.test[0].action[0].operation.sourceId, "fixture-patient-create") - self.assertEqual(inst.test[0].action[0].operation.type.code, "create") + self.assertEqual(inst.test[0].action[0].operation.type.code, "read") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 201(Created).") - self.assertEqual(inst.test[0].action[1].assert_fhir.response, "created") + self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the request method GET was sent by the client system under test.") + self.assertEqual(inst.test[0].action[1].assert_fhir.requestMethod, "get") self.assertFalse(inst.test[0].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned HTTP Header Location is present.") - self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "response") - self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Location") - self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "notEmpty") + self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the client requested an Accept of xml.") + self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "request") + self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Accept") + self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "contains") + self.assertEqual(inst.test[0].action[2].assert_fhir.value, "xml") self.assertFalse(inst.test[0].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[3].operation.accept, "xml") - self.assertEqual(inst.test[0].action[3].operation.description, "Read the created Patient using the captured Location URL value.") - self.assertTrue(inst.test[0].action[3].operation.encodeRequestUrl) - self.assertEqual(inst.test[0].action[3].operation.type.code, "read") - self.assertEqual(inst.test[0].action[3].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[0].action[3].operation.url, "${PatientCreateLocation}") - self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.test[0].action[4].assert_fhir.response, "okay") + self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.test[0].action[3].assert_fhir.direction, "response") + self.assertEqual(inst.test[0].action[3].assert_fhir.response, "okay") + self.assertFalse(inst.test[0].action[3].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[4].assert_fhir.contentType, "xml") + self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned format is XML.") + self.assertEqual(inst.test[0].action[4].assert_fhir.direction, "response") self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned resource type is Patient.") + self.assertEqual(inst.test[0].action[5].assert_fhir.direction, "response") self.assertEqual(inst.test[0].action[5].assert_fhir.resource, "Patient") self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Create a Patient resource and capture the returned HTTP Header Location. Then search for (read) that Patient using the Location URL value and validate the response.") - self.assertEqual(inst.test[0].id, "01-PatientCreateSearch") - self.assertEqual(inst.test[0].name, "Patient Create Search") + self.assertEqual(inst.test[0].description, "Read a Patient from the first destination test system using the user defined dynamic variable ${Dest1PatientResourceId}. Perform basic validation.") + self.assertEqual(inst.test[0].id, "01-ReadPatient-Destination1") + self.assertEqual(inst.test[0].name, "ReadPatient-Destination1") self.assertEqual(inst.test[1].action[0].operation.accept, "xml") - self.assertEqual(inst.test[1].action[0].operation.description, "Search for Patient resources on the destination test system.") + self.assertEqual(inst.test[1].action[0].operation.contentType, "xml") + self.assertEqual(inst.test[1].action[0].operation.description, "Read a Patient from the second destination test system and perform basic validation.") + self.assertEqual(inst.test[1].action[0].operation.destination, 2) self.assertTrue(inst.test[1].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[1].action[0].operation.params, "?family=${PatientSearchFamilyName}&given=${PatientSearchGivenName}") + self.assertEqual(inst.test[1].action[0].operation.origin, 1) + self.assertEqual(inst.test[1].action[0].operation.params, "/${Dest2PatientResourceId}") + self.assertEqual(inst.test[1].action[0].operation.requestHeader[0].field, "Accept-Charset") + self.assertEqual(inst.test[1].action[0].operation.requestHeader[0].value, "utf-8") self.assertEqual(inst.test[1].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[1].action[0].operation.type.code, "search") + self.assertEqual(inst.test[1].action[0].operation.type.code, "read") self.assertEqual(inst.test[1].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.test[1].action[1].assert_fhir.response, "okay") + self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the client requested an Accept of xml.") + self.assertEqual(inst.test[1].action[1].assert_fhir.direction, "request") + self.assertEqual(inst.test[1].action[1].assert_fhir.headerField, "Accept") + self.assertEqual(inst.test[1].action[1].assert_fhir.operator, "contains") + self.assertEqual(inst.test[1].action[1].assert_fhir.value, "xml") self.assertFalse(inst.test[1].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[2].assert_fhir.contentType, "xml") - self.assertEqual(inst.test[1].action[2].assert_fhir.description, "Confirm that the returned format is XML.") + self.assertEqual(inst.test[1].action[2].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.test[1].action[2].assert_fhir.direction, "response") + self.assertEqual(inst.test[1].action[2].assert_fhir.response, "okay") self.assertFalse(inst.test[1].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[3].assert_fhir.description, "Confirm that the returned resource type is Bundle.") - self.assertEqual(inst.test[1].action[3].assert_fhir.resource, "Bundle") + self.assertEqual(inst.test[1].action[3].assert_fhir.contentType, "xml") + self.assertEqual(inst.test[1].action[3].assert_fhir.description, "Confirm that the returned format is XML.") + self.assertEqual(inst.test[1].action[3].assert_fhir.direction, "response") self.assertFalse(inst.test[1].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[4].assert_fhir.description, "Confirm that the returned Bundle conforms to the base FHIR specification.") - self.assertEqual(inst.test[1].action[4].assert_fhir.validateProfileId, "bundle-profile") + self.assertEqual(inst.test[1].action[4].assert_fhir.description, "Confirm that the returned resource type is Patient.") + self.assertEqual(inst.test[1].action[4].assert_fhir.direction, "response") + self.assertEqual(inst.test[1].action[4].assert_fhir.resource, "Patient") self.assertFalse(inst.test[1].action[4].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[5].assert_fhir.description, "Confirm that the returned Bundle type equals 'searchset'.") - self.assertEqual(inst.test[1].action[5].assert_fhir.operator, "equals") - self.assertEqual(inst.test[1].action[5].assert_fhir.path, "fhir:Bundle/fhir:type/@value") - self.assertEqual(inst.test[1].action[5].assert_fhir.value, "searchset") - self.assertFalse(inst.test[1].action[5].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[6].assert_fhir.description, "Confirm that the returned Bundle total is greater than or equal to the number of returned entries.") - self.assertEqual(inst.test[1].action[6].assert_fhir.expression, "Bundle.total.toInteger() >= entry.count()") - self.assertFalse(inst.test[1].action[6].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].description, "Search for Patient resources using the user defined dynamic variables ${PatientSearchFamilyName} and ${PatientSearchGivenName} and validate response.") - self.assertEqual(inst.test[1].id, "02-PatientSearchDynamic") - self.assertEqual(inst.test[1].name, "Patient Search Dynamic") + self.assertEqual(inst.test[1].description, "Read a Patient from the second destination test system using the user defined dynamic variable ${Dest2PatientResourceId}. Perform basic validation.") + self.assertEqual(inst.test[1].id, "02-ReadPatient-Destination2") + self.assertEqual(inst.test[1].name, "ReadPatient-Destination2") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-search") - self.assertEqual(inst.variable[0].headerField, "Location") - self.assertEqual(inst.variable[0].name, "PatientCreateLocation") - self.assertEqual(inst.variable[0].sourceId, "PatientCreateResponse") - self.assertEqual(inst.variable[1].description, "Enter patient search criteria for a known family name on the target system") - self.assertEqual(inst.variable[1].hint, "[Family name]") - self.assertEqual(inst.variable[1].name, "PatientSearchFamilyName") - self.assertEqual(inst.variable[2].description, "Enter patient search criteria for a known given name on the target system") - self.assertEqual(inst.variable[2].hint, "[Given name]") - self.assertEqual(inst.variable[2].name, "PatientSearchGivenName") - self.assertEqual(inst.variable[3].description, "Evaluate the returned Patient searchset Bundle.total value") - self.assertEqual(inst.variable[3].expression, "Bundle.total.toInteger()") - self.assertEqual(inst.variable[3].name, "PatientSearchBundleTotal") + self.assertEqual(inst.title, "Multisystem Test Script") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-multisystem") + self.assertEqual(inst.variable[0].defaultValue, "example") + self.assertEqual(inst.variable[0].name, "Dest1PatientResourceId") + self.assertEqual(inst.variable[1].defaultValue, "example") + self.assertEqual(inst.variable[1].name, "Dest2PatientResourceId") self.assertEqual(inst.version, "1.0") def testTestScript2(self): - inst = self.instantiate_from("testscript-example.json") + inst = self.instantiate_from("testscript-example-history.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript2(inst) @@ -177,32 +165,31 @@ def implTestScript2(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") - self.assertEqual(inst.description, "TestScript example resource with setup to delete if present and create a new instance of a Patient; and single test definition to read the created Patient with various asserts.") self.assertTrue(inst.experimental) self.assertFalse(inst.fixture[0].autocreate) self.assertFalse(inst.fixture[0].autodelete) self.assertEqual(inst.fixture[0].id, "fixture-patient-create") self.assertFalse(inst.fixture[1].autocreate) self.assertFalse(inst.fixture[1].autodelete) - self.assertEqual(inst.fixture[1].id, "fixture-patient-minimum") - self.assertEqual(inst.id, "testscript-example") + self.assertEqual(inst.fixture[1].id, "fixture-patient-update") + self.assertEqual(inst.id, "testscript-example-history") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9876") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9877") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Update, Read and Delete Operations") - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#delete") - self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#read") - self.assertEqual(inst.metadata.capability[0].link[2], "http://hl7.org/fhir/http.html#update") + self.assertEqual(inst.metadata.capability[0].description, "Patient Update, Delete and History (Instance) Operations") + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#update") + self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#delete") + self.assertEqual(inst.metadata.capability[0].link[2], "http://hl7.org/fhir/http.html#history") self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "TestScript Example") + self.assertEqual(inst.name, "TestScript Example History") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient Conditional Create (Update), Read and Delete Operations") + self.assertEqual(inst.purpose, "Patient (Conditional) Create, Update, Delete and History (Instance) Operations") self.assertEqual(inst.setup.action[0].operation.accept, "json") self.assertEqual(inst.setup.action[0].operation.description, "Execute a delete operation to insure the patient does not exist on the server.") self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) @@ -230,92 +217,56 @@ def implTestScript2(self, inst): self.assertEqual(inst.setup.action[3].assert_fhir.direction, "response") self.assertEqual(inst.setup.action[3].assert_fhir.responseCode, "201") self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[4].operation.description, "Read the created patient resource on the test server using the id from fixture-patient-create. Verify contents.") + self.assertEqual(inst.setup.action[4].operation.accept, "json") + self.assertEqual(inst.setup.action[4].operation.contentType, "json") + self.assertEqual(inst.setup.action[4].operation.description, "Update patient resource on test server using the contents of fixture-patient-update") self.assertTrue(inst.setup.action[4].operation.encodeRequestUrl) + self.assertEqual(inst.setup.action[4].operation.label, "SetupUpdatePatient") + self.assertEqual(inst.setup.action[4].operation.params, "/${createResourceId}") self.assertEqual(inst.setup.action[4].operation.resource, "Patient") - self.assertEqual(inst.setup.action[4].operation.targetId, "fixture-patient-create") - self.assertEqual(inst.setup.action[4].operation.type.code, "read") + self.assertEqual(inst.setup.action[4].operation.sourceId, "fixture-patient-update") + self.assertEqual(inst.setup.action[4].operation.type.code, "update") self.assertEqual(inst.setup.action[4].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") self.assertEqual(inst.setup.action[5].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") self.assertEqual(inst.setup.action[5].assert_fhir.direction, "response") - self.assertEqual(inst.setup.action[5].assert_fhir.response, "okay") + self.assertEqual(inst.setup.action[5].assert_fhir.responseCode, "200") self.assertFalse(inst.setup.action[5].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[6].assert_fhir.compareToSourceExpression, "Patient.name.first().family") - self.assertEqual(inst.setup.action[6].assert_fhir.compareToSourceId, "fixture-patient-create") - self.assertEqual(inst.setup.action[6].assert_fhir.description, "Confirm that the returned Patient contains the expected family name 'Chalmers'. Uses explicit compareToSourceId reference to fixture-patient-create used to create the Patient.") - self.assertEqual(inst.setup.action[6].assert_fhir.operator, "equals") - self.assertFalse(inst.setup.action[6].assert_fhir.warningOnly) self.assertEqual(inst.status, "draft") - self.assertEqual(inst.teardown.action[0].operation.description, "Delete the patient resource on the test server using the id from fixture-patient-create.") - self.assertTrue(inst.teardown.action[0].operation.encodeRequestUrl) - self.assertEqual(inst.teardown.action[0].operation.resource, "Patient") - self.assertEqual(inst.teardown.action[0].operation.targetId, "fixture-patient-create") - self.assertEqual(inst.teardown.action[0].operation.type.code, "delete") - self.assertEqual(inst.teardown.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[0].action[0].operation.description, "Read the patient resource on the test server using the id from fixture-patient-create. Prevent URL encoding of the request.") - self.assertFalse(inst.test[0].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[0].action[0].operation.accept, "json") + self.assertEqual(inst.test[0].action[0].operation.contentType, "json") + self.assertEqual(inst.test[0].action[0].operation.description, "Get the Patient history on the test server using the id from fixture-patient-create.") + self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.responseId, "fixture-patient-read") self.assertEqual(inst.test[0].action[0].operation.targetId, "fixture-patient-create") - self.assertEqual(inst.test[0].action[0].operation.type.code, "read") + self.assertEqual(inst.test[0].action[0].operation.type.code, "history") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") self.assertEqual(inst.test[0].action[1].assert_fhir.direction, "response") - self.assertEqual(inst.test[0].action[1].assert_fhir.label, "01-ReadPatientOK") self.assertEqual(inst.test[0].action[1].assert_fhir.response, "okay") self.assertFalse(inst.test[0].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned HTTP Header Last-Modified is present. Warning only as the server might not support versioning.") - self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "response") - self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Last-Modified") - self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "notEmpty") - self.assertTrue(inst.test[0].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned resource type is Patient.") - self.assertEqual(inst.test[0].action[3].assert_fhir.resource, "Patient") + self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned resource type is Bundle.") + self.assertEqual(inst.test[0].action[2].assert_fhir.resource, "Bundle") + self.assertFalse(inst.test[0].action[2].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned Bundle conforms to the base FHIR specification.") + self.assertEqual(inst.test[0].action[3].assert_fhir.validateProfileId, "bundle-profile") self.assertFalse(inst.test[0].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned Patient conforms to the base FHIR specification.") - self.assertEqual(inst.test[0].action[4].assert_fhir.validateProfileId, "patient-profile") + self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned Bundle type equals 'history'.") + self.assertEqual(inst.test[0].action[4].assert_fhir.operator, "equals") + self.assertEqual(inst.test[0].action[4].assert_fhir.path, "fhir:Bundle/fhir:type/@value") + self.assertEqual(inst.test[0].action[4].assert_fhir.value, "history") self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned Patient contains the expected family name 'Chalmers'. Uses explicit sourceId reference to read responseId fixture.") - self.assertEqual(inst.test[0].action[5].assert_fhir.operator, "equals") - self.assertEqual(inst.test[0].action[5].assert_fhir.path, "fhir:Patient/fhir:name/fhir:family/@value") - self.assertEqual(inst.test[0].action[5].assert_fhir.sourceId, "fixture-patient-read") - self.assertEqual(inst.test[0].action[5].assert_fhir.value, "Chalmers") - self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[6].assert_fhir.description, "Confirm that the returned Patient contains the expected given name 'Peter'. Uses explicit sourceId reference to read responseId fixture.") - self.assertEqual(inst.test[0].action[6].assert_fhir.operator, "equals") - self.assertEqual(inst.test[0].action[6].assert_fhir.path, "fhir:Patient/fhir:name/fhir:given/@value") - self.assertEqual(inst.test[0].action[6].assert_fhir.sourceId, "fixture-patient-read") - self.assertEqual(inst.test[0].action[6].assert_fhir.value, "Peter") - self.assertFalse(inst.test[0].action[6].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[7].assert_fhir.compareToSourceId, "fixture-patient-create") - self.assertEqual(inst.test[0].action[7].assert_fhir.compareToSourcePath, "fhir:Patient/fhir:name/fhir:family/@value") - self.assertEqual(inst.test[0].action[7].assert_fhir.operator, "equals") - self.assertEqual(inst.test[0].action[7].assert_fhir.path, "fhir:Patient/fhir:name/fhir:family/@value") - self.assertFalse(inst.test[0].action[7].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[8].assert_fhir.compareToSourceId, "fixture-patient-create") - self.assertEqual(inst.test[0].action[8].assert_fhir.compareToSourcePath, "fhir:Patient/fhir:name/fhir:given/@value") - self.assertEqual(inst.test[0].action[8].assert_fhir.path, "fhir:Patient/fhir:name/fhir:given/@value") - self.assertEqual(inst.test[0].action[8].assert_fhir.sourceId, "fixture-patient-read") - self.assertFalse(inst.test[0].action[8].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[9].assert_fhir.description, "Confirm that the returned resource contains the expected retained elements and values. Warning only to provide users with reviewable results.") - self.assertEqual(inst.test[0].action[9].assert_fhir.minimumId, "fixture-patient-minimum") - self.assertTrue(inst.test[0].action[9].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Read a Patient and validate response.") - self.assertEqual(inst.test[0].id, "01-ReadPatient") - self.assertEqual(inst.test[0].name, "Read Patient") + self.assertEqual(inst.test[0].description, "Get the history for a known Patient and validate response.") + self.assertEqual(inst.test[0].id, "01-HistoryPatient") + self.assertEqual(inst.test[0].name, "History Patient") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example") - self.assertEqual(inst.useContext[0].code.code, "focus") - self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "positive") - self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://terminology.hl7.org/CodeSystem/variant-state") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-history") self.assertEqual(inst.variable[0].name, "createResourceId") self.assertEqual(inst.variable[0].path, "Patient/id") self.assertEqual(inst.variable[0].sourceId, "fixture-patient-create") self.assertEqual(inst.version, "1.0") def testTestScript3(self): - inst = self.instantiate_from("testscript-example-readtest.json") + inst = self.instantiate_from("testscript-example-update.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript3(inst) @@ -332,31 +283,68 @@ def implTestScript3(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") - self.assertEqual(inst.description, "TestScript example resource with ported Sprinkler basic read tests R001, R002, R003, R004. The read tests will utilize user defined dynamic variables that will hold the Patient resource id values.") + self.assertEqual(inst.description, "TestScript example resource with setup to delete if present and create a new instance of a Patient; and single test definition to update that Patient with various asserts.") self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "testscript-example-readtest") + self.assertFalse(inst.fixture[0].autocreate) + self.assertFalse(inst.fixture[0].autodelete) + self.assertEqual(inst.fixture[0].id, "fixture-patient-create") + self.assertFalse(inst.fixture[1].autocreate) + self.assertFalse(inst.fixture[1].autodelete) + self.assertEqual(inst.fixture[1].id, "fixture-patient-update") + self.assertEqual(inst.id, "testscript-example-update") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9879") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9882") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Read Operation") - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#read") + self.assertEqual(inst.metadata.capability[0].description, "Patient Update and Delete Operations") + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#update") + self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#delete") self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "TestScript Example Read Test") + self.assertEqual(inst.name, "TestScript Example Update") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient Read Operation") + self.assertEqual(inst.purpose, "Patient (Conditional) Create, Update, Delete Operations") + self.assertEqual(inst.setup.action[0].operation.accept, "xml") + self.assertEqual(inst.setup.action[0].operation.description, "Execute a delete operation to insure the patient does not exist on the server.") + self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) + self.assertEqual(inst.setup.action[0].operation.label, "SetupDeletePatient") + self.assertEqual(inst.setup.action[0].operation.params, "/${createResourceId}") + self.assertEqual(inst.setup.action[0].operation.resource, "Patient") + self.assertEqual(inst.setup.action[0].operation.type.code, "delete") + self.assertEqual(inst.setup.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.setup.action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK) or 204(No Content).") + self.assertEqual(inst.setup.action[1].assert_fhir.direction, "response") + self.assertEqual(inst.setup.action[1].assert_fhir.operator, "in") + self.assertEqual(inst.setup.action[1].assert_fhir.responseCode, "200,204") + self.assertFalse(inst.setup.action[1].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[2].operation.accept, "xml") + self.assertEqual(inst.setup.action[2].operation.contentType, "xml") + self.assertEqual(inst.setup.action[2].operation.description, "Create patient resource on test server using the contents of fixture-patient-create") + self.assertTrue(inst.setup.action[2].operation.encodeRequestUrl) + self.assertEqual(inst.setup.action[2].operation.label, "SetupCreatePatient") + self.assertEqual(inst.setup.action[2].operation.params, "/${createResourceId}") + self.assertEqual(inst.setup.action[2].operation.resource, "Patient") + self.assertEqual(inst.setup.action[2].operation.sourceId, "fixture-patient-create") + self.assertEqual(inst.setup.action[2].operation.type.code, "update") + self.assertEqual(inst.setup.action[2].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.setup.action[3].assert_fhir.description, "Confirm that the returned HTTP status is 201(Created).") + self.assertEqual(inst.setup.action[3].assert_fhir.direction, "response") + self.assertEqual(inst.setup.action[3].assert_fhir.responseCode, "201") + self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) self.assertEqual(inst.status, "draft") self.assertEqual(inst.test[0].action[0].operation.accept, "xml") - self.assertEqual(inst.test[0].action[0].operation.description, "Read the known Patient resource on the destination test system using the user defined dynamic variable ${KnownPatientResourceId}.") + self.assertEqual(inst.test[0].action[0].operation.contentType, "xml") + self.assertEqual(inst.test[0].action[0].operation.description, "Update patient resource on test server using the contents of fixture-patient-update") self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[0].action[0].operation.params, "/${KnownPatientResourceId}") + self.assertEqual(inst.test[0].action[0].operation.label, "SetupUpdatePatient") + self.assertEqual(inst.test[0].action[0].operation.params, "/${createResourceId}") self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.type.code, "read") + self.assertEqual(inst.test[0].action[0].operation.sourceId, "fixture-patient-update") + self.assertEqual(inst.test[0].action[0].operation.type.code, "update") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") self.assertEqual(inst.test[0].action[1].assert_fhir.response, "okay") @@ -368,63 +356,18 @@ def implTestScript3(self, inst): self.assertEqual(inst.test[0].action[3].assert_fhir.headerField, "Last-Modified") self.assertEqual(inst.test[0].action[3].assert_fhir.operator, "notEmpty") self.assertTrue(inst.test[0].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned resource type is Patient.") - self.assertEqual(inst.test[0].action[4].assert_fhir.resource, "Patient") - self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned Patient conforms to the base FHIR specification.") - self.assertEqual(inst.test[0].action[5].assert_fhir.validateProfileId, "patient-profile") - self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Read a known Patient and validate response.") - self.assertEqual(inst.test[0].id, "R001") - self.assertEqual(inst.test[0].name, "Sprinkler Read Test R001") - self.assertEqual(inst.test[1].action[0].operation.accept, "xml") - self.assertTrue(inst.test[1].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[1].action[0].operation.params, "/1") - self.assertEqual(inst.test[1].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[1].action[0].operation.type.code, "read") - self.assertEqual(inst.test[1].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 404(Not Found).") - self.assertEqual(inst.test[1].action[1].assert_fhir.response, "notFound") - self.assertFalse(inst.test[1].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].description, "Read an unknown Resource Type and validate response.") - self.assertEqual(inst.test[1].id, "R002") - self.assertEqual(inst.test[1].name, "Sprinkler Read Test R002") - self.assertEqual(inst.test[2].action[0].operation.accept, "xml") - self.assertEqual(inst.test[2].action[0].operation.description, "Attempt to read the non-existing Patient resource on the destination test system using the user defined dynamic variable ${NonExistsPatientResourceId}.") - self.assertTrue(inst.test[2].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[2].action[0].operation.params, "/${NonExistsPatientResourceId}") - self.assertEqual(inst.test[2].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[2].action[0].operation.type.code, "read") - self.assertEqual(inst.test[2].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[2].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 404(Not Found).") - self.assertEqual(inst.test[2].action[1].assert_fhir.response, "notFound") - self.assertFalse(inst.test[2].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[2].description, "Read a known, non-existing Patient and validate response.") - self.assertEqual(inst.test[2].id, "R003") - self.assertEqual(inst.test[2].name, "Sprinkler Read Test R003") - self.assertEqual(inst.test[3].action[0].operation.accept, "xml") - self.assertEqual(inst.test[3].action[0].operation.description, "Attempt to read a Patient resource on the destination test system using known bad formatted resource id.") - self.assertTrue(inst.test[3].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[3].action[0].operation.params, "/ID-may-not-contain-CAPITALS") - self.assertEqual(inst.test[3].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[3].action[0].operation.type.code, "read") - self.assertEqual(inst.test[3].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[3].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 400(Bad Request).") - self.assertEqual(inst.test[3].action[1].assert_fhir.response, "bad") - self.assertFalse(inst.test[3].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[3].description, "Read a Patient using a known bad formatted resource id and validate response.") - self.assertEqual(inst.test[3].id, "R004") - self.assertEqual(inst.test[3].name, "Sprinkler Read Test R004") + self.assertEqual(inst.test[0].description, "Update a Patient and validate response.") + self.assertEqual(inst.test[0].id, "01-UpdatePatient") + self.assertEqual(inst.test[0].name, "Update Patient") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-readtest") - self.assertEqual(inst.variable[0].defaultValue, "example") - self.assertEqual(inst.variable[0].name, "KnownPatientResourceId") - self.assertEqual(inst.variable[1].defaultValue, "does-not-exist") - self.assertEqual(inst.variable[1].name, "NonExistsPatientResourceId") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-update") + self.assertEqual(inst.variable[0].name, "createResourceId") + self.assertEqual(inst.variable[0].path, "Patient/id") + self.assertEqual(inst.variable[0].sourceId, "fixture-patient-create") self.assertEqual(inst.version, "1.0") def testTestScript4(self): - inst = self.instantiate_from("testscript-example-multisystem.json") + inst = self.instantiate_from("testscript-example-search.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript4(inst) @@ -441,118 +384,130 @@ def implTestScript4(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") - self.assertEqual(inst.destination[0].index, 1) - self.assertEqual(inst.destination[0].profile.code, "FHIR-Server") - self.assertEqual(inst.destination[1].index, 2) - self.assertEqual(inst.destination[1].profile.code, "FHIR-Server") + self.assertEqual(inst.description, "TestScript example resource with simple Patient search test. The read tests will utilize user defined dynamic variables that will hold the Patient search parameter values.") self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "testscript-example-multisystem") + self.assertFalse(inst.fixture[0].autocreate) + self.assertFalse(inst.fixture[0].autodelete) + self.assertEqual(inst.fixture[0].id, "fixture-patient-create") + self.assertEqual(inst.id, "testscript-example-search") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9878") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9881") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Read Operation") - self.assertEqual(inst.metadata.capability[0].destination, 1) - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#read") - self.assertEqual(inst.metadata.capability[0].origin[0], 1) + self.assertEqual(inst.metadata.capability[0].description, "Patient Search Operation") + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#search") self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) - self.assertEqual(inst.metadata.capability[1].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[1].description, "Patient Read Operation") - self.assertEqual(inst.metadata.capability[1].destination, 2) - self.assertEqual(inst.metadata.capability[1].link[0], "http://hl7.org/fhir/http.html#read") - self.assertEqual(inst.metadata.capability[1].origin[0], 1) - self.assertTrue(inst.metadata.capability[1].required) - self.assertFalse(inst.metadata.capability[1].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "testscript-example-multisystem") - self.assertEqual(inst.origin[0].index, 1) - self.assertEqual(inst.origin[0].profile.code, "FHIR-Client") + self.assertEqual(inst.name, "TestScript Example Search") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient Read Operation") + self.assertEqual(inst.purpose, "Patient Search Operation") + self.assertEqual(inst.setup.action[0].operation.accept, "xml") + self.assertEqual(inst.setup.action[0].operation.description, "Test simple search to verify server support.") + self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) + self.assertEqual(inst.setup.action[0].operation.params, "?family=DONTEXPECTAMATCH&given=DONTEXPECTAMATCH") + self.assertEqual(inst.setup.action[0].operation.resource, "Patient") + self.assertEqual(inst.setup.action[0].operation.type.code, "search") + self.assertEqual(inst.setup.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.setup.action[1].assert_fhir.description, "Confirm that the request url contains the family search parameter.") + self.assertEqual(inst.setup.action[1].assert_fhir.direction, "request") + self.assertEqual(inst.setup.action[1].assert_fhir.operator, "contains") + self.assertEqual(inst.setup.action[1].assert_fhir.requestURL, "family") + self.assertFalse(inst.setup.action[1].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[2].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.setup.action[2].assert_fhir.direction, "response") + self.assertEqual(inst.setup.action[2].assert_fhir.responseCode, "200") + self.assertFalse(inst.setup.action[2].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[3].assert_fhir.description, "Confirm that the returned resource type is Bundle.") + self.assertEqual(inst.setup.action[3].assert_fhir.resource, "Bundle") + self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[4].assert_fhir.description, "Confirm that the returned Bundle correctly defines the navigation links.") + self.assertTrue(inst.setup.action[4].assert_fhir.navigationLinks) + self.assertFalse(inst.setup.action[4].assert_fhir.warningOnly) self.assertEqual(inst.status, "draft") self.assertEqual(inst.test[0].action[0].operation.accept, "xml") self.assertEqual(inst.test[0].action[0].operation.contentType, "xml") - self.assertEqual(inst.test[0].action[0].operation.description, "Read a Patient from the first destination test system and perform basic validation.") - self.assertEqual(inst.test[0].action[0].operation.destination, 1) + self.assertEqual(inst.test[0].action[0].operation.description, "Create a Patient resource and capture the returned HTTP Header Location.") self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[0].action[0].operation.origin, 1) - self.assertEqual(inst.test[0].action[0].operation.params, "/${Dest1PatientResourceId}") - self.assertEqual(inst.test[0].action[0].operation.requestId, "request-read-patient-01") self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.type.code, "read") + self.assertEqual(inst.test[0].action[0].operation.responseId, "PatientCreateResponse") + self.assertEqual(inst.test[0].action[0].operation.sourceId, "fixture-patient-create") + self.assertEqual(inst.test[0].action[0].operation.type.code, "create") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the request method GET was sent by the client system under test.") - self.assertEqual(inst.test[0].action[1].assert_fhir.requestMethod, "get") + self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 201(Created).") + self.assertEqual(inst.test[0].action[1].assert_fhir.response, "created") self.assertFalse(inst.test[0].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the client requested an Accept of xml.") - self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "request") - self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Accept") - self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "contains") - self.assertEqual(inst.test[0].action[2].assert_fhir.value, "xml") + self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned HTTP Header Location is present.") + self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "response") + self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Location") + self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "notEmpty") self.assertFalse(inst.test[0].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.test[0].action[3].assert_fhir.direction, "response") - self.assertEqual(inst.test[0].action[3].assert_fhir.response, "okay") - self.assertFalse(inst.test[0].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[4].assert_fhir.contentType, "xml") - self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned format is XML.") - self.assertEqual(inst.test[0].action[4].assert_fhir.direction, "response") + self.assertEqual(inst.test[0].action[3].operation.accept, "xml") + self.assertEqual(inst.test[0].action[3].operation.description, "Read the created Patient using the captured Location URL value.") + self.assertTrue(inst.test[0].action[3].operation.encodeRequestUrl) + self.assertEqual(inst.test[0].action[3].operation.type.code, "read") + self.assertEqual(inst.test[0].action[3].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.test[0].action[3].operation.url, "${PatientCreateLocation}") + self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.test[0].action[4].assert_fhir.response, "okay") self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned resource type is Patient.") - self.assertEqual(inst.test[0].action[5].assert_fhir.direction, "response") self.assertEqual(inst.test[0].action[5].assert_fhir.resource, "Patient") self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Read a Patient from the first destination test system using the user defined dynamic variable ${Dest1PatientResourceId}. Perform basic validation.") - self.assertEqual(inst.test[0].id, "01-ReadPatient-Destination1") - self.assertEqual(inst.test[0].name, "ReadPatient-Destination1") + self.assertEqual(inst.test[0].description, "Create a Patient resource and capture the returned HTTP Header Location. Then search for (read) that Patient using the Location URL value and validate the response.") + self.assertEqual(inst.test[0].id, "01-PatientCreateSearch") + self.assertEqual(inst.test[0].name, "Patient Create Search") self.assertEqual(inst.test[1].action[0].operation.accept, "xml") - self.assertEqual(inst.test[1].action[0].operation.contentType, "xml") - self.assertEqual(inst.test[1].action[0].operation.description, "Read a Patient from the second destination test system and perform basic validation.") - self.assertEqual(inst.test[1].action[0].operation.destination, 2) + self.assertEqual(inst.test[1].action[0].operation.description, "Search for Patient resources on the destination test system.") self.assertTrue(inst.test[1].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[1].action[0].operation.origin, 1) - self.assertEqual(inst.test[1].action[0].operation.params, "/${Dest2PatientResourceId}") - self.assertEqual(inst.test[1].action[0].operation.requestHeader[0].field, "Accept-Charset") - self.assertEqual(inst.test[1].action[0].operation.requestHeader[0].value, "utf-8") + self.assertEqual(inst.test[1].action[0].operation.params, "?family=${PatientSearchFamilyName}&given=${PatientSearchGivenName}") self.assertEqual(inst.test[1].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[1].action[0].operation.type.code, "read") + self.assertEqual(inst.test[1].action[0].operation.type.code, "search") self.assertEqual(inst.test[1].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the client requested an Accept of xml.") - self.assertEqual(inst.test[1].action[1].assert_fhir.direction, "request") - self.assertEqual(inst.test[1].action[1].assert_fhir.headerField, "Accept") - self.assertEqual(inst.test[1].action[1].assert_fhir.operator, "contains") - self.assertEqual(inst.test[1].action[1].assert_fhir.value, "xml") + self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.test[1].action[1].assert_fhir.response, "okay") self.assertFalse(inst.test[1].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[2].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.test[1].action[2].assert_fhir.direction, "response") - self.assertEqual(inst.test[1].action[2].assert_fhir.response, "okay") + self.assertEqual(inst.test[1].action[2].assert_fhir.contentType, "xml") + self.assertEqual(inst.test[1].action[2].assert_fhir.description, "Confirm that the returned format is XML.") self.assertFalse(inst.test[1].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[3].assert_fhir.contentType, "xml") - self.assertEqual(inst.test[1].action[3].assert_fhir.description, "Confirm that the returned format is XML.") - self.assertEqual(inst.test[1].action[3].assert_fhir.direction, "response") + self.assertEqual(inst.test[1].action[3].assert_fhir.description, "Confirm that the returned resource type is Bundle.") + self.assertEqual(inst.test[1].action[3].assert_fhir.resource, "Bundle") self.assertFalse(inst.test[1].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].action[4].assert_fhir.description, "Confirm that the returned resource type is Patient.") - self.assertEqual(inst.test[1].action[4].assert_fhir.direction, "response") - self.assertEqual(inst.test[1].action[4].assert_fhir.resource, "Patient") + self.assertEqual(inst.test[1].action[4].assert_fhir.description, "Confirm that the returned Bundle conforms to the base FHIR specification.") + self.assertEqual(inst.test[1].action[4].assert_fhir.validateProfileId, "bundle-profile") self.assertFalse(inst.test[1].action[4].assert_fhir.warningOnly) - self.assertEqual(inst.test[1].description, "Read a Patient from the second destination test system using the user defined dynamic variable ${Dest2PatientResourceId}. Perform basic validation.") - self.assertEqual(inst.test[1].id, "02-ReadPatient-Destination2") - self.assertEqual(inst.test[1].name, "ReadPatient-Destination2") + self.assertEqual(inst.test[1].action[5].assert_fhir.description, "Confirm that the returned Bundle type equals 'searchset'.") + self.assertEqual(inst.test[1].action[5].assert_fhir.operator, "equals") + self.assertEqual(inst.test[1].action[5].assert_fhir.path, "fhir:Bundle/fhir:type/@value") + self.assertEqual(inst.test[1].action[5].assert_fhir.value, "searchset") + self.assertFalse(inst.test[1].action[5].assert_fhir.warningOnly) + self.assertEqual(inst.test[1].action[6].assert_fhir.description, "Confirm that the returned Bundle total is greater than or equal to the number of returned entries.") + self.assertEqual(inst.test[1].action[6].assert_fhir.expression, "Bundle.total.toInteger() >= entry.count()") + self.assertFalse(inst.test[1].action[6].assert_fhir.warningOnly) + self.assertEqual(inst.test[1].description, "Search for Patient resources using the user defined dynamic variables ${PatientSearchFamilyName} and ${PatientSearchGivenName} and validate response.") + self.assertEqual(inst.test[1].id, "02-PatientSearchDynamic") + self.assertEqual(inst.test[1].name, "Patient Search Dynamic") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Multisystem Test Script") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-multisystem") - self.assertEqual(inst.variable[0].defaultValue, "example") - self.assertEqual(inst.variable[0].name, "Dest1PatientResourceId") - self.assertEqual(inst.variable[1].defaultValue, "example") - self.assertEqual(inst.variable[1].name, "Dest2PatientResourceId") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-search") + self.assertEqual(inst.variable[0].headerField, "Location") + self.assertEqual(inst.variable[0].name, "PatientCreateLocation") + self.assertEqual(inst.variable[0].sourceId, "PatientCreateResponse") + self.assertEqual(inst.variable[1].description, "Enter patient search criteria for a known family name on the target system") + self.assertEqual(inst.variable[1].hint, "[Family name]") + self.assertEqual(inst.variable[1].name, "PatientSearchFamilyName") + self.assertEqual(inst.variable[2].description, "Enter patient search criteria for a known given name on the target system") + self.assertEqual(inst.variable[2].hint, "[Given name]") + self.assertEqual(inst.variable[2].name, "PatientSearchGivenName") + self.assertEqual(inst.variable[3].description, "Evaluate the returned Patient searchset Bundle.total value") + self.assertEqual(inst.variable[3].expression, "Bundle.total.toInteger()") + self.assertEqual(inst.variable[3].name, "PatientSearchBundleTotal") self.assertEqual(inst.version, "1.0") def testTestScript5(self): - inst = self.instantiate_from("testscript-example-update.json") + inst = self.instantiate_from("testscript-example.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript5(inst) @@ -569,32 +524,33 @@ def implTestScript5(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") - self.assertEqual(inst.description, "TestScript example resource with setup to delete if present and create a new instance of a Patient; and single test definition to update that Patient with various asserts.") + self.assertEqual(inst.description, "TestScript example resource with setup to delete if present and create a new instance of a Patient; and single test definition to read the created Patient with various asserts.") self.assertTrue(inst.experimental) self.assertFalse(inst.fixture[0].autocreate) self.assertFalse(inst.fixture[0].autodelete) self.assertEqual(inst.fixture[0].id, "fixture-patient-create") self.assertFalse(inst.fixture[1].autocreate) self.assertFalse(inst.fixture[1].autodelete) - self.assertEqual(inst.fixture[1].id, "fixture-patient-update") - self.assertEqual(inst.id, "testscript-example-update") + self.assertEqual(inst.fixture[1].id, "fixture-patient-minimum") + self.assertEqual(inst.id, "testscript-example") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9882") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9876") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Update and Delete Operations") - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#update") - self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#delete") + self.assertEqual(inst.metadata.capability[0].description, "Patient Update, Read and Delete Operations") + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#delete") + self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#read") + self.assertEqual(inst.metadata.capability[0].link[2], "http://hl7.org/fhir/http.html#update") self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "TestScript Example Update") + self.assertEqual(inst.name, "TestScript Example") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient (Conditional) Create, Update, Delete Operations") - self.assertEqual(inst.setup.action[0].operation.accept, "xml") + self.assertEqual(inst.purpose, "Patient Conditional Create (Update), Read and Delete Operations") + self.assertEqual(inst.setup.action[0].operation.accept, "json") self.assertEqual(inst.setup.action[0].operation.description, "Execute a delete operation to insure the patient does not exist on the server.") self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) self.assertEqual(inst.setup.action[0].operation.label, "SetupDeletePatient") @@ -607,8 +563,8 @@ def implTestScript5(self, inst): self.assertEqual(inst.setup.action[1].assert_fhir.operator, "in") self.assertEqual(inst.setup.action[1].assert_fhir.responseCode, "200,204") self.assertFalse(inst.setup.action[1].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[2].operation.accept, "xml") - self.assertEqual(inst.setup.action[2].operation.contentType, "xml") + self.assertEqual(inst.setup.action[2].operation.accept, "json") + self.assertEqual(inst.setup.action[2].operation.contentType, "json") self.assertEqual(inst.setup.action[2].operation.description, "Create patient resource on test server using the contents of fixture-patient-create") self.assertTrue(inst.setup.action[2].operation.encodeRequestUrl) self.assertEqual(inst.setup.action[2].operation.label, "SetupCreatePatient") @@ -621,39 +577,92 @@ def implTestScript5(self, inst): self.assertEqual(inst.setup.action[3].assert_fhir.direction, "response") self.assertEqual(inst.setup.action[3].assert_fhir.responseCode, "201") self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[4].operation.description, "Read the created patient resource on the test server using the id from fixture-patient-create. Verify contents.") + self.assertTrue(inst.setup.action[4].operation.encodeRequestUrl) + self.assertEqual(inst.setup.action[4].operation.resource, "Patient") + self.assertEqual(inst.setup.action[4].operation.targetId, "fixture-patient-create") + self.assertEqual(inst.setup.action[4].operation.type.code, "read") + self.assertEqual(inst.setup.action[4].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.setup.action[5].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.setup.action[5].assert_fhir.direction, "response") + self.assertEqual(inst.setup.action[5].assert_fhir.response, "okay") + self.assertFalse(inst.setup.action[5].assert_fhir.warningOnly) + self.assertEqual(inst.setup.action[6].assert_fhir.compareToSourceExpression, "Patient.name.first().family") + self.assertEqual(inst.setup.action[6].assert_fhir.compareToSourceId, "fixture-patient-create") + self.assertEqual(inst.setup.action[6].assert_fhir.description, "Confirm that the returned Patient contains the expected family name 'Chalmers'. Uses explicit compareToSourceId reference to fixture-patient-create used to create the Patient.") + self.assertEqual(inst.setup.action[6].assert_fhir.operator, "equals") + self.assertFalse(inst.setup.action[6].assert_fhir.warningOnly) self.assertEqual(inst.status, "draft") - self.assertEqual(inst.test[0].action[0].operation.accept, "xml") - self.assertEqual(inst.test[0].action[0].operation.contentType, "xml") - self.assertEqual(inst.test[0].action[0].operation.description, "Update patient resource on test server using the contents of fixture-patient-update") - self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) - self.assertEqual(inst.test[0].action[0].operation.label, "SetupUpdatePatient") - self.assertEqual(inst.test[0].action[0].operation.params, "/${createResourceId}") + self.assertEqual(inst.teardown.action[0].operation.description, "Delete the patient resource on the test server using the id from fixture-patient-create.") + self.assertTrue(inst.teardown.action[0].operation.encodeRequestUrl) + self.assertEqual(inst.teardown.action[0].operation.resource, "Patient") + self.assertEqual(inst.teardown.action[0].operation.targetId, "fixture-patient-create") + self.assertEqual(inst.teardown.action[0].operation.type.code, "delete") + self.assertEqual(inst.teardown.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.test[0].action[0].operation.description, "Read the patient resource on the test server using the id from fixture-patient-create. Prevent URL encoding of the request.") + self.assertFalse(inst.test[0].action[0].operation.encodeRequestUrl) self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.sourceId, "fixture-patient-update") - self.assertEqual(inst.test[0].action[0].operation.type.code, "update") + self.assertEqual(inst.test[0].action[0].operation.responseId, "fixture-patient-read") + self.assertEqual(inst.test[0].action[0].operation.targetId, "fixture-patient-create") + self.assertEqual(inst.test[0].action[0].operation.type.code, "read") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") + self.assertEqual(inst.test[0].action[1].assert_fhir.direction, "response") + self.assertEqual(inst.test[0].action[1].assert_fhir.label, "01-ReadPatientOK") self.assertEqual(inst.test[0].action[1].assert_fhir.response, "okay") self.assertFalse(inst.test[0].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[2].assert_fhir.contentType, "xml") - self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned format is XML.") - self.assertFalse(inst.test[0].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned HTTP Header Last-Modified is present. Warning only as the server might not support versioning.") - self.assertEqual(inst.test[0].action[3].assert_fhir.headerField, "Last-Modified") - self.assertEqual(inst.test[0].action[3].assert_fhir.operator, "notEmpty") - self.assertTrue(inst.test[0].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Update a Patient and validate response.") - self.assertEqual(inst.test[0].id, "01-UpdatePatient") - self.assertEqual(inst.test[0].name, "Update Patient") + self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned HTTP Header Last-Modified is present. Warning only as the server might not support versioning.") + self.assertEqual(inst.test[0].action[2].assert_fhir.direction, "response") + self.assertEqual(inst.test[0].action[2].assert_fhir.headerField, "Last-Modified") + self.assertEqual(inst.test[0].action[2].assert_fhir.operator, "notEmpty") + self.assertTrue(inst.test[0].action[2].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned resource type is Patient.") + self.assertEqual(inst.test[0].action[3].assert_fhir.resource, "Patient") + self.assertFalse(inst.test[0].action[3].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned Patient conforms to the base FHIR specification.") + self.assertEqual(inst.test[0].action[4].assert_fhir.validateProfileId, "patient-profile") + self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned Patient contains the expected family name 'Chalmers'. Uses explicit sourceId reference to read responseId fixture.") + self.assertEqual(inst.test[0].action[5].assert_fhir.operator, "equals") + self.assertEqual(inst.test[0].action[5].assert_fhir.path, "fhir:Patient/fhir:name/fhir:family/@value") + self.assertEqual(inst.test[0].action[5].assert_fhir.sourceId, "fixture-patient-read") + self.assertEqual(inst.test[0].action[5].assert_fhir.value, "Chalmers") + self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[6].assert_fhir.description, "Confirm that the returned Patient contains the expected given name 'Peter'. Uses explicit sourceId reference to read responseId fixture.") + self.assertEqual(inst.test[0].action[6].assert_fhir.operator, "equals") + self.assertEqual(inst.test[0].action[6].assert_fhir.path, "fhir:Patient/fhir:name/fhir:given/@value") + self.assertEqual(inst.test[0].action[6].assert_fhir.sourceId, "fixture-patient-read") + self.assertEqual(inst.test[0].action[6].assert_fhir.value, "Peter") + self.assertFalse(inst.test[0].action[6].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[7].assert_fhir.compareToSourceId, "fixture-patient-create") + self.assertEqual(inst.test[0].action[7].assert_fhir.compareToSourcePath, "fhir:Patient/fhir:name/fhir:family/@value") + self.assertEqual(inst.test[0].action[7].assert_fhir.operator, "equals") + self.assertEqual(inst.test[0].action[7].assert_fhir.path, "fhir:Patient/fhir:name/fhir:family/@value") + self.assertFalse(inst.test[0].action[7].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[8].assert_fhir.compareToSourceId, "fixture-patient-create") + self.assertEqual(inst.test[0].action[8].assert_fhir.compareToSourcePath, "fhir:Patient/fhir:name/fhir:given/@value") + self.assertEqual(inst.test[0].action[8].assert_fhir.path, "fhir:Patient/fhir:name/fhir:given/@value") + self.assertEqual(inst.test[0].action[8].assert_fhir.sourceId, "fixture-patient-read") + self.assertFalse(inst.test[0].action[8].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[9].assert_fhir.description, "Confirm that the returned resource contains the expected retained elements and values. Warning only to provide users with reviewable results.") + self.assertEqual(inst.test[0].action[9].assert_fhir.minimumId, "fixture-patient-minimum") + self.assertTrue(inst.test[0].action[9].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].description, "Read a Patient and validate response.") + self.assertEqual(inst.test[0].id, "01-ReadPatient") + self.assertEqual(inst.test[0].name, "Read Patient") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-update") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example") + self.assertEqual(inst.useContext[0].code.code, "focus") + self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].code, "positive") + self.assertEqual(inst.useContext[0].valueCodeableConcept.coding[0].system, "http://terminology.hl7.org/CodeSystem/variant-state") self.assertEqual(inst.variable[0].name, "createResourceId") self.assertEqual(inst.variable[0].path, "Patient/id") self.assertEqual(inst.variable[0].sourceId, "fixture-patient-create") self.assertEqual(inst.version, "1.0") def testTestScript6(self): - inst = self.instantiate_from("testscript-example-history.json") + inst = self.instantiate_from("testscript-example-readtest.json") self.assertIsNotNone(inst, "Must have instantiated a TestScript instance") self.implTestScript6(inst) @@ -670,103 +679,94 @@ def implTestScript6(self, inst): self.assertEqual(inst.copyright, "© HL7.org 2011+") self.assertEqual(inst.date.datetime, FHIRDateTime("2017-01-18").datetime) self.assertEqual(inst.date.as_json(), "2017-01-18") + self.assertEqual(inst.description, "TestScript example resource with ported Sprinkler basic read tests R001, R002, R003, R004. The read tests will utilize user defined dynamic variables that will hold the Patient resource id values.") self.assertTrue(inst.experimental) - self.assertFalse(inst.fixture[0].autocreate) - self.assertFalse(inst.fixture[0].autodelete) - self.assertEqual(inst.fixture[0].id, "fixture-patient-create") - self.assertFalse(inst.fixture[1].autocreate) - self.assertFalse(inst.fixture[1].autodelete) - self.assertEqual(inst.fixture[1].id, "fixture-patient-update") - self.assertEqual(inst.id, "testscript-example-history") + self.assertEqual(inst.id, "testscript-example-readtest") self.assertEqual(inst.identifier.system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9877") + self.assertEqual(inst.identifier.value, "urn:oid:1.3.6.1.4.1.21367.2005.3.7.9879") self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") self.assertEqual(inst.jurisdiction[0].coding[0].display, "United States of America (the)") self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") self.assertEqual(inst.metadata.capability[0].capabilities, "CapabilityStatement/example") - self.assertEqual(inst.metadata.capability[0].description, "Patient Update, Delete and History (Instance) Operations") - self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#update") - self.assertEqual(inst.metadata.capability[0].link[1], "http://hl7.org/fhir/http.html#delete") - self.assertEqual(inst.metadata.capability[0].link[2], "http://hl7.org/fhir/http.html#history") + self.assertEqual(inst.metadata.capability[0].description, "Patient Read Operation") + self.assertEqual(inst.metadata.capability[0].link[0], "http://hl7.org/fhir/http.html#read") self.assertTrue(inst.metadata.capability[0].required) self.assertFalse(inst.metadata.capability[0].validated) self.assertEqual(inst.metadata.link[0].description, "Demographics and other administrative information about an individual or animal receiving care or other health-related services.") self.assertEqual(inst.metadata.link[0].url, "http://hl7.org/fhir/patient.html") - self.assertEqual(inst.name, "TestScript Example History") + self.assertEqual(inst.name, "TestScript Example Read Test") self.assertEqual(inst.publisher, "HL7") - self.assertEqual(inst.purpose, "Patient (Conditional) Create, Update, Delete and History (Instance) Operations") - self.assertEqual(inst.setup.action[0].operation.accept, "json") - self.assertEqual(inst.setup.action[0].operation.description, "Execute a delete operation to insure the patient does not exist on the server.") - self.assertTrue(inst.setup.action[0].operation.encodeRequestUrl) - self.assertEqual(inst.setup.action[0].operation.label, "SetupDeletePatient") - self.assertEqual(inst.setup.action[0].operation.params, "/${createResourceId}") - self.assertEqual(inst.setup.action[0].operation.resource, "Patient") - self.assertEqual(inst.setup.action[0].operation.type.code, "delete") - self.assertEqual(inst.setup.action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.setup.action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK) or 204(No Content).") - self.assertEqual(inst.setup.action[1].assert_fhir.direction, "response") - self.assertEqual(inst.setup.action[1].assert_fhir.operator, "in") - self.assertEqual(inst.setup.action[1].assert_fhir.responseCode, "200,204") - self.assertFalse(inst.setup.action[1].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[2].operation.accept, "json") - self.assertEqual(inst.setup.action[2].operation.contentType, "json") - self.assertEqual(inst.setup.action[2].operation.description, "Create patient resource on test server using the contents of fixture-patient-create") - self.assertTrue(inst.setup.action[2].operation.encodeRequestUrl) - self.assertEqual(inst.setup.action[2].operation.label, "SetupCreatePatient") - self.assertEqual(inst.setup.action[2].operation.params, "/${createResourceId}") - self.assertEqual(inst.setup.action[2].operation.resource, "Patient") - self.assertEqual(inst.setup.action[2].operation.sourceId, "fixture-patient-create") - self.assertEqual(inst.setup.action[2].operation.type.code, "update") - self.assertEqual(inst.setup.action[2].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.setup.action[3].assert_fhir.description, "Confirm that the returned HTTP status is 201(Created).") - self.assertEqual(inst.setup.action[3].assert_fhir.direction, "response") - self.assertEqual(inst.setup.action[3].assert_fhir.responseCode, "201") - self.assertFalse(inst.setup.action[3].assert_fhir.warningOnly) - self.assertEqual(inst.setup.action[4].operation.accept, "json") - self.assertEqual(inst.setup.action[4].operation.contentType, "json") - self.assertEqual(inst.setup.action[4].operation.description, "Update patient resource on test server using the contents of fixture-patient-update") - self.assertTrue(inst.setup.action[4].operation.encodeRequestUrl) - self.assertEqual(inst.setup.action[4].operation.label, "SetupUpdatePatient") - self.assertEqual(inst.setup.action[4].operation.params, "/${createResourceId}") - self.assertEqual(inst.setup.action[4].operation.resource, "Patient") - self.assertEqual(inst.setup.action[4].operation.sourceId, "fixture-patient-update") - self.assertEqual(inst.setup.action[4].operation.type.code, "update") - self.assertEqual(inst.setup.action[4].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") - self.assertEqual(inst.setup.action[5].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.setup.action[5].assert_fhir.direction, "response") - self.assertEqual(inst.setup.action[5].assert_fhir.responseCode, "200") - self.assertFalse(inst.setup.action[5].assert_fhir.warningOnly) + self.assertEqual(inst.purpose, "Patient Read Operation") self.assertEqual(inst.status, "draft") - self.assertEqual(inst.test[0].action[0].operation.accept, "json") - self.assertEqual(inst.test[0].action[0].operation.contentType, "json") - self.assertEqual(inst.test[0].action[0].operation.description, "Get the Patient history on the test server using the id from fixture-patient-create.") + self.assertEqual(inst.test[0].action[0].operation.accept, "xml") + self.assertEqual(inst.test[0].action[0].operation.description, "Read the known Patient resource on the destination test system using the user defined dynamic variable ${KnownPatientResourceId}.") self.assertTrue(inst.test[0].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[0].action[0].operation.params, "/${KnownPatientResourceId}") self.assertEqual(inst.test[0].action[0].operation.resource, "Patient") - self.assertEqual(inst.test[0].action[0].operation.targetId, "fixture-patient-create") - self.assertEqual(inst.test[0].action[0].operation.type.code, "history") + self.assertEqual(inst.test[0].action[0].operation.type.code, "read") self.assertEqual(inst.test[0].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") self.assertEqual(inst.test[0].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 200(OK).") - self.assertEqual(inst.test[0].action[1].assert_fhir.direction, "response") self.assertEqual(inst.test[0].action[1].assert_fhir.response, "okay") self.assertFalse(inst.test[0].action[1].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned resource type is Bundle.") - self.assertEqual(inst.test[0].action[2].assert_fhir.resource, "Bundle") + self.assertEqual(inst.test[0].action[2].assert_fhir.contentType, "xml") + self.assertEqual(inst.test[0].action[2].assert_fhir.description, "Confirm that the returned format is XML.") self.assertFalse(inst.test[0].action[2].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned Bundle conforms to the base FHIR specification.") - self.assertEqual(inst.test[0].action[3].assert_fhir.validateProfileId, "bundle-profile") - self.assertFalse(inst.test[0].action[3].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned Bundle type equals 'history'.") - self.assertEqual(inst.test[0].action[4].assert_fhir.operator, "equals") - self.assertEqual(inst.test[0].action[4].assert_fhir.path, "fhir:Bundle/fhir:type/@value") - self.assertEqual(inst.test[0].action[4].assert_fhir.value, "history") + self.assertEqual(inst.test[0].action[3].assert_fhir.description, "Confirm that the returned HTTP Header Last-Modified is present. Warning only as the server might not support versioning.") + self.assertEqual(inst.test[0].action[3].assert_fhir.headerField, "Last-Modified") + self.assertEqual(inst.test[0].action[3].assert_fhir.operator, "notEmpty") + self.assertTrue(inst.test[0].action[3].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].action[4].assert_fhir.description, "Confirm that the returned resource type is Patient.") + self.assertEqual(inst.test[0].action[4].assert_fhir.resource, "Patient") self.assertFalse(inst.test[0].action[4].assert_fhir.warningOnly) - self.assertEqual(inst.test[0].description, "Get the history for a known Patient and validate response.") - self.assertEqual(inst.test[0].id, "01-HistoryPatient") - self.assertEqual(inst.test[0].name, "History Patient") + self.assertEqual(inst.test[0].action[5].assert_fhir.description, "Confirm that the returned Patient conforms to the base FHIR specification.") + self.assertEqual(inst.test[0].action[5].assert_fhir.validateProfileId, "patient-profile") + self.assertFalse(inst.test[0].action[5].assert_fhir.warningOnly) + self.assertEqual(inst.test[0].description, "Read a known Patient and validate response.") + self.assertEqual(inst.test[0].id, "R001") + self.assertEqual(inst.test[0].name, "Sprinkler Read Test R001") + self.assertEqual(inst.test[1].action[0].operation.accept, "xml") + self.assertTrue(inst.test[1].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[1].action[0].operation.params, "/1") + self.assertEqual(inst.test[1].action[0].operation.resource, "Patient") + self.assertEqual(inst.test[1].action[0].operation.type.code, "read") + self.assertEqual(inst.test[1].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.test[1].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 404(Not Found).") + self.assertEqual(inst.test[1].action[1].assert_fhir.response, "notFound") + self.assertFalse(inst.test[1].action[1].assert_fhir.warningOnly) + self.assertEqual(inst.test[1].description, "Read an unknown Resource Type and validate response.") + self.assertEqual(inst.test[1].id, "R002") + self.assertEqual(inst.test[1].name, "Sprinkler Read Test R002") + self.assertEqual(inst.test[2].action[0].operation.accept, "xml") + self.assertEqual(inst.test[2].action[0].operation.description, "Attempt to read the non-existing Patient resource on the destination test system using the user defined dynamic variable ${NonExistsPatientResourceId}.") + self.assertTrue(inst.test[2].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[2].action[0].operation.params, "/${NonExistsPatientResourceId}") + self.assertEqual(inst.test[2].action[0].operation.resource, "Patient") + self.assertEqual(inst.test[2].action[0].operation.type.code, "read") + self.assertEqual(inst.test[2].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.test[2].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 404(Not Found).") + self.assertEqual(inst.test[2].action[1].assert_fhir.response, "notFound") + self.assertFalse(inst.test[2].action[1].assert_fhir.warningOnly) + self.assertEqual(inst.test[2].description, "Read a known, non-existing Patient and validate response.") + self.assertEqual(inst.test[2].id, "R003") + self.assertEqual(inst.test[2].name, "Sprinkler Read Test R003") + self.assertEqual(inst.test[3].action[0].operation.accept, "xml") + self.assertEqual(inst.test[3].action[0].operation.description, "Attempt to read a Patient resource on the destination test system using known bad formatted resource id.") + self.assertTrue(inst.test[3].action[0].operation.encodeRequestUrl) + self.assertEqual(inst.test[3].action[0].operation.params, "/ID-may-not-contain-CAPITALS") + self.assertEqual(inst.test[3].action[0].operation.resource, "Patient") + self.assertEqual(inst.test[3].action[0].operation.type.code, "read") + self.assertEqual(inst.test[3].action[0].operation.type.system, "http://terminology.hl7.org/CodeSystem/testscript-operation-codes") + self.assertEqual(inst.test[3].action[1].assert_fhir.description, "Confirm that the returned HTTP status is 400(Bad Request).") + self.assertEqual(inst.test[3].action[1].assert_fhir.response, "bad") + self.assertFalse(inst.test[3].action[1].assert_fhir.warningOnly) + self.assertEqual(inst.test[3].description, "Read a Patient using a known bad formatted resource id and validate response.") + self.assertEqual(inst.test[3].id, "R004") + self.assertEqual(inst.test[3].name, "Sprinkler Read Test R004") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-history") - self.assertEqual(inst.variable[0].name, "createResourceId") - self.assertEqual(inst.variable[0].path, "Patient/id") - self.assertEqual(inst.variable[0].sourceId, "fixture-patient-create") + self.assertEqual(inst.url, "http://hl7.org/fhir/TestScript/testscript-example-readtest") + self.assertEqual(inst.variable[0].defaultValue, "example") + self.assertEqual(inst.variable[0].name, "KnownPatientResourceId") + self.assertEqual(inst.variable[1].defaultValue, "does-not-exist") + self.assertEqual(inst.variable[1].name, "NonExistsPatientResourceId") self.assertEqual(inst.version, "1.0") diff --git a/tests/models/valueset_test.py b/tests/models/valueset_test.py index 49180d2c..464eb397 100644 --- a/tests/models/valueset_test.py +++ b/tests/models/valueset_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return valueset.ValueSet(js) def testValueSet1(self): - inst = self.instantiate_from("valueset-example-hierarchical.json") + inst = self.instantiate_from("valueset-example.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") self.implValueSet1(inst) @@ -30,6 +30,59 @@ def testValueSet1(self): self.implValueSet1(inst2) def implValueSet1(self, inst): + self.assertTrue(inst.compose.inactive) + self.assertEqual(inst.compose.include[0].concept[0].code, "14647-2") + self.assertEqual(inst.compose.include[0].concept[0].display, "Cholesterol [Moles/Volume]") + self.assertEqual(inst.compose.include[0].concept[1].code, "2093-3") + self.assertEqual(inst.compose.include[0].concept[1].display, "Cholesterol [Mass/Volume]") + self.assertEqual(inst.compose.include[0].concept[2].code, "35200-5") + self.assertEqual(inst.compose.include[0].concept[2].display, "Cholesterol [Mass Or Moles/Volume]") + self.assertEqual(inst.compose.include[0].concept[3].code, "9342-7") + self.assertEqual(inst.compose.include[0].concept[3].display, "Cholesterol [Percentile]") + self.assertEqual(inst.compose.include[0].system, "http://loinc.org") + self.assertEqual(inst.compose.include[0].version, "2.36") + self.assertEqual(inst.compose.lockedDate.date, FHIRDate("2012-06-13").date) + self.assertEqual(inst.compose.lockedDate.as_json(), "2012-06-13") + self.assertEqual(inst.contact[0].name, "FHIR project team") + self.assertEqual(inst.contact[0].telecom[0].system, "url") + self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") + self.assertEqual(inst.copyright, "This content from LOINC ® is copyright © 1995 Regenstrief Institute, Inc. and the LOINC Committee, and available at no cost under the license at http://loinc.org/terms-of-use.") + self.assertEqual(inst.date.datetime, FHIRDateTime("2015-06-22").datetime) + self.assertEqual(inst.date.as_json(), "2015-06-22") + self.assertEqual(inst.description, "This is an example value set that includes all the LOINC codes for serum/plasma cholesterol from v2.36.") + self.assertTrue(inst.experimental) + self.assertEqual(inst.id, "example-extensional") + self.assertEqual(inst.identifier[0].system, "http://acme.com/identifiers/valuesets") + self.assertEqual(inst.identifier[0].value, "loinc-cholesterol-int") + self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") + self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + self.assertEqual(inst.name, "LOINC Codes for Cholesterol in Serum/Plasma") + self.assertEqual(inst.publisher, "HL7 International") + self.assertEqual(inst.purpose, "This value set was published by ACME Inc in order to make clear which codes are used for Cholesterol by AcmeClinicals (Adult Ambulatory care support in USA)") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/example-extensional") + self.assertEqual(inst.useContext[0].code.code, "age") + self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") + self.assertEqual(inst.useContext[0].valueQuantity.code, "a") + self.assertEqual(inst.useContext[0].valueQuantity.comparator, ">") + self.assertEqual(inst.useContext[0].valueQuantity.system, "http://unitsofmeasure.org") + self.assertEqual(inst.useContext[0].valueQuantity.unit, "yrs") + self.assertEqual(inst.useContext[0].valueQuantity.value, 18) + self.assertEqual(inst.version, "20150622") + + def testValueSet2(self): + inst = self.instantiate_from("valueset-example-hierarchical.json") + self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") + self.implValueSet2(inst) + + js = inst.as_json() + self.assertEqual("ValueSet", js["resourceType"]) + inst2 = valueset.ValueSet(js) + self.implValueSet2(inst2) + + def implValueSet2(self, inst): self.assertEqual(inst.compose.include[0].concept[0].code, "invalid") self.assertEqual(inst.compose.include[0].concept[1].code, "structure") self.assertEqual(inst.compose.include[0].concept[2].code, "required") @@ -156,17 +209,17 @@ def implValueSet1(self, inst): self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/example-hierarchical") self.assertEqual(inst.version, "4.0.1") - def testValueSet2(self): + def testValueSet3(self): inst = self.instantiate_from("valueset-example-expansion.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") - self.implValueSet2(inst) + self.implValueSet3(inst) js = inst.as_json() self.assertEqual("ValueSet", js["resourceType"]) inst2 = valueset.ValueSet(js) - self.implValueSet2(inst2) + self.implValueSet3(inst2) - def implValueSet2(self, inst): + def implValueSet3(self, inst): self.assertEqual(inst.compose.include[0].filter[0].op, "=") self.assertEqual(inst.compose.include[0].filter[0].property, "parent") self.assertEqual(inst.compose.include[0].filter[0].value, "LP43571-6") @@ -232,47 +285,8 @@ def implValueSet2(self, inst): self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/example-expansion") self.assertEqual(inst.version, "20150622") - def testValueSet3(self): - inst = self.instantiate_from("valueset-list-example-codes.json") - self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") - self.implValueSet3(inst) - - js = inst.as_json() - self.assertEqual("ValueSet", js["resourceType"]) - inst2 = valueset.ValueSet(js) - self.implValueSet3(inst2) - - def implValueSet3(self, inst): - self.assertEqual(inst.compose.include[0].system, "http://terminology.hl7.org/CodeSystem/list-example-use-codes") - self.assertEqual(inst.contact[0].telecom[0].system, "url") - self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.date.datetime, FHIRDateTime("2019-11-01T09:29:23+11:00").datetime) - self.assertEqual(inst.date.as_json(), "2019-11-01T09:29:23+11:00") - self.assertEqual(inst.description, "Example use codes for the List resource - typical kinds of use.") - self.assertFalse(inst.experimental) - self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg") - self.assertEqual(inst.extension[0].valueCode, "fhir") - self.assertEqual(inst.extension[1].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status") - self.assertEqual(inst.extension[1].valueCode, "draft") - self.assertEqual(inst.extension[2].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm") - self.assertEqual(inst.extension[2].valueInteger, 1) - self.assertEqual(inst.id, "list-example-codes") - self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") - self.assertEqual(inst.identifier[0].value, "urn:oid:2.16.840.1.113883.4.642.3.316") - self.assertTrue(inst.immutable) - self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2019-11-01T09:29:23.356+11:00").datetime) - self.assertEqual(inst.meta.lastUpdated.as_json(), "2019-11-01T09:29:23.356+11:00") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/shareablevalueset") - self.assertEqual(inst.name, "ExampleUseCodesForList") - self.assertEqual(inst.publisher, "FHIR Project") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Example Use Codes for List") - self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/list-example-codes") - self.assertEqual(inst.version, "4.0.1") - def testValueSet4(self): - inst = self.instantiate_from("valueset-example-yesnodontknow.json") + inst = self.instantiate_from("valueset-example-inactive.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") self.implValueSet4(inst) @@ -282,32 +296,41 @@ def testValueSet4(self): self.implValueSet4(inst2) def implValueSet4(self, inst): - self.assertEqual(inst.compose.include[0].valueSet[0], "http://terminology.hl7.org/ValueSet/v2-0136") - self.assertEqual(inst.compose.include[1].concept[0].code, "asked-unknown") - self.assertEqual(inst.compose.include[1].concept[0].display, "Don't know") - self.assertEqual(inst.compose.include[1].system, "http://terminology.hl7.org/CodeSystem/data-absent-reason") - self.assertEqual(inst.description, "For Capturing simple yes-no-don't know answers") - self.assertEqual(inst.expansion.contains[0].code, "Y") - self.assertEqual(inst.expansion.contains[0].display, "Yes") - self.assertEqual(inst.expansion.contains[0].system, "http://terminology.hl7.org/CodeSystem/v2-0136") - self.assertEqual(inst.expansion.contains[1].code, "N") - self.assertEqual(inst.expansion.contains[1].display, "No") - self.assertEqual(inst.expansion.contains[1].system, "http://terminology.hl7.org/CodeSystem/v2-0136") - self.assertEqual(inst.expansion.contains[2].code, "asked-unknown") - self.assertEqual(inst.expansion.contains[2].display, "Don't know") - self.assertEqual(inst.expansion.contains[2].system, "http://terminology.hl7.org/CodeSystem/data-absent-reason") - self.assertEqual(inst.expansion.identifier, "urn:uuid:bf99fe50-2c2b-41ad-bd63-bee6919810b4") - self.assertEqual(inst.expansion.timestamp.datetime, FHIRDateTime("2015-07-14T10:00:00Z").datetime) - self.assertEqual(inst.expansion.timestamp.as_json(), "2015-07-14T10:00:00Z") - self.assertEqual(inst.id, "yesnodontknow") - self.assertEqual(inst.name, "Yes/No/Don't Know") + self.assertTrue(inst.compose.inactive) + self.assertEqual(inst.compose.include[0].filter[0].op, "descendent-of") + self.assertEqual(inst.compose.include[0].filter[0].property, "concept") + self.assertEqual(inst.compose.include[0].filter[0].value, "_ActMoodPredicate") + self.assertEqual(inst.compose.include[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.description, "HL7 v3 ActMood Predicate codes, including inactive codes") + self.assertEqual(inst.expansion.contains[0].code, "CRT") + self.assertEqual(inst.expansion.contains[0].display, "criterion") + self.assertTrue(inst.expansion.contains[0].inactive) + self.assertEqual(inst.expansion.contains[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.expansion.contains[1].code, "EXPEC") + self.assertEqual(inst.expansion.contains[1].contains[0].code, "GOL") + self.assertEqual(inst.expansion.contains[1].contains[0].display, "goal") + self.assertEqual(inst.expansion.contains[1].contains[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.expansion.contains[1].contains[1].code, "RSK") + self.assertEqual(inst.expansion.contains[1].contains[1].display, "risk") + self.assertEqual(inst.expansion.contains[1].contains[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.expansion.contains[1].display, "expectation") + self.assertEqual(inst.expansion.contains[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.expansion.contains[2].code, "OPT") + self.assertEqual(inst.expansion.contains[2].display, "option") + self.assertEqual(inst.expansion.contains[2].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") + self.assertEqual(inst.expansion.identifier, "urn:uuid:46c00b3f-003a-4f31-9d4b-ea2de58b2a99") + self.assertEqual(inst.expansion.timestamp.datetime, FHIRDateTime("2017-02-26T10:00:00Z").datetime) + self.assertEqual(inst.expansion.timestamp.as_json(), "2017-02-26T10:00:00Z") + self.assertEqual(inst.id, "inactive") + self.assertEqual(inst.name, "Example-inactive") self.assertEqual(inst.status, "draft") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/yesnodontknow") + self.assertEqual(inst.title, "Example with inactive codes") + self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/inactive") self.assertEqual(inst.version, "4.0.1") def testValueSet5(self): - inst = self.instantiate_from("valueset-example.json") + inst = self.instantiate_from("valueset-example-filter.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") self.implValueSet5(inst) @@ -317,59 +340,6 @@ def testValueSet5(self): self.implValueSet5(inst2) def implValueSet5(self, inst): - self.assertTrue(inst.compose.inactive) - self.assertEqual(inst.compose.include[0].concept[0].code, "14647-2") - self.assertEqual(inst.compose.include[0].concept[0].display, "Cholesterol [Moles/Volume]") - self.assertEqual(inst.compose.include[0].concept[1].code, "2093-3") - self.assertEqual(inst.compose.include[0].concept[1].display, "Cholesterol [Mass/Volume]") - self.assertEqual(inst.compose.include[0].concept[2].code, "35200-5") - self.assertEqual(inst.compose.include[0].concept[2].display, "Cholesterol [Mass Or Moles/Volume]") - self.assertEqual(inst.compose.include[0].concept[3].code, "9342-7") - self.assertEqual(inst.compose.include[0].concept[3].display, "Cholesterol [Percentile]") - self.assertEqual(inst.compose.include[0].system, "http://loinc.org") - self.assertEqual(inst.compose.include[0].version, "2.36") - self.assertEqual(inst.compose.lockedDate.date, FHIRDate("2012-06-13").date) - self.assertEqual(inst.compose.lockedDate.as_json(), "2012-06-13") - self.assertEqual(inst.contact[0].name, "FHIR project team") - self.assertEqual(inst.contact[0].telecom[0].system, "url") - self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") - self.assertEqual(inst.copyright, "This content from LOINC ® is copyright © 1995 Regenstrief Institute, Inc. and the LOINC Committee, and available at no cost under the license at http://loinc.org/terms-of-use.") - self.assertEqual(inst.date.datetime, FHIRDateTime("2015-06-22").datetime) - self.assertEqual(inst.date.as_json(), "2015-06-22") - self.assertEqual(inst.description, "This is an example value set that includes all the LOINC codes for serum/plasma cholesterol from v2.36.") - self.assertTrue(inst.experimental) - self.assertEqual(inst.id, "example-extensional") - self.assertEqual(inst.identifier[0].system, "http://acme.com/identifiers/valuesets") - self.assertEqual(inst.identifier[0].value, "loinc-cholesterol-int") - self.assertEqual(inst.jurisdiction[0].coding[0].code, "US") - self.assertEqual(inst.jurisdiction[0].coding[0].system, "urn:iso:std:iso:3166") - self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/shareablevalueset") - self.assertEqual(inst.name, "LOINC Codes for Cholesterol in Serum/Plasma") - self.assertEqual(inst.publisher, "HL7 International") - self.assertEqual(inst.purpose, "This value set was published by ACME Inc in order to make clear which codes are used for Cholesterol by AcmeClinicals (Adult Ambulatory care support in USA)") - self.assertEqual(inst.status, "draft") - self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/example-extensional") - self.assertEqual(inst.useContext[0].code.code, "age") - self.assertEqual(inst.useContext[0].code.system, "http://terminology.hl7.org/CodeSystem/usage-context-type") - self.assertEqual(inst.useContext[0].valueQuantity.code, "a") - self.assertEqual(inst.useContext[0].valueQuantity.comparator, ">") - self.assertEqual(inst.useContext[0].valueQuantity.system, "http://unitsofmeasure.org") - self.assertEqual(inst.useContext[0].valueQuantity.unit, "yrs") - self.assertEqual(inst.useContext[0].valueQuantity.value, 18) - self.assertEqual(inst.version, "20150622") - - def testValueSet6(self): - inst = self.instantiate_from("valueset-example-filter.json") - self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") - self.implValueSet6(inst) - - js = inst.as_json() - self.assertEqual("ValueSet", js["resourceType"]) - inst2 = valueset.ValueSet(js) - self.implValueSet6(inst2) - - def implValueSet6(self, inst): self.assertEqual(inst.compose.include[0].filter[0].op, "=") self.assertEqual(inst.compose.include[0].filter[0].property, "acme-plasma") self.assertEqual(inst.compose.include[0].filter[0].value, "true") @@ -390,61 +360,52 @@ def implValueSet6(self, inst): self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/example-filter") self.assertEqual(inst.version, "4.0.1") - def testValueSet7(self): - inst = self.instantiate_from("valueset-example-inactive.json") + def testValueSet6(self): + inst = self.instantiate_from("valueset-example-yesnodontknow.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") - self.implValueSet7(inst) + self.implValueSet6(inst) js = inst.as_json() self.assertEqual("ValueSet", js["resourceType"]) inst2 = valueset.ValueSet(js) - self.implValueSet7(inst2) + self.implValueSet6(inst2) - def implValueSet7(self, inst): - self.assertTrue(inst.compose.inactive) - self.assertEqual(inst.compose.include[0].filter[0].op, "descendent-of") - self.assertEqual(inst.compose.include[0].filter[0].property, "concept") - self.assertEqual(inst.compose.include[0].filter[0].value, "_ActMoodPredicate") - self.assertEqual(inst.compose.include[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.description, "HL7 v3 ActMood Predicate codes, including inactive codes") - self.assertEqual(inst.expansion.contains[0].code, "CRT") - self.assertEqual(inst.expansion.contains[0].display, "criterion") - self.assertTrue(inst.expansion.contains[0].inactive) - self.assertEqual(inst.expansion.contains[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.expansion.contains[1].code, "EXPEC") - self.assertEqual(inst.expansion.contains[1].contains[0].code, "GOL") - self.assertEqual(inst.expansion.contains[1].contains[0].display, "goal") - self.assertEqual(inst.expansion.contains[1].contains[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.expansion.contains[1].contains[1].code, "RSK") - self.assertEqual(inst.expansion.contains[1].contains[1].display, "risk") - self.assertEqual(inst.expansion.contains[1].contains[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.expansion.contains[1].display, "expectation") - self.assertEqual(inst.expansion.contains[1].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.expansion.contains[2].code, "OPT") - self.assertEqual(inst.expansion.contains[2].display, "option") - self.assertEqual(inst.expansion.contains[2].system, "http://terminology.hl7.org/CodeSystem/v3-ActMood") - self.assertEqual(inst.expansion.identifier, "urn:uuid:46c00b3f-003a-4f31-9d4b-ea2de58b2a99") - self.assertEqual(inst.expansion.timestamp.datetime, FHIRDateTime("2017-02-26T10:00:00Z").datetime) - self.assertEqual(inst.expansion.timestamp.as_json(), "2017-02-26T10:00:00Z") - self.assertEqual(inst.id, "inactive") - self.assertEqual(inst.name, "Example-inactive") + def implValueSet6(self, inst): + self.assertEqual(inst.compose.include[0].valueSet[0], "http://terminology.hl7.org/ValueSet/v2-0136") + self.assertEqual(inst.compose.include[1].concept[0].code, "asked-unknown") + self.assertEqual(inst.compose.include[1].concept[0].display, "Don't know") + self.assertEqual(inst.compose.include[1].system, "http://terminology.hl7.org/CodeSystem/data-absent-reason") + self.assertEqual(inst.description, "For Capturing simple yes-no-don't know answers") + self.assertEqual(inst.expansion.contains[0].code, "Y") + self.assertEqual(inst.expansion.contains[0].display, "Yes") + self.assertEqual(inst.expansion.contains[0].system, "http://terminology.hl7.org/CodeSystem/v2-0136") + self.assertEqual(inst.expansion.contains[1].code, "N") + self.assertEqual(inst.expansion.contains[1].display, "No") + self.assertEqual(inst.expansion.contains[1].system, "http://terminology.hl7.org/CodeSystem/v2-0136") + self.assertEqual(inst.expansion.contains[2].code, "asked-unknown") + self.assertEqual(inst.expansion.contains[2].display, "Don't know") + self.assertEqual(inst.expansion.contains[2].system, "http://terminology.hl7.org/CodeSystem/data-absent-reason") + self.assertEqual(inst.expansion.identifier, "urn:uuid:bf99fe50-2c2b-41ad-bd63-bee6919810b4") + self.assertEqual(inst.expansion.timestamp.datetime, FHIRDateTime("2015-07-14T10:00:00Z").datetime) + self.assertEqual(inst.expansion.timestamp.as_json(), "2015-07-14T10:00:00Z") + self.assertEqual(inst.id, "yesnodontknow") + self.assertEqual(inst.name, "Yes/No/Don't Know") self.assertEqual(inst.status, "draft") self.assertEqual(inst.text.status, "generated") - self.assertEqual(inst.title, "Example with inactive codes") - self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/inactive") + self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/yesnodontknow") self.assertEqual(inst.version, "4.0.1") - def testValueSet8(self): + def testValueSet7(self): inst = self.instantiate_from("valueset-examplescenario-actor-type.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") - self.implValueSet8(inst) + self.implValueSet7(inst) js = inst.as_json() self.assertEqual("ValueSet", js["resourceType"]) inst2 = valueset.ValueSet(js) - self.implValueSet8(inst2) + self.implValueSet7(inst2) - def implValueSet8(self, inst): + def implValueSet7(self, inst): self.assertEqual(inst.compose.include[0].system, "http://hl7.org/fhir/examplescenario-actor-type") self.assertEqual(inst.contact[0].telecom[0].system, "url") self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") @@ -475,6 +436,45 @@ def implValueSet8(self, inst): self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/examplescenario-actor-type") self.assertEqual(inst.version, "4.0.1") + def testValueSet8(self): + inst = self.instantiate_from("valueset-list-example-codes.json") + self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") + self.implValueSet8(inst) + + js = inst.as_json() + self.assertEqual("ValueSet", js["resourceType"]) + inst2 = valueset.ValueSet(js) + self.implValueSet8(inst2) + + def implValueSet8(self, inst): + self.assertEqual(inst.compose.include[0].system, "http://terminology.hl7.org/CodeSystem/list-example-use-codes") + self.assertEqual(inst.contact[0].telecom[0].system, "url") + self.assertEqual(inst.contact[0].telecom[0].value, "http://hl7.org/fhir") + self.assertEqual(inst.date.datetime, FHIRDateTime("2019-11-01T09:29:23+11:00").datetime) + self.assertEqual(inst.date.as_json(), "2019-11-01T09:29:23+11:00") + self.assertEqual(inst.description, "Example use codes for the List resource - typical kinds of use.") + self.assertFalse(inst.experimental) + self.assertEqual(inst.extension[0].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg") + self.assertEqual(inst.extension[0].valueCode, "fhir") + self.assertEqual(inst.extension[1].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status") + self.assertEqual(inst.extension[1].valueCode, "draft") + self.assertEqual(inst.extension[2].url, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm") + self.assertEqual(inst.extension[2].valueInteger, 1) + self.assertEqual(inst.id, "list-example-codes") + self.assertEqual(inst.identifier[0].system, "urn:ietf:rfc:3986") + self.assertEqual(inst.identifier[0].value, "urn:oid:2.16.840.1.113883.4.642.3.316") + self.assertTrue(inst.immutable) + self.assertEqual(inst.meta.lastUpdated.datetime, FHIRInstant("2019-11-01T09:29:23.356+11:00").datetime) + self.assertEqual(inst.meta.lastUpdated.as_json(), "2019-11-01T09:29:23.356+11:00") + self.assertEqual(inst.meta.profile[0], "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + self.assertEqual(inst.name, "ExampleUseCodesForList") + self.assertEqual(inst.publisher, "FHIR Project") + self.assertEqual(inst.status, "draft") + self.assertEqual(inst.text.status, "generated") + self.assertEqual(inst.title, "Example Use Codes for List") + self.assertEqual(inst.url, "http://hl7.org/fhir/ValueSet/list-example-codes") + self.assertEqual(inst.version, "4.0.1") + def testValueSet9(self): inst = self.instantiate_from("valueset-example-intensional.json") self.assertIsNotNone(inst, "Must have instantiated a ValueSet instance") diff --git a/tests/models/visionprescription_test.py b/tests/models/visionprescription_test.py index da3946e4..be5af20d 100644 --- a/tests/models/visionprescription_test.py +++ b/tests/models/visionprescription_test.py @@ -20,7 +20,7 @@ def instantiate_from(self, filename): return visionprescription.VisionPrescription(js) def testVisionPrescription1(self): - inst = self.instantiate_from("visionprescription-example.json") + inst = self.instantiate_from("visionprescription-example-1.json") self.assertIsNotNone(inst, "Must have instantiated a VisionPrescription instance") self.implVisionPrescription1(inst) @@ -30,46 +30,6 @@ def testVisionPrescription1(self): self.implVisionPrescription1(inst2) def implVisionPrescription1(self, inst): - self.assertEqual(inst.created.datetime, FHIRDateTime("2014-06-15").datetime) - self.assertEqual(inst.created.as_json(), "2014-06-15") - self.assertEqual(inst.dateWritten.datetime, FHIRDateTime("2014-06-15").datetime) - self.assertEqual(inst.dateWritten.as_json(), "2014-06-15") - self.assertEqual(inst.id, "33123") - self.assertEqual(inst.identifier[0].system, "http://www.happysight.com/prescription") - self.assertEqual(inst.identifier[0].value, "15013") - self.assertEqual(inst.lensSpecification[0].add, 2.0) - self.assertEqual(inst.lensSpecification[0].eye, "right") - self.assertEqual(inst.lensSpecification[0].prism[0].amount, 0.5) - self.assertEqual(inst.lensSpecification[0].prism[0].base, "down") - self.assertEqual(inst.lensSpecification[0].product.coding[0].code, "lens") - self.assertEqual(inst.lensSpecification[0].product.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct") - self.assertEqual(inst.lensSpecification[0].sphere, -2.0) - self.assertEqual(inst.lensSpecification[1].add, 2.0) - self.assertEqual(inst.lensSpecification[1].axis, 180) - self.assertEqual(inst.lensSpecification[1].cylinder, -0.5) - self.assertEqual(inst.lensSpecification[1].eye, "left") - self.assertEqual(inst.lensSpecification[1].prism[0].amount, 0.5) - self.assertEqual(inst.lensSpecification[1].prism[0].base, "up") - self.assertEqual(inst.lensSpecification[1].product.coding[0].code, "lens") - self.assertEqual(inst.lensSpecification[1].product.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct") - self.assertEqual(inst.lensSpecification[1].sphere, -1.0) - self.assertEqual(inst.meta.tag[0].code, "HTEST") - self.assertEqual(inst.meta.tag[0].display, "test health data") - self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - self.assertEqual(inst.status, "active") - self.assertEqual(inst.text.status, "generated") - - def testVisionPrescription2(self): - inst = self.instantiate_from("visionprescription-example-1.json") - self.assertIsNotNone(inst, "Must have instantiated a VisionPrescription instance") - self.implVisionPrescription2(inst) - - js = inst.as_json() - self.assertEqual("VisionPrescription", js["resourceType"]) - inst2 = visionprescription.VisionPrescription(js) - self.implVisionPrescription2(inst2) - - def implVisionPrescription2(self, inst): self.assertEqual(inst.created.datetime, FHIRDateTime("2014-06-15").datetime) self.assertEqual(inst.created.as_json(), "2014-06-15") self.assertEqual(inst.dateWritten.datetime, FHIRDateTime("2014-06-15").datetime) @@ -115,4 +75,44 @@ def implVisionPrescription2(self, inst): self.assertEqual(inst.status, "active") self.assertEqual(inst.text.div, "
Sample Contract Lens prescription
") self.assertEqual(inst.text.status, "generated") + + def testVisionPrescription2(self): + inst = self.instantiate_from("visionprescription-example.json") + self.assertIsNotNone(inst, "Must have instantiated a VisionPrescription instance") + self.implVisionPrescription2(inst) + + js = inst.as_json() + self.assertEqual("VisionPrescription", js["resourceType"]) + inst2 = visionprescription.VisionPrescription(js) + self.implVisionPrescription2(inst2) + + def implVisionPrescription2(self, inst): + self.assertEqual(inst.created.datetime, FHIRDateTime("2014-06-15").datetime) + self.assertEqual(inst.created.as_json(), "2014-06-15") + self.assertEqual(inst.dateWritten.datetime, FHIRDateTime("2014-06-15").datetime) + self.assertEqual(inst.dateWritten.as_json(), "2014-06-15") + self.assertEqual(inst.id, "33123") + self.assertEqual(inst.identifier[0].system, "http://www.happysight.com/prescription") + self.assertEqual(inst.identifier[0].value, "15013") + self.assertEqual(inst.lensSpecification[0].add, 2.0) + self.assertEqual(inst.lensSpecification[0].eye, "right") + self.assertEqual(inst.lensSpecification[0].prism[0].amount, 0.5) + self.assertEqual(inst.lensSpecification[0].prism[0].base, "down") + self.assertEqual(inst.lensSpecification[0].product.coding[0].code, "lens") + self.assertEqual(inst.lensSpecification[0].product.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct") + self.assertEqual(inst.lensSpecification[0].sphere, -2.0) + self.assertEqual(inst.lensSpecification[1].add, 2.0) + self.assertEqual(inst.lensSpecification[1].axis, 180) + self.assertEqual(inst.lensSpecification[1].cylinder, -0.5) + self.assertEqual(inst.lensSpecification[1].eye, "left") + self.assertEqual(inst.lensSpecification[1].prism[0].amount, 0.5) + self.assertEqual(inst.lensSpecification[1].prism[0].base, "up") + self.assertEqual(inst.lensSpecification[1].product.coding[0].code, "lens") + self.assertEqual(inst.lensSpecification[1].product.coding[0].system, "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct") + self.assertEqual(inst.lensSpecification[1].sphere, -1.0) + self.assertEqual(inst.meta.tag[0].code, "HTEST") + self.assertEqual(inst.meta.tag[0].display, "test health data") + self.assertEqual(inst.meta.tag[0].system, "http://terminology.hl7.org/CodeSystem/v3-ActReason") + self.assertEqual(inst.status, "active") + self.assertEqual(inst.text.status, "generated")