us_core_test_kit 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b73a4e0cf3b98f1b09f9a5bc3f56b93ba0cba8da4bbcde8c2127f2a3c09a94b
-  data.tar.gz: 0f4d607e94bfa318a277cd35868c0fa167f32961570c8770515a11ca8dcbdf04
+  metadata.gz: cf7aef28c22652157e161c0577936f83368ed966e95d313d43a96c3aae618a3f
+  data.tar.gz: d44b31b58c97c38e9d80462a47dbc2baa50e2e6cdc2e98ed4cb244a375c381bf
 SHA512:
-  metadata.gz: 47cc427c5706c733c03d0a2b70aff8d121eb71ab386665f57da2a35e1a79427bf07635d2151946b87680b55b055de4bb6bd07b35744b3f4e5e7f0ad6a896d136
-  data.tar.gz: f18d68b343f04368c2bc30563c348792e662bf1f22e5417f014ff3939a92d19a8457c63c677453787d2603548818e08bd31b28cb54989a6813fbbe87f2512169
+  metadata.gz: 6b87c6b6d5be087b6d28837ea02581ec2fc53bef7301e858db3b7e9e7538e8db93a54416a916ec8e8077c9cdcc5313880a63353d633d5e0039306e7c93c28758
+  data.tar.gz: 348461765954b1564b1e44bbac4c149de5740c18c13edb920a79cc1ddf00a5a6279fab8f0ee01732b9caf1bd1a4a54bb7a17f471a2abc3325ac96410e6691cf5

data/lib/us_core_test_kit/custom_groups/v4.0.0/device_udi_pi_test.rb

@@ -16,7 +16,7 @@ module USCoreTestKit
         resources = scratch_resources[:all] || []
 
         skip_if resources.blank?,
-                'No Devices resources appeart to be available. ' \
+                'No Devices resources appear to be available. ' \
                 'Please use patients with more information.'
 
         resources.each do |device|

data/lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb

@@ -21,7 +21,7 @@ module USCoreTestKit
         provenances = scratch_provenance_resources[:all] || []
 
         skip_if resources.blank?,
-                'No DocumentReference resources appeart to be available. ' \
+                'No DocumentReference resources appear to be available. ' \
                 'Please use patients with more information.'
 
         resources.each do |docref|

data/lib/us_core_test_kit/date_search_validation.rb

@@ -36,7 +36,7 @@ module USCoreTestKit
       range
     end
 
-    def fhir_date_comparer(search_range, target_range, comparator)
+    def fhir_date_comparer(search_range, target_range, comparator, extend_start = false, extend_end = false)
       # Implicitly, a missing lower boundary is "less than" any actual date. A missing upper boundary is "greater than" any actual date.
       case comparator
       when 'eq' # the range of the search value fully contains the range of the target value
@@ -44,13 +44,13 @@ module USCoreTestKit
       when 'ne' # the range of the search value does not fully contain the range of the target value
         target_range[:start].nil? || target_range[:end].nil? || search_range[:start] > target_range[:start] || search_range[:end] < target_range[:end]
       when 'gt' #  the range above the search value intersects (i.e. overlaps) with the range of the target value
-        target_range[:end].nil? || search_range[:end] < target_range[:end]
+        target_range[:end].nil? || search_range[:end] < target_range[:end] || (search_range[:end] < (target_range[:end] + 1) && extend_end)
       when 'lt' # the range below the search value intersects (i.e. overlaps) with the range of the target value
-        target_range[:start].nil? || search_range[:start] > target_range[:start]
+        target_range[:start].nil? || search_range[:start] > target_range[:start] || (search_range[:start] > (target_range[:start] - 1) && extend_start)
       when 'ge'
-        fhir_date_comparer(search_range, target_range, 'gt') || fhir_date_comparer(search_range, target_range, 'eq')
+        fhir_date_comparer(search_range, target_range, 'gt', extend_start, extend_end) || fhir_date_comparer(search_range, target_range, 'eq')
       when 'le'
-        fhir_date_comparer(search_range, target_range, 'lt') || fhir_date_comparer(search_range, target_range, 'eq')
+        fhir_date_comparer(search_range, target_range, 'lt', extend_start, extend_end) || fhir_date_comparer(search_range, target_range, 'eq')
       when 'sa' # the range above the search value contains the range of the target value
         !target_range[:start].nil? && search_range[:end] < target_range[:start]
       when 'eb' # the range below the search value contains the range of the target value
@@ -81,9 +81,11 @@ module USCoreTestKit
       else
         comparator = 'eq'
       end
+      search_is_date = is_date?(search_value)
+      target_is_date = is_date?(target_value)
       search_range = get_fhir_datetime_range(search_value)
       target_range = get_fhir_datetime_range(target_value)
-      fhir_date_comparer(search_range, target_range, comparator)
+      fhir_date_comparer(search_range, target_range, comparator, !search_is_date && target_is_date, !search_is_date && target_is_date)
     end
 
     def validate_period_search(search_value, target_value)
@@ -93,9 +95,14 @@ module USCoreTestKit
       else
         comparator = 'eq'
       end
+      search_is_date = is_date?(search_value)
       search_range = get_fhir_datetime_range(search_value)
       target_range = get_fhir_period_range(target_value)
-      fhir_date_comparer(search_range, target_range, comparator)
+      fhir_date_comparer(search_range, target_range, comparator, !search_is_date && is_date?(target_value.start), !search_is_date && is_date?(target_value.end))
+    end
+
+    def is_date?(value)
+     /^\d{4}(-\d{2})?(-\d{2})?$/.match?(value) # YYYY or YYYY-MM or YYYY-MM-DD
     end
   end
 end

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

@@ -7401,307 +7401,6 @@
     - http://hl7.org/fhir/StructureDefinition/Observation
     - http://hl7.org/fhir/StructureDefinition/MolecularSequence
   :delayed_references: []
-- :name: us_core_vital_signs
-  :class_name: USCorev400VitalSignsSequence
-  :version: v4.0.0
-  :reformatted_version: v400
-  :resource: Observation
-  :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs
-  :profile_name: US Core Vital Signs Profile
-  :profile_version: 4.0.0
-  :title: Observation Vital Signs
-  :short_description: Verify support for the server capabilities required by the US
-    Core Vital Signs Profile.
-  :interactions:
-  - :code: create
-    :expectation: MAY
-  - :code: search-type
-    :expectation: SHALL
-  - :code: read
-    :expectation: SHALL
-  - :code: vread
-    :expectation: SHOULD
-  - :code: update
-    :expectation: MAY
-  - :code: patch
-    :expectation: MAY
-  - :code: delete
-    :expectation: MAY
-  - :code: history-instance
-    :expectation: SHOULD
-  - :code: history-type
-    :expectation: MAY
-  :operations: []
-  :searches:
-  - :expectation: SHALL
-    :names:
-    - patient
-    - code
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
-  - :expectation: SHOULD
-    :names:
-    - patient
-    - category
-    - status
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
-  - :expectation: SHOULD
-    :names:
-    - patient
-    - code
-    - date
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
-  - :expectation: SHALL
-    :names:
-    - patient
-    - category
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
-  - :expectation: SHALL
-    :names:
-    - patient
-    - category
-    - date
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
-  :search_definitions:
-    :patient:
-      :paths:
-      - subject
-      :full_paths:
-      - Observation.subject
-      :comparators: {}
-      :values: []
-      :type: Reference
-      :contains_multiple: false
-      :multiple_or: MAY
-    :category:
-      :paths:
-      - category
-      :full_paths:
-      - Observation.category
-      :comparators: {}
-      :values:
-      - vital-signs
-      :type: CodeableConcept
-      :contains_multiple: true
-      :multiple_or: MAY
-    :status:
-      :paths:
-      - status
-      :full_paths:
-      - Observation.status
-      :comparators: {}
-      :values:
-      - registered
-      - preliminary
-      - final
-      - amended
-      - corrected
-      - cancelled
-      - entered-in-error
-      - unknown
-      :type: code
-      :contains_multiple: false
-      :multiple_or: SHALL
-    :code:
-      :paths:
-      - code
-      :full_paths:
-      - Observation.code
-      :comparators: {}
-      :values:
-      - 59576-9
-      - 8289-1
-      - 77606-2
-      - 59408-5
-      - 3150-0
-      - 3151-8
-      :type: CodeableConcept
-      :contains_multiple: false
-      :multiple_or: SHOULD
-    :date:
-      :paths:
-      - effective
-      :full_paths:
-      - Observation.effective
-      :comparators:
-        :eq: MAY
-        :ne: MAY
-        :gt: SHALL
-        :ge: SHALL
-        :lt: SHALL
-        :le: SHALL
-        :sa: MAY
-        :eb: MAY
-        :ap: MAY
-      :values: []
-      :type: date
-      :contains_multiple: false
-      :multiple_or: MAY
-  :include_params: *3
-  :revincludes: *4
-  :required_concepts: []
-  :must_supports:
-    :extensions: []
-    :slices:
-    - :name: Observation.category:VSCat
-      :path: category
-      :discriminator:
-        :type: value
-        :values:
-        - :path: coding.code
-          :value: vital-signs
-        - :path: coding.system
-          :value: http://terminology.hl7.org/CodeSystem/observation-category
-    :elements:
-    - :path: status
-    - :path: category
-    - :path: category.coding
-    - :path: category.coding.system
-      :fixed_value: http://terminology.hl7.org/CodeSystem/observation-category
-    - :path: category.coding.code
-      :fixed_value: vital-signs
-    - :path: code
-    - :path: subject
-      :types:
-      - Reference
-    - :path: effectiveDateTime
-      :original_path: effective[x]
-    - :path: valueQuantity
-      :original_path: value[x]
-  :mandatory_elements:
-  - Observation.status
-  - Observation.category
-  - Observation.category.coding
-  - Observation.category.coding.system
-  - Observation.category.coding.code
-  - Observation.code
-  - Observation.subject
-  - Observation.effective[x]
-  - Observation.component.code
-  :bindings:
-  - :type: code
-    :strength: preferred
-    :system: http://hl7.org/fhir/ValueSet/languages
-    :path: language
-  - :type: code
-    :strength: required
-    :system: http://hl7.org/fhir/ValueSet/observation-status
-    :path: status
-  - :type: CodeableConcept
-    :strength: preferred
-    :system: http://hl7.org/fhir/ValueSet/observation-category
-    :path: category
-  - :type: CodeableConcept
-    :strength: preferred
-    :system: http://hl7.org/fhir/ValueSet/observation-category
-    :path: category
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/us/core/ValueSet/us-core-vital-signs
-    :path: code
-  - :type: Quantity
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/ucum-vitals-common
-    :path: value
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/data-absent-reason
-    :path: dataAbsentReason
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/observation-interpretation
-    :path: interpretation
-  - :type: CodeableConcept
-    :strength: example
-    :system: http://hl7.org/fhir/ValueSet/body-site
-    :path: bodySite
-  - :type: CodeableConcept
-    :strength: example
-    :system: http://hl7.org/fhir/ValueSet/observation-methods
-    :path: method
-  - :type: CodeableConcept
-    :strength: preferred
-    :system: http://hl7.org/fhir/ValueSet/referencerange-meaning
-    :path: referenceRange.type
-  - :type: CodeableConcept
-    :strength: example
-    :system: http://hl7.org/fhir/ValueSet/referencerange-appliesto
-    :path: referenceRange.appliesTo
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/us/core/ValueSet/us-core-vital-signs
-    :path: component.code
-  - :type: Quantity
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/ucum-vitals-common
-    :path: component.value
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/data-absent-reason
-    :path: component.dataAbsentReason
-  - :type: CodeableConcept
-    :strength: extensible
-    :system: http://hl7.org/fhir/ValueSet/observation-interpretation
-    :path: component.interpretation
-  :references:
-  - :path: Observation.basedOn
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/CarePlan
-    - http://hl7.org/fhir/StructureDefinition/DeviceRequest
-    - http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation
-    - http://hl7.org/fhir/StructureDefinition/MedicationRequest
-    - http://hl7.org/fhir/StructureDefinition/NutritionOrder
-    - http://hl7.org/fhir/StructureDefinition/ServiceRequest
-  - :path: Observation.partOf
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/MedicationAdministration
-    - http://hl7.org/fhir/StructureDefinition/MedicationDispense
-    - http://hl7.org/fhir/StructureDefinition/MedicationStatement
-    - http://hl7.org/fhir/StructureDefinition/Procedure
-    - http://hl7.org/fhir/StructureDefinition/Immunization
-    - http://hl7.org/fhir/StructureDefinition/ImagingStudy
-  - :path: Observation.subject
-    :profiles:
-    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
-  - :path: Observation.focus
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/Resource
-  - :path: Observation.encounter
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/Encounter
-  - :path: Observation.performer
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/Practitioner
-    - http://hl7.org/fhir/StructureDefinition/PractitionerRole
-    - http://hl7.org/fhir/StructureDefinition/Organization
-    - http://hl7.org/fhir/StructureDefinition/CareTeam
-    - http://hl7.org/fhir/StructureDefinition/Patient
-    - http://hl7.org/fhir/StructureDefinition/RelatedPerson
-  - :path: Observation.specimen
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/Specimen
-  - :path: Observation.device
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/Device
-    - http://hl7.org/fhir/StructureDefinition/DeviceMetric
-  - :path: Observation.hasMember
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse
-    - http://hl7.org/fhir/StructureDefinition/MolecularSequence
-    - http://hl7.org/fhir/StructureDefinition/vitalsigns
-  - :path: Observation.derivedFrom
-    :profiles:
-    - http://hl7.org/fhir/StructureDefinition/DocumentReference
-    - http://hl7.org/fhir/StructureDefinition/ImagingStudy
-    - http://hl7.org/fhir/StructureDefinition/Media
-    - http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse
-    - http://hl7.org/fhir/StructureDefinition/MolecularSequence
-    - http://hl7.org/fhir/StructureDefinition/vitalsigns
-  :delayed_references: []
 - :name: us_core_blood_pressure
   :class_name: USCorev400BloodPressureSequence
   :version: v4.0.0
@@ -11615,9 +11314,8 @@
     - patient
     - code
     - date
-    :names_not_must_support_or_mandatory:
-    - date
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :expectation: SHALL
     :names:
     - patient
@@ -11629,9 +11327,8 @@
     - patient
     - category
     - date
-    :names_not_must_support_or_mandatory:
-    - date
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   :search_definitions:
     :patient:
       :paths:
@@ -12183,20 +11880,12 @@
       :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/metadata.yml

@@ -185,20 +185,12 @@
     :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

@@ -34,7 +34,7 @@ module USCoreTestKit
         * Patient.extension:birthsex
         * Patient.extension:ethnicity
         * Patient.extension:race
-        * Patient.name.period.end or Patient.name.use
+        * Patient.name.period.end
         * Patient.name.suffix
         * Patient.telecom
         * Patient.telecom.system

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

@@ -49,9 +49,8 @@
   - patient
   - code
   - date
-  :names_not_must_support_or_mandatory:
-  - date
-  :must_support_or_mandatory: false
+  :names_not_must_support_or_mandatory: []
+  :must_support_or_mandatory: true
 - :expectation: SHALL
   :names:
   - patient
@@ -63,9 +62,8 @@
   - patient
   - category
   - date
-  :names_not_must_support_or_mandatory:
-  - date
-  :must_support_or_mandatory: false
+  :names_not_must_support_or_mandatory: []
+  :must_support_or_mandatory: true
 :search_definitions:
   :patient:
     :paths:

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

@@ -18,8 +18,6 @@ none are returned, the test is skipped.
       )
 
       id :us_core_v400_smokingstatus_patient_category_date_search_test
-      optional
-  
       input :patient_ids,
         title: 'Patient IDs',
         description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements'