us_core_test_kit 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 827607a65eeb7956db852bbf500ad1d9d55f03403e6eb9075d2adb6186e69b2f
-  data.tar.gz: efabaf62e09af2fed1de8a5e15e5bcc104ff744dbcfe4976577774a92700a700
+  metadata.gz: bdc4fea5a8e94c9dde41b1c053c16721409f58b6d37f4e42fa36e858aec9e7c5
+  data.tar.gz: 1727d350f98467cb1f8ba4900952490544181b831c2c73dba20951555b362a01
 SHA512:
-  metadata.gz: 07a7bffbc53564983eb5c28944f98983108abf34be06f96eafff061edfc6bc4f800db1634b7e2414d452c063e926a97d834429c762825c0d72dd83eae58eb3be
-  data.tar.gz: 4dcfe3c97fb35c3319f466936a3c09ea84d9c887b02d487ce1b0a14de2e999c0097b9d6d55e9e319f10f102693b0e58d8ccdcdb26861e35b51c39cdb35a3c931
+  metadata.gz: 74945726f34b89deadf829a77b2bf1e0bb7efb95e0c0c915768aa1db8125c18288412d93d6b111b518d7409fafc4dd064167e21d36696316a04994748f814a3c
+  data.tar.gz: 5d0d727278877a6c4a841740d189745c70da31487296e3e8e1c2b001bb8c5c519a37093d8b0f68c440cbf3a8d21989dacc42175163f38c8648a8aed78bfee0fe

data/lib/us_core_test_kit/custom_groups/v6.0.0/capability_statement_group.rb

@@ -0,0 +1,131 @@
+require 'tls_test_kit'
+require_relative '../capability_statement/conformance_support_test'
+require_relative '../capability_statement/fhir_version_test'
+require_relative '../capability_statement/json_support_test'
+require_relative '../capability_statement/profile_support_test'
+require_relative '../capability_statement/instantiate_test'
+
+module USCoreTestKit
+  module USCoreV600
+    class CapabilityStatementGroup < Inferno::TestGroup
+      id :us_core_v600_capability_statement
+      title 'Capability Statement'
+      short_description 'Retrieve information about supported server functionality using the FHIR capabilties interaction.'
+      description %(
+        # Background
+        The #{title} Sequence tests a FHIR server's ability to formally describe
+        features supported by the API by using the [Capability
+        Statement](https://www.hl7.org/fhir/capabilitystatement.html) resource.
+        The features described in the Capability Statement must be consistent with
+        the required capabilities of a US Core server. The Capability Statement
+        must also advertise the location of the required SMART on FHIR endpoints
+        that enable authenticated access to the FHIR server resources.
+
+        The Capability Statement resource allows clients to determine which
+        resources are supported by a FHIR Server. Not all servers are expected to
+        implement all possible queries and data elements described in the US Core
+        API. For example, the US Core Implementation Guide requires that the
+        Patient resource and only one additional resource profile from the US Core
+        Profiles.
+
+        # Test Methodology
+
+        This test sequence accesses the server endpoint at `/metadata` using a
+        `GET` request. It parses the Capability Statement and verifies that:
+
+        * The endpoint is secured by an appropriate cryptographic protocol
+        * The resource matches the expected FHIR version defined by the tests
+        * The resource is a valid FHIR resource
+        * The server claims support for JSON encoding of resources
+        * The server claims support for the Patient resource and one other
+          resource
+
+        It collects the following information that is saved in the testing session
+        for use by later tests:
+
+        * List of resources supported
+        * List of queries parameters supported
+      )
+      run_as_group
+
+      PROFILES = {
+        'AllergyIntolerance' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-allergyintolerance'].freeze,
+        'CarePlan' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-careplan'].freeze,
+        'CareTeam' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-careteam'].freeze,
+        'Condition' => [
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns'
+        ].freeze,
+        'Coverage' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-coverage'].freeze,
+        'Device' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device'].freeze,
+        'DiagnosticReport' => [
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-note'
+        ].freeze,
+        'DocumentReference' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference'].freeze,
+        'Encounter' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter'].freeze,
+        'Goal' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-goal'].freeze,
+        'Immunization' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization'].freeze,
+        'Location' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-location'].freeze,
+        'Medication' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication'].freeze,
+        'MedicationDispense' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationdispense'].freeze,
+        'MedicationRequest' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest'].freeze,
+        'Observation' => [
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-pregnancyintent',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-screening-assessment',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sexual-orientation',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry',
+          'http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure',
+          'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height',
+          'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-occupation',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-result',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-pregnancystatus'
+        ].freeze,
+        'Organization' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'].freeze,
+        'Patient' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'].freeze,
+        'Practitioner' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner'].freeze,
+        'PractitionerRole' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole'].freeze,
+        'Procedure' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure'].freeze,
+        'Provenance' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance'].freeze,
+        'RelatedPerson' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-relatedperson'].freeze,
+        'ServiceRequest' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-servicerequest'].freeze,
+        'Specimen' => ['http://hl7.org/fhir/us/core/StructureDefinition/us-core-specimen'].freeze
+      }.freeze
+
+      test from: :tls_version_test,
+          id: :standalone_auth_tls,
+          title: 'FHIR server secured by transport layer security',
+          description: %(
+            Systems **SHALL** use TLS version 1.2 or higher for all transmissions
+            not taking place over a secure network connection.
+          ),
+          config: {
+            options: {  minimum_allowed_version: OpenSSL::SSL::TLS1_2_VERSION }
+          }
+      test from: :us_core_conformance_support
+      test from: :us_core_fhir_version
+      test from: :us_core_json_support
+
+      test from: :us_core_profile_support do
+        config(
+          options: { us_core_resources: PROFILES.keys }
+        )
+      end
+
+      test from: :us_core_instantiate
+    end
+  end
+end

data/lib/us_core_test_kit/fhir_resource_navigation.rb

@@ -6,7 +6,7 @@ module USCoreTestKit
       elements = Array.wrap(elements)
       return elements if path.blank?
 
-      paths = path.split('.')
+      paths = path.split(/(?<!hl7)\./)
       segment = paths.first
       remaining_path = paths.drop(1).join('.')
 
@@ -33,8 +33,8 @@ module USCoreTestKit
         return elements.first
       end
 
-      path_segments = path.split('.')
-      segment = path_segments.shift.delete_suffix('[x]').to_sym
+      path_segments = path.split(/(?<!hl7)\./)
+      segment = path_segments.shift.delete_suffix('[x]').gsub(/^class$/, 'local_class').to_sym
 
       no_elements_present =
         elements.none? do |element|
@@ -63,7 +63,13 @@ module USCoreTestKit
     end
 
     def get_next_value(element, property)
-      element.send(property)
+      extension_url = property[/(?<=where\(url=').*(?='\))/]
+
+      if extension_url.present?
+        element.url == extension_url ? element : nil
+      else
+        element.send(property)
+      end
     rescue NoMethodError
       nil
     end

data/lib/us_core_test_kit/generated/v3.1.1/document_reference/metadata.yml

@@ -132,7 +132,8 @@
     :full_paths:
     - DocumentReference.category
     :comparators: {}
-    :values: []
+    :values:
+    - clinical-note
     :type: CodeableConcept
     :contains_multiple: true
     :multiple_or: MAY

data/lib/us_core_test_kit/generated/v3.1.1/metadata.yml

@@ -1400,7 +1400,8 @@
       :full_paths:
       - DocumentReference.category
       :comparators: {}
-      :values: []
+      :values:
+      - clinical-note
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY
@@ -6040,9 +6041,17 @@
     - :path: address.city
     - :path: address.state
     - :path: address.postalCode
-    - :path: address.period
     - :path: communication
     - :path: communication.language
+    :choices:
+    - :paths:
+      - address.period.end
+      - address.use
+      :uscdi_only: true
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system

data/lib/us_core_test_kit/generated/v3.1.1/patient/metadata.yml

@@ -171,9 +171,17 @@
   - :path: address.city
   - :path: address.state
   - :path: address.postalCode
-  - :path: address.period
   - :path: communication
   - :path: communication.language
+  :choices:
+  - :paths:
+    - address.period.end
+    - address.use
+    :uscdi_only: true
+  - :paths:
+    - name.period.end
+    - name.use
+    :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier
 - Patient.identifier.system

data/lib/us_core_test_kit/generated/v3.1.1/patient/patient_must_support_test.rb

@@ -15,7 +15,6 @@ module USCoreTestKit
         * Patient.address
         * Patient.address.city
         * Patient.address.line
-        * Patient.address.period
         * Patient.address.postalCode
         * Patient.address.state
         * Patient.birthDate
@@ -35,6 +34,11 @@ module USCoreTestKit
         * Patient.telecom.system
         * Patient.telecom.use
         * Patient.telecom.value
+
+        For ONC USCDI requirements, each Patient must support the following additional elements:
+
+        * Patient.address.period.end or Patient.address.use
+        * Patient.name.period.end or Patient.name.use
       )
 
       id :us_core_v311_patient_must_support_test

data/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb

@@ -42,10 +42,11 @@ module USCoreTestKit
         The US Core Test Kit tests systems for their conformance to the [US Core
         Implementation Guide](http://hl7.org/fhir/us/core/STU3.1.1).
 
-        Resources are validated with the FHIR Java validator using `tx.fhir.org`
-        as the terminology server. Users should note that the although the ONC
-        Certification (g)(10) Standardized API Test Suite includes tests from
-        this suite, [it uses a different method to perform terminology
+        HL7® FHIR® resources are validated with the Java validator using
+        `tx.fhir.org` as the terminology server. Users should note that the
+        although the ONC Certification (g)(10) Standardized API Test Suite
+        includes tests from this suite, [it uses a different method to perform
+        terminology
         validation](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/FAQ#q-why-do-some-resources-fail-in-us-core-test-kit-with-terminology-validation-errors).
         As a result, resource validation results may not be consistent between
         the US Core Test Suite and the ONC Certification (g)(10) Standardized
@@ -61,6 +62,8 @@ module USCoreTestKit
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1
       ].freeze
 
+      VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
+
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
             Generator::GroupMetadata.new(raw_metadata)
@@ -69,8 +72,11 @@ module USCoreTestKit
 
       validator do
         url ENV.fetch('V311_VALIDATOR_URL', 'http://validator_service:4567')
+        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
         exclude_message do |message|
-          VALIDATION_MESSAGE_FILTERS.any? { |filter| filter.match? message.message }
+
+          message_filters.any? { |filter| filter.match? message.message }
         end
 
         perform_additional_validation do |resource, profile_url|

data/lib/us_core_test_kit/generated/v4.0.0/document_reference/metadata.yml

@@ -102,7 +102,8 @@
     :full_paths:
     - DocumentReference.category
     :comparators: {}
-    :values: []
+    :values:
+    - clinical-note
     :type: CodeableConcept
     :contains_multiple: true
     :multiple_or: MAY

data/lib/us_core_test_kit/generated/v4.0.0/metadata.yml

@@ -1388,7 +1388,8 @@
       :full_paths:
       - DocumentReference.category
       :comparators: {}
-      :values: []
+      :values:
+      - clinical-note
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY
@@ -6543,17 +6544,23 @@
     - :path: address.city
     - :path: address.state
     - :path: address.postalCode
-    - :path: address.period
     - :path: communication.language
       :uscdi_only: true
     - :path: name.suffix
       :uscdi_only: true
-    - :path: name.period.end
-      :uscdi_only: true
     - :path: telecom
       :uscdi_only: true
     - :path: communication
       :uscdi_only: true
+    :choices:
+    - :paths:
+      - address.period.end
+      - address.use
+      :uscdi_only: true
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system

data/lib/us_core_test_kit/generated/v4.0.0/patient/metadata.yml

@@ -176,17 +176,23 @@
   - :path: address.city
   - :path: address.state
   - :path: address.postalCode
-  - :path: address.period
   - :path: communication.language
     :uscdi_only: true
   - :path: name.suffix
     :uscdi_only: true
-  - :path: name.period.end
-    :uscdi_only: true
   - :path: telecom
     :uscdi_only: true
   - :path: communication
     :uscdi_only: true
+  :choices:
+  - :paths:
+    - address.period.end
+    - address.use
+    :uscdi_only: true
+  - :paths:
+    - name.period.end
+    - name.use
+    :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier
 - Patient.identifier.system

data/lib/us_core_test_kit/generated/v4.0.0/patient/patient_must_support_test.rb

@@ -15,7 +15,6 @@ module USCoreTestKit
         * Patient.address
         * Patient.address.city
         * Patient.address.line
-        * Patient.address.period
         * Patient.address.postalCode
         * Patient.address.state
         * Patient.birthDate
@@ -29,12 +28,13 @@ module USCoreTestKit
 
         For ONC USCDI requirements, each Patient must support the following additional elements:
 
+        * Patient.address.period.end or Patient.address.use
         * Patient.communication
         * Patient.communication.language
         * Patient.extension:birthsex
         * Patient.extension:ethnicity
         * Patient.extension:race
-        * Patient.name.period.end
+        * Patient.name.period.end or Patient.name.use
         * Patient.name.suffix
         * Patient.telecom
         * Patient.telecom.system

data/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb

@@ -44,10 +44,11 @@ module USCoreTestKit
         The US Core Test Kit tests systems for their conformance to the [US Core
         Implementation Guide](http://hl7.org/fhir/us/core/STU4).
 
-        Resources are validated with the FHIR Java validator using `tx.fhir.org`
-        as the terminology server. Users should note that the although the ONC
-        Certification (g)(10) Standardized API Test Suite includes tests from
-        this suite, [it uses a different method to perform terminology
+        HL7® FHIR® resources are validated with the Java validator using
+        `tx.fhir.org` as the terminology server. Users should note that the
+        although the ONC Certification (g)(10) Standardized API Test Suite
+        includes tests from this suite, [it uses a different method to perform
+        terminology
         validation](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/FAQ#q-why-do-some-resources-fail-in-us-core-test-kit-with-terminology-validation-errors).
         As a result, resource validation results may not be consistent between
         the US Core Test Suite and the ONC Certification (g)(10) Standardized
@@ -63,6 +64,8 @@ module USCoreTestKit
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1
       ].freeze
 
+      VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
+
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
             Generator::GroupMetadata.new(raw_metadata)
@@ -71,8 +74,11 @@ module USCoreTestKit
 
       validator do
         url ENV.fetch('V400_VALIDATOR_URL', 'http://validator_service:4567')
+        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
         exclude_message do |message|
-          VALIDATION_MESSAGE_FILTERS.any? { |filter| filter.match? message.message }
+
+          message_filters.any? { |filter| filter.match? message.message }
         end
 
         perform_additional_validation do |resource, profile_url|

data/lib/us_core_test_kit/generated/v5.0.1/condition_encounter_diagnosis/metadata.yml

@@ -120,9 +120,9 @@
     :multiple_or: MAY
   :asserted-date:
     :paths:
-    - extension
+    - extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
     :full_paths:
-    - Condition.extension
+    - Condition.extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
     :comparators:
       :eq: MAY
       :ne: MAY
@@ -134,8 +134,8 @@
       :eb: MAY
       :ap: MAY
     :values: []
-    :type: Extension
-    :contains_multiple: true
+    :type: dateTime
+    :contains_multiple: false
     :multiple_or: MAY
   :code:
     :paths:

data/lib/us_core_test_kit/generated/v5.0.1/condition_problems_health_concerns/metadata.yml

@@ -121,9 +121,9 @@
     :multiple_or: MAY
   :asserted-date:
     :paths:
-    - extension
+    - extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
     :full_paths:
-    - Condition.extension
+    - Condition.extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
     :comparators:
       :eq: MAY
       :ne: MAY
@@ -135,8 +135,8 @@
       :eb: MAY
       :ap: MAY
     :values: []
-    :type: Extension
-    :contains_multiple: true
+    :type: dateTime
+    :contains_multiple: false
     :multiple_or: MAY
   :code:
     :paths:

data/lib/us_core_test_kit/generated/v5.0.1/document_reference/metadata.yml

@@ -102,7 +102,8 @@
     :full_paths:
     - DocumentReference.category
     :comparators: {}
-    :values: []
+    :values:
+    - clinical-note
     :type: CodeableConcept
     :contains_multiple: true
     :multiple_or: MAY

data/lib/us_core_test_kit/generated/v5.0.1/metadata.yml

@@ -669,9 +669,9 @@
       :multiple_or: MAY
     :asserted-date:
       :paths:
-      - extension
+      - extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
       :full_paths:
-      - Condition.extension
+      - Condition.extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
       :comparators:
         :eq: MAY
         :ne: MAY
@@ -683,8 +683,8 @@
         :eb: MAY
         :ap: MAY
       :values: []
-      :type: Extension
-      :contains_multiple: true
+      :type: dateTime
+      :contains_multiple: false
       :multiple_or: MAY
     :code:
       :paths:
@@ -976,9 +976,9 @@
       :multiple_or: MAY
     :asserted-date:
       :paths:
-      - extension
+      - extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
       :full_paths:
-      - Condition.extension
+      - Condition.extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-assertedDate').valueDateTime
       :comparators:
         :eq: MAY
         :ne: MAY
@@ -990,8 +990,8 @@
         :eb: MAY
         :ap: MAY
       :values: []
-      :type: Extension
-      :contains_multiple: true
+      :type: dateTime
+      :contains_multiple: false
       :multiple_or: MAY
     :code:
       :paths:
@@ -1871,7 +1871,8 @@
       :full_paths:
       - DocumentReference.category
       :comparators: {}
-      :values: []
+      :values:
+      - clinical-note
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY
@@ -8780,13 +8781,10 @@
     - :path: address.city
     - :path: address.state
     - :path: address.postalCode
-    - :path: address.period
     - :path: communication.language
       :uscdi_only: true
     - :path: name.suffix
       :uscdi_only: true
-    - :path: name.period.end
-      :uscdi_only: true
     - :path: telecom
       :uscdi_only: true
     - :path: communication
@@ -8797,6 +8795,15 @@
     - :path: name.use
       :fixed_value: old
       :uscdi_only: true
+    :choices:
+    - :paths:
+      - address.period.end
+      - address.use
+      :uscdi_only: true
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system
@@ -9662,7 +9669,8 @@
       :full_paths:
       - QuestionnaireResponse.meta.tag
       :comparators: {}
-      :values: []
+      :values:
+      - sdoh
       :type: Coding
       :contains_multiple: true
       :multiple_or: MAY
@@ -9981,6 +9989,11 @@
       - sdoh
       - '386053000'
       - '410606002'
+      - '108252007'
+      - '363679005'
+      - '409063005'
+      - '409073007'
+      - '387713003'
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY

data/lib/us_core_test_kit/generated/v5.0.1/patient/metadata.yml

@@ -179,13 +179,10 @@
   - :path: address.city
   - :path: address.state
   - :path: address.postalCode
-  - :path: address.period
   - :path: communication.language
     :uscdi_only: true
   - :path: name.suffix
     :uscdi_only: true
-  - :path: name.period.end
-    :uscdi_only: true
   - :path: telecom
     :uscdi_only: true
   - :path: communication
@@ -196,6 +193,15 @@
   - :path: name.use
     :fixed_value: old
     :uscdi_only: true
+  :choices:
+  - :paths:
+    - address.period.end
+    - address.use
+    :uscdi_only: true
+  - :paths:
+    - name.period.end
+    - name.use
+    :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier
 - Patient.identifier.system

data/lib/us_core_test_kit/generated/v5.0.1/patient/patient_must_support_test.rb

@@ -15,7 +15,6 @@ module USCoreTestKit
         * Patient.address
         * Patient.address.city
         * Patient.address.line
-        * Patient.address.period
         * Patient.address.postalCode
         * Patient.address.state
         * Patient.birthDate
@@ -29,16 +28,15 @@ module USCoreTestKit
 
         For ONC USCDI requirements, each Patient must support the following additional elements:
 
-        * Patient.address.use
+        * Patient.address.period.end or Patient.address.use
         * Patient.communication
         * Patient.communication.language
         * Patient.extension:birthsex
         * Patient.extension:ethnicity
         * Patient.extension:genderIdentity
         * Patient.extension:race
-        * Patient.name.period.end
+        * Patient.name.period.end or Patient.name.use
         * Patient.name.suffix
-        * Patient.name.use
         * Patient.telecom
         * Patient.telecom.system
         * Patient.telecom.use