onc_certification_g10_test_kit 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26db3a7b89aa5bfcd52c5e918543a6a8883e7672825b4c821bc90b7d86f92f39
-  data.tar.gz: ae93cb1f1d78eda01567a1e85071605a190e6e3c6473a65508a6977229282236
+  metadata.gz: adbba68d88b3af6ac68f713093db688cf40e238e00435cfc25f1dd7a533dcdb5
+  data.tar.gz: 78d90d908e7c9dac8bb0e78072aa75014db120d11fc9daf09bd247118a0bc6bd
 SHA512:
-  metadata.gz: c9f971806d40478dd207b333073433741a9dc3b596de17d0bd6d6e3b2507dcdac2031dad2227eec0b090aec38bc79f21271d1b0fd17d8233c6d1f517359671ff
-  data.tar.gz: 70a818c745d8f7068bb0834885f3e0215b20115232f1a73c2265a499df8fc164265c73706d75d6eb6934f3a6bbe4fa7e71001766603b86933b0d0fe0cdb98c98
+  metadata.gz: 7bfe60790522993322888d224c41556f61010a800f378f14a0a4597d70c198d887f68b9e97819cfb5696988a26ad07de386e8c2af92e1ca34bd541ff918fb575
+  data.tar.gz: 90f2b6a0cfed1eaaf46519e68faec2937f210f5504f3d4cd1ad72070fd4a031db5e0cc5b136fe9bf895005483dcac673ff282b2b8c7cdb647447ff49df7d4c7e

data/lib/inferno/terminology/expected_manifest.yml

@@ -97,6 +97,7 @@
   :code_systems:
   - http://nucc.org/provider-taxonomy
   - http://snomed.info/sct
+  - urn:oid:2.16.840.1.113883.6.101
 - :url: http://hl7.org/fhir/ValueSet/condition-clinical
   :file: hl7_org_fhir_ValueSet_condition-clinical.msgpack
   :count: 6
@@ -111,11 +112,12 @@
   - http://terminology.hl7.org/CodeSystem/condition-ver-status
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-condition-category
   :file: hl7_org_fhir_us_core_ValueSet_us-core-condition-category.msgpack
-  :count: 3
+  :count: 4
   :type: bloom
   :code_systems:
   - http://terminology.hl7.org/CodeSystem/condition-category
   - http://hl7.org/fhir/us/core/CodeSystem/condition-category
+  - http://snomed.info/sct
 - :url: http://hl7.org/fhir/ValueSet/condition-severity
   :file: hl7_org_fhir_ValueSet_condition-severity.msgpack
   :count: 3
@@ -124,7 +126,7 @@
   - http://snomed.info/sct
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-condition-code
   :file: hl7_org_fhir_us_core_ValueSet_us-core-condition-code.msgpack
-  :count: 297182
+  :count: 297482
   :type: bloom
   :code_systems:
   - http://snomed.info/sct
@@ -174,7 +176,7 @@
   - http://loinc.org
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-diagnosticreport-report-and-note-codes
   :file: hl7_org_fhir_us_core_ValueSet_us-core-diagnosticreport-report-and-note-codes.msgpack
-  :count: 270991
+  :count: 24810
   :type: bloom
   :code_systems:
   - http://loinc.org
@@ -219,7 +221,11 @@
   :file: hl7_org_fhir_ValueSet_security-labels.msgpack
   :count: 200
   :type: bloom
-  :code_systems: []
+  :code_systems:
+  - http://terminology.hl7.org/CodeSystem/v3-Confidentiality
+  - http://terminology.hl7.org/CodeSystem/v3-ActCode
+  - http://terminology.hl7.org/CodeSystem/v3-ObservationValue
+  - http://terminology.hl7.org/CodeSystem/v3-ActReason
 - :url: http://hl7.org/fhir/ValueSet/mimetypes
   :file: hl7_org_fhir_ValueSet_mimetypes.msgpack
   :count: 2382
@@ -381,7 +387,7 @@
   - http://hl7.org/fhir/address-type
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-usps-state
   :file: hl7_org_fhir_us_core_ValueSet_us-core-usps-state.msgpack
-  :count: 59
+  :count: 62
   :type: bloom
   :code_systems:
   - https://www.usps.com/
@@ -556,7 +562,7 @@
   - http://terminology.hl7.org/CodeSystem/v2-0131
 - :url: http://hl7.org/fhir/us/core/ValueSet/simple-language
   :file: hl7_org_fhir_us_core_ValueSet_simple-language.msgpack
-  :count: 8212
+  :count: 8239
   :type: bloom
   :code_systems:
   - urn:ietf:bcp:47
@@ -568,48 +574,53 @@
   - http://hl7.org/fhir/link-type
 - :url: http://hl7.org/fhir/us/core/ValueSet/omb-race-category
   :file: hl7_org_fhir_us_core_ValueSet_omb-race-category.msgpack
-  :count: 7
+  :count: 8
   :type: bloom
   :code_systems:
   - urn:oid:2.16.840.1.113883.6.238
   - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://hl7.org/fhir/us/core/ValueSet/detailed-race
   :file: hl7_org_fhir_us_core_ValueSet_detailed-race.msgpack
-  :count: 917
+  :count: 919
   :type: bloom
   :code_systems:
   - urn:oid:2.16.840.1.113883.6.238
+  - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://hl7.org/fhir/us/core/ValueSet/omb-ethnicity-category
   :file: hl7_org_fhir_us_core_ValueSet_omb-ethnicity-category.msgpack
-  :count: 2
+  :count: 4
   :type: bloom
   :code_systems:
   - urn:oid:2.16.840.1.113883.6.238
+  - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity
   :file: hl7_org_fhir_us_core_ValueSet_detailed-ethnicity.msgpack
-  :count: 42
+  :count: 44
   :type: bloom
   :code_systems:
   - urn:oid:2.16.840.1.113883.6.238
+  - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://hl7.org/fhir/us/core/ValueSet/birthsex
   :file: hl7_org_fhir_us_core_ValueSet_birthsex.msgpack
-  :count: 3
+  :count: 5
   :type: bloom
   :code_systems:
   - http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender
   - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-provider-role
   :file: hl7_org_fhir_us_core_ValueSet_us-core-provider-role.msgpack
-  :count: 237
+  :count: 862
   :type: bloom
   :code_systems:
   - http://nucc.org/provider-taxonomy
+  - urn:oid:2.16.840.1.113883.6.101
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-provider-specialty
   :file: hl7_org_fhir_us_core_ValueSet_us-core-provider-specialty.msgpack
   :count: 862
   :type: bloom
   :code_systems:
   - http://nucc.org/provider-taxonomy
+  - urn:oid:2.16.840.1.113883.6.101
 - :url: http://hl7.org/fhir/ValueSet/event-status
   :file: hl7_org_fhir_ValueSet_event-status.msgpack
   :count: 8
@@ -618,13 +629,17 @@
   - http://hl7.org/fhir/event-status
 - :url: http://hl7.org/fhir/us/core/ValueSet/us-core-procedure-code
   :file: hl7_org_fhir_us_core_ValueSet_us-core-procedure-code.msgpack
-  :count: 285523
+  :count: 556515
   :type: bloom
   :code_systems:
   - http://www.ama-assn.org/go/cpt
   - http://snomed.info/sct
-  - urn:oid:2.16.840.1.113883.6.285
+  - http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets
   - http://www.cms.gov/Medicare/Coding/ICD10
+  - http://www.ada.org/cdt
+  - http://loinc.org
+  - urn:oid:2.16.840.1.113883.6.285
+  - http://ada.org/cdt
   - urn:oid:2.16.840.1.113883.6.13
 - :url: http://hl7.org/fhir/ValueSet/device-action
   :file: hl7_org_fhir_ValueSet_device-action.msgpack
@@ -666,9 +681,157 @@
   :type: bloom
   :code_systems:
   - http://hl7.org/fhir/provenance-entity-role
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.8
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1186_8.msgpack
+  :count: 766
+  :type: bloom
+  :code_systems:
+  - http://www.nlm.nih.gov/research/umls/rxnorm
+  - http://snomed.info/sct
+- :url: http://hl7.org/fhir/ValueSet/narrative-status
+  :file: hl7_org_fhir_ValueSet_narrative-status.msgpack
+  :count: 4
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/narrative-status
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.30
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1099_30.msgpack
+  :count: 590
+  :type: bloom
+  :code_systems:
+  - http://snomed.info/sct
+  - http://terminology.hl7.org/CodeSystem/v3-ParticipationFunction
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.6
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1010_6.msgpack
+  :count: 196
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/sid/cvx
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.4
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1010_4.msgpack
+  :count: 1000
+  :type: bloom
+  :code_systems:
+  - http://www.nlm.nih.gov/research/umls/rxnorm
+- :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-vital-signs
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-vital-signs.msgpack
+  :count: 19
+  :type: bloom
+  :code_systems:
+  - http://loinc.org
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.11.20.9.38
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113883_11_20_9_38.msgpack
+  :count: 8
+  :type: bloom
+  :code_systems:
+  - http://snomed.info/sct
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.1066
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_114222_4_11_1066.msgpack
+  :count: 856
+  :type: bloom
+  :code_systems:
+  - http://nucc.org/provider-taxonomy
+  - urn:oid:2.16.840.1.113883.6.101
+- :url: http://hl7.org/fhir/ValueSet/resource-types
+  :file: hl7_org_fhir_ValueSet_resource-types.msgpack
+  :count: 148
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/resource-types
+- :url: http://hl7.org/fhir/ValueSet/condition-category
+  :file: hl7_org_fhir_ValueSet_condition-category.msgpack
+  :count: 2
+  :type: bloom
+  :code_systems:
+  - http://terminology.hl7.org/CodeSystem/condition-category
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-problem-or-health-concern
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-problem-or-health-concern.msgpack
+  :count: 2
+  :type: bloom
+  :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-goal-description
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-goal-description.msgpack
+  :count: 760133
+  :type: bloom
+  :code_systems:
+  - http://snomed.info/sct
+  - http://loinc.org
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-common-sdoh-assessments
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-common-sdoh-assessments.msgpack
+  :count: 47
+  :type: bloom
+  :code_systems:
+  - http://loinc.org
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-sexual-orientation
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-sexual-orientation.msgpack
+  :count: 6
+  :type: bloom
+  :code_systems:
+  - http://snomed.info/sct
+  - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-survey-codes
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-survey-codes.msgpack
+  :count: 11120
+  :type: bloom
+  :code_systems:
+  - http://loinc.org
+- :url: http://hl7.org/fhir/us/core/ValueSet/us-core-clinical-test-codes
+  :file: hl7_org_fhir_us_core_ValueSet_us-core-clinical-test-codes.msgpack
+  :count: 461
+  :type: bloom
+  :code_systems:
+  - http://loinc.org
+- :url: http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.32
+  :file: cts_nlm_nih_gov_fhir_ValueSet_2_16_840_1_113762_1_4_1021_32.msgpack
+  :count: 7
+  :type: bloom
+  :code_systems:
+  - http://snomed.info/sct
+  - http://terminology.hl7.org/CodeSystem/v3-NullFlavor
+- :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
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/questionnaire-answers-status
+  - urn:oid:2.16.840.1.113883.6.101
+- :url: http://hl7.org/fhir/ValueSet/relatedperson-relationshiptype
+  :file: hl7_org_fhir_ValueSet_relatedperson-relationshiptype.msgpack
+  :count: 117
+  :type: bloom
+  :code_systems:
+  - http://terminology.hl7.org/CodeSystem/v2-0131
+  - http://terminology.hl7.org/CodeSystem/v3-RoleCode
+- :url: http://hl7.org/fhir/ValueSet/request-intent
+  :file: hl7_org_fhir_ValueSet_request-intent.msgpack
+  :count: 9
+  :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
+  :type: bloom
+  :code_systems:
+  - http://hl7.org/fhir/us/core/CodeSystem/us-core-tags
+  - http://snomed.info/sct
 - :url: urn:ietf:bcp:47
   :file: urn_ietf_bcp_47.msgpack
-  :count: 8533
+  :count: 8562
   :type: bloom
   :code_systems: urn:ietf:bcp:47
 - :url: http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical
@@ -746,6 +909,11 @@
   :count: 862
   :type: bloom
   :code_systems: http://nucc.org/provider-taxonomy
+- :url: urn:oid:2.16.840.1.113883.6.101
+  :file: urn_oid_2_16_840_1_113883_6_101.msgpack
+  :count: 970
+  :type: bloom
+  :code_systems: urn:oid:2.16.840.1.113883.6.101
 - :url: http://terminology.hl7.org/CodeSystem/condition-clinical
   :file: terminology_hl7_org_CodeSystem_condition-clinical.msgpack
   :count: 6
@@ -831,6 +999,26 @@
   :count: 4
   :type: bloom
   :code_systems: http://hl7.org/fhir/document-relationship-type
+- :url: http://terminology.hl7.org/CodeSystem/v3-Confidentiality
+  :file: terminology_hl7_org_CodeSystem_v3-Confidentiality.msgpack
+  :count: 20
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/v3-Confidentiality
+- :url: http://terminology.hl7.org/CodeSystem/v3-ActCode
+  :file: terminology_hl7_org_CodeSystem_v3-ActCode.msgpack
+  :count: 1116
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ActCode
+- :url: http://terminology.hl7.org/CodeSystem/v3-ObservationValue
+  :file: terminology_hl7_org_CodeSystem_v3-ObservationValue.msgpack
+  :count: 250
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ObservationValue
+- :url: http://terminology.hl7.org/CodeSystem/v3-ActReason
+  :file: terminology_hl7_org_CodeSystem_v3-ActReason.msgpack
+  :count: 280
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ActReason
 - :url: urn:ietf:bcp:13
   :file: urn_ietf_bcp_13.msgpack
   :count: 2382
@@ -856,11 +1044,6 @@
   :count: 9
   :type: bloom
   :code_systems: http://hl7.org/fhir/encounter-status
-- :url: http://terminology.hl7.org/CodeSystem/v3-ActCode
-  :file: terminology_hl7_org_CodeSystem_v3-ActCode.msgpack
-  :count: 1116
-  :type: bloom
-  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ActCode
 - :url: http://www.ama-assn.org/go/cpt
   :file: www_ama-assn_org_go_cpt.msgpack
   :count: 14654
@@ -963,7 +1146,7 @@
   :code_systems: http://hl7.org/fhir/address-type
 - :url: https://www.usps.com/
   :file: www_usps_com_.msgpack
-  :count: 59
+  :count: 62
   :type: bloom
   :code_systems: https://www.usps.com/
 - :url: http://hl7.org/fhir/days-of-week
@@ -1076,26 +1259,36 @@
   :count: 3
   :type: bloom
   :code_systems: http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender
-- :url: urn:oid:2.16.840.1.113883.6.285
-  :file: urn_oid_2_16_840_1_113883_6_285.msgpack
+- :url: http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets
+  :file: www_cms_gov_Medicare_Coding_HCPCSReleaseCodeSets.msgpack
   :count: 7783
   :type: bloom
-  :code_systems: urn:oid:2.16.840.1.113883.6.285
+  :code_systems: http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets
 - :url: http://www.cms.gov/Medicare/Coding/ICD10
   :file: www_cms_gov_Medicare_Coding_ICD10.msgpack
   :count: 190673
   :type: bloom
   :code_systems: http://www.cms.gov/Medicare/Coding/ICD10
+- :url: http://www.ada.org/cdt
+  :file: www_ada_org_cdt.msgpack
+  :count: 867
+  :type: bloom
+  :code_systems: http://www.ada.org/cdt
+- :url: urn:oid:2.16.840.1.113883.6.285
+  :file: urn_oid_2_16_840_1_113883_6_285.msgpack
+  :count: 7783
+  :type: bloom
+  :code_systems: urn:oid:2.16.840.1.113883.6.285
+- :url: http://ada.org/cdt
+  :file: ada_org_cdt.msgpack
+  :count: 867
+  :type: bloom
+  :code_systems: http://ada.org/cdt
 - :url: urn:oid:2.16.840.1.113883.6.13
   :file: urn_oid_2_16_840_1_113883_6_13.msgpack
   :count: 867
   :type: bloom
   :code_systems: urn:oid:2.16.840.1.113883.6.13
-- :url: http://terminology.hl7.org/CodeSystem/v3-ActReason
-  :file: terminology_hl7_org_CodeSystem_v3-ActReason.msgpack
-  :count: 280
-  :type: bloom
-  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ActReason
 - :url: http://terminology.hl7.org/CodeSystem/v3-DocumentCompletion
   :file: terminology_hl7_org_CodeSystem_v3-DocumentCompletion.msgpack
   :count: 9
@@ -1121,3 +1314,23 @@
   :count: 5
   :type: bloom
   :code_systems: http://hl7.org/fhir/provenance-entity-role
+- :url: http://terminology.hl7.org/CodeSystem/v3-ParticipationFunction
+  :file: terminology_hl7_org_CodeSystem_v3-ParticipationFunction.msgpack
+  :count: 49
+  :type: bloom
+  :code_systems: http://terminology.hl7.org/CodeSystem/v3-ParticipationFunction
+- :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

data/lib/inferno/terminology/fhir_package_manager.rb

@@ -10,6 +10,31 @@ module Inferno
     module FHIRPackageManager
       class << self
         REGISTRY_SERVER_URL = 'https://packages.fhir.org'.freeze
+        REQUIRED_VSAC_VALUE_SET_URLS = [
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.8',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.30',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.6',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.4',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.11.20.9.38',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.1066',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.1.11.10267',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.27',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.5',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.32',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.836',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.1.11.14914',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.837',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.877',
+          '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.1186.1',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
+          '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.113762.1.4.1186.2',
+          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.2074.1.1.3'
+        ].freeze
+
         # Get the FHIR Package from the registry.
         #
         # e.g. get_package('hl7.fhir.us.core#3.1.1')
@@ -49,6 +74,8 @@ module Inferno
             resource = JSON.parse(entry.read) if file_name.end_with? '.json'
             next unless resource&.[]('url')
 
+            next if package.start_with?('us.nlm.vsac') && !REQUIRED_VSAC_VALUE_SET_URLS.include?(resource['url'])
+
             encoded_name = "#{encode_name(resource['url'])}.json"
             encoded_file_name = File.join(path, encoded_name)
             if File.exist?(encoded_file_name) && !resource['url'] == JSON.parse(File.read(encoded_file_name))['url']

data/lib/inferno/terminology/loader.rb

@@ -49,6 +49,18 @@ module Inferno
           end
         end
 
+        def add_alternative_code_system_names(code_systems)
+          code_systems << 'urn:oid:2.16.840.1.113883.6.285' if code_systems.include? 'http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets'
+          code_systems << 'urn:oid:2.16.840.1.113883.6.13' if code_systems.include? 'http://ada.org/cdt'
+          if code_systems.include? 'http://www.ada.org/cdt'
+            code_systems << 'http://ada.org/cdt'
+            code_systems << 'urn:oid:2.16.840.1.113883.6.13'
+          end
+          code_systems << 'urn:oid:2.16.840.1.113883.6.101' if code_systems.include? 'http://nucc.org/provider-taxonomy'
+          code_systems << 'urn:oid:2.16.840.1.113883.6.101' if code_systems.include? 'http://hl7.org/fhir/questionnaire-answers-status'
+          code_systems.uniq!
+        end
+
         # Creates the valueset validators, based on the passed in parameters and
         # the value_sets_repo
         #
@@ -86,13 +98,17 @@ module Inferno
             begin
               # Save the validator to file, and get the "new" count of number of codes
               new_count = save_to_file(vs.value_set, filename, type)
+              code_systems = vs.all_included_code_systems
+              Inferno.logger.debug "  #{new_count} codes"
+              next if new_count.zero?
 
+              add_alternative_code_system_names(code_systems)
               {
                 url: vs_url,
                 file: name_by_type(File.basename(filename), type),
                 count: new_count,
                 type: type.to_s,
-                code_systems: vs.included_code_systems
+                code_systems: code_systems
               }
             rescue UnknownCodeSystemException,
                    FilterOperationException,
@@ -190,6 +206,11 @@ module Inferno
 
         # Chooses which filetype to save the validator as, based on the type variable passed in
         def save_to_file(codeset, filename, type)
+          if codeset.blank?
+            Inferno.logger.debug "Unable to save #{filename} because it contains no codes"
+            return 0
+          end
+
           case type
           when :bloom
             save_bloom_to_file(codeset, name_by_type(filename, type))

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

@@ -17,7 +17,7 @@ module Inferno
 
         def run
           Loader.register_umls_db db_for_version
-          Loader.load_value_sets_from_directory(Inferno::Terminology::PACKAGE_DIR, true)
+          Loader.load_value_sets_from_directory(PACKAGE_DIR, true)
           Loader.create_validators(
             type: type,
             minimum_binding_strength: minimum_binding_strength,

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

@@ -16,6 +16,11 @@ module Inferno
 
         def download_us_core
           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(
+            'us.nlm.vsac#0.7.0', File.join(PACKAGE_DIR, 'vsac'), ['ValueSet', 'CodeSystem']
+          )
         end
 
         def download_fhir_expansions

data/lib/inferno/terminology/value_set.rb

@@ -64,6 +64,10 @@ module Inferno
           abbreviation: 'NCI_UCUM',
           name: 'Unified Code for Units of Measure (UCUM)'
         }.freeze,
+        'urn:oid:2.16.840.1.113883.6.101' => {
+          abbreviation: 'NUCCHCPT',
+          name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
+        },
         'http://nucc.org/provider-taxonomy' => {
           abbreviation: 'NUCCHCPT',
           name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
@@ -72,6 +76,10 @@ module Inferno
           abbreviation: 'CPT',
           name: 'Current Procedural Terminology (CPT)'
         }.freeze,
+        'http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets' => {
+          abbreviation: 'HCPCS',
+          name: 'Healthcare Common Procedure Coding System (HCPCS)'
+        }.freeze,
         'urn:oid:2.16.840.1.113883.6.285' => {
           abbreviation: 'HCPCS',
           name: 'Healthcare Common Procedure Coding System (HCPCS)'
@@ -79,7 +87,15 @@ module Inferno
         'urn:oid:2.16.840.1.113883.6.13' => {
           abbreviation: 'CDT',
           name: 'Code on Dental Procedures and Nomenclature (CDT)'
-        }.freeze
+        }.freeze,
+        'http://ada.org/cdt' => {
+          abbreviation: 'CDT',
+          name: 'Code on Dental Procedures and Nomenclature (CDT)'
+        },
+        'http://www.ada.org/cdt' => {
+          abbreviation: 'CDT',
+          name: 'Code on Dental Procedures and Nomenclature (CDT)'
+        }
       }.freeze
 
       CODE_SYS = {
@@ -88,7 +104,19 @@ module Inferno
         'http://ihe.net/fhir/ValueSet/IHE.FormatCode.codesystem' =>
           -> { value_sets_repo.find('http://hl7.org/fhir/ValueSet/formatcodes').value_set },
         'https://www.usps.com/' =>
-          -> { value_sets_repo.find('http://hl7.org/fhir/us/core/ValueSet/us-core-usps-state').value_set }
+          lambda do
+            codes = [
+              'AL', 'AK', 'AS', 'AZ', 'AR', 'CA', 'CO', 'CT', 'DE', 'DC', 'FM',
+              'FL', 'GA', 'GU', 'HI', 'ID', 'IL', 'IN', 'IA', 'KS', 'KY', 'LA',
+              'ME', 'MH', 'MD', 'MA', 'MI', 'MN', 'MS', 'MO', 'MT', 'NE', 'NV',
+              'NH', 'NJ', 'NM', 'NY', 'NC', 'ND', 'MP', 'OH', 'OK', 'OR', 'PW',
+              'PA', 'PR', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VT', 'VI', 'VA',
+              'WA', 'WV', 'WI', 'WY', 'AE', 'AP', 'AA'
+            ]
+            codes.each_with_object(Set.new) do |code, set|
+              set.add(system: 'https://www.usps.com/', code: code)
+            end
+          end
       }.freeze
 
       # https://www.nlm.nih.gov/research/umls/knowledge_sources/metathesaurus/release/attribute_names.html
@@ -104,7 +132,9 @@ module Inferno
       end
 
       def umls_abbreviation(system)
-        return SAB.dig(system, :abbreviation) if system != 'http://nucc.org/provider-taxonomy'
+        if system != 'http://nucc.org/provider-taxonomy' && system != 'urn:oid:2.16.840.1.113883.6.101'
+          return SAB.dig(system, :abbreviation)
+        end
 
         @nucc_system ||= # rubocop:disable Naming/MemoizedInstanceVariableName
           if @db.execute("SELECT COUNT(*) FROM mrconso WHERE SAB = 'NUCCPT'").flatten.first.positive?
@@ -166,10 +196,23 @@ module Inferno
         @value_set.length
       end
 
+      def all_included_code_systems
+        (included_code_systems + code_systems_in_codings).uniq
+      end
+
       def included_code_systems
         @value_set_model.compose.include.map(&:system).compact.uniq
       end
 
+      def code_systems_in_codings
+        return [] if value_set.blank?
+
+        value_set
+          .map { |coding| coding[:system] }
+          .compact
+          .uniq
+      end
+
       TOO_COSTLY_URL = 'http://hl7.org/fhir/StructureDefinition/valueset-toocostly'.freeze
       def too_costly?
         @value_set_model&.expansion&.extension&.find { |vs| vs.url == TOO_COSTLY_URL }&.value
@@ -318,9 +361,9 @@ module Inferno
 
         unless vscs.valueSet.empty?
           # If no concepts or filtered systems were present and already created the intersection_set
-          im_val_set = import_value_set(vscs.valueSet.first)
+          im_val_set = import_value_set(vscs.valueSet.first).value_set
           vscs.valueSet.drop(1).each do |im_val|
-            im_val_set = im_val_set.intersection(im_val)
+            im_val_set = im_val_set.intersection(import_value_set(im_val).value_set)
           end
           intersection_set = intersection_set.nil? ? im_val_set : intersection_set.intersection(im_val_set)
         end
@@ -405,6 +448,9 @@ module Inferno
           raise FilterOperationException, filter&.op
         end
         filtered_set
+      rescue UnknownCodeSystemException => e
+        Inferno.logger.debug e.message
+        filtered_set.presence || Set.new
       end
 
       # Imports the ValueSet with the provided URL from the known local ValueSet Authority