onc_certification_g10_test_kit 3.8.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684b1d3bb5e7e1b863449d65f09aab2f87050dbc3145e700b735e983ff1c363f
-  data.tar.gz: 808259cb62b506e6c432ae2ef0d1878920131fff49e31cd70b43e8c05dce6fb8
+  metadata.gz: 2525b2baf952aee11b7ea83097aa3e90e7b41ce6a8e1f423a6c5c5449121f720
+  data.tar.gz: 7a6b0ba8da7ca7a63bb3faf2baadd6572efd5f56e98ca0f53145e4cfcd06cff4
 SHA512:
-  metadata.gz: 430f9a8267a7fc1aaead33250a258fe7b6c99d6459dee03ecefb60af440668b7390ba2f09ee9a3d6953034d0da0094a09de4cc718602bdeb5466adac391f292e
-  data.tar.gz: 523348bc9d83e1e12e72e4359607d38c4380c7b1fcb87101a83ff38299e625c907cad4cd62af1cd0a90fe0a04d24e56f5f1cef278bf40067065fc89185ede8b5
+  metadata.gz: 6a7dcb2f51e58c49e79ddf73c1e52bfee9e1f1b06ed20ded7c756604bbeaf1466df79380e240d9dd80963e2c03fc5be44d0ce9bf84dbc7fdeac35fd4cdcb0353
+  data.tar.gz: dc384fa0d44d2a1adf882626a5c92c5ee61872bcfd356020bcd5105fcc389f71d6830c3df93df8dd4ae08a4074e9a3baf4f89caf696aec703a8acffa1616487d

data/lib/inferno/terminology/expected_manifest.yml

@@ -121,7 +121,7 @@
   - http://hl7.org/fhir/composition-status
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-documentreference-type
   :file: hl7_org_fhir_us_core_ValueSet_us-core-documentreference-type.msgpack
-  :count: 11042
+  :count: 11418
   :type: bloom
   :code_systems:
   - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
@@ -134,7 +134,7 @@
   - http://hl7.org/fhir/document-relationship-type
 - :url: http://hl7.org/fhir/ValueSet/mimetypes
   :file: hl7_org_fhir_ValueSet_mimetypes.msgpack
-  :count: 2382
+  :count: 2503
   :type: bloom
   :code_systems:
   - urn:ietf:bcp:13
@@ -354,30 +354,6 @@
   :code_systems:
   - http://terminology.hl7.org/CodeSystem/condition-category
   - http://hl7.org/fhir/us/core/CodeSystem/condition-category
-- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-diagnosticreport-category
-  :file: hl7_org_fhir_us_core_ValueSet_us-core-diagnosticreport-category.msgpack
-  :count: 3
-  :type: bloom
-  :code_systems:
-  - http://loinc.org
-- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-documentreference-category
-  :file: hl7_org_fhir_us_core_ValueSet_us-core-documentreference-category.msgpack
-  :count: 1
-  :type: bloom
-  :code_systems:
-  - http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category
-- :url: http://hl7.org/fhir/ValueSet/medicationrequest-category
-  :file: hl7_org_fhir_ValueSet_medicationrequest-category.msgpack
-  :count: 4
-  :type: bloom
-  :code_systems:
-  - http://terminology.hl7.org/CodeSystem/medicationrequest-category
-- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-tags
-  :file: hl7_org_fhir_us_core_ValueSet_us-core-tags.msgpack
-  :count: 1
-  :type: bloom
-  :code_systems:
-  - http://hl7.org/fhir/us/core/CodeSystem/us-core-tags
 - :url: http://hl7.org/fhir/ValueSet/questionnaire-answers-status
   :file: hl7_org_fhir_ValueSet_questionnaire-answers-status.msgpack
   :count: 5
@@ -390,13 +366,37 @@
   :type: bloom
   :code_systems:
   - http://hl7.org/fhir/request-intent
-- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-servicerequest-category
-  :file: hl7_org_fhir_us_core_ValueSet_us-core-servicerequest-category.msgpack
-  :count: 8
+- :url: http://hl7.org/fhir/ValueSet/fm-status
+  :file: hl7_org_fhir_ValueSet_fm-status.msgpack
+  :count: 4
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/fm-status
+- :url: http://hl7.org/fhir/ValueSet/medicationdispense-status
+  :file: hl7_org_fhir_ValueSet_medicationdispense-status.msgpack
+  :count: 9
+  :type: bloom
+  :code_systems:
+  - http://terminology.hl7.org/CodeSystem/medicationdispense-status
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-clinical-result-observation-category
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-clinical-result-observation-category.msgpack
+  :count: 7
+  :type: bloom
+  :code_systems:
+  - http://terminology.hl7.org/CodeSystem/observation-category
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1240.3
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1240_3.msgpack
+  :count: 4
   :type: bloom
   :code_systems:
-  - http://hl7.org/fhir/us/core/CodeSystem/us-core-tags
   - http://snomed.info/sct
+  - http://terminology.hl7.org/CodeSystem/data-absent-reason
+- :url: http://hl7.org/fhir/ValueSet/specimen-status
+  :file: hl7_org_fhir_ValueSet_specimen-status.msgpack
+  :count: 4
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/specimen-status
 - :url: http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical
   :file: terminology_hl7_org_CodeSystem_allergyintolerance-clinical.msgpack
   :count: 3
@@ -504,7 +504,7 @@
   :code_systems: http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://loinc.org
   :file: loinc_org.msgpack
-  :count: 283408
+  :count: 287148
   :type: bloom
   :code_systems: http://loinc.org
 - :url: http://hl7.org/fhir/document-relationship-type
@@ -514,7 +514,7 @@
   :code_systems: http://hl7.org/fhir/document-relationship-type
 - :url: urn:ietf:bcp:13
   :file: urn_ietf_bcp_13.msgpack
-  :count: 2382
+  :count: 2503
   :type: bloom
   :code_systems: urn:ietf:bcp:13
 - :url: http://hl7.org/fhir/identifier-use
@@ -597,11 +597,6 @@
   :count: 4
   :type: bloom
   :code_systems: http://hl7.org/fhir/quantity-comparator
-- :url: http://unitsofmeasure.org
-  :file: unitsofmeasure_org.msgpack
-  :count: 1443
-  :type: bloom
-  :code_systems: http://unitsofmeasure.org
 - :url: http://hl7.org/fhir/name-use
   :file: hl7_org_fhir_name-use.msgpack
   :count: 7
@@ -652,28 +647,38 @@
   :count: 2
   :type: bloom
   :code_systems: http://hl7.org/fhir/us/core/CodeSystem/condition-category
-- :url: http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category
-  :file: hl7_org_fhir_us_core_CodeSystem_us-core-documentreference-category.msgpack
-  :count: 1
-  :type: bloom
-  :code_systems: http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category
-- :url: http://terminology.hl7.org/CodeSystem/medicationrequest-category
-  :file: terminology_hl7_org_CodeSystem_medicationrequest-category.msgpack
-  :count: 4
-  :type: bloom
-  :code_systems: http://terminology.hl7.org/CodeSystem/medicationrequest-category
-- :url: http://hl7.org/fhir/us/core/CodeSystem/us-core-tags
-  :file: hl7_org_fhir_us_core_CodeSystem_us-core-tags.msgpack
-  :count: 1
-  :type: bloom
-  :code_systems: http://hl7.org/fhir/us/core/CodeSystem/us-core-tags
 - :url: http://hl7.org/fhir/questionnaire-answers-status
   :file: hl7_org_fhir_questionnaire-answers-status.msgpack
   :count: 5
   :type: bloom
   :code_systems: http://hl7.org/fhir/questionnaire-answers-status
+- :url: http://hl7.org/fhir/fm-status
+  :file: hl7_org_fhir_fm-status.msgpack
+  :count: 4
+  :type: bloom
+  :code_systems: http://hl7.org/fhir/fm-status
+- :url: http://terminology.hl7.org/CodeSystem/medicationdispense-status
+  :file: terminology_hl7_org_CodeSystem_medicationdispense-status.msgpack
+  :count: 9
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/medicationdispense-status
+- :url: http://terminology.hl7.org/CodeSystem/observation-category
+  :file: terminology_hl7_org_CodeSystem_observation-category.msgpack
+  :count: 9
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/observation-category
 - :url: http://snomed.info/sct
   :file: snomed_info_sct.msgpack
-  :count: 498684
+  :count: 508538
   :type: bloom
   :code_systems: http://snomed.info/sct
+- :url: http://terminology.hl7.org/CodeSystem/data-absent-reason
+  :file: terminology_hl7_org_CodeSystem_data-absent-reason.msgpack
+  :count: 15
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/data-absent-reason
+- :url: http://hl7.org/fhir/specimen-status
+  :file: hl7_org_fhir_specimen-status.msgpack
+  :count: 4
+  :type: bloom
+  :code_systems: http://hl7.org/fhir/specimen-status

data/lib/inferno/terminology/fhir_package_manager.rb

@@ -18,7 +18,8 @@ module Inferno
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.102',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.103',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.2074.1.1.3'
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.2074.1.1.3',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1240.3'
           # The ValueSets below are needed when building all of the terminology
           # rather than only the terminology for required bindings.
           # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.8',

data/lib/inferno/terminology/loader.rb

@@ -28,7 +28,10 @@ module Inferno
         'http://hl7.org/fhir/ValueSet/example-intensional', # Unhandled filter parent =
         'http://hl7.org/fhir/ValueSet/use-context', # ValueSet contains an unknown ValueSet
         'http://hl7.org/fhir/ValueSet/media-modality', # ValueSet contains an unknown ValueSet
-        'http://hl7.org/fhir/ValueSet/example-hierarchical' # Example valueset with fake codes
+        'http://hl7.org/fhir/ValueSet/example-hierarchical', # Example valueset with fake codes
+        # We don't perform code system validation, this code system is no longer
+        # in UMLS, and this bloom filter was not being correctly generated anyway
+        'http://unitsofmeasure.org'
       ].freeze
 
       @value_sets_repo = Inferno::Repositories::ValueSets.new
@@ -146,7 +149,7 @@ module Inferno
               Inferno.logger.warn "#{e.message} for CodeSystem #{cs_name}"
               next
             end
-          end
+          end.compact
           validators = (vs_validators + cs_validators).compact
 
           # Write manifest for loading later
@@ -195,7 +198,8 @@ module Inferno
           all_metadata =
             USCoreTestKit::USCoreV311::USCoreTestSuite.metadata +
             USCoreTestKit::USCoreV400::USCoreTestSuite.metadata +
-            USCoreTestKit::USCoreV501::USCoreTestSuite.metadata
+            USCoreTestKit::USCoreV501::USCoreTestSuite.metadata +
+            USCoreTestKit::USCoreV610::USCoreTestSuite.metadata
 
           all_metadata =
             all_metadata

data/lib/inferno/terminology/tasks/check_built_terminology.rb

@@ -34,6 +34,13 @@ module Inferno
           mismatched_value_sets.each do |value_set|
             Inferno.logger.info mismatched_value_set_message(value_set)
           end
+
+          return unless new_value_sets.present?
+
+          Inferno.logger.info("\nThe following unexpected value set validators were created:")
+          new_value_sets.each do |value_set|
+            Inferno.logger.info("#{value_set[:url]}: #{value_set[:count]} codes")
+          end
         end
 
         def expected_manifest
@@ -48,7 +55,7 @@ module Inferno
         def new_manifest
           return [] unless File.exist? new_manifest_path
 
-          YAML.load_file(new_manifest_path)
+          @new_manifest ||= YAML.load_file(new_manifest_path)
         end
 
         def mismatched_value_sets
@@ -59,10 +66,19 @@ module Inferno
             end
         end
 
+        def new_value_sets
+          @new_value_sets ||=
+            new_manifest.reject { |value_set| old_value_set?(value_set[:url]) }
+        end
+
         def new_value_set(url)
           new_manifest.find { |value_set| value_set[:url] == url }
         end
 
+        def old_value_set?(url)
+          expected_manifest.any? { |value_set| value_set[:url] == url }
+        end
+
         def only_non_umls_mismatch?
           mismatched_value_sets.all? { |value_set| NON_UMLS_SYSTEMS.include? value_set[:url] }
         end

data/lib/inferno/terminology/tasks/download_fhir_terminology.rb

@@ -18,8 +18,9 @@ module Inferno
           FHIRPackageManager.get_package('hl7.fhir.us.core#3.1.1', PACKAGE_DIR, ['ValueSet', 'CodeSystem'])
           FHIRPackageManager.get_package('hl7.fhir.us.core#4.0.0', PACKAGE_DIR, ['ValueSet', 'CodeSystem'])
           FHIRPackageManager.get_package('hl7.fhir.us.core#5.0.1', PACKAGE_DIR, ['ValueSet', 'CodeSystem'])
+          FHIRPackageManager.get_package('hl7.fhir.us.core#6.1.0', PACKAGE_DIR, ['ValueSet', 'CodeSystem'])
           FHIRPackageManager.get_package(
-            'us.nlm.vsac#0.7.0', File.join(PACKAGE_DIR, 'vsac'), ['ValueSet', 'CodeSystem']
+            'us.nlm.vsac#0.11.0', File.join(PACKAGE_DIR, 'vsac'), ['ValueSet', 'CodeSystem']
           )
         end
 

data/lib/inferno/terminology/tasks/download_umls.rb

@@ -12,7 +12,8 @@ module Inferno
           '2019' => 'https://download.nlm.nih.gov/umls/kss/2019AB/umls-2019AB-full.zip',
           '2020' => 'https://download.nlm.nih.gov/umls/kss/2020AB/umls-2020AB-full.zip',
           '2021' => 'https://download.nlm.nih.gov/umls/kss/2021AA/umls-2021AA-full.zip',
-          '2022' => 'https://download.nlm.nih.gov/umls/kss/2022AA/umls-2022AA-full.zip'
+          '2022' => 'https://download.nlm.nih.gov/umls/kss/2022AA/umls-2022AA-full.zip',
+          '2023' => 'https://download.nlm.nih.gov/umls/kss/2023AA/umls-2023AA-full.zip'
         }.freeze
         TICKET_GRANTING_TICKET_URL = 'https://utslogin.nlm.nih.gov/cas/v1/api-key'.freeze
 

data/lib/inferno/terminology/tasks/expand_value_set_to_file.rb

@@ -16,7 +16,7 @@ module Inferno
           # Before writing the JSON to a file at the end
           end_vs = nil if type == 'json'
 
-          %w[2022].each do |version|
+          %w[2023].each do |version|
             Loader.register_umls_db File.join(TEMP_DIR, version, 'umls.db')
             Loader.load_value_sets_from_directory(PACKAGE_DIR, true)
             vs = Repositories::ValueSets.new.find(value_set_url)

data/lib/inferno/terminology/tasks/run_umls_jar.rb

@@ -12,7 +12,8 @@ module Inferno
           '2019' => 'inferno_2019.prop',
           '2020' => 'inferno_2020.prop',
           '2021' => 'inferno_2021.prop',
-          '2022' => 'inferno_2022.prop'
+          '2022' => 'inferno_2022.prop',
+          '2023' => 'inferno_2023.prop'
         }.freeze
 
         attr_reader :version

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_validation.rb

@@ -414,6 +414,26 @@ module ONCCertificationG10TestKit
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
 
+        For US Core v6.1.0, this test expects evidence of the following US Core profiles
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-occupation
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-pregnancyintent
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-pregnancystatus
+        * 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-smokingstatus
+        * http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
+        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry
+        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
       DESCRIPTION
 
       include BulkExportValidationTester
@@ -658,5 +678,170 @@ module ONCCertificationG10TestKit
         perform_bulk_export_validation
       end
     end
+
+    test do
+      title 'ServiceRequest resources returned conform to the US Core ServiceRequest Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core ServiceRequest profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      id :g10_us_core_6_bulk_service_request_validation
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'ServiceRequest'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'RelatedPerson resources returned conform to the US Core RelatedPerson Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core RelatedPerson profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_related_person_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'RelatedPerson'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'QuestionnaireResponse resources returned conform to the US Core QuestionnaireResponse Profile if ' \
+            'bulk data has QuestionnaireResponse resources'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core QuestionnaireResponse profile. This includes checking for missing
+        data elements and value set verification. This test is omitted if bulk
+        data export does not return any QuestionnaireResponse resources.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_questionnaire_response_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'QuestionnaireResponse'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'PractionerRole resources returned conform to the US Core PractionerRole Profile if bulk data export ' \
+            'has PractionerRole resources'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core PractitionerRole profile. This includes checking for missing
+        data elements and value set verification. This test is omitted if bulk
+        data export does not return any  resources.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_practitioner_role_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'PractitionerRole'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'Coverage resources returned conform to the US Core Coverage Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Coverage profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_coverage_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'Coverage'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'MedicationDispense resources returned conform to the US Core MedicationDispense Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core MedicationDispense profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_medication_dispense_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'MedicationDispense'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
+
+    test do
+      title 'Specimen resources returned conform to the US Core Specimen Profile'
+      description <<~DESCRIPTION
+        This test verifies that the resources returned from bulk data export
+        conform to the US Core Specimen profile. This includes checking
+        for missing data elements and value set verification.
+      DESCRIPTION
+
+      required_suite_options G10Options::US_CORE_6_REQUIREMENT
+
+      id :g10_us_core_6_bulk_specimen_validation
+
+      include BulkExportValidationTester
+
+      def resource_type
+        'Specimen'
+      end
+
+      run do
+        perform_bulk_export_validation
+      end
+    end
   end
 end

data/lib/onc_certification_g10_test_kit/bulk_export_validation_tester.rb

@@ -11,12 +11,16 @@ module ONCCertificationG10TestKit
     MAX_NUM_COLLECTED_LINES = 100
     MIN_RESOURCE_COUNT = 2
     OMIT_KLASS = ['Medication', 'Location', 'QuestionnaireResponse', 'PractitionerRole'].freeze
+    PROFILES_TO_SKIP = [
+      'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation'
+    ].freeze
 
     def metadata_list
       @metadata_list ||=
         versioned_us_core_module::USCoreTestSuite
           .metadata
           .select { |metadata| metadata.resource == resource_type }
+          .reject { |metadata| PROFILES_TO_SKIP.include? metadata.profile_url }
     end
 
     def resources_from_all_files

data/lib/onc_certification_g10_test_kit/g10_options.rb

@@ -3,6 +3,7 @@ module ONCCertificationG10TestKit
     US_CORE_3 = 'us_core_3'.freeze
     US_CORE_4 = 'us_core_4'.freeze
     US_CORE_5 = 'us_core_5'.freeze
+    US_CORE_6 = 'us_core_6'.freeze
 
     BULK_DATA_1 = 'multi_patient_api_stu1'.freeze
     BULK_DATA_2 = 'multi_patient_api_stu2'.freeze
@@ -13,6 +14,7 @@ module ONCCertificationG10TestKit
     US_CORE_3_REQUIREMENT = { us_core_version: US_CORE_3 }.freeze
     US_CORE_4_REQUIREMENT = { us_core_version: US_CORE_4 }.freeze
     US_CORE_5_REQUIREMENT = { us_core_version: US_CORE_5 }.freeze
+    US_CORE_6_REQUIREMENT = { us_core_version: US_CORE_6 }.freeze
 
     BULK_DATA_1_REQUIREMENT = { multi_patient_version: BULK_DATA_1 }.freeze
     BULK_DATA_2_REQUIREMENT = { multi_patient_version: BULK_DATA_2 }.freeze
@@ -32,8 +34,14 @@ module ONCCertificationG10TestKit
       us_core_version == US_CORE_5
     end
 
+    def using_us_core_6?
+      us_core_version == US_CORE_6
+    end
+
     def versioned_us_core_module
       case us_core_version
+      when US_CORE_6
+        USCoreTestKit::USCoreV610
       when US_CORE_5
         USCoreTestKit::USCoreV501
       when US_CORE_4

data/lib/onc_certification_g10_test_kit/igs/CodeSystem-observation-category.json

@@ -0,0 +1,83 @@
+{
+  "resourceType" : "CodeSystem",
+  "id" : "observation-category",
+  "meta" : {
+    "lastUpdated" : "2020-04-09T21:10:28.568+00:00",
+    "profile" : ["http://hl7.org/fhir/StructureDefinition/shareablecodesystem"]
+  },
+  "text" : {
+    "status" : "generated",
+    "div" : "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>This code system <code>http://terminology.hl7.org/CodeSystem/observation-category</code> defines the following codes:</p><table class=\"codes\"><tr><td style=\"white-space:nowrap\"><b>Code</b></td><td><b>Display</b></td><td><b>Definition</b></td></tr><tr><td style=\"white-space:nowrap\">social-history<a name=\"observation-category-social-history\"> </a></td><td>Social History</td><td>Social History Observations define the patient's occupational, personal (e.g., lifestyle), social, familial, and environmental history and health risk factors that may impact the patient's health.</td></tr><tr><td style=\"white-space:nowrap\">vital-signs<a name=\"observation-category-vital-signs\"> </a></td><td>Vital Signs</td><td>Clinical observations measure the body's basic functions such as blood pressure, heart rate, respiratory rate, height, weight, body mass index, head circumference, pulse oximetry, temperature, and body surface area.</td></tr><tr><td style=\"white-space:nowrap\">imaging<a name=\"observation-category-imaging\"> </a></td><td>Imaging</td><td>Observations generated by imaging. The scope includes observations regarding plain x-ray, ultrasound, CT, MRI, angiography, echocardiography, and nuclear medicine.</td></tr><tr><td style=\"white-space:nowrap\">laboratory<a name=\"observation-category-laboratory\"> </a></td><td>Laboratory</td><td>The results of observations generated by laboratories.  Laboratory results are typically generated by laboratories providing analytic services in areas such as chemistry, hematology, serology, histology, cytology, anatomic pathology (including digital pathology), microbiology, and/or virology. These observations are based on analysis of specimens obtained from the patient and submitted to the laboratory.</td></tr><tr><td style=\"white-space:nowrap\">procedure<a name=\"observation-category-procedure\"> </a></td><td>Procedure</td><td>Observations generated by other procedures.  This category includes observations resulting from interventional and non-interventional procedures excluding laboratory and imaging (e.g., cardiology catheterization, endoscopy, electrodiagnostics, etc.).  Procedure results are typically generated by a clinician to provide more granular information about component observations made during a procedure.  An example would be when a gastroenterologist reports the size of a polyp observed during a colonoscopy.</td></tr><tr><td style=\"white-space:nowrap\">survey<a name=\"observation-category-survey\"> </a></td><td>Survey</td><td>Assessment tool/survey instrument observations (e.g., Apgar Scores, Montreal Cognitive Assessment (MoCA)).</td></tr><tr><td style=\"white-space:nowrap\">exam<a name=\"observation-category-exam\"> </a></td><td>Exam</td><td>Observations generated by physical exam findings including direct observations made by a clinician and use of simple instruments and the result of simple maneuvers performed directly on the patient's body.</td></tr><tr><td style=\"white-space:nowrap\">therapy<a name=\"observation-category-therapy\"> </a></td><td>Therapy</td><td>Observations generated by non-interventional treatment protocols (e.g. occupational, physical, radiation, nutritional and medication therapy)</td></tr><tr><td style=\"white-space:nowrap\">activity<a name=\"observation-category-activity\"> </a></td><td>Activity</td><td>Observations that measure or record any bodily activity that enhances or maintains physical fitness and overall health and wellness.  Not under direct supervision of practitioner such as a physical therapist. (e.g., laps swum, steps, sleep data)</td></tr></table></div>"
+  },
+  "extension" : [{
+    "url" : "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
+    "valueCode" : "oo"
+  }],
+  "url" : "http://terminology.hl7.org/CodeSystem/observation-category",
+  "identifier" : [{
+    "system" : "urn:ietf:rfc:3986",
+    "value" : "urn:oid:2.16.840.1.113883.4.642.1.1125"
+  }],
+  "version" : "0.1.0",
+  "name" : "ObservationCategoryCodes",
+  "title" : "Observation Category Codes",
+  "status" : "draft",
+  "experimental" : false,
+  "date" : "2023-02-25T11:07:30-07:00",
+  "publisher" : "FHIR Project team",
+  "contact" : [{
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://hl7.org/fhir"
+    }]
+  }],
+  "description" : "Observation Category codes.",
+  "caseSensitive" : true,
+  "valueSet" : "http://terminology.hl7.org/ValueSet/observation-category",
+  "content" : "complete",
+  "concept" : [{
+    "code" : "social-history",
+    "display" : "Social History",
+    "definition" : "Social History Observations define the patient's occupational, personal (e.g., lifestyle), social, familial, and environmental history and health risk factors that may impact the patient's health."
+  },
+  {
+    "code" : "vital-signs",
+    "display" : "Vital Signs",
+    "definition" : "Clinical observations measure the body's basic functions such as blood pressure, heart rate, respiratory rate, height, weight, body mass index, head circumference, pulse oximetry, temperature, and body surface area."
+  },
+  {
+    "code" : "imaging",
+    "display" : "Imaging",
+    "definition" : "Observations generated by imaging. The scope includes observations regarding plain x-ray, ultrasound, CT, MRI, angiography, echocardiography, and nuclear medicine."
+  },
+  {
+    "code" : "laboratory",
+    "display" : "Laboratory",
+    "definition" : "The results of observations generated by laboratories.  Laboratory results are typically generated by laboratories providing analytic services in areas such as chemistry, hematology, serology, histology, cytology, anatomic pathology (including digital pathology), microbiology, and/or virology. These observations are based on analysis of specimens obtained from the patient and submitted to the laboratory."
+  },
+  {
+    "code" : "procedure",
+    "display" : "Procedure",
+    "definition" : "Observations generated by other procedures.  This category includes observations resulting from interventional and non-interventional procedures excluding laboratory and imaging (e.g., cardiology catheterization, endoscopy, electrodiagnostics, etc.).  Procedure results are typically generated by a clinician to provide more granular information about component observations made during a procedure.  An example would be when a gastroenterologist reports the size of a polyp observed during a colonoscopy."
+  },
+  {
+    "code" : "survey",
+    "display" : "Survey",
+    "definition" : "Assessment tool/survey instrument observations (e.g., Apgar Scores, Montreal Cognitive Assessment (MoCA))."
+  },
+  {
+    "code" : "exam",
+    "display" : "Exam",
+    "definition" : "Observations generated by physical exam findings including direct observations made by a clinician and use of simple instruments and the result of simple maneuvers performed directly on the patient's body."
+  },
+  {
+    "code" : "therapy",
+    "display" : "Therapy",
+    "definition" : "Observations generated by non-interventional treatment protocols (e.g. occupational, physical, radiation, nutritional and medication therapy)"
+  },
+  {
+    "code" : "activity",
+    "display" : "Activity",
+    "definition" : "Observations that measure or record any bodily activity that enhances or maintains physical fitness and overall health and wellness.  Not under direct supervision of practitioner such as a physical therapist. (e.g., laps swum, steps, sleep data)"
+  }]
+}