us_core_test_kit 0.2.1 → 0.2.4

data/lib/us_core_test_kit/generated/v4.0.0/heart_rate/heart_rate_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_heart_rate_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Heart Rate Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Heart Rate Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/immunization/immunization_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_immunization_validation_test
       title 'Immunization resources returned during previous tests conform to the US Core Immunization Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Immunization Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/medication_request/medication_request_must_support_test.rb

@@ -19,8 +19,7 @@ module USCoreTestKit
         * MedicationRequest.encounter
         * MedicationRequest.intent
         * MedicationRequest.medication[x]
-        * MedicationRequest.reportedBoolean
-        * MedicationRequest.reportedReference
+        * MedicationRequest.reportedBoolean or MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.status
         * MedicationRequest.subject

data/lib/us_core_test_kit/generated/v4.0.0/medication_request/medication_request_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_medication_request_validation_test
       title 'MedicationRequest resources returned during previous tests conform to the US Core MedicationRequest Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core MedicationRequest Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/medication_request/medication_validation_test.rb

@@ -8,7 +8,7 @@ module USCoreTestKit
       id :us_core_v400_medication_validation_test
       title 'Medication resources returned during previous tests conform to the US Core Medication Profile'
       description %(
-  This test verifies resources returned from previous tests conform to
+This test verifies resources returned from previous tests conform to
 the [US Core Medication Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication).
 
 It verifies the presence of mandatory elements and that elements with
@@ -29,7 +29,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication',
+                                skip_if_empty: false)
       end
     end
   end

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

@@ -12119,10 +12119,13 @@
     :extensions:
     - :id: Patient.extension:race
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
+      :uscdi_only: true
     - :id: Patient.extension:ethnicity
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
+      :uscdi_only: true
     - :id: Patient.extension:birthsex
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
+      :uscdi_only: true
     :slices: []
     :elements:
     - :path: identifier
@@ -12132,8 +12135,11 @@
     - :path: name.family
     - :path: name.given
     - :path: telecom.system
+      :uscdi_only: true
     - :path: telecom.value
+      :uscdi_only: true
     - :path: telecom.use
+      :uscdi_only: true
     - :path: gender
     - :path: birthDate
     - :path: address
@@ -12143,10 +12149,23 @@
     - :path: address.postalCode
     - :path: address.period
     - :path: communication.language
-    - :path: telecom
+      :uscdi_only: true
     - :path: name.suffix
+      :uscdi_only: true
     - :path: name.use
       :fixed_value: old
+      :uscdi_only: true
+    - :path: name.period.end
+      :uscdi_only: true
+    - :path: telecom
+      :uscdi_only: true
+    - :path: communication
+      :uscdi_only: true
+    :choices:
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system
@@ -13976,7 +13995,6 @@
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
-      - http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization
     - :path: agent.onBehalfOf
       :types:
       - Reference

data/lib/us_core_test_kit/generated/v4.0.0/observation_lab/observation_lab_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_observation_lab_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Laboratory Result Observation Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Laboratory Result Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/organization/organization_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_organization_validation_test
       title 'Organization resources returned during previous tests conform to the US Core Organization Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Organization Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization',
+                                skip_if_empty: true)
       end
     end
   end

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

@@ -151,10 +151,13 @@
   :extensions:
   - :id: Patient.extension:race
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
+    :uscdi_only: true
   - :id: Patient.extension:ethnicity
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
+    :uscdi_only: true
   - :id: Patient.extension:birthsex
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
+    :uscdi_only: true
   :slices: []
   :elements:
   - :path: identifier
@@ -164,8 +167,11 @@
   - :path: name.family
   - :path: name.given
   - :path: telecom.system
+    :uscdi_only: true
   - :path: telecom.value
+    :uscdi_only: true
   - :path: telecom.use
+    :uscdi_only: true
   - :path: gender
   - :path: birthDate
   - :path: address
@@ -175,10 +181,23 @@
   - :path: address.postalCode
   - :path: address.period
   - :path: communication.language
-  - :path: telecom
+    :uscdi_only: true
   - :path: name.suffix
+    :uscdi_only: true
   - :path: name.use
     :fixed_value: old
+    :uscdi_only: true
+  - :path: name.period.end
+    :uscdi_only: true
+  - :path: telecom
+    :uscdi_only: true
+  - :path: communication
+    :uscdi_only: true
+  :choices:
+  - :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

@@ -19,10 +19,6 @@ module USCoreTestKit
         * Patient.address.postalCode
         * Patient.address.state
         * Patient.birthDate
-        * Patient.communication.language
-        * Patient.extension:birthsex
-        * Patient.extension:ethnicity
-        * Patient.extension:race
         * Patient.gender
         * Patient.identifier
         * Patient.identifier.system
@@ -30,8 +26,16 @@ module USCoreTestKit
         * Patient.name
         * Patient.name.family
         * Patient.name.given
+
+        For ONC USCDI requirements, each Patient must support the following additional elements:
+
+        * Patient.communication
+        * Patient.communication.language
+        * Patient.extension:birthsex
+        * Patient.extension:ethnicity
+        * Patient.extension:race
+        * Patient.name.period.end or Patient.name.use
         * Patient.name.suffix
-        * Patient.name.use
         * Patient.telecom
         * Patient.telecom.system
         * Patient.telecom.use

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

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_patient_validation_test
       title 'Patient resources returned during previous tests conform to the US Core Patient Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Patient Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_bmi_for_age/pediatric_bmi_for_age_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_pediatric_bmi_for_age_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Pediatric BMI for Age Observation Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Pediatric BMI for Age Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_pediatric_weight_for_height_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Pediatric Weight for Height Observation Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Pediatric Weight for Height Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/practitioner/practitioner_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_practitioner_validation_test
       title 'Practitioner resources returned during previous tests conform to the US Core Practitioner Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Practitioner Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/procedure/procedure_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_procedure_validation_test
       title 'Procedure resources returned during previous tests conform to the US Core Procedure Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Procedure Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure',
+                                skip_if_empty: true)
       end
     end
   end

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

@@ -64,7 +64,6 @@
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
-    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization
   - :path: agent.onBehalfOf
     :types:
     - Reference

data/lib/us_core_test_kit/generated/v4.0.0/provenance/provenance_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_provenance_validation_test
       title 'Provenance resources returned during previous tests conform to the US Core Provenance Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Provenance Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry/pulse_oximetry_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_pulse_oximetry_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Pulse Oximetry Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Pulse Oximetry Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/respiratory_rate_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_respiratory_rate_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Respiratory Rate Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Respiratory Rate Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate',
+                                skip_if_empty: true)
       end
     end
   end

data/lib/us_core_test_kit/generated/v4.0.0/smokingstatus/smokingstatus_validation_test.rb

@@ -8,8 +8,9 @@ module USCoreTestKit
       id :us_core_v400_smokingstatus_validation_test
       title 'Observation resources returned during previous tests conform to the US Core Smoking Status Observation Profile'
       description %(
-  This test verifies resources returned from the first search conform to
+This test verifies resources returned from the first search conform to
 the [US Core Smoking Status Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus).
+Systems must demonstrate at least one valid example in order to pass this test.
 
 It verifies the presence of mandatory elements and that elements with
 required bindings contain appropriate values. CodeableConcept element
@@ -29,7 +30,9 @@ fail if their code/system are not found in the valueset.
       end
 
       run do
-        perform_validation_test(scratch_resources[:all] || [], 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus')
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus',
+                                skip_if_empty: true)
       end
     end
   end

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

@@ -44,8 +44,8 @@ module USCoreTestKit
       VALIDATION_MESSAGE_FILTERS = [
         %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
         %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        /^Observation\.effective\.ofType\(Period\): vs-1:/, # Invalid invariant in FHIR v4.0.1
-        /^Observation\.effective\.ofType\(Period\): us-core-1:/ # Invalid invariant in US Core v3.1.1
+        /Observation\.effective\.ofType\(Period\): vs-1:/, # Invalid invariant in FHIR v4.0.1
+        /Observation\.effective\.ofType\(Period\): us-core-1:/ # Invalid invariant in US Core v3.1.1
       ].freeze
 
       def self.metadata

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -277,7 +277,6 @@ module USCoreTestKit
         when '4.0.0'
           add_device_distinct_identifier
           add_patient_uscdi_elements
-          add_provenance_agent_who
         end
       end
 
@@ -344,18 +343,23 @@ module USCoreTestKit
       def add_must_support_choices
         choices = []
 
-        choices << {paths: ['content.attachment.data', 'content.attachment.url']} if profile.type == 'DocumentReference'
+        choices << { paths: ['content.attachment.data', 'content.attachment.url'] } if profile.type == 'DocumentReference'
 
         case profile.version
         when '3.1.1'
-          choices << {paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF']} if profile.type == 'Device'
+          choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] } if profile.type == 'Device'
         when '4.0.0'
           case profile.type
           when 'Encounter'
-            choices << {paths: ['reasonCode', 'reasonReference']}
-            choices << {paths: ['location.location', 'serviceProvider']}
+            choices << { paths: ['reasonCode', 'reasonReference'] }
+            choices << { paths: ['location.location', 'serviceProvider'] }
           when 'MedicationRequest'
-            choices << {paths: ['reportedBoolean', 'reportedReference']}
+            choices << { paths: ['reportedBoolean', 'reportedReference'] }
+          when 'Patient'
+            choices << {
+              paths: ['name.period.end', 'name.use'],
+              uscdi_only: true
+            }
           end
         end
 
@@ -377,35 +381,44 @@ module USCoreTestKit
           #US Core 4.0.0 Section 10.112.1.1 Additional USCDI v1 Requirement:
           @must_supports[:extensions] << {
             id: 'Patient.extension:race',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race',
+            uscdi_only: true
           }
           @must_supports[:extensions] << {
             id: 'Patient.extension:ethnicity',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity',
+            uscdi_only: true
           }
           @must_supports[:extensions] << {
             id: 'Patient.extension:birthsex',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'telecom'
+            path: 'name.suffix',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.suffix'
+            path: 'name.use',
+            fixed_value: 'old',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.use',
-            fixed_value: 'old'
+            path: 'name.period.end',
+            uscdi_only: true
           }
-        end
-      end
-
-      def add_provenance_agent_who
-        # FHIR-36344 US Core 4.0.0 mistakenly not lable us-core-organization as MS for Provenance.agent.who
-        # This will be fixed in US Core 5.0.0
-        if profile.type == 'Provenance'
-          target_element = @must_supports[:elements].find { |element| element[:path] == 'agent.who'}
-          target_element[:target_profiles] << 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'
+          @must_supports[:elements] << {
+            path: 'telecom',
+            uscdi_only: true
+          }
+          @must_supports[:elements] << {
+            path: 'communication',
+            uscdi_only: true
+          }
+          @must_supports[:elements].each do |element|
+            path = element[:path]
+            element[:uscdi_only] = true if path.include?('telecom.') || path.include?('communication.')
+          end
         end
       end
     end

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -68,9 +68,32 @@ module USCoreTestKit
       end
 
       def must_support_list_string
-        slice_names = group_metadata.must_supports[:slices].map { |slice| slice[:name] }
-        element_names = group_metadata.must_supports[:elements].map { |slice| "#{resource_type}.#{slice[:path]}" }
-        extension_names = group_metadata.must_supports[:extensions].map { |slice| slice[:id] }
+        build_must_support_list_string(false)
+      end
+
+      def uscdi_list_string
+        build_must_support_list_string(true)
+      end
+
+      def build_must_support_list_string(uscdi_only)
+        slice_names = group_metadata.must_supports[:slices]
+          .select { |slice| slice[:uscdi_only].presence == uscdi_only.presence }
+          .map { |slice| slice[:name] }
+
+        element_names = group_metadata.must_supports[:elements]
+          .select { |element| element[:uscdi_only].presence == uscdi_only.presence }
+          .map { |element| "#{resource_type}.#{element[:path]}" }
+
+        extension_names = group_metadata.must_supports[:extensions]
+          .select { |extension| extension[:uscdi_only].presence == uscdi_only.presence }
+          .map { |extension| extension[:id] }
+
+        group_metadata.must_supports[:choices]&.each do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
+          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+        end
+
         (slice_names + element_names + extension_names)
           .uniq
           .sort