us_core_test_kit 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100200153e9adc8ef4a768a34ab02fe1b2460a72bde04350f3681ad699aacb99
-  data.tar.gz: 41013e5c4b2161553a28bd73f9928fb00097455e3b547adbfe02fd0115a3f03e
+  metadata.gz: 9580bce91af645498d5ca61297a7900bfd2ed2abd400ae55308c2f209a4e14ff
+  data.tar.gz: 2945d9afa14d016011f3c84a2d4d035ec1bfa05117a1b5d20aa6d549fb368a05
 SHA512:
-  metadata.gz: 37702b890daf5dc75452d610cd9cc70b2cca359b8d8580f842ed770ea24f3447dc6af0db058bc156a07344ad48f6ecbfba83e34427c5258c5270a418fda1145f
-  data.tar.gz: 6b658f5e99a0d62939d18f7316e57dc3bc901a6130eb668b24750a6e76ee33a456a732c87db8bb7e71efcbf848e2e1536aff28226b6b33bab4e811aa09e3bc7a
+  metadata.gz: 134c8e48cc4731b4be03739b99ab90011c30de23d379699db6b91cc993f8f0d5fee1b52f9f0c1759c383d1a87bfa2fbef008c60eec9b3ef21261e0908efd9f66
+  data.tar.gz: c9deea8845664b41cb335ffa428edeeabe26ad94cd11cd69ae0832a892fcfb13f3b910a54a29cb8e775c8d9e14b8fcaddd6a949bb1ae465eee3c881d1a68be20

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,7 +33,7 @@ module USCoreTestKit
         return elements.first
       end
 
-      path_segments = path.split('.')
+      path_segments = path.split(/(?<!hl7)\./)
       segment = path_segments.shift.delete_suffix('[x]').to_sym
 
       no_elements_present =
@@ -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/metadata.yml

@@ -6040,9 +6040,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/v4.0.0/device/metadata.yml

@@ -136,8 +136,6 @@
   :file_name: device_must_support_test.rb
 - :id: us_core_v400_device_reference_resolution_test
   :file_name: device_reference_resolution_test.rb
-- :id: us_core_v400_device_udi_pi_test
-  :file_name: "../../custom_groups/v4.0.0/device_udi_pi_test.rb"
 :id: us_core_v400_device
 :file_name: device_group.rb
 :delayed_references: []

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

@@ -5,7 +5,6 @@ require_relative 'device/device_provenance_revinclude_search_test'
 require_relative 'device/device_validation_test'
 require_relative 'device/device_must_support_test'
 require_relative 'device/device_reference_resolution_test'
-require_relative '../../custom_groups/v4.0.0/device_udi_pi_test'
 
 module USCoreTestKit
   module USCoreV400
@@ -84,7 +83,6 @@ read succeeds.
       test from: :us_core_v400_device_validation_test
       test from: :us_core_v400_device_must_support_test
       test from: :us_core_v400_device_reference_resolution_test
-      test from: :us_core_v400_device_udi_pi_test
     end
   end
 end

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

@@ -19,6 +19,7 @@ module USCoreTestKit
 
         * MedicationRequest.encounter
         * MedicationRequest.medication[x]
+        * MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.subject
       )

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

@@ -150,7 +150,7 @@
     :original_path: reported[x]
   - :path: reportedReference
     :original_path: reported[x]
-    :type:
+    :types:
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner

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

@@ -2529,7 +2529,7 @@
       :original_path: reported[x]
     - :path: reportedReference
       :original_path: reported[x]
-      :type:
+      :types:
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
@@ -6543,17 +6543,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/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/device/metadata.yml

@@ -136,8 +136,6 @@
   :file_name: device_must_support_test.rb
 - :id: us_core_v501_device_reference_resolution_test
   :file_name: device_reference_resolution_test.rb
-- :id: us_core_v400_device_udi_pi_test
-  :file_name: "../../custom_groups/v4.0.0/device_udi_pi_test.rb"
 :id: us_core_v501_device
 :file_name: device_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v5.0.1/device_group.rb

@@ -5,7 +5,6 @@ require_relative 'device/device_provenance_revinclude_search_test'
 require_relative 'device/device_validation_test'
 require_relative 'device/device_must_support_test'
 require_relative 'device/device_reference_resolution_test'
-require_relative '../../custom_groups/v4.0.0/device_udi_pi_test'
 
 module USCoreTestKit
   module USCoreV501
@@ -84,7 +83,6 @@ read succeeds.
       test from: :us_core_v501_device_validation_test
       test from: :us_core_v501_device_must_support_test
       test from: :us_core_v501_device_reference_resolution_test
-      test from: :us_core_v400_device_udi_pi_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v5.0.1/medication_request/medication_request_reference_resolution_test.rb

@@ -19,6 +19,7 @@ module USCoreTestKit
 
         * MedicationRequest.encounter
         * MedicationRequest.medication[x]
+        * MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.subject
       )

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

@@ -161,7 +161,7 @@
     :original_path: reported[x]
   - :path: reportedReference
     :original_path: reported[x]
-    :type:
+    :types:
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner

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:
@@ -3079,7 +3079,7 @@
       :original_path: reported[x]
     - :path: reportedReference
       :original_path: reported[x]
-      :type:
+      :types:
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
@@ -8780,13 +8780,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 +8794,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
@@ -10047,6 +10053,11 @@
         - sdoh
         - '386053000'
         - '410606002'
+        - '108252007'
+        - '363679005'
+        - '409063005'
+        - '409073007'
+        - '387713003'
     :elements:
     - :path: status
     - :path: intent

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

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

@@ -170,6 +170,11 @@
       - sdoh
       - '386053000'
       - '410606002'
+      - '108252007'
+      - '363679005'
+      - '409063005'
+      - '409073007'
+      - '387713003'
   :elements:
   - :path: status
   - :path: intent

data/lib/us_core_test_kit/generator/group_generator.rb

@@ -110,11 +110,6 @@ module USCoreTestKit
         return if group_metadata.reformatted_version == 'v311'
 
         case group_metadata.resource
-        when 'Device'
-          group_metadata.add_test(
-            id: 'us_core_v400_device_udi_pi_test',
-            file_name: '../../custom_groups/v4.0.0/device_udi_pi_test.rb'
-          )
         when 'DocumentReference'
           group_metadata.add_test(
             id: 'us_core_v400_document_reference_custodian_test',