us_core_test_kit 0.11.5 → 0.11.6

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -89,14 +89,32 @@ module USCoreTestKit
           .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.key?(:paths)
-
-          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)
+        choice_names = []
+        group_metadata.must_supports[:choices]&.map do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
+
+          combined = []
+          if choice.key?(:paths)
+            choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+            combined << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+          end
+
+          if choice.key?(:extension_ids)
+            choice[:extension_ids].each { |extesnion_id| extension_names.delete(extesnion_id) }
+            combined << choice[:extension_ids].join(' or ')
+          end
+
+          if choice.key?(:elements)
+            choice[:elements].each { |element| element_names.delete("#{resource_type}.#{element[:path]}") }
+            combined << choice[:elements].map { |element|
+              "#{resource_type}.#{element[:path]}:#{element[:fixed_value]}"
+            }.join(' or ')
+          end
+
+          choice_names << combined.join(' or ') if combined.any?
+        end || []
+
+        (slice_names + element_names + extension_names + choice_names)
           .uniq
           .sort
           .map { |name| "#{' ' * 8}* #{name}" }
@@ -105,7 +123,7 @@ module USCoreTestKit
 
       def generate
         FileUtils.mkdir_p(output_file_directory)
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
 
         group_metadata.add_test(
           id: test_id,

data/lib/us_core_test_kit/generator/naming.rb

@@ -33,12 +33,13 @@ module USCoreTestKit
         'v4.0.0' => 'http://hl7.org/fhir/us/core/STU4',
         'v5.0.1' => 'http://hl7.org/fhir/us/core/STU5.0.1',
         'v6.1.0' => 'http://hl7.org/fhir/us/core/STU6.1',
-        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7'
+        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7',
+        'v8.0.0' => 'http://hl7.org/fhir/us/core/STU8'
       }.freeze
 
       class << self
         def resources_with_multiple_profiles
-          ['Condition', 'DiagnosticReport', 'Observation']
+          ['Condition', 'DiagnosticReport', 'Observation', 'DocumentReference']
         end
 
         def resource_has_multiple_profiles?(resource)
@@ -56,6 +57,7 @@ module USCoreTestKit
           group_metadata.name
             .delete_prefix('us_core_')
             .gsub('diagnosticreport', 'diagnostic_report')
+            .gsub('documentreference', 'document_reference')
             .underscore
         end
 

data/lib/us_core_test_kit/generator/special_cases.rb

@@ -1,12 +1,14 @@
 module USCoreTestKit
   class Generator
     module SpecialCases
+      # These resources are excluded from US Core Test Suite
       RESOURCES_TO_EXCLUDE = {
         'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
         'PractitionerRole' => ['v311', 'v400']
       }.freeze
 
+      # These profiles are excluded from US Core Test Suite
       PROFILES_TO_EXCLUDE = [
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-survey',
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs'
@@ -21,18 +23,20 @@ module USCoreTestKit
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation' => ['v610', 'v700']
       }.freeze
 
+      # These resources relies on references from other resources and do not have search tests.
+      # Test groups for these resources are placed at the bottom of US Core test group.
       NON_USCDI_RESOURCES = {
         'Encounter' => ['v311', 'v400'],
-        'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'RelatedPerson' => ['v501', 'v610', 'v700']
+        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'RelatedPerson' => ['v501', 'v610', 'v700', 'v800']
       }.freeze
 
+      # These resources relies on references from other resources but they also have mandatory search tests.
       SEARCHABLE_DELAYED_RESOURCES = {
-        'Location' => ['v700']
+        'Location' => ['v700', 'v800']
       }.freeze
 
       ALL_VERSION_CATEGORY_FIRST_PROFILES = [
@@ -51,8 +55,10 @@ module USCoreTestKit
       ].freeze
 
       VERSION_SPECIFIC_CATEGORY_FIRST_PROFILES = {
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700'],
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610', 'v700']
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700',
+                                                                                                    'v800'],
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610',
+                                                                                                         'v700', 'v800']
       }.freeze
 
       class << self

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -112,17 +112,21 @@ module USCoreTestKit
 
       def clinical_notes_guidance_file_name
         if ig_metadata.ig_version == 'v3.1.1'
-          "../../custom_groups/#{ig_metadata.ig_version}/clinical_notes_guidance_group"
-        else
+          '../../custom_groups/v3.1.1/clinical_notes_guidance_group'
+        elsif ig_metadata.ig_version[1].to_i < 8
           '../../custom_groups/v4.0.0/clinical_notes_guidance_group'
+        else
+          '../../custom_groups/v8.0.0/clinical_notes_guidance_group'
         end
       end
 
       def clinical_notes_guidance_group_id
         if ig_metadata.reformatted_version == 'v311'
-          "us_core_#{ig_metadata.reformatted_version}_clinical_notes_guidance"
-        else
+          'us_core_v311_clinical_notes_guidance'
+        elsif ig_metadata.ig_version[1].to_i < 8
           'us_core_v400_clinical_notes_guidance'
+        else
+          'us_core_v800_clinical_notes_guidance'
         end
       end
 

data/lib/us_core_test_kit/generator/templates/interpreter_required_extension_test.rb.erb

@@ -0,0 +1,25 @@
+require_relative '../../../interpreter_required_extension_test'
+
+module USCoreTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include USCoreTestKit::InterpreterRequiredExtensionTest
+
+      title 'Certifying server system supports the US Core Interpreter Needed Extension on either the US Core Patient or US Core Encounter Profiles'
+      description %(
+        Servers can use the US Core Interpreter Needed Extension on the US Core Patient
+        or US Core Encounter Profiles to communicate whether a patient needs an interpreter.
+        Although the extension is marked as an Additional USCDI Requirements on both US Core
+        Patient and US Core Encounter Profiles, the certifying Server system is not required
+        to support the extension on both profiles, but SHALL support the extension on at least
+        one.
+      )
+
+      id :<%= test_id %>
+
+      run do
+        verify_interpreter_required_extension_exists
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/validation_test_generator.rb

@@ -96,7 +96,7 @@ module USCoreTestKit
 
       def generate
         FileUtils.mkdir_p(output_file_directory)
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
 
         test_metadata = {
           id: test_id,
@@ -112,26 +112,26 @@ module USCoreTestKit
 
       def description
         <<~DESCRIPTION
-        #{description_intro}
-        It verifies the presence of mandatory elements and that elements with
-        required bindings contain appropriate values. CodeableConcept element
-        bindings will fail if none of their codings have a code/system belonging
-        to the bound ValueSet. Quantity, Coding, and code element bindings will
-        fail if their code/system are not found in the valueset.
+          #{description_intro}
+          It verifies the presence of mandatory elements and that elements with
+          required bindings contain appropriate values. CodeableConcept element
+          bindings will fail if none of their codings have a code/system belonging
+          to the bound ValueSet. Quantity, Coding, and code element bindings will
+          fail if their code/system are not found in the valueset.
         DESCRIPTION
       end
 
       def description_intro
         if resource_type == 'Medication'
           <<~MEDICATION_INTRO
-          This test verifies resources returned from previous tests conform to
-          the [#{profile_name}](#{profile_url}).
+            This test verifies resources returned from previous tests conform to
+            the [#{profile_name}](#{profile_url}).
           MEDICATION_INTRO
         else
           <<~GENERIC_INTRO
-          This test verifies resources returned from the first search conform to
-          the [#{profile_name}](#{profile_url}).
-          Systems must demonstrate at least one valid example in order to pass this test.
+            This test verifies resources returned from the first search conform to
+            the [#{profile_name}](#{profile_url}).
+            Systems must demonstrate at least one valid example in order to pass this test.
           GENERIC_INTRO
         end
       end

data/lib/us_core_test_kit/generator.rb

@@ -16,6 +16,7 @@ require_relative 'generator/search_test_generator'
 require_relative 'generator/suite_generator'
 require_relative 'generator/validation_test_generator'
 require_relative 'generator/practitioner_address_test_generator'
+require_relative 'generator/interpreter_required_extension_test_generator'
 
 module USCoreTestKit
   class Generator
@@ -46,6 +47,7 @@ module USCoreTestKit
       generate_must_support_tests
       generate_reference_resolution_tests
       generate_practitioner_address_tests
+      generate_interpreter_required_extension_test_generator
 
       generate_granular_scope_tests
 
@@ -67,9 +69,7 @@ module USCoreTestKit
     end
 
     def write_metadata
-      File.open(File.join(base_output_dir, 'metadata.yml'), 'w') do |file|
-        file.write(YAML.dump(ig_metadata.to_hash))
-      end
+      File.write(File.join(base_output_dir, 'metadata.yml'), YAML.dump(ig_metadata.to_hash))
     end
 
     def base_output_dir
@@ -126,6 +126,10 @@ module USCoreTestKit
       PractitionerAddressTestGenerator.generate(ig_metadata, base_output_dir)
     end
 
+    def generate_interpreter_required_extension_test_generator
+      InterpreterRequiredExtensionTestGenerator.generate(ig_metadata, base_output_dir)
+    end
+
     def generate_suites
       SuiteGenerator.generate(ig_metadata, base_output_dir)
     end

data/lib/us_core_test_kit/igs/us_core_800/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)"
+  }]
+}

data/lib/us_core_test_kit/igs/us_core_800/Resource-lastUpdated.json

@@ -0,0 +1,43 @@
+{
+  "resourceType" : "SearchParameter",
+  "id" : "Resource-lastUpdated",
+  "extension" : [{
+    "url" : "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+    "valueCode" : "trial-use"
+  }],
+  "url" : "http://hl7.org/fhir/SearchParameter/Resource-lastUpdated",
+  "version" : "4.0.1",
+  "name" : "_lastUpdated",
+  "status" : "draft",
+  "experimental" : false,
+  "date" : "2019-11-01T09:29:23+11:00",
+  "publisher" : "Health Level Seven International (FHIR Infrastructure)",
+  "contact" : [{
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://hl7.org/fhir"
+    }]
+  },
+  {
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://www.hl7.org/Special/committees/fiwg/index.cfm"
+    }]
+  }],
+  "description" : "When the resource version last changed",
+  "code" : "_lastUpdated",
+  "base" : ["Resource"],
+  "type" : "date",
+  "expression" : "Resource.meta.lastUpdated",
+  "xpath" : "f:Resource/f:meta/f:lastUpdated",
+  "xpathUsage" : "normal",
+  "comparator" : ["eq",
+  "ne",
+  "gt",
+  "ge",
+  "lt",
+  "le",
+  "sa",
+  "eb",
+  "ap"]
+}