diff --git a/.gitattributes b/.gitattributes index f7fbf78a6c0..e43e4ff5b11 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,15 +1,18 @@ -# Normal text let sit to auto -*.htm text -*.html text -*.css text -*.js text - -## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout. -*.sh text eol=lf -*.md text eol=lf -*.json text eol=lf -*.yml text eol=lf -*.csv text eol=lf -*.hl7 text eol=lf -.environment/sftp-conf/ssh_host_*_key text eol=lf - +# Normal text let sit to auto +*.htm text +*.html text +*.css text +*.js text + +## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout. +*.sh text eol=lf +*.md text eol=lf +*.json text eol=lf +*.yml text eol=lf +*.csv text eol=lf +*.hl7 text eol=lf +.environment/sftp-conf/ssh_host_*_key text eol=lf +* text=auto +*.gradle text eol=lf + + diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e96977a7103..8bc1de5d19f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -324,6 +324,17 @@ updates: timezone: "US/Eastern" rebase-strategy: "disabled" + # auth + - package-ecosystem: "gradle" + directory: "/auth" + open-pull-requests-limit: 100 + schedule: + interval: "weekly" + day: "sunday" + time: "04:17" + timezone: "US/Eastern" + rebase-strategy: "disabled" + # Backend - package-ecosystem: "gradle" directory: "/prime-router" diff --git a/.github/workflows/scan_action_logs.yml b/.github/workflows/scan_action_logs.yml index 8e5389d7aff..4d852aa9924 100644 --- a/.github/workflows/scan_action_logs.yml +++ b/.github/workflows/scan_action_logs.yml @@ -16,9 +16,9 @@ jobs: id: scan with: github-token: ${{ secrets.RUNLEAKS_TOKEN }} - run-limit: 500 + run-limit: 300 min-days-old: 0 - max-days-old: 2 + max-days-old: 1 patterns-path: ".github/runleaks/patterns.txt" exclusions-path: ".github/runleaks/exclusions.txt" fail-on-leak: false diff --git a/.github/workflows/validate_terraform.yml b/.github/workflows/validate_terraform.yml index 0f5e50e6a91..6fa0c54c997 100644 --- a/.github/workflows/validate_terraform.yml +++ b/.github/workflows/validate_terraform.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: Run Checkov action - uses: bridgecrewio/checkov-action@15c964c5bee933376cc576908ccfad6687718c8e + uses: bridgecrewio/checkov-action@d0e41abbcc8c1103c6ae7e451681d071f05e1c20 with: directory: operations/app/terraform - skip_check: CKV_AZURE_139,CKV_AZURE_137,CKV_AZURE_103,CKV_AZURE_104,CKV_AZURE_102,CKV_AZURE_130,CKV_AZURE_121,CKV_AZURE_67,CKV_AZURE_56,CKV_AZURE_17,CKV_AZURE_63,CKV_AZURE_18,CKV_AZURE_88,CKV_AZURE_65,CKV_AZURE_13,CKV_AZURE_66,CKV_AZURE_33,CKV_AZURE_35,CKV_AZURE_36,CKV_AZURE_98,CKV2_AZURE_1,CKV2_AZURE_15,CKV2_AZURE_21,CKV_AZURE_213,CKV_AZURE_59,CKV2_AZURE_33,CKV2_AZURE_32,CKV2_AZURE_28,CKV_AZURE_206,CKV_AZURE_42,CKV_AZURE_110,CKV_AZURE_109,CKV_AZURE_166,CKV2_AZURE_38,CKV2_AZURE_40,CKV2_AZURE_41,CKV_AZURE_235 + skip_check: CKV_AZURE_139,CKV_AZURE_137,CKV_AZURE_103,CKV_AZURE_104,CKV_AZURE_102,CKV_AZURE_130,CKV_AZURE_121,CKV_AZURE_67,CKV_AZURE_56,CKV_AZURE_17,CKV_AZURE_63,CKV_AZURE_18,CKV_AZURE_88,CKV_AZURE_65,CKV_AZURE_13,CKV_AZURE_66,CKV_AZURE_33,CKV_AZURE_35,CKV_AZURE_36,CKV_AZURE_98,CKV2_AZURE_1,CKV2_AZURE_15,CKV2_AZURE_21,CKV_AZURE_213,CKV_AZURE_59,CKV2_AZURE_33,CKV2_AZURE_32,CKV2_AZURE_28,CKV_AZURE_206,CKV_AZURE_42,CKV_AZURE_110,CKV_AZURE_109,CKV_AZURE_166,CKV2_AZURE_38,CKV2_AZURE_40,CKV2_AZURE_41,CKV_AZURE_235,CKV_AZURE_244 diff --git a/.gitmodules b/.gitmodules index 2dabe2b7af9..e9bf75b86d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "operations/slack-boltjs-app"] path = operations/slack-boltjs-app - url = https://github.com/JosiahSiegel/slack-boltjs-app + url = https://github.com/focusconsulting/slack-boltjs-app diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a20397b4ebd..2360922c337 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { } dependencies { - val kotlinVersion by System.getProperties() + val kotlinVersion = KotlinVersion.CURRENT.toString() implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}") implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:12.1.1") } \ No newline at end of file diff --git a/frontend-react/e2e/mocks/organizations.ts b/frontend-react/e2e/mocks/organizations.ts index ccf6449548f..185a0ed1dd0 100644 --- a/frontend-react/e2e/mocks/organizations.ts +++ b/frontend-react/e2e/mocks/organizations.ts @@ -1,387 +1,986 @@ -export const MOCK_GET_RECEIVERS_AK = [ - { - name: "full-elr-test", - organizationName: "ak-phd", - topic: "full-elr", - customerStatus: "active", - translation: { - schemaName: - "classpath:/metadata/hl7_mapping/receivers/STLTs/AK/AK-receiver-transform.yml", - useTestProcessingMode: false, - useBatchHeaders: true, - receivingApplicationName: null, - receivingApplicationOID: null, - receivingFacilityName: null, - receivingFacilityOID: null, - messageProfileId: null, - replaceValue: { - "PID-22-3": "CDCREC", - }, - replaceValueAwithB: {}, - reportingFacilityName: null, - reportingFacilityId: null, - reportingFacilityIdType: null, - suppressQstForAoe: false, - suppressHl7Fields: "PID-5-7, ORC-12-1, OBR-16-1", - suppressAoe: false, - defaultAoeToUnknown: false, - replaceUnicodeWithAscii: false, - useBlankInsteadOfUnknown: null, - truncateHDNamespaceIds: false, - truncateHl7Fields: null, - usePid14ForPatientEmail: false, - convertTimestampToDateTime: null, - cliaForOutOfStateTesting: null, - cliaForSender: {}, - phoneNumberFormatting: "STANDARD", - suppressNonNPI: false, - processingModeCode: null, - replaceDiiWithOid: null, - applyOTCDefault: false, - useOrderingFacilityName: "STANDARD", - valueSetOverrides: {}, - nameFormat: "STANDARD", - receivingOrganization: null, - convertPositiveDateTimeOffsetToNegative: false, - stripInvalidCharsRegex: null, - convertDateTimesToReceiverLocalTime: false, - useHighPrecisionHeaderDateTimeFormat: false, - type: "HL7", - truncationConfig: { - truncateHDNamespaceIds: false, - truncateHl7Fields: [], - customLengthHl7Fields: {}, - }, - }, - jurisdictionalFilter: [ - "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'AK') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'AK')", - ], - qualityFilter: [ - "Bundle.entry.resource.ofType(MessageHeader).id.exists()", - "Bundle.entry.resource.ofType(Patient).birthDate.exists()", - "Bundle.entry.resource.ofType(Patient).name.family.exists()", - "Bundle.entry.resource.ofType(Patient).name.given.count() > 0", - "Bundle.entry.resource.ofType(Specimen).type.exists()", - "(Bundle.entry.resource.ofType(Patient).address.line.exists() or Bundle.entry.resource.ofType(Patient).address.postalCode.exists() or Bundle.entry.resource.ofType(Patient).telecom.exists())", - "((Bundle.entry.resource.ofType(Specimen).collection.collectedPeriod.exists() or Bundle.entry.resource.ofType(Specimen).collection.collected.exists()) or Bundle.entry.resource.ofType(ServiceRequest).occurrence.exists() or Bundle.entry.resource.ofType(Observation).effective.exists())", - ], - routingFilter: [ - "Bundle.entry.resource.ofType(Organization).where(identifier.value in ('05D2201580')).exists()", - ], - processingModeFilter: [ - "Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').exists().not() or Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').value != 'hcintegrations'", - ], - reverseTheQualityFilter: false, - deidentify: false, - deidentifiedValue: "", - timing: { - operation: "MERGE", - numberPerDay: 1440, - initialTime: "00:00", - timeZone: "EASTERN", - maxReportCount: 100, - whenEmpty: { - action: "NONE", - onlyOncePerDay: false, - }, - }, - description: "", - transport: { - host: "sftp-west.inductivehealth.com", - port: "22", - filePath: "/incoming/full_elr/staging", - credentialName: null, - type: "SFTP", - }, - version: 8, - createdBy: "michael.kalish@focusconsulting.io", - createdAt: "2024-03-05T16:03:09.781Z", - conditionFilter: [], - mappedConditionFilter: [], - externalName: null, - enrichmentSchemaNames: [], - timeZone: null, - dateTimeFormat: "OFFSET", +export const MOCK_GET_RECEIVERS_IGNORE = [ { + "name" : "QUALITY_ALL", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "empty", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" }, - { - name: "elr", - organizationName: "ak-phd", - topic: "covid-19", - customerStatus: "active", - translation: { - schemaName: "covid-19", - useTestProcessingMode: false, - useBatchHeaders: true, - receivingApplicationName: null, - receivingApplicationOID: null, - receivingFacilityName: null, - receivingFacilityOID: null, - messageProfileId: null, - replaceValue: { - "PID-22-3": "CDCREC", - }, - replaceValueAwithB: {}, - reportingFacilityName: null, - reportingFacilityId: null, - reportingFacilityIdType: null, - suppressQstForAoe: false, - suppressHl7Fields: "PID-5-7, ORC-12-1, OBR-16-1", - suppressAoe: false, - defaultAoeToUnknown: false, - replaceUnicodeWithAscii: false, - useBlankInsteadOfUnknown: null, - truncateHDNamespaceIds: false, - truncateHl7Fields: null, - usePid14ForPatientEmail: false, - convertTimestampToDateTime: null, - cliaForOutOfStateTesting: null, - cliaForSender: {}, - phoneNumberFormatting: "STANDARD", - suppressNonNPI: false, - processingModeCode: null, - replaceDiiWithOid: null, - applyOTCDefault: false, - useOrderingFacilityName: "STANDARD", - valueSetOverrides: {}, - nameFormat: "STANDARD", - receivingOrganization: null, - convertPositiveDateTimeOffsetToNegative: false, - stripInvalidCharsRegex: null, - convertDateTimesToReceiverLocalTime: false, - useHighPrecisionHeaderDateTimeFormat: false, - type: "HL7", - truncationConfig: { - truncateHDNamespaceIds: false, - truncateHl7Fields: [], - customLengthHl7Fields: {}, - }, - }, - jurisdictionalFilter: [ - "orEquals(ordering_facility_state, AK, patient_state, AK)", - ], - qualityFilter: ["doesNotMatch(sender_id, simple_report.*)"], - routingFilter: [], - processingModeFilter: ["matches(processing_mode_code,T,D,P)"], - reverseTheQualityFilter: false, - deidentify: false, - deidentifiedValue: "", - timing: { - operation: "MERGE", - numberPerDay: 1440, - initialTime: "00:00", - timeZone: "EASTERN", - maxReportCount: 100, - whenEmpty: { - action: "NONE", - onlyOncePerDay: false, - }, - }, - description: "", - transport: null, - version: 16, - createdBy: "james.gilmore@agile6.com", - createdAt: "2024-04-11T21:39:30.454Z", - conditionFilter: [], - mappedConditionFilter: [], - externalName: null, - enrichmentSchemaNames: [], - timeZone: null, - dateTimeFormat: "OFFSET", + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, QUALITY_ALL)" ], + "qualityFilter" : [ "allowAll()" ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : null, + "description" : "", + "transport" : null, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "QUALITY_FAIL", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "empty", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" }, -]; - -export const MOCK_GET_RECEIVERS_IGNORE = [ - { - name: "FULL_ELR", - organizationName: "ignore", - topic: "full-elr", - customerStatus: "active", - translation: { - schemaName: - "classpath:/metadata/hl7_mapping/receivers/STLTs/CO/CO.yml", - useTestProcessingMode: false, - useBatchHeaders: true, - receivingApplicationName: "CA-ELR", - receivingApplicationOID: null, - receivingFacilityName: "CA", - receivingFacilityOID: null, - messageProfileId: null, - replaceValue: {}, - replaceValueAwithB: {}, - reportingFacilityName: null, - reportingFacilityId: null, - reportingFacilityIdType: null, - suppressQstForAoe: false, - suppressHl7Fields: null, - suppressAoe: false, - defaultAoeToUnknown: false, - replaceUnicodeWithAscii: false, - useBlankInsteadOfUnknown: null, - truncateHDNamespaceIds: false, - truncateHl7Fields: null, - usePid14ForPatientEmail: false, - convertTimestampToDateTime: null, - cliaForOutOfStateTesting: null, - cliaForSender: {}, - phoneNumberFormatting: "STANDARD", - suppressNonNPI: false, - processingModeCode: null, - replaceDiiWithOid: null, - applyOTCDefault: false, - useOrderingFacilityName: "STANDARD", - valueSetOverrides: {}, - nameFormat: "standard", - receivingOrganization: null, - convertPositiveDateTimeOffsetToNegative: false, - stripInvalidCharsRegex: null, - convertDateTimesToReceiverLocalTime: false, - useHighPrecisionHeaderDateTimeFormat: false, - type: "HL7", - truncationConfig: { - truncateHDNamespaceIds: false, - truncateHl7Fields: [], - customLengthHl7Fields: {}, - }, - }, - jurisdictionalFilter: [ - "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')", - ], - qualityFilter: [ - "Bundle.entry.resource.ofType(MessageHeader).id.exists()", - "Bundle.entry.resource.ofType(Patient).birthDate.exists()", - "Bundle.entry.resource.ofType(Patient).name.family.exists()", - "Bundle.entry.resource.ofType(Patient).name.given.count() > 0", - "Bundle.entry.resource.ofType(Specimen).type.exists()", - "(Bundle.entry.resource.ofType(Patient).address.line.exists() or Bundle.entry.resource.ofType(Patient).address.postalCode.exists() or Bundle.entry.resource.ofType(Patient).telecom.exists())", - "((Bundle.entry.resource.ofType(Specimen).collection.collectedPeriod.exists() or Bundle.entry.resource.ofType(Specimen).collection.collected.exists()) or Bundle.entry.resource.ofType(ServiceRequest).occurrence.exists() or Bundle.entry.resource.ofType(Observation).effective.exists())", - ], - routingFilter: [], - processingModeFilter: [ - "Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').exists().not() or Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').value != 'hcintegrations'", - ], - reverseTheQualityFilter: false, - deidentify: false, - deidentifiedValue: "", - timing: { - operation: "MERGE", - numberPerDay: 1440, - initialTime: "00:00", - timeZone: "EASTERN", - maxReportCount: 100, - whenEmpty: { - action: "NONE", - onlyOncePerDay: false, - }, - }, - description: "", - transport: { - host: "172.17.6.20", - port: "22", - filePath: "./upload", - credentialName: null, - type: "SFTP", - }, - version: 13, - createdBy: "michael.kalish@focusconsulting.io", - createdAt: "2024-02-27T21:52:41.537Z", - conditionFilter: [], - mappedConditionFilter: [], - externalName: "Ignore FULL_ELR", - enrichmentSchemaNames: [], - timeZone: null, - dateTimeFormat: "OFFSET", + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, QUALITY_FAIL)" ], + "qualityFilter" : [ "hasValidDataFor(blankField)", "hasAtLeastOneOf(message_id,blankField)" ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : null, + "description" : "", + "transport" : null, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "HL7", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "fl/fl-covid-19", + "format" : "HL7", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" }, - { - name: "ELR_ELIMS", - organizationName: "ignore", - topic: "elr-elims", - customerStatus: "active", - translation: { - schemaName: - "classpath:/metadata/hl7_mapping/ORU_R01/ORU_R01-base.yml", - useTestProcessingMode: false, - useBatchHeaders: true, - receivingApplicationName: null, - receivingApplicationOID: null, - receivingFacilityName: null, - receivingFacilityOID: null, - messageProfileId: null, - replaceValue: {}, - replaceValueAwithB: {}, - reportingFacilityName: null, - reportingFacilityId: null, - reportingFacilityIdType: null, - suppressQstForAoe: false, - suppressHl7Fields: null, - suppressAoe: false, - defaultAoeToUnknown: false, - replaceUnicodeWithAscii: false, - useBlankInsteadOfUnknown: null, - truncateHDNamespaceIds: false, - truncateHl7Fields: null, - usePid14ForPatientEmail: false, - convertTimestampToDateTime: null, - cliaForOutOfStateTesting: null, - cliaForSender: {}, - phoneNumberFormatting: "STANDARD", - suppressNonNPI: false, - processingModeCode: null, - replaceDiiWithOid: null, - applyOTCDefault: false, - useOrderingFacilityName: "STANDARD", - valueSetOverrides: {}, - nameFormat: "standard", - receivingOrganization: null, - convertPositiveDateTimeOffsetToNegative: false, - stripInvalidCharsRegex: null, - convertDateTimesToReceiverLocalTime: false, - useHighPrecisionHeaderDateTimeFormat: false, - type: "HL7", - truncationConfig: { - truncateHDNamespaceIds: false, - truncateHl7Fields: [], - customLengthHl7Fields: {}, - }, - }, - jurisdictionalFilter: [ - "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')", - ], - qualityFilter: ["true"], - routingFilter: [], - processingModeFilter: [], - reverseTheQualityFilter: false, - deidentify: false, - deidentifiedValue: "", - timing: { - operation: "MERGE", - numberPerDay: 1440, - initialTime: "00:00", - timeZone: "EASTERN", - maxReportCount: 100, - whenEmpty: { - action: "NONE", - onlyOncePerDay: false, - }, - }, - description: "", - transport: { - host: "172.17.6.20", - port: "22", - filePath: "./upload", - credentialName: null, - type: "SFTP", - }, - version: 3, - createdBy: "jimfuqian@navapbc.com", - createdAt: "2024-01-19T01:44:40.928Z", - conditionFilter: [], - mappedConditionFilter: [], - externalName: "ELIMS Ignore Receiver", - enrichmentSchemaNames: [], - timeZone: null, - dateTimeFormat: "OFFSET", + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, HL7)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } }, -]; + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "QUALITY_PASS", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "empty", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, QUALITY_PASS, removed)" ], + "qualityFilter" : [ "hasValidDataFor(message_id,ordering_facility_county,ordering_facility_state)", "hasAtLeastOneOf(message_id,blankField)", "matches(ordering_facility_county, QUALITY_PASS)" ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : null, + "description" : "", + "transport" : null, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "QUALITY_REVERSED", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "empty", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, QUALITY_REVERSED, kept)" ], + "qualityFilter" : [ "hasValidDataFor(message_id,ordering_facility_county,ordering_facility_state)", "hasAtLeastOneOf(message_id,blankField)", "matches(ordering_facility_county, QUALITY_REVERSED)" ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : true, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : null, + "description" : "", + "transport" : null, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "BLOBSTORE", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "hhsprotect/hhsprotect-covid-19", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, BLOBSTORE)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : true, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "storageName" : "PartnerStorage", + "containerName" : "hhsprotect", + "type" : "BLOBSTORE" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "CSV", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "az/pima-az-covid-19", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, CSV)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "For testing only.", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "HL7_NULL", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "tx/tx-covid-19", + "format" : "HL7_BATCH", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, HL7_NULL)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "dummy" : null, + "type" : "NULL" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "EVERY_5_MINS", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "covid-19", + "useTestProcessingMode" : false, + "useBatchHeaders" : true, + "receivingApplicationName" : null, + "receivingApplicationOID" : null, + "receivingFacilityName" : null, + "receivingFacilityOID" : null, + "messageProfileId" : null, + "replaceValue" : { }, + "replaceValueAwithB" : { }, + "reportingFacilityName" : null, + "reportingFacilityId" : null, + "reportingFacilityIdType" : null, + "suppressQstForAoe" : false, + "suppressHl7Fields" : null, + "suppressAoe" : false, + "defaultAoeToUnknown" : false, + "replaceUnicodeWithAscii" : false, + "useBlankInsteadOfUnknown" : null, + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : null, + "usePid14ForPatientEmail" : false, + "convertTimestampToDateTime" : null, + "cliaForOutOfStateTesting" : null, + "cliaForSender" : { }, + "phoneNumberFormatting" : "STANDARD", + "suppressNonNPI" : false, + "processingModeCode" : null, + "replaceDiiWithOid" : null, + "applyOTCDefault" : false, + "useOrderingFacilityName" : "STANDARD", + "valueSetOverrides" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "convertPositiveDateTimeOffsetToNegative" : false, + "stripInvalidCharsRegex" : null, + "convertDateTimesToReceiverLocalTime" : false, + "useHighPrecisionHeaderDateTimeFormat" : false, + "type" : "HL7", + "truncationConfig" : { + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : [ ], + "customLengthHl7Fields" : { } + } + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, EVERY_5_MINS)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 288, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "Batches and Sends every 5 minutes. For Load testing.", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "EVERY_15_MINS", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "covid-19", + "useTestProcessingMode" : false, + "useBatchHeaders" : true, + "receivingApplicationName" : null, + "receivingApplicationOID" : null, + "receivingFacilityName" : null, + "receivingFacilityOID" : null, + "messageProfileId" : null, + "replaceValue" : { }, + "replaceValueAwithB" : { }, + "reportingFacilityName" : null, + "reportingFacilityId" : null, + "reportingFacilityIdType" : null, + "suppressQstForAoe" : false, + "suppressHl7Fields" : null, + "suppressAoe" : false, + "defaultAoeToUnknown" : false, + "replaceUnicodeWithAscii" : false, + "useBlankInsteadOfUnknown" : null, + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : null, + "usePid14ForPatientEmail" : false, + "convertTimestampToDateTime" : null, + "cliaForOutOfStateTesting" : null, + "cliaForSender" : { }, + "phoneNumberFormatting" : "STANDARD", + "suppressNonNPI" : false, + "processingModeCode" : null, + "replaceDiiWithOid" : null, + "applyOTCDefault" : false, + "useOrderingFacilityName" : "STANDARD", + "valueSetOverrides" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "convertPositiveDateTimeOffsetToNegative" : false, + "stripInvalidCharsRegex" : null, + "convertDateTimesToReceiverLocalTime" : false, + "useHighPrecisionHeaderDateTimeFormat" : false, + "type" : "HL7", + "truncationConfig" : { + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : [ ], + "customLengthHl7Fields" : { } + } + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)", "matches(ordering_facility_county, EVERY_15_MINS)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 96, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "Batches and Sends every 15 minutes. For Load testing.", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "SETTINGS_TEST", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "empty", + "format" : "CSV", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_county, SETTINGS_TEST)" ], + "qualityFilter" : [ "allowAll()" ], + "routingFilter" : [ "matches(sender_fullname, ignore.ignore-empty)", "matches(sender_orgname, ignore)" ], + "processingModeFilter" : [ "matches(processing_mode_code, P)" ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "Used to test putting sender settings into the data, using ignore.ignore-empty", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "HL7_BATCH", + "organizationName" : "ignore", + "topic" : "covid-19", + "customerStatus" : "active", + "translation" : { + "schemaName" : "az/az-covid-19-hl7", + "format" : "HL7_BATCH", + "useBatching" : false, + "defaults" : { }, + "nameFormat" : "STANDARD", + "receivingOrganization" : null, + "type" : "CUSTOM" + }, + "jurisdictionalFilter" : [ "matches(ordering_facility_county, HL7_BATCH)", "matches(ordering_facility_state, IG)" ], + "qualityFilter" : [ ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : null, + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "FULL_ELR_FHIR", + "organizationName" : "ignore", + "topic" : "full-elr", + "customerStatus" : "active", + "translation" : { + "schemaName" : "", + "useBatching" : true, + "nameFormat" : "standard", + "receivingOrganization" : null, + "type" : "FHIR" + }, + "jurisdictionalFilter" : [ "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')" ], + "qualityFilter" : [ "Bundle.entry.resource.ofType(MessageHeader).id.exists()", "Bundle.entry.resource.ofType(Patient).birthDate.exists()", "Bundle.entry.resource.ofType(Patient).name.family.exists()", "Bundle.entry.resource.ofType(Patient).name.given.count() > 0", "Bundle.entry.resource.ofType(Specimen).type.exists()", "(Bundle.entry.resource.ofType(Patient).address.line.exists() or Bundle.entry.resource.ofType(Patient).address.postalCode.exists() or Bundle.entry.resource.ofType(Patient).telecom.exists())", "((Bundle.entry.resource.ofType(Specimen).collection.collectedPeriod.exists() or Bundle.entry.resource.ofType(Specimen).collection.collected.exists()) or Bundle.entry.resource.ofType(ServiceRequest).occurrence.exists() or Bundle.entry.resource.ofType(Observation).effective.exists())" ], + "routingFilter" : [ ], + "processingModeFilter" : [ "Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').exists().not() or Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').value != 'hcintegrations'" ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "Ignore FULL_ELR_FHIR", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "FULL_ELR", + "organizationName" : "ignore", + "topic" : "full-elr", + "customerStatus" : "active", + "translation" : { + "schemaName" : "classpath:/metadata/hl7_mapping/receivers/STLTs/CO/CO.yml", + "useTestProcessingMode" : false, + "useBatchHeaders" : true, + "receivingApplicationName" : "CA-ELR", + "receivingApplicationOID" : null, + "receivingFacilityName" : "CA", + "receivingFacilityOID" : null, + "messageProfileId" : null, + "replaceValue" : { }, + "replaceValueAwithB" : { }, + "reportingFacilityName" : null, + "reportingFacilityId" : null, + "reportingFacilityIdType" : null, + "suppressQstForAoe" : false, + "suppressHl7Fields" : null, + "suppressAoe" : false, + "defaultAoeToUnknown" : false, + "replaceUnicodeWithAscii" : false, + "useBlankInsteadOfUnknown" : null, + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : null, + "usePid14ForPatientEmail" : false, + "convertTimestampToDateTime" : null, + "cliaForOutOfStateTesting" : null, + "cliaForSender" : { }, + "phoneNumberFormatting" : "STANDARD", + "suppressNonNPI" : false, + "processingModeCode" : null, + "replaceDiiWithOid" : null, + "applyOTCDefault" : false, + "useOrderingFacilityName" : "STANDARD", + "valueSetOverrides" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "convertPositiveDateTimeOffsetToNegative" : false, + "stripInvalidCharsRegex" : null, + "convertDateTimesToReceiverLocalTime" : false, + "useHighPrecisionHeaderDateTimeFormat" : false, + "type" : "HL7", + "truncationConfig" : { + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : [ ], + "customLengthHl7Fields" : { } + } + }, + "jurisdictionalFilter" : [ "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')" ], + "qualityFilter" : [ "Bundle.entry.resource.ofType(MessageHeader).id.exists()", "Bundle.entry.resource.ofType(Patient).birthDate.exists()", "Bundle.entry.resource.ofType(Patient).name.family.exists()", "Bundle.entry.resource.ofType(Patient).name.given.count() > 0", "Bundle.entry.resource.ofType(Specimen).type.exists()", "(Bundle.entry.resource.ofType(Patient).address.line.exists() or Bundle.entry.resource.ofType(Patient).address.postalCode.exists() or Bundle.entry.resource.ofType(Patient).telecom.exists())", "((Bundle.entry.resource.ofType(Specimen).collection.collectedPeriod.exists() or Bundle.entry.resource.ofType(Specimen).collection.collected.exists()) or Bundle.entry.resource.ofType(ServiceRequest).occurrence.exists() or Bundle.entry.resource.ofType(Observation).effective.exists())" ], + "routingFilter" : [ ], + "processingModeFilter" : [ "Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').exists().not() or Bundle.entry.resource.ofType(MessageHeader).extension('https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id').value != 'hcintegrations'" ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "Ignore FULL_ELR", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}, { + "name" : "ELR_ELIMS", + "organizationName" : "ignore", + "topic" : "elr-elims", + "customerStatus" : "active", + "translation" : { + "schemaName" : "classpath:/metadata/hl7_mapping/ORU_R01/ORU_R01-base.yml", + "useTestProcessingMode" : false, + "useBatchHeaders" : true, + "receivingApplicationName" : null, + "receivingApplicationOID" : null, + "receivingFacilityName" : null, + "receivingFacilityOID" : null, + "messageProfileId" : null, + "replaceValue" : { }, + "replaceValueAwithB" : { }, + "reportingFacilityName" : null, + "reportingFacilityId" : null, + "reportingFacilityIdType" : null, + "suppressQstForAoe" : false, + "suppressHl7Fields" : null, + "suppressAoe" : false, + "defaultAoeToUnknown" : false, + "replaceUnicodeWithAscii" : false, + "useBlankInsteadOfUnknown" : null, + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : null, + "usePid14ForPatientEmail" : false, + "convertTimestampToDateTime" : null, + "cliaForOutOfStateTesting" : null, + "cliaForSender" : { }, + "phoneNumberFormatting" : "STANDARD", + "suppressNonNPI" : false, + "processingModeCode" : null, + "replaceDiiWithOid" : null, + "applyOTCDefault" : false, + "useOrderingFacilityName" : "STANDARD", + "valueSetOverrides" : { }, + "nameFormat" : "standard", + "receivingOrganization" : null, + "convertPositiveDateTimeOffsetToNegative" : false, + "stripInvalidCharsRegex" : null, + "convertDateTimesToReceiverLocalTime" : false, + "useHighPrecisionHeaderDateTimeFormat" : false, + "type" : "HL7", + "truncationConfig" : { + "truncateHDNamespaceIds" : false, + "truncateHl7Fields" : [ ], + "customLengthHl7Fields" : { } + } + }, + "jurisdictionalFilter" : [ "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')" ], + "qualityFilter" : [ "true" ], + "routingFilter" : [ ], + "processingModeFilter" : [ ], + "reverseTheQualityFilter" : false, + "deidentify" : false, + "deidentifiedValue" : "", + "timing" : { + "operation" : "MERGE", + "numberPerDay" : 1440, + "initialTime" : "00:00", + "timeZone" : "EASTERN", + "maxReportCount" : 100, + "whenEmpty" : { + "action" : "NONE", + "onlyOncePerDay" : false + } + }, + "description" : "", + "transport" : { + "host" : "172.17.6.20", + "port" : "22", + "filePath" : "./upload", + "credentialName" : null, + "type" : "SFTP" + }, + "version" : null, + "createdBy" : null, + "createdAt" : null, + "conditionFilter" : [ ], + "mappedConditionFilter" : [ ], + "externalName" : "ELIMS Ignore Receiver", + "enrichmentSchemaNames" : [ ], + "timeZone" : null, + "dateTimeFormat" : "OFFSET" +}]; + +export const MOCK_GET_SENDERS_IGNORE = [ { + "name" : "ignore-empty", + "organizationName" : "ignore", + "format" : "CSV", + "customerStatus" : "active", + "schemaName" : "empty", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "covid-19", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-simple-report", + "organizationName" : "ignore", + "format" : "CSV", + "customerStatus" : "active", + "schemaName" : "primedatainput/pdi-covid-19", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "covid-19", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-waters", + "organizationName" : "ignore", + "format" : "CSV", + "customerStatus" : "active", + "schemaName" : "waters/waters-covid-19", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "covid-19", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-hl7", + "organizationName" : "ignore", + "format" : "HL7", + "customerStatus" : "active", + "schemaName" : "hl7/test-covid-19", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "covid-19", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-full-elr", + "organizationName" : "ignore", + "format" : "HL7", + "customerStatus" : "active", + "schemaName" : "", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "full-elr", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "default", + "organizationName" : "ignore", + "format" : "CSV", + "customerStatus" : "active", + "schemaName" : "primedatainput/pdi-covid-19", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "covid-19", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-elr-elims", + "organizationName" : "ignore", + "format" : "HL7", + "customerStatus" : "active", + "schemaName" : "classpath:/metadata/fhir_transforms/senders/original-pipeline-transforms.yml", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "elr-elims", + "version" : null, + "createdBy" : null, + "createdAt" : null +}, { + "name" : "ignore-full-elr-e2e", + "organizationName" : "ignore", + "format" : "HL7", + "customerStatus" : "active", + "schemaName" : "classpath:/metadata/fhir_transforms/senders/baseline-sender-transform.yml", + "processingType" : "sync", + "allowDuplicates" : true, + "senderType" : null, + "primarySubmissionMethod" : null, + "topic" : "full-elr", + "version" : null, + "createdBy" : null, + "createdAt" : null +} ] + +export const MOCK_GET_ORGANIZATION_IGNORE = { + "name" : "ignore", + "description" : "FOR TESTING ONLY", + "jurisdiction" : "FEDERAL", + "filters" : [ { + "topic" : "covid-19", + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)" ], + "qualityFilter" : null, + "routingFilter" : null, + "processingModeFilter" : null, + "conditionFilter" : null, + "mappedConditionFilter" : null + }, { + "topic" : "monkeypox", + "jurisdictionalFilter" : [ "matches(ordering_facility_state, IG)" ], + "qualityFilter" : null, + "routingFilter" : null, + "processingModeFilter" : null, + "conditionFilter" : null, + "mappedConditionFilter" : null + }, { + "topic" : "full-elr", + "jurisdictionalFilter" : [ "(Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state.exists() and Bundle.entry.resource.ofType(ServiceRequest)[0].requester.resolve().organization.resolve().address.state = 'IG') or (Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG')" ], + "qualityFilter" : [ "(Bundle.entry.resource.ofType(MessageHeader).event.code.exists() and Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01')" ], + "routingFilter" : null, + "processingModeFilter" : null, + "conditionFilter" : null, + "mappedConditionFilter" : null + }, { + "topic" : "mars-otc-elr", + "jurisdictionalFilter" : [ "Bundle.entry.resource.ofType(Patient).address.state.exists() and Bundle.entry.resource.ofType(Patient).address.state = 'IG'" ], + "qualityFilter" : null, + "routingFilter" : null, + "processingModeFilter" : null, + "conditionFilter" : null, + "mappedConditionFilter" : null + } ], + "featureFlags" : [ ], + "keys" : [ { + "scope" : "ignore.*.admin", + "keys" : [ { + "kty" : "EC", + "kid" : "adminkey", + "crv" : "P-384", + "x" : "78eOugxhQPd_tUKOhsfcZ04bp_xgL2kuJN6ZrNgWv6qZXHXqoqVKVXlzO_Q9NXdn", + "y" : "Zo7eBcyQpAarTANsPKB95xT69Ue_cCyp1DBmTRk3nJBBhF6XZkT-AaYaXmGhPNWG" + } ] + }, { + "scope" : "ignore.*.report", + "keys" : [ ] + } ], + "version" : 2197, + "createdBy" : "ignore.*.admin_8e376400-dd3d-452c-973b-ea38358c4b7d", + "createdAt" : "2024-09-16T15:18:36.062Z" +} export const MOCK_GET_ORGANIZATION_SETTINGS_LIST = [ { diff --git a/frontend-react/e2e/pages/BasePage.ts b/frontend-react/e2e/pages/BasePage.ts index ea831731a04..066f2cdec8f 100644 --- a/frontend-react/e2e/pages/BasePage.ts +++ b/frontend-react/e2e/pages/BasePage.ts @@ -89,8 +89,8 @@ export abstract class BasePage { typeof err === "function" || typeof err === "object" ? err : { - status: typeof err === "number" ? err : 500, - }; + status: typeof err === "number" ? err : 500, + }; } /** @@ -134,9 +134,11 @@ export abstract class BasePage { ); } - async testHeader() { + async testHeader(hasHeading = true) { await expect(this.page).toHaveTitle(this.title); - await expect(this.heading).toBeVisible(); + if (hasHeading) { + await expect(this.heading).toBeVisible(); + } } async testCard(card: { name: string }) { diff --git a/frontend-react/e2e/pages/authenticated/last-mile-failures.ts b/frontend-react/e2e/pages/authenticated/admin/last-mile-failures.ts similarity index 94% rename from frontend-react/e2e/pages/authenticated/last-mile-failures.ts rename to frontend-react/e2e/pages/authenticated/admin/last-mile-failures.ts index bfc8c1bccea..9b51f5ea855 100644 --- a/frontend-react/e2e/pages/authenticated/last-mile-failures.ts +++ b/frontend-react/e2e/pages/authenticated/admin/last-mile-failures.ts @@ -1,8 +1,8 @@ import { expect, Locator } from "@playwright/test"; import { startOfDay, subDays } from "date-fns"; -import { tableRows } from "../../helpers/utils"; -import { MOCK_GET_RESEND, MOCK_GET_SEND_FAILURES } from "../../mocks/lastMilefailures"; -import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../BasePage"; +import { tableRows } from "../../../helpers/utils"; +import { MOCK_GET_RESEND, MOCK_GET_SEND_FAILURES } from "../../../mocks/lastMilefailures"; +import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../../BasePage"; export class LastMileFailuresPage extends BasePage { static readonly URL_LAST_MILE = "/admin/lastmile"; diff --git a/frontend-react/e2e/pages/authenticated/message-details.ts b/frontend-react/e2e/pages/authenticated/admin/message-details.ts similarity index 92% rename from frontend-react/e2e/pages/authenticated/message-details.ts rename to frontend-react/e2e/pages/authenticated/admin/message-details.ts index 124831a1829..ce245bd7430 100644 --- a/frontend-react/e2e/pages/authenticated/message-details.ts +++ b/frontend-react/e2e/pages/authenticated/admin/message-details.ts @@ -1,7 +1,7 @@ import { MessageIDSearchPage } from "./message-id-search"; -import { MOCK_GET_MESSAGE } from "../../mocks/messages"; +import { MOCK_GET_MESSAGE } from "../../../mocks/messages"; -import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../BasePage"; +import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../../BasePage"; export class MessageDetailsPage extends BasePage { static readonly URL_MESSAGE_DETAILS = `/message-details/${MessageIDSearchPage.MESSAGE_ID}`; diff --git a/frontend-react/e2e/pages/authenticated/message-id-search.ts b/frontend-react/e2e/pages/authenticated/admin/message-id-search.ts similarity index 93% rename from frontend-react/e2e/pages/authenticated/message-id-search.ts rename to frontend-react/e2e/pages/authenticated/admin/message-id-search.ts index d708f3f10c3..bf13796ba95 100644 --- a/frontend-react/e2e/pages/authenticated/message-id-search.ts +++ b/frontend-react/e2e/pages/authenticated/admin/message-id-search.ts @@ -1,5 +1,5 @@ -import { MOCK_GET_MESSAGE, MOCK_GET_MESSAGES } from "../../mocks/messages"; -import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../BasePage"; +import { MOCK_GET_MESSAGE, MOCK_GET_MESSAGES } from "../../../mocks/messages"; +import { BasePage, BasePageTestArgs, RouteHandlerFulfillEntry } from "../../BasePage"; export class MessageIDSearchPage extends BasePage { static readonly URL_MESSAGE_ID_SEARCH = "/admin/message-tracker"; diff --git a/frontend-react/e2e/pages/authenticated/admin/organization-edit.ts b/frontend-react/e2e/pages/authenticated/admin/organization-edit.ts new file mode 100644 index 00000000000..b914b4ee2c7 --- /dev/null +++ b/frontend-react/e2e/pages/authenticated/admin/organization-edit.ts @@ -0,0 +1,182 @@ +import { expect, Locator, Page } from "@playwright/test"; +import { RSReceiver, RSSender } from "../../../../src/config/endpoints/settings"; +import { formatDate } from "../../../../src/utils/misc"; +import { + MOCK_GET_ORGANIZATION_IGNORE, + MOCK_GET_RECEIVERS_IGNORE, + MOCK_GET_SENDERS_IGNORE +} from "../../../mocks/organizations"; +import { BasePage, BasePageTestArgs, type RouteHandlerFulfillEntry } from "../../BasePage"; + +export class OrganizationEditPage extends BasePage { + static readonly URL_ORGANIZATION_EDIT = `/admin/orgsettings/org/ignore`; + static readonly API_ORGANIZATION_IGNORE = "/api/settings/organizations/ignore"; + static readonly API_SENDERS = "/api/settings/organizations/ignore/senders"; + static readonly API_RECEIVERS = "/api/settings/organizations/ignore/receivers"; + protected _organizationSenders: RSSender[]; + protected _organizationReceivers: RSReceiver[]; + + readonly orgSenderNew: { + cancel: Locator; + save: Locator; + } + readonly orgSenderEdit: { + modal: Locator; + cancelButton: Locator; + editJsonButton: Locator; + editJsonModal: { + save: Locator; + checkSyntax: Locator; + back: Locator; + }; + } + readonly orgReceiverNew: { + cancel: Locator; + save: Locator; + } + readonly orgReceiverEdit: { + modal: Locator; + cancelButton: Locator; + editJsonButton: Locator; + editJsonModal: { + save: Locator; + checkSyntax: Locator; + back: Locator; + }; + } + + constructor(testArgs: BasePageTestArgs) { + super( + { + url: OrganizationEditPage.URL_ORGANIZATION_EDIT, + title: "Organization edit - Admin", + }, + testArgs, + ); + + this._organizationSenders = []; + this._organizationReceivers = []; + + this.addMockRouteHandlers( + [this.createMockOrganizationIgnoreAPIHandler(), + this.createMockOrganizationSenderAPIHandler(), + this.createMockOrganizationReceiverAPIHandler()] + ); + this.orgSenderNew = { + cancel: this.page.getByRole("button", { + name: "Cancel", + }), + save: this.page.getByRole("button", { + name: "Save", + }), + } + this.orgSenderEdit = { + modal: this.page.getByTestId("modalWindow"), + cancelButton: this.page.getByRole("button", { + name: "Cancel", + }), + editJsonButton: this.page.getByRole("button", { + name: "Edit json and save...", + }), + editJsonModal: { + save: this.page.getByTestId("editCompareSaveButton"), + checkSyntax: this.page.getByTestId("editCheckSyntaxButton"), + back: this.page.getByRole("button", { + name: "Back", + }), + } + } + this.orgReceiverNew = { + cancel: this.page.getByRole("button", { + name: "Cancel", + }), + save: this.page.getByRole("button", { + name: "Save", + }), + } + + this.orgReceiverEdit = { + modal: this.page.getByTestId("modalWindow"), + cancelButton: this.page.getByRole("button", { + name: "Cancel", + }), + editJsonButton: this.page.getByRole("button", { + name: "Edit json and save...", + }), + editJsonModal: { + save: this.page.getByTestId("editCompareSaveButton"), + checkSyntax: this.page.getByTestId("editCheckSyntaxButton"), + back: this.page.getByRole("button", { + name: "Back", + }), + } + } + } + + get isPageLoadExpected() { + return super.isPageLoadExpected && this.testArgs.storageState === this.testArgs.adminLogin.path; + } + + createMockOrganizationIgnoreAPIHandler(): RouteHandlerFulfillEntry { + return [ + OrganizationEditPage.API_ORGANIZATION_IGNORE, + () => { + return { + json: MOCK_GET_ORGANIZATION_IGNORE, + }; + }, + ]; + } + + createMockOrganizationSenderAPIHandler(): RouteHandlerFulfillEntry { + return [ + OrganizationEditPage.API_SENDERS, + () => { + return { + json: MOCK_GET_SENDERS_IGNORE, + }; + }, + ]; + } + + createMockOrganizationReceiverAPIHandler(): RouteHandlerFulfillEntry { + return [ + OrganizationEditPage.API_RECEIVERS, + () => { + return { + json: MOCK_GET_RECEIVERS_IGNORE, + }; + }, + ]; + } + + async testTableHeaders() { + await expect(this.page.locator(".usa-table th").nth(0)).toHaveText(/Name/); + await expect(this.page.locator(".usa-table th").nth(1)).toHaveText(/Org Name/); + await expect(this.page.locator(".usa-table th").nth(2)).toHaveText(/Topic/); + await expect(this.page.locator(".usa-table th").nth(3)).toHaveText(/Status/); + await expect(this.page.locator(".usa-table th").nth(4)).toHaveText(/Meta/); + await expect(this.page.locator(".usa-table th").nth(4)).toHaveText(/Action/); + + return true; + } + + getOrgMeta(metaData: any){ + const { version, createdAt, createdBy } = metaData; + + // handle cases where individual metadata are not available + const versionDisplay = version || version === 0 ? `v${version} ` : ""; + const createdAtDisplay = createdAt + ? `[${formatDate(metaData.createdAt)}] ` + : ""; + const createdByDisplay = createdBy ?? ""; + + return `${versionDisplay}${createdAtDisplay}${createdByDisplay}`; + } + + getApplyButton(page: Page) { + return page.getByRole("button", { + name: "Apply", + }); + } +} diff --git a/frontend-react/e2e/pages/authenticated/organization.ts b/frontend-react/e2e/pages/authenticated/admin/organization.ts similarity index 90% rename from frontend-react/e2e/pages/authenticated/organization.ts rename to frontend-react/e2e/pages/authenticated/admin/organization.ts index 80a09aa4807..77f9b2be438 100644 --- a/frontend-react/e2e/pages/authenticated/organization.ts +++ b/frontend-react/e2e/pages/authenticated/admin/organization.ts @@ -1,7 +1,7 @@ import { expect } from "@playwright/test"; -import { RSOrganizationSettings } from "../../../src/config/endpoints/settings"; -import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../mocks/organizations"; -import { BasePage, BasePageTestArgs, type RouteHandlerFulfillEntry } from "../BasePage"; +import { RSOrganizationSettings } from "../../../../src/config/endpoints/settings"; +import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../../mocks/organizations"; +import { BasePage, BasePageTestArgs, type RouteHandlerFulfillEntry } from "../../BasePage"; export class OrganizationPage extends BasePage { static readonly API_ORGANIZATIONS = "/api/settings/organizations"; diff --git a/frontend-react/e2e/spec/all/authenticated/admin/last-mile-failures-page.spec.ts b/frontend-react/e2e/spec/all/authenticated/admin/last-mile-failures-page.spec.ts index ba01d3812c2..60bc2032f68 100644 --- a/frontend-react/e2e/spec/all/authenticated/admin/last-mile-failures-page.spec.ts +++ b/frontend-react/e2e/spec/all/authenticated/admin/last-mile-failures-page.spec.ts @@ -1,5 +1,5 @@ import { tableRows } from "../../../../helpers/utils"; -import { LastMileFailuresPage } from "../../../../pages/authenticated/last-mile-failures"; +import { LastMileFailuresPage } from "../../../../pages/authenticated/admin/last-mile-failures"; import { test as baseTest, expect } from "../../../../test"; export interface LastMileFailuresPageFixtures { diff --git a/frontend-react/e2e/spec/all/authenticated/admin/message-details-page.spec.ts b/frontend-react/e2e/spec/all/authenticated/admin/message-details-page.spec.ts index 2a101640d8c..e461e7beb02 100644 --- a/frontend-react/e2e/spec/all/authenticated/admin/message-details-page.spec.ts +++ b/frontend-react/e2e/spec/all/authenticated/admin/message-details-page.spec.ts @@ -2,8 +2,8 @@ import fs from "node:fs"; import { parseFileLocation } from "../../../../../src/utils/misc"; import { tableRows } from "../../../../helpers/utils"; import { MOCK_GET_MESSAGE } from "../../../../mocks/messages"; -import { MessageDetailsPage } from "../../../../pages/authenticated/message-details"; -import { MessageIDSearchPage } from "../../../../pages/authenticated/message-id-search"; +import { MessageDetailsPage } from "../../../../pages/authenticated/admin/message-details"; +import { MessageIDSearchPage } from "../../../../pages/authenticated/admin/message-id-search"; import { mockGetHistoryReportResponse } from "../../../../pages/authenticated/report-details"; import { test as baseTest, expect } from "../../../../test"; diff --git a/frontend-react/e2e/spec/all/authenticated/admin/message-id-search-page.spec.ts b/frontend-react/e2e/spec/all/authenticated/admin/message-id-search-page.spec.ts index 2ac84973da4..6af81d230eb 100644 --- a/frontend-react/e2e/spec/all/authenticated/admin/message-id-search-page.spec.ts +++ b/frontend-react/e2e/spec/all/authenticated/admin/message-id-search-page.spec.ts @@ -1,6 +1,6 @@ import { noData, tableRows } from "../../../../helpers/utils"; import { MOCK_GET_MESSAGES } from "../../../../mocks/messages"; -import { MessageIDSearchPage } from "../../../../pages/authenticated/message-id-search"; +import { MessageIDSearchPage } from "../../../../pages/authenticated/admin/message-id-search"; import { openReportIdDetailPage } from "../../../../pages/authenticated/submission-history"; import { test as baseTest, expect } from "../../../../test"; diff --git a/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-edit-page.spec.ts b/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-edit-page.spec.ts new file mode 100644 index 00000000000..4068bc091dd --- /dev/null +++ b/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-edit-page.spec.ts @@ -0,0 +1,241 @@ +import { expect } from "@playwright/test"; +import { tableDataCellValue } from "../../../../helpers/utils"; +import { MOCK_GET_ORGANIZATION_IGNORE } from "../../../../mocks/organizations"; +import { OrganizationEditPage } from "../../../../pages/authenticated/admin/organization-edit"; +import { test as baseTest } from "../../../../test"; + +export interface OrganizationEditPageFixtures { + organizationEditPage: OrganizationEditPage; +} + +const test = baseTest.extend({ + organizationEditPage: async ( + { + page: _page, + isMockDisabled, + adminLogin, + senderLogin, + receiverLogin, + storageState, + frontendWarningsLogPath, + isFrontendWarningsLog, + }, + use, + ) => { + const page = new OrganizationEditPage({ + page: _page, + isMockDisabled, + adminLogin, + senderLogin, + receiverLogin, + storageState, + frontendWarningsLogPath, + isFrontendWarningsLog, + }); + await page.goto(); + await use(page); + }, +}); + +test.describe("Organization Edit Page", () => { + test.describe("not authenticated", () => { + test("redirects to login", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page).toHaveURL("/login"); + }); + }); + + test.describe("receiver user", () => { + test.use({ storageState: "e2e/.auth/receiver.json" }); + test("returns Page Not Found", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page).toHaveTitle(/Page Not Found/); + }); + }); + + test.describe("sender user", () => { + test.use({ storageState: "e2e/.auth/sender.json" }); + test("returns Page Not Found", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page).toHaveTitle(/Page Not Found/); + }); + }); + + test.describe("admin user", () => { + test.use({ storageState: "e2e/.auth/admin.json" }); + + test.describe("header", () => { + test("has correct title", async ({ organizationEditPage }) => { + await organizationEditPage.testHeader(false); + }); + }); + + test.describe("when there is an error", () => { + test("the error is shown on the page", async ({ organizationEditPage }) => { + organizationEditPage.mockError = true; + await organizationEditPage.reload(); + await expect(organizationEditPage.page.getByText("there was an error")).toBeVisible(); + }); + }); + + test.describe("when there is no error", () => { + test("has correct title", async ({ organizationEditPage }) => { + await organizationEditPage.testHeader(false); + }); + + test.describe("edit section", () => { + test("has expected 'Meta'", async ({ organizationEditPage }) => { + const meta = organizationEditPage.page.getByTestId("gridContainer").getByTestId("grid").nth(2); + await expect(meta).toHaveText(organizationEditPage.getOrgMeta(MOCK_GET_ORGANIZATION_IGNORE)); + }); + + test("has expected 'Description'", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page.getByTestId("description")).toHaveValue(MOCK_GET_ORGANIZATION_IGNORE.description); + }); + + test("has expected 'Jurisdiction'", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page.getByTestId("jurisdiction")).toHaveValue(MOCK_GET_ORGANIZATION_IGNORE.jurisdiction); + }); + + test("has expected 'Filters'", async ({ organizationEditPage }) => { + await expect(organizationEditPage.page.getByTestId("filters")).toHaveValue(JSON.stringify(MOCK_GET_ORGANIZATION_IGNORE.filters, null, 2)); + }); + }); + + test.describe("'Preview save...'", () => { + test.beforeEach(async ({ organizationEditPage }) => { + await organizationEditPage.page + .getByRole("button", { + name: "Preview save...", + }) + .click(); + }); + + test("saves and closes modal", async ({ organizationEditPage }) => { + const modal = organizationEditPage.page.getByTestId("modalWindow").nth(0); + await expect(modal).toContainText(/You are about to change this setting: ignore/); + }); + + test("'Go back' closes modal'", async ({ organizationEditPage }) => { + const modal = organizationEditPage.page.getByTestId("modalWindow").nth(0); + await expect(modal).toBeVisible(); + + await organizationEditPage.page + .getByRole("button", { + name: "Go back", + }) + .click(); + await expect(modal).toBeHidden(); + }); + }); + + test.describe("'Organization Sender Settings' section", () => { + test("can create a new organization sender", async ({ organizationEditPage }) => { + await organizationEditPage.page + .locator('#orgsendersettings').getByRole('link', { name: 'New' }) + .click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgnewsetting/org/ignore/settingtype/sender`); + await expect(organizationEditPage.page.getByText(/Org name: ignore/)).toBeVisible(); + await expect(organizationEditPage.page.getByText(/Setting Type: sender/)).toBeVisible(); + + await organizationEditPage.page.getByTestId("orgSettingName").fill("e2e-test"); + + await organizationEditPage.orgSenderNew.cancel.click(); + }); + + test("can edit an organization sender", async ({ organizationEditPage }) => { + const firstOrgSender = await organizationEditPage.page.locator("#orgsendersettings").nth(0).locator("td").nth(0).innerText(); + await organizationEditPage.page.locator('#orgsendersettings').getByRole('link', { name: 'Edit' }).nth(0).click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgsendersettings/org/ignore/sender/${firstOrgSender}/action/edit`); + await expect(organizationEditPage.page.getByText(`Org name: ignore`)).toBeVisible(); + await expect(organizationEditPage.page.getByText(`Sender name: ${firstOrgSender}`)).toBeVisible(); + + await organizationEditPage.orgSenderEdit.editJsonButton.click(); + const modal = organizationEditPage.page.getByTestId("modalWindow").nth(0); + await expect(modal).toBeVisible(); + + // Save button is disabled + await expect(organizationEditPage.orgSenderEdit.editJsonModal.save).toHaveAttribute("disabled"); + + await organizationEditPage.orgSenderEdit.editJsonModal.checkSyntax.click(); + await expect(organizationEditPage.orgSenderEdit.editJsonModal.save).not.toHaveAttribute("disabled"); + + await organizationEditPage.orgSenderEdit.editJsonModal.save.click(); + await expect(modal).toBeHidden(); + + const orgSenderLocator = firstOrgSender.replace("-", "_"); + + await expect(organizationEditPage.page.locator(`#id_Item__${orgSenderLocator}__has_been_saved`).getByTestId("alerttoast")).toHaveText(`Item '${firstOrgSender}' has been saved`); + await expect(organizationEditPage.page).toHaveURL(organizationEditPage.url); + }); + + test("can cancel when editing an organization sender", async ({ organizationEditPage }) => { + const firstOrgSender = await tableDataCellValue(organizationEditPage.page, 0, 0); + await organizationEditPage.page. + locator('#orgsendersettings').getByRole('link', { name: 'Edit' }).nth(0).click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgsendersettings/org/ignore/sender/${firstOrgSender}/action/edit`); + await expect(organizationEditPage.page.getByText(`Org name: ignore`)).toBeVisible(); + await expect(organizationEditPage.page.getByText(`Sender name: ${firstOrgSender}`)).toBeVisible(); + + await organizationEditPage.orgSenderEdit.cancelButton.click(); + await expect(organizationEditPage.page).toHaveURL(organizationEditPage.url); + }); + }); + + test.describe("'Organization Receiver Settings' section", () => { + test("can create a new organization receiver", async ({ organizationEditPage }) => { + await organizationEditPage.page + .locator('#orgreceiversettings').getByRole('link', { name: 'New' }) + .click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgnewsetting/org/ignore/settingtype/receiver`); + await expect(organizationEditPage.page.getByText(/Org name: ignore/)).toBeVisible(); + await expect(organizationEditPage.page.getByText(/Setting Type: receiver/)).toBeVisible(); + + await organizationEditPage.page.getByTestId("orgSettingName").fill("e2e-test"); + + await organizationEditPage.orgReceiverNew.cancel.click(); + }); + + test("can edit an organization receiver", async ({ organizationEditPage }) => { + const firstOrgReceiver = await organizationEditPage.page.locator("#orgreceiversettings").nth(0).locator("td").nth(0).innerText(); + await organizationEditPage.page.locator('#orgreceiversettings').getByRole('link', { name: 'Edit' }).nth(0).click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgreceiversettings/org/ignore/receiver/${firstOrgReceiver}/action/edit`); + await expect(organizationEditPage.page.getByText(`Org name: ignore`)).toBeVisible(); + await expect(organizationEditPage.page.getByText(`Receiver name: ${firstOrgReceiver}`)).toBeVisible(); + + await organizationEditPage.orgReceiverEdit.editJsonButton.click(); + const modal = organizationEditPage.page.getByTestId("modalWindow").nth(0); + await expect(modal).toBeVisible(); + + // Save button is disabled + await expect(organizationEditPage.orgReceiverEdit.editJsonModal.save).toHaveAttribute("disabled"); + + await organizationEditPage.orgReceiverEdit.editJsonModal.checkSyntax.click(); + await expect(organizationEditPage.orgReceiverEdit.editJsonModal.save).not.toHaveAttribute("disabled"); + + await organizationEditPage.orgReceiverEdit.editJsonModal.save.click(); + await expect(modal).toBeHidden(); + + const orgReceiverLocator = firstOrgReceiver.replace("-", "_"); + + await expect(organizationEditPage.page.locator(`#id_Item__${orgReceiverLocator}__has_been_updated`).getByTestId("alerttoast")).toHaveText(`Item '${firstOrgReceiver}' has been updated`); + await expect(organizationEditPage.page).toHaveURL(organizationEditPage.url); + }); + + test("can cancel when editing an organization receiver", async ({ organizationEditPage }) => { + const firstOrgReceiver = await organizationEditPage.page.locator("#orgreceiversettings").nth(0).locator("td").nth(0).innerText(); + await organizationEditPage.page.locator('#orgreceiversettings').getByRole('link', { name: 'Edit' }).nth(0).click(); + await expect(organizationEditPage.page).toHaveURL(`/admin/orgreceiversettings/org/ignore/receiver/${firstOrgReceiver}/action/edit`); + await expect(organizationEditPage.page.getByText(`Org name: ignore`)).toBeVisible(); + await expect(organizationEditPage.page.getByText(`Receiver name: ${firstOrgReceiver}`)).toBeVisible(); + + await organizationEditPage.orgReceiverEdit.cancelButton.click(); + await expect(organizationEditPage.page).toHaveURL(organizationEditPage.url); + }); + }); + }); + }); + + test.describe("footer", () => { + test("has footer and explicit scroll to footer and scroll to top", async ({ organizationEditPage }) => { + await organizationEditPage.testFooter(); + }); + }); +}); diff --git a/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-page.spec.ts b/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-page.spec.ts index ea405a97a83..70c8cf8079f 100644 --- a/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-page.spec.ts +++ b/frontend-react/e2e/spec/all/authenticated/admin/organization-settings-page.spec.ts @@ -3,7 +3,7 @@ import { readFileSync } from "node:fs"; import { join } from "node:path"; import { fileURLToPath } from "node:url"; import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../../../mocks/organizations"; -import { OrganizationPage } from "../../../../pages/authenticated/organization"; +import { OrganizationPage } from "../../../../pages/authenticated/admin/organization"; import { test as baseTest } from "../../../../test"; const __dirname = fileURLToPath(import.meta.url); @@ -43,41 +43,41 @@ const test = baseTest.extend({ test.describe("Admin Organization Settings Page", () => { test.describe("not authenticated", () => { - test("redirects to login", async ({organizationPage}) => { + test("redirects to login", async ({ organizationPage }) => { await expect(organizationPage.page).toHaveURL("/login"); }); }); - test.describe("authenticated receiver", () => { - test.use({storageState: "e2e/.auth/receiver.json"}); - test("returns Page Not Found", async ({organizationPage}) => { + test.describe("receiver user", () => { + test.use({ storageState: "e2e/.auth/receiver.json" }); + test("returns Page Not Found", async ({ organizationPage }) => { await expect(organizationPage.page).toHaveTitle(/Page Not Found/); }); }); - test.describe("authenticated sender", () => { - test.use({storageState: "e2e/.auth/sender.json"}); - test("returns Page Not Found", async ({organizationPage}) => { + test.describe("sender user", () => { + test.use({ storageState: "e2e/.auth/sender.json" }); + test("returns Page Not Found", async ({ organizationPage }) => { await expect(organizationPage.page).toHaveTitle(/Page Not Found/); }); }); - test.describe("authenticated admin", () => { - test.use({storageState: "e2e/.auth/admin.json"}); + test.describe("admin user", () => { + test.use({ storageState: "e2e/.auth/admin.json" }); - test.describe("Header", () => { - test("has correct title + heading", async ({organizationPage}) => { + test.describe("header", () => { + test("has correct title + heading", async ({ organizationPage }) => { await organizationPage.testHeader(); }); }); - test("If there is an error, the error is shown on the page", async ({organizationPage}) => { + test("if there is an error, the error is shown on the page", async ({ organizationPage }) => { organizationPage.mockError = true; await organizationPage.reload(); await expect(organizationPage.page.getByText("there was an error")).toBeVisible(); }); - test.describe("When there is no error", () => { + test.describe("when there is no error", () => { test("nav contains the 'Admin tools' dropdown with 'Organization Settings' option", async ({ organizationPage, }) => { @@ -96,12 +96,12 @@ test.describe("Admin Organization Settings Page", () => { await expect(organizationPage.page).toHaveURL("/admin/settings"); }); - test("Has correct title", async ({organizationPage}) => { + test("has correct title", async ({ organizationPage }) => { await expect(organizationPage.page).toHaveURL(/settings/); await expect(organizationPage.page).toHaveTitle(/Admin-Organizations/); }); - test("Displays data", async ({organizationPage}) => { + test("displays data", async ({ organizationPage }) => { // Heading with result length await expect( organizationPage.page.getByRole("heading", { @@ -122,7 +122,7 @@ test.describe("Admin Organization Settings Page", () => { const cols = await row.getByRole("cell").allTextContents(); expect(cols).toHaveLength(colHeaders.length); - const {description, jurisdiction, name, stateCode} = + const { description, jurisdiction, name, stateCode } = i === 0 ? MOCK_GET_ORGANIZATION_SETTINGS_LIST[0] : (MOCK_GET_ORGANIZATION_SETTINGS_LIST.find((i) => i.name === cols[0]) ?? { @@ -141,7 +141,7 @@ test.describe("Admin Organization Settings Page", () => { } }); - test("Create new organization navigation works", async ({organizationPage}) => { + test("create new organization navigation works", async ({ organizationPage }) => { const link = organizationPage.page.getByRole("link", { name: "Create New Organization", }); @@ -155,7 +155,7 @@ test.describe("Admin Organization Settings Page", () => { expect(organizationPage.page.url()).toContain(expectedUrl); }); - test("Save CSV button downloads a file", async ({organizationPage}) => { + test("save CSV button downloads a file", async ({ organizationPage }) => { const downloadProm = organizationPage.page.waitForEvent("download"); const saveButton = organizationPage.page.getByRole("button", { name: "Save List to CSV", @@ -174,9 +174,9 @@ test.describe("Admin Organization Settings Page", () => { expect(download.suggestedFilename()).toBe("prime-orgs.csv"); }); - test("Filtering works", async ({organizationPage}) => { + test("filtering works", async ({ organizationPage }) => { const table = organizationPage.page.getByRole("table"); - const {description, name, jurisdiction, stateCode} = MOCK_GET_ORGANIZATION_SETTINGS_LIST[2]; + const { description, name, jurisdiction, stateCode } = MOCK_GET_ORGANIZATION_SETTINGS_LIST[2]; const filterBox = organizationPage.page.getByRole("textbox", { name: "Filter:", }); @@ -201,7 +201,7 @@ test.describe("Admin Organization Settings Page", () => { } }); - test('Clicking "Set" updates link label', async ({organizationPage}) => { + test('clicking "Set" updates link label', async ({ organizationPage }) => { const firstDataRow = organizationPage.page.getByRole("table").getByRole("row").nth(1); const firstDataRowName = (await firstDataRow.getByRole("cell").nth(0).textContent()) ?? "INVALID"; const setButton = firstDataRow.getByRole("button", { @@ -218,9 +218,9 @@ test.describe("Admin Organization Settings Page", () => { await expect(orgLink).toHaveAttribute("href", "/admin/settings"); }); - test("Edit navigation works", async ({organizationPage}) => { + test("edit navigation works", async ({ organizationPage }) => { const firstDataRow = organizationPage.page.getByRole("table").getByRole("row").nth(1); - const firstDataRowName = await firstDataRow.getByRole("cell").nth(0).textContent(); + const firstDataRowName = (await firstDataRow.getByRole("cell").nth(0).textContent()) ?? "INVALID"; const expectedUrl = `/admin/orgsettings/org/${firstDataRowName}`; const editButton = firstDataRow.getByRole("button", { name: "Edit", @@ -229,15 +229,15 @@ test.describe("Admin Organization Settings Page", () => { await expect(editButton).toBeVisible(); await editButton.click(); await organizationPage.page.waitForURL(expectedUrl); - await expect(organizationPage.page.getByRole("heading")).toBeVisible(); + expect(organizationPage.page.locator("h2").getByText(firstDataRowName)).toBeTruthy(); expect(organizationPage.page.url()).toContain(expectedUrl); }); }); }); - test.describe("Footer", () => { - test("has footer and explicit scroll to footer and scroll to top", async ({organizationPage}) => { + test.describe("footer", () => { + test("has footer and explicit scroll to footer and scroll to top", async ({ organizationPage }) => { await organizationPage.testFooter(); }); }); diff --git a/frontend-react/e2e/spec/all/idletimeout.spec.ts b/frontend-react/e2e/spec/all/idletimeout.spec.ts index 0b35f0fd34d..cc42f98b4d9 100644 --- a/frontend-react/e2e/spec/all/idletimeout.spec.ts +++ b/frontend-react/e2e/spec/all/idletimeout.spec.ts @@ -1,7 +1,7 @@ import { expect } from "@playwright/test"; import process from "node:process"; -import { OrganizationPage } from "../../pages/authenticated/organization"; +import { OrganizationPage } from "../../pages/authenticated/admin/organization"; import { test as baseTest } from "../../test"; const timeout = parseInt(process.env.VITE_IDLE_TIMEOUT ?? "20000"); diff --git a/frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts b/frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts index e1a09504f79..c10e94b3f5d 100644 --- a/frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts +++ b/frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts @@ -1,5 +1,5 @@ import { tableRows } from "../../../helpers/utils"; -import { LastMileFailuresPage } from "../../../pages/authenticated/last-mile-failures"; +import { LastMileFailuresPage } from "../../../pages/authenticated/admin/last-mile-failures"; import { test as baseTest, expect } from "../../../test"; export interface LastMileFailuresPageFixtures { @@ -83,14 +83,16 @@ test.describe("Last Mile Failure page", await expect(modal).toContainText(`Report ID:${reportIdCell}`); }); - test("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => { + test.skip("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => { test.skip(!isMockDisabled, "Mocks are ENABLED, skipping test"); const receiver = tableRows(lastMileFailuresPage.page).nth(0).locator("td").nth(2); const receiverCell = await receiver.getByRole("link").innerText(); + const orgName = receiverCell.slice(0,receiverCell.indexOf(".")) + const receiverName = receiverCell.slice(receiverCell.indexOf(".") + 1) await receiver.click(); await expect(lastMileFailuresPage.page).toHaveURL( - `/admin/orgreceiversettings/org/${receiverCell}/receiver//action/edit`, + `/admin/orgreceiversettings/org/${orgName}/receiver/${receiverName}/action/edit`, ); }); }); diff --git a/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-edit-page-user-flow.spec.ts b/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-edit-page-user-flow.spec.ts new file mode 100644 index 00000000000..a96aefcb628 --- /dev/null +++ b/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-edit-page-user-flow.spec.ts @@ -0,0 +1,86 @@ +import { expect } from "@playwright/test"; +import { OrganizationEditPage } from "../../../pages/authenticated/admin/organization-edit"; +import { test as baseTest } from "../../../test"; + +export interface OrganizationEditPageFixtures { + organizationEditPage: OrganizationEditPage; +} + +const test = baseTest.extend({ + organizationEditPage: async ( + { + page: _page, + isMockDisabled, + adminLogin, + senderLogin, + receiverLogin, + storageState, + frontendWarningsLogPath, + isFrontendWarningsLog, + }, + use, + ) => { + const page = new OrganizationEditPage({ + page: _page, + isMockDisabled, + adminLogin, + senderLogin, + receiverLogin, + storageState, + frontendWarningsLogPath, + isFrontendWarningsLog, + }); + await page.goto(); + await use(page); + }, +}); + +test.describe("Organization Edit Page", { + tag: "@smoke", +}, () => { + test.describe("admin user", () => { + test.use({storageState: "e2e/.auth/admin.json"}); + + test("has correct title", async ({organizationEditPage}) => { + await organizationEditPage.testHeader(false); + await expect(organizationEditPage.page.getByText(/Org name: ignore/)).toBeVisible(); + }); + + test.describe("edit section", () => { + test("has expected 'Meta'", async ({organizationEditPage}) => { + const meta = organizationEditPage.page.getByTestId("gridContainer").getByTestId("grid").nth(2); + await expect(meta).not.toBeEmpty(); + }); + + test("has expected 'Description'", async ({organizationEditPage}) => { + await expect(organizationEditPage.page.getByTestId("description")).not.toBeEmpty(); + }); + + test("has expected 'Jurisdiction'", async ({organizationEditPage}) => { + await expect(organizationEditPage.page.getByTestId("jurisdiction")).not.toBeEmpty(); + }); + }); + + test.describe("'Organization Sender Settings' section", () => { + test.beforeEach(async ({ organizationEditPage }) => { + await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody").waitFor({ state: "visible" }); + }); + + test("has at least one sender listed in the table", async ({organizationEditPage}) => { + const rowCount = await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody tr").count(); + expect(rowCount).toBeGreaterThanOrEqual(1); + }); + }); + + test.describe("'Organization Receiver Settings' section", () => { + test.beforeEach(async ({ organizationEditPage }) => { + await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody").waitFor({ state: "visible" }); + }); + + test("has at least one sender listed in the table", async ({organizationEditPage}) => { + const rowCount = await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody tr").count(); + expect(rowCount).toBeGreaterThanOrEqual(1); + }); + }); + }); +}); diff --git a/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts b/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts index fa74fc13713..c1decd33a17 100644 --- a/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts +++ b/frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts @@ -1,7 +1,6 @@ import { expect } from "@playwright/test"; import { tableRows } from "../../../helpers/utils"; -import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../../mocks/organizations"; -import { OrganizationPage } from "../../../pages/authenticated/organization"; +import { OrganizationPage } from "../../../pages/authenticated/admin/organization"; import { test as baseTest } from "../../../test"; @@ -72,23 +71,24 @@ test.describe("Admin Organization Settings Page - user flow smoke tests", { test("filtering works as expected", async ({organizationPage}) => { const table = organizationPage.page.getByRole("table"); - const {description, name, jurisdiction, stateCode} = MOCK_GET_ORGANIZATION_SETTINGS_LIST[2]; + const firstDataRow = organizationPage.page.getByRole("table").getByRole("row").nth(1); + const firstDataRowName = (await firstDataRow.getByRole("cell").nth(0).textContent()) ?? "INVALID"; const filterBox = organizationPage.page.getByRole("textbox", { name: "Filter:", }); await expect(filterBox).toBeVisible(); - await filterBox.fill(name); + await filterBox.fill(firstDataRowName); const rows = await table.getByRole("row").all(); expect(rows).toHaveLength(2); const cols = rows[1].getByRole("cell").allTextContents(); const expectedColContents = [ - name, - description ?? "", - jurisdiction ?? "", - stateCode ?? "", - "", + await firstDataRow.getByRole("cell").nth(0).textContent(), + await firstDataRow.getByRole("cell").nth(1).textContent() ?? "", + await firstDataRow.getByRole("cell").nth(2).textContent() ?? "", + await firstDataRow.getByRole("cell").nth(3).textContent() ?? "", + await firstDataRow.getByRole("cell").nth(4).textContent() ?? "", "SetEdit", ]; diff --git a/frontend-react/src/components/Admin/CompareJsonModal.tsx b/frontend-react/src/components/Admin/CompareJsonModal.tsx index 87b456d9e66..d68fe7d4cd5 100644 --- a/frontend-react/src/components/Admin/CompareJsonModal.tsx +++ b/frontend-react/src/components/Admin/CompareJsonModal.tsx @@ -169,6 +169,7 @@ export const ConfirmSaveSettingModal = forwardRef( aria-label="Check the settings JSON syntax" key={`${uniquid}-validate-button`} data-uniquid={uniquid} + data-testid={"editCheckSyntaxButton"} onClick={onCheckSyntaxClick} type="button" > diff --git a/operations/app/terraform/modules/storage/candidate_slot.tf b/operations/app/terraform/modules/storage/candidate_slot.tf index 68c12afbf8b..6fa9feadd23 100644 --- a/operations/app/terraform/modules/storage/candidate_slot.tf +++ b/operations/app/terraform/modules/storage/candidate_slot.tf @@ -9,6 +9,7 @@ resource "azurerm_storage_account" "storage_account_candidate" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false network_rules { default_action = var.is_temp_env == true ? "Allow" : "Deny" @@ -155,6 +156,7 @@ resource "azurerm_storage_account" "storage_partner_candidate" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false network_rules { default_action = var.is_temp_env == true ? "Allow" : "Deny" diff --git a/operations/app/terraform/modules/storage/main.tf b/operations/app/terraform/modules/storage/main.tf index 2d2414ada35..8ad6e5456e2 100644 --- a/operations/app/terraform/modules/storage/main.tf +++ b/operations/app/terraform/modules/storage/main.tf @@ -9,6 +9,7 @@ resource "azurerm_storage_account" "storage_account" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false network_rules { default_action = var.is_temp_env == true ? "Allow" : "Deny" @@ -166,6 +167,7 @@ resource "azurerm_storage_account" "storage_public" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false static_website { index_document = "index.html" @@ -208,6 +210,7 @@ resource "azurerm_storage_account" "storage_partner" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false network_rules { default_action = var.is_temp_env == true ? "Allow" : "Deny" diff --git a/operations/app/terraform/modules/storage/trial_frontends.tf b/operations/app/terraform/modules/storage/trial_frontends.tf index f5ca92fe474..0ff68c67d35 100644 --- a/operations/app/terraform/modules/storage/trial_frontends.tf +++ b/operations/app/terraform/modules/storage/trial_frontends.tf @@ -10,6 +10,7 @@ resource "azurerm_storage_account" "storage_trials" { min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false enable_https_traffic_only = true + local_user_enabled = false static_website { index_document = "index.html" diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index b64a5b7208e..c07dbd0c501 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -35,17 +35,17 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { val kotlinVersion by System.getProperties() id("reportstream.project-conventions") - id("org.flywaydb.flyway") version "10.17.0" + id("org.flywaydb.flyway") version "10.18.0" id("nu.studer.jooq") version "9.0" id("com.github.johnrengelman.shadow") version "8.1.1" id("com.microsoft.azure.azurefunctions") version "1.16.1" id("com.adarshr.test-logger") version "4.0.0" id("jacoco") id("org.jetbrains.dokka") version "1.8.20" - id("com.avast.gradle.docker-compose") version "0.17.7" + id("com.avast.gradle.docker-compose") version "0.17.8" id("org.jetbrains.kotlin.plugin.serialization") version "$kotlinVersion" id("com.nocwriter.runsql") version ("1.0.3") - id("io.swagger.core.v3.swagger-gradle-plugin") version "2.2.22" + id("io.swagger.core.v3.swagger-gradle-plugin") version "2.2.23" } group = "gov.cdc.prime.reportstream" @@ -65,7 +65,7 @@ val javaVersion = when (appJvmTarget) { } val ktorVersion = "2.3.12" val kotlinVersion by System.getProperties() -val jacksonVersion = "2.17.1" +val jacksonVersion = "2.17.2" jacoco.toolVersion = "0.8.12" // Local database information, first one wins: @@ -617,10 +617,19 @@ task("uploadSwaggerUI") { } tasks.register("killFunc") { - exec { - workingDir = project.rootDir + doLast { val processName = "func" - commandLine = listOf("sh", "-c", "pkill -9 $processName || true") + if (org.gradle.internal.os.OperatingSystem.current().isWindows) { + exec { + workingDir = project.rootDir + commandLine = listOf("cmd", "/c", "taskkill /F /IM $processName.exe || exit 0") + } + } else { + exec { + workingDir = project.rootDir + commandLine = listOf("sh", "-c", "pkill -9 $processName || true") + } + } } } @@ -796,7 +805,7 @@ buildscript { // will need to be removed once this issue is resolved in Maven. classpath("net.minidev:json-smart:2.5.1") // as per flyway v10 docs the postgres flyway module must be on the project buildpath - classpath("org.flywaydb:flyway-database-postgresql:10.17.0") + classpath("org.flywaydb:flyway-database-postgresql:10.18.0") } } @@ -809,37 +818,37 @@ configurations { } dependencies { - jooqGenerator("org.postgresql:postgresql:42.7.3") + jooqGenerator("org.postgresql:postgresql:42.7.4") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") implementation("com.microsoft.azure.functions:azure-functions-java-library:3.1.0") - implementation("com.azure:azure-core:1.51.0") - implementation("com.azure:azure-core-http-netty:1.15.3") + implementation("com.azure:azure-core:1.52.0") + implementation("com.azure:azure-core-http-netty:1.15.4") implementation("com.azure:azure-storage-blob:12.27.0") { exclude(group = "com.azure", module = "azure-core") } implementation("com.azure:azure-storage-queue:12.22.0") { exclude(group = "com.azure", module = "azure-core") } - implementation("com.azure:azure-security-keyvault-secrets:4.8.5") { + implementation("com.azure:azure-security-keyvault-secrets:4.8.6") { exclude(group = "com.azure", module = "azure-core") exclude(group = "com.azure", module = "azure-core-http-netty") } - implementation("com.azure:azure-identity:1.13.2") { + implementation("com.azure:azure-identity:1.13.3") { exclude(group = "com.azure", module = "azure-core") exclude(group = "com.azure", module = "azure-core-http-netty") } - implementation("com.nimbusds:nimbus-jose-jwt:9.40") - implementation("org.apache.logging.log4j:log4j-api:2.23.1") - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1") - implementation("org.apache.logging.log4j:log4j-layout-template-json:2.23.1") - implementation("org.apache.logging.log4j:log4j-api-kotlin:1.4.0") + implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("org.apache.logging.log4j:log4j-api:2.24.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.0") + implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.0") + implementation("org.apache.logging.log4j:log4j-layout-template-json:2.24.0") + implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0") implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") - implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.9.3") + implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.10.0") implementation("tech.tablesaw:tablesaw-core:0.43.1") implementation("com.github.ajalt.clikt:clikt-jvm:4.4.0") @@ -848,7 +857,7 @@ dependencies { implementation("com.github.javafaker:javafaker:1.0.2") { exclude(group = "org.yaml", module = "snakeyaml") } - implementation("org.yaml:snakeyaml:2.2") + implementation("org.yaml:snakeyaml:2.3") implementation("io.github.linuxforhealth:hl7v2-fhir-converter") { version { branch = "master" @@ -864,7 +873,7 @@ dependencies { implementation("ca.uhn.hapi:hapi-base:2.5.1") implementation("ca.uhn.hapi:hapi-structures-v251:2.5.1") implementation("ca.uhn.hapi:hapi-structures-v27:2.5.1") - implementation("com.googlecode.libphonenumber:libphonenumber:8.13.42") + implementation("com.googlecode.libphonenumber:libphonenumber:8.13.46") implementation("org.thymeleaf:thymeleaf:3.1.2.RELEASE") implementation("com.sendgrid:sendgrid-java:4.10.2") implementation("com.okta.jwt:okta-jwt-verifier:0.5.7") @@ -878,12 +887,12 @@ dependencies { implementation("org.apache.commons:commons-text:1.12.0") implementation("commons-codec:commons-codec:1.17.1") implementation("commons-io:commons-io:2.16.1") - implementation("org.postgresql:postgresql:42.7.3") + implementation("org.postgresql:postgresql:42.7.4") implementation("com.zaxxer:HikariCP:5.1.0") - implementation("org.flywaydb:flyway-core:10.17.0") - implementation("org.flywaydb:flyway-database-postgresql:10.17.0") + implementation("org.flywaydb:flyway-core:10.18.0") + implementation("org.flywaydb:flyway-database-postgresql:10.18.0") implementation("org.commonmark:commonmark:0.22.0") - implementation("com.google.guava:guava:33.2.1-jre") + implementation("com.google.guava:guava:33.3.0-jre") implementation("com.helger.as2:as2-lib:5.1.2") implementation("org.bouncycastle:bcprov-jdk15to18:1.78.1") implementation("org.bouncycastle:bcprov-jdk18on:1.78.1") @@ -906,14 +915,14 @@ dependencies { implementation("it.skrape:skrapeit-http-fetcher:1.3.0-alpha.2") implementation("org.apache.poi:poi:5.3.0") implementation("org.apache.poi:poi-ooxml:5.3.0") - implementation("org.apache.commons:commons-compress:1.26.2") + implementation("org.apache.commons:commons-compress:1.27.1") implementation("commons-io:commons-io:2.16.1") implementation("com.anyascii:anyascii:0.3.2") // force jsoup since skrapeit-html-parser@1.2.1+ has not updated implementation("org.jsoup:jsoup:1.18.1") // https://mvnrepository.com/artifact/io.swagger/swagger-annotations implementation("io.swagger:swagger-annotations:1.6.14") - implementation("io.swagger.core.v3:swagger-jaxrs2:2.2.22") + implementation("io.swagger.core.v3:swagger-jaxrs2:2.2.23") // https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api implementation("javax.ws.rs:javax.ws.rs-api:2.1.1") // https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api @@ -939,7 +948,7 @@ dependencies { implementation("io.konform:konform-jvm:0.4.0") runtimeOnly("com.okta.jwt:okta-jwt-verifier-impl:0.5.7") - runtimeOnly("com.squareup.okio:okio:3.9.0") + runtimeOnly("com.squareup.okio:okio:3.9.1") runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5") runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5") diff --git a/prime-router/docs/docs-deprecated/chatops-provisioning.md b/prime-router/docs/docs-deprecated/chatops-provisioning.md index be53b2b7e44..2d43ba96f49 100644 --- a/prime-router/docs/docs-deprecated/chatops-provisioning.md +++ b/prime-router/docs/docs-deprecated/chatops-provisioning.md @@ -2,7 +2,7 @@ ## Application -[slack-boltjs-app](https://github.com/JosiahSiegel/slack-boltjs-app) is installed as a submodule under [operations/slack-boltjs-app](../../operations/slack-boltjs-app/). +[slack-boltjs-app](https://github.com/focusconsulting/slack-boltjs-app) is installed as a submodule under [operations/slack-boltjs-app](../../operations/slack-boltjs-app/). To update the submodule, navigate to the subdirectory and `git pull`. diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Address.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Address.yml deleted file mode 100644 index a94d4bd4ae2..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Address.yml +++ /dev/null @@ -1,74 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -line: - type: STRING - valueOf: 'GeneralUtils.makeStringArray( street, suiteApt, addressee)' - generateList: true - expressionType: JEXL - vars: - street: String, XAD.1 - suiteApt: String, XAD.2 - addressee: String, XAD.19 - -city: - type: STRING - valueOf: $city | XAD.3 - expressionType: HL7Spec - -state: - type: STRING - valueOf: $state | XAD.4 - expressionType: HL7Spec - -postalCode: - type: STRING - valueOf: $postalCode | XAD.5 - expressionType: HL7Spec - -district: - type: STRING - valueOf: 'GeneralUtils.getAddressDistrict( patientCounty, addressCountyParish, patient)' - expressionType: JEXL - vars: - # from Patient, if provided. - patientCounty: $distPatientCounty - addressCountyParish: String, XAD.9 | $distCountyParish - patient: $distPatient - -country: - type: STRING - valueOf: $country | XAD.6 - expressionType: HL7Spec - -use: - type: STRING - valueOf: 'GeneralUtils.getAddressUse( xad7Type, xad16TempIndicator, xad17BadIndicator)' - expressionType: JEXL - vars: - xad7Type: String, XAD.7 - xad16TempIndicator: String, XAD.16 - xad17BadIndicator: String, XAD.17 - -type: - type: STRING - valueOf: 'GeneralUtils.getAddressType( xad7Type, xad18Usage)' - expressionType: JEXL - vars: - xad7Type: String, XAD.7 - xad18Usage: String, XAD.18 - -# date range -period_1: - valueOf: datatype/Period - expressionType: resource - vars: - start: XAD.12.1 - end: XAD.12.2 - -# explicit date effective (start) and expiration (end) -period_2: - valueOf: datatype/Period - expressionType: resource - vars: - start: XAD.13 - end: XAD.14 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation.yml deleted file mode 100644 index 45ecd84554e..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation.yml +++ /dev/null @@ -1,82 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# When annotationText is a concatenation of multiple NTE records, the first NTE.5 is used -# to create the practitioner reference. Other NTE.5's are ignored. - - -# NTE.5 is not available in 2.5.1 version of the spec -authorReference: - condition: $performer NOT_NULL - valueOf: datatypes/XCN/Practitioner - expressionType: reference - specs: NTE.5 - vars: - performer: NTE.5 - -time: - type: STRING - valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)" - expressionType: JEXL - vars: - dateTimeIn: NTE.6 - -_time: - expressionType: nested - vars: - dateTimeIn: NTE.6 - condition: $dateTimeIn NOT_NULL - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $dateTimeIn - expressionType: HL7Spec - -text: - type: STRING - valueOf: NTE.3 - required: true - expressionType: HL7Spec - -extension_1-noteSource: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: note-source - valueId: - valueOf: NTE.2 - expressionType: HL7Spec - type: STRING - -extension_2-noteComment: - generateList: true - expressionType: nested - specs: NTE.3 * - expressionsMap: - url: - type: SYSTEM_URL - value: note-comment - valueId: - valueOf: FT - expressionType: HL7Spec - type: STRING - -extension_3-noteType: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: note-type - valueCodeableConcept: - valueOf: datatypes/CWE/CodeableConcept - expressionType: resource - specs: NTE.4 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation_var.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation_var.yml deleted file mode 100644 index eaba9bf960e..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Annotation_var.yml +++ /dev/null @@ -1,22 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -text: - type: STRING - valueOf: $noteText - required: true - -extension_1: - condition: $noteSource NOT_NULL - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: note-source - valueCodeableConcept: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: String, $noteSource - constants: - system: v2-0105 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/CodeableConcept.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/CodeableConcept.yml deleted file mode 100644 index 7cebf214eeb..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/CodeableConcept.yml +++ /dev/null @@ -1,118 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -coding_1: - condition: $code NOT_NULL && $coding NULL - type: CODING_SYSTEM_V2_IDENTIFIER - valueOf: ID |TX - generateList: true - expressionType: HL7Spec - vars: - code: ID |TX - -# IS is different than ID | TX because we want to keep unknown (user-defined) codes -coding_2: - condition: $code NOT_NULL && $coding NULL - type: CODING_SYSTEM_V2_IS_USER_DEFINED_TABLE - valueOf: IS - generateList: true - expressionType: HL7Spec - vars: - code: IS - -# Generalized CWE for alternate codes handles mismatched systems and codes -coding_3: - valueOf: $coding - generateList: true - condition: $coding NOT_NULL - specs: CWE - vars: - coding: CODING_SYSTEM_V2_ALTERNATE, CWE - -# Generalized CWE through CODING_SYSTEM_V2 handles mismatched systems and codes -coding_4: - valueOf: $coding - generateList: true - condition: $coding NOT_NULL && $nameOfSystem NOT_EQUALS SCT - specs: CWE - vars: - coding: CODING_SYSTEM_V2, CWE - nameOfSystem: CWE.3 - -coding_5: - generateList: true - valueOf: datatype/Coding - expressionType: resource - condition: $code NOT_NULL - vars: - code: CWE.10 - display: CWE.11 - system: CWE.12 - version: CWE.13 - constants: - codeIndex: "second alternate identifier" - - -coding_6: - generateList: true - valueOf: datatype/Coding - expressionType: resource - condition: $code NOT_NULL || $display NOT_NULL - vars: - code: String, CWE.4 | CNE.4 | CE.4 - display: String, CWE.5 | CNE.5 | CE.5 - system: $overrideSystem | CWE.6 | CNE.6 | CE.6 - version: String, CWE.8 | CNE.8 - constants: - codeIndex: "alternate identifier" - -# Allows alternate coding to be added from variables -coding_7: - generateList: true - valueOf: datatype/Coding # uses values from vars - expressionType: resource - condition: $code NOT_NULL - vars: - code: $alternateCode - display: $alternateDisplay - system: $alternateSystem - constants: - codeIndex: "alternate identifier" - -coding_8: - generateList: true - valueOf: datatype/Coding - expressionType: resource - condition: $code NOT_NULL || $display NOT_NULL - vars: - code: String, CWE.1 | CNE.1 | CE.1 - display: String, CWE.2 | CNE.2 | CE.2 - system: $overrideSystem | CWE.3 | CNE.3 | CE.3 - version: String, CWE.7 | CNE.7 - codingSystemOID: String, CWE.14 - constants: - codeIndex: "identifier" - -coding_9: - generateList: true - valueOf: datatype/Coding # uses values from vars - expressionType: resource - condition: $code NOT_NULL - vars: - code: $primaryCode - display: $primaryDisplay - system: $primarySystem - constants: - codeIndex: "identifier" - -coding_10: - valueOf: $coding - condition: $coding NOT_NULL - generateList: true - -# Require available text, and the absence of an identifierCoding -text: - condition: $displayText NOT_NULL && $identifierCoding NULL - type: STRING - valueOf: $displayText - vars: - displayText: $text | CWE.9 | CNE.9 diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Coding.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Coding.yml deleted file mode 100644 index 2379c9adac4..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Coding.yml +++ /dev/null @@ -1,59 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -system_1: - type: SYSTEM_URL - valueOf: $system - -system_2: - type: STRING - valueOf: $system - -version: - type: STRING - valueOf: $version - -code: - type: STRING - valueOf: $code - -display: - type: STRING - valueOf: $display - -extension_1-codingSystemOID: - generateList: true - expressionType: nested - condition: $codingSystemOID NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: coding-system-oid - valueOid: - type: STRING - valueOf: $oidString - vars: - oidString: $oidUrlPrefix + $codingSystemOID - constants: - oidUrlPrefix: "urn:oid:" - -# A codeable concept can have an identifier, an alternate identifier -# and in 2.7+ (and NIST 2.5.1) a second alternate identifier. It is also possible -# that a codeable concept will have an identifier and a second alternate identifier -# but no alternate identifier, so this extension keeps track of what it was -# Values: "identifier", "alternate identifier", "second alternate identifier" -extension_2-codeIndex: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: code-index-name - valueString: - type: STRING - valueOf: $codeIndexStr - vars: - codeIndexStr: String, $codeIndex | $codeIndexDefault - constants: - codeIndexDefault: "identifier" - - diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/ContactPoint.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/ContactPoint.yml deleted file mode 100644 index 1db0eed3dfd..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/ContactPoint.yml +++ /dev/null @@ -1,115 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -system_1: - condition: $emailValue NOT_NULL - type: STRING - valueOf: "email" - vars: - emailValue: XTN.4 - -system_2: - condition: $useCode EQUALS BPN || $equipType EQUALS BP - type: STRING - valueOf: "pager" - vars: - useCode: String, XTN.2 - equipType: String, XTN.3 - -system_3: - condition: $equipType EQUALS_STRING FX - type: STRING - valueOf: "fax" - vars: - equipType: String, XTN.3 - -system_4: - condition: $emailValue NULL - type: STRING - valueOf: "phone" - vars: - emailValue: XTN.4 - -# value is phone number or email address depending on a value in email address (XTN.4) -value_1: - condition: $emailValue NULL - type: STRING - valueOf: 'GeneralUtils.getFormattedTelecomNumberValue( xtn1Old, xtn5Country, xtn6Area, xtn7Local, xtn8Extension, xtn12Unformatted )' - expressionType: JEXL - vars: - xtn1Old: String, XTN.1 - xtn5Country: String, XTN.5 - xtn6Area: String, XTN.6 - xtn7Local: String, XTN.7 - xtn8Extension: String, XTN.8 - xtn12Unformatted: String, XTN.12 - emailValue: XTN.4 - -value_2: - condition: $emailValue NOT_NULL - type: STRING - valueOf: $emailValue - vars: - emailValue: XTN.4 - -# Default use to "home" or "work", whatever is passed in -use_1: - type: STRING - valueOf: $use - expressionType: HL7Spec - -# But if CP, then change use to "mobile" -use_2: - condition: $equipmentType EQUALS CP - type: STRING - valueOf: $mobile - expressionType: HL7Spec - vars: - equipmentType: String, XTN.3 - constants: - mobile: "mobile" - -use_3: - condition: $useCode EQUALS WPN - type: STRING - value: "work" - vars: - useCode: String, XTN.2 - -use_4: - condition: $useCode EQUALS PRN - type: STRING - value: "home" - vars: - useCode: String, XTN.2 - -use_5: - condition: $useCode EQUALS ORN - type: STRING - value: "temp" - vars: - useCode: String, XTN.2 - -period: - valueOf: datatype/Period - expressionType: resource - vars: - start: XTN.13 - end: XTN.14 - -rank: - type: STRING - valueOf: XTN.18 - expressionType: HL7Spec - -extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: "text" - valueString: - type: STRING - valueOf: XTN.9 - expressionType: HL7Spec - diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_1.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_1.yml deleted file mode 100644 index 3349ca30481..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_1.yml +++ /dev/null @@ -1,36 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# Special SPM-2 type to handle EIP since the subcomponent spec is not supported (e.g. SPM.2.1.2) -type: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: $type - vars: - valueIn: $code | $alternateCode | $type - -system: - type: STRING - valueOf: EIP.1.2 | $system - expressionType: HL7Spec - -value: - type: STRING - valueOf: EIP.1.1 | $value - expressionType: HL7Spec - required: true - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, EIP.1.3 - value: $oidUrlPrefix + EIP.1.3 - systemStr: String, EIP.1.4 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_2.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_2.yml deleted file mode 100644 index c2551227acb..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Entity_Identifier_Pair_2.yml +++ /dev/null @@ -1,36 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# Special SPM-2 type to handle EIP since the subcomponent spec is not supported (e.g. SPM.2.1.2) -type: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: $type - vars: - valueIn: $code | $primaryCode | $type - -system: - type: STRING - valueOf: EIP.2.2 | $system - expressionType: HL7Spec - -value: - type: STRING - valueOf: EIP.2.1 | $value - expressionType: HL7Spec - required: true - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, EIP.2.3 - value: $oidUrlPrefix + EIP.2.3 - systemStr: String, EIP.2.4 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/HumanName.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/HumanName.yml deleted file mode 100644 index 8c77f6c7678..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/HumanName.yml +++ /dev/null @@ -1,99 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -text: - type: STRING - valueOf: 'GeneralUtils.generateName(prefix, first, middle, family, suffix)' - expressionType: JEXL - vars: - prefix: String, XPN.5 | XCN.6 | CNN.6 | NDL.6 | PPN.6 - first: String, XPN.2 | XCN.3 | CNN.3 | NDL.3 | PPN.3 - middle: String, XPN.3 | XCN.4 | CNN.4 | NDL.4 | PPN.4 - family: String, XPN.1 | XCN.2 | CNN.2 | NDL.2 | PPN.2 - suffix: String, XPN.4 | XCN.5 | CNN.5 | NDL.5 | PPN.5 - -family: - type: STRING - valueOf: XPN.1 | XCN.2 | CNN.2 | NDL.2 | PPN.2 - expressionType: HL7Spec - -given: - type: STRING - valueOf: 'GeneralUtils.makeStringArray(first, middle)' - generateList: true - expressionType: JEXL - vars: - first: String, XPN.2 | XCN.3 | CNN.3 | NDL.3 | PPN.3 - middle: String, XPN.3 | XCN.4 | CNN.4 | NDL.4 | PPN.4 - -prefix: - type: STRING - valueOf: XPN.5 | XCN.6 | CNN.6 | NDL.6 | PPN.6 - expressionType: HL7Spec - -use: - type: NAME_USE - valueOf: XPN.7 | XCN.10 - expressionType: HL7Spec - -suffix_1-suffix: - type: STRING - generateList: true - valueOf: XPN.4 | XCN.5 | CNN.5 | NDL.5 | PPN.5 - expressionType: HL7Spec - -suffix_2-degree: - type: STRING - generateList: true - valueOf: XCN.7 - expressionType: HL7Spec - -suffix_3-professional-suffix: - type: STRING - generateList: true - valueOf: XCN.21 - expressionType: HL7Spec - -period: - valueOf: datatype/Period - expressionType: resource - vars: - start: XPN.12 | XCN.19 - end: XPN.13 | XCN.20 - -extension: - generateList: true - expressionType: nested - vars: - suffix: String, XCN.5 - suffixDegree: String, XCN.7 - professionalSuffix: String, XCN.21 - expressions: - - expressionType: nested - condition: $suffix NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: name-suffix - valueString: - type: STRING - valueOf: $suffix - - - expressionType: nested - condition: $suffixDegree NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: name-suffix-degree - valueString: - type: STRING - valueOf: $suffixDegree - - - expressionType: nested - condition: $professionalSuffix NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: name-suffix-professional - valueString: - type: STRING - valueOf: $professionalSuffix diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier.yml deleted file mode 100644 index e5217caf1be..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier.yml +++ /dev/null @@ -1,48 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# added condition to filter out if empty -type: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: CX.5 | $type - vars: - valueIn: CX.5 | $code | $alternateCode | $type - -system_1: - type: STRING - valueOf: CX.4 | CWE.4 |EI.2 | $system - expressionType: HL7Spec - -system_2: - type: SYSTEM_URL - valueOf: CX.4 | CWE.4 | EI.2 | $system - expressionType: HL7Spec - -value: - type: STRING - valueOf: CX.1 | CWE.1 | EI.1 | $value - expressionType: HL7Spec - required: true - -period: - valueOf: datatype/Period - expressionType: resource - vars: - start: CX.7 | CWE.7 - end: CX.8 | CWE.8 - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, EI.3 - value: $oidUrlPrefix + EI.3 - systemStr: String, EI.4 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Gen.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Gen.yml deleted file mode 100644 index b30f180de7b..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Gen.yml +++ /dev/null @@ -1,48 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -system: - type: SYSTEM_URL - valueOf: $system - -value: - type: STRING - valueOf: $val - required: true - vars: - val: XON.10 | $id - -type: - valueOf: datatype/CodeableConcept_var - condition: $code NOT_NULL - expressionType: resource - vars: - code: XON.6 | $typeCode - system: $typeCodeSystem - -period: - valueOf: datatype/Period - expressionType: resource - vars: - start: $start - end: $end - -extension_1: - # If the system is not a URL then add it as a code - condition: $codeAsUrl NULL && $code NOT_NULL - generateList: true - expressionType: nested - vars: - codeAsUrl: SYSTEM_URL, $system - code: String, $system - expressionsMap: - url: - type: SYSTEM_URL - value: coding-system - valueCodeableConcept: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - system: SYSTEM_URL, $system_code - display: $NULL - constants: - system_code: "v2-0396" diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Observation.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Observation.yml deleted file mode 100644 index 06bede43d55..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_Observation.yml +++ /dev/null @@ -1,24 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -system: - type: SYSTEM_URL - valueOf: $sys - expressionType: HL7Spec - -# override - simply pass the value if no need to join -value_1: - condition: $fillpla NOT_NULL - type: STRING - valueOf: $fillpla - expressionType: HL7Spec - required: true - -# override from library - verify $obx3 exists before joining -value_2: - condition: $fillpla NOT_NULL && $obx3 NOT_NULL - type: STRING - valueOf: $join - expressionType: HL7Spec - required: true - vars: - join: $fillpla + $joinChar + $obx3 diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_SystemID.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_SystemID.yml deleted file mode 100644 index 4a89d113352..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_SystemID.yml +++ /dev/null @@ -1,134 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -type_1: - condition: $identifierCoding NOT_NULL - valueOf: datatype/CodeableConcept - expressionType: resource - specs: CX.5 | $typeSegment - vars: - # Because calculated system id's don't have text if there is a valid system, - # see if there is a valid code and system as input to creating text in the CodeableConcept - identifierCoding: CODING_SYSTEM_V2_IDENTIFIER, CX.5 | $typeSegment - -type_2: # used in instance where objects are passed directly to the codeable concept instead of coming directly from a field - valueOf: datatype/CodeableConcept_var - generateList: true - expressionType: resource - -system_1: - condition: $systemExists NOT_NULL - type: STRING - valueOf: CX.4 | CWE.4 | EI.2 - expressionType: HL7Spec - vars: - systemExists: CX.4 | CWE.4 | EI.2 - -# When a system is passed in, try looking it up. -# If it doesn't resolve, create a system ID (urn:id:xxxx) -system_2: - condition: $systemID NOT_NULL - type: STRING - valueOf: $systemLookup | $systemCreated - expressionType: HL7Spec - vars: - systemCreated: SYSTEM_ID, $systemID - systemLookup: SYSTEM_URL, $systemID - -value: - type: STRING - valueOf: CX.1 | CWE.1 | EI.1 | HD.1 | $value - expressionType: HL7Spec - -period: - valueOf: datatype/Period - expressionType: resource - vars: - start: CX.7 | CWE.7 | XCN.19 - end: CX.8 | CWE.8 | XCN.20 - -use: - condition: $mrgUse NOT_NULL - value: $mrgUse - vars: - mrgUse: $use - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, CX.4.2 - value: $oidUrlPrefix + CX.4.2 - systemStr: String, CX.4.3 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - -# Assigning facility OID -extension_2: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, CX.6.2 - value: $oidUrlPrefix + CX.6.2 - systemStr: String, CX.6.3 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: assigning-facility-universal-id - -extension_3: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, XCN.9.2 - value: $oidUrlPrefix + XCN.9.2 - systemStr: String, XCN.9.3 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - -# Assigning facility namespace -extension_4: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL - vars: - value: String, CX.6.1 - constants: - KEY_NAME_SUFFIX: String - urlValue: assigning-facility-namespace-id - -# Assigning authority namespace -extension_5: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL - vars: - value: String, XCN.9.1 - constants: - KEY_NAME_SUFFIX: String - urlValue: namespace-id - -extension_6: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, EI.3 - value: $oidUrlPrefix + EI.3 - systemStr: String, EI.4 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_XON.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_XON.yml deleted file mode 100644 index 55d4709bd66..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_XON.yml +++ /dev/null @@ -1,51 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -value: - type: STRING - valueOf: $val - vars: - val: XON.10 | XON.3 - -type_1: - valueOf: datatype/CodeableConcept_var - generateList: true - expressionType: resource - vars: - code: String, XON.7 - system: SYSTEM_URL, $systemCode - constants: - systemCode: "v2-0203" - -extension_1-assigning-authority: - generateList: true - expressionType: resource - valueOf: extension/ExtensionHierarchicDesignator - specs: XON.6 - constants: - urlValue: assigning-authority - -extension_2-assigning-facility: - generateList: true - expressionType: nested - specs: XON.8 - expressionsMap: - url: - type: SYSTEM_URL - value: assigning-facility - valueReference: - valueOf: resource/Location - expressionType: reference - specs: HD - vars: - name: String, XON.8.1 - -extension_3-name-representation-code: - condition: $value NOT_NULL - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, XON.9 - constants: - KEY_NAME_SUFFIX: String - urlValue: name-representation-code \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_var.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_var.yml deleted file mode 100644 index c82ad858b93..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Identifier_var.yml +++ /dev/null @@ -1,89 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# Used when a coding is not available but separate values are -type_1: - condition: $code NOT_NULL && $coding NULL - valueOf: datatype/CodeableConcept_var - generateList: true - expressionType: resource - # CodeableConcept_var uses these scope vars: - # $code (for CodeableConcept.Coding.code) - # $system (for CodeableConcept.Coding.system) - # $display (for CodeableConcept.Coding.display) - # $version (for CodeableConcept.Coding.version) - # $text (for CodeableConcept.text) - -# Used when a coding is available -type_2: - condition: $coding NOT_NULL && $code NULL - valueOf: datatype/CodeableConcept - generateList: true - expressionType: resource - -value: - type: STRING - valueOf: $valueIn - -system_1: - type: STRING - valueOf: $systemId - -system_2: - condition: $systemCX NOT_NULL - valueOf: $join - vars: - join: $systemCX, GeneralUtils.noWhiteSpace(join) - -use: - condition: $use NOT_NULL - type: STRING - valueOf: $use - -period: - condition: $start NOT_NULL || $end NOT_NULL - valueOf: datatype/Period - expressionType: resource - vars: - start: $start - end: $end - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL - vars: - value: $namespaceId - constants: - KEY_NAME_SUFFIX: String - urlValue: namespace-id - -# For OIDs -extension_2: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, $universalId - value: $oidUrlPrefix + $universalId - systemStr: String, $universalIdType - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - -# For all other ID types -extension_3: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr NOT_EQUALS ISO - vars: - idStr: String, $universalId - value: $idUrlPrefix + $universalId - systemStr: String, $universalIdType - constants: - idUrlPrefix: "urn:id:" - KEY_NAME_SUFFIX: String - urlValue: universal-id \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Quantity.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Quantity.yml deleted file mode 100644 index b98aa8d4b1c..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Quantity.yml +++ /dev/null @@ -1,88 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -value_1: - condition: $value CONTAINS_STRING '.' - # Not specifying a type results in the full "value" being reported correctly and no rounding/float conversion occurs. - # However, it also breaks the integration tests, so we are going to have to duplicate this value into an extension - # until LinuxForHealth provides a permanent solution. - # For a permanent solution, an issue was submitted to LinuxForHealth/hl7v2-fhir-converter at - # https://github.com/LinuxForHealth/hl7v2-fhir-converter/issues/500 - # in order to add a new decimal type that will not round the value - type: FLOAT - valueOf: $value -value_2: - # Try to keep implicit precision for integers - condition: $value NOT_CONTAINS_STRING '.' - type: INTEGER - valueOf: $value -comparator: - type: STRING - # Hl7 supports an equal sign as a comparator that FHIR does not, making sure its a supported comparator. - # see extensions on this config for handling of unsupported comparators - condition: $sComparator EQUALS_STRING '<' || $sComparator EQUALS_STRING '<=' || $sComparator EQUALS_STRING '>=' || $sComparator EQUALS_STRING '>' - valueOf: $sComparator - vars: - sComparator: String, $comparator -unit: - type: STRING - valueOf: $unit -system_1: - type: URI - valueOf: $system -system_2: - type: STRING - valueOf: $resolvedSystem -system_3: - condition: $sys NOT_NULL - valueOf: $systemCWE - vars: - systemCWE: $urn + $sys -code: - condition: $system NOT_NULL || $resolvedSystem NOT_NULL || $sys NOT_NULL - type: STRING - valueOf: $code - -extension_1: - condition: $value NOT_EQUALS_STRING '<' && $value NOT_EQUALS_STRING '<=' && $value NOT_EQUALS_STRING '>=' && $value NOT_EQUALS_STRING '>' - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, $comparator - constants: - KEY_NAME_SUFFIX: String - urlValue: comparator - -extension_2: - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, $separator - constants: - KEY_NAME_SUFFIX: String - urlValue: separator - -extension_3: - condition: $units NOT_NULL - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: units - valueCodeableConcept: - valueOf: datatype/CodeableConcept - specs: $units - expressionType: resource - -# The raw value in case it is not really a quantity -extension_4: - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, $value - constants: - KEY_NAME_SUFFIX: String - urlValue: alternate-value \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Ratio.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Ratio.yml deleted file mode 100644 index 0eff9f2fb0f..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Ratio.yml +++ /dev/null @@ -1,17 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -numerator_1: - valueOf: datatype/Quantity - expressionType: resource - vars: - value: String, $numerator - unit: $numunit | CE.1 | CWE.1 - resolvedSystem: $unitSystem - -denominator_1: - valueOf: datatype/Quantity - expressionType: resource - vars: - value: String, $denominator - unit: $denunit | CE.1 | CWE.1 - resolvedSystem: $unitSystem \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/Timing.yml b/prime-router/metadata/HL7/catchall/hl7/datatype/Timing.yml deleted file mode 100644 index 5fa9d2f2fbf..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/Timing.yml +++ /dev/null @@ -1,11 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -repeat: - expressionType: nested - expressionsMap: - boundsPeriod: - valueOf: datatype/Period - expressionType: resource - vars: - start: $startTiming - end: $endTiming \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatype/deprecated.md b/prime-router/metadata/HL7/catchall/hl7/datatype/deprecated.md deleted file mode 100644 index c2a958f19c5..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatype/deprecated.md +++ /dev/null @@ -1,6 +0,0 @@ -## Deprecated location - -Use of this location for mapping schema is deprecated. Please see -the [Mapping schema file structure](../../../../docs/design/design/mapping-schemas.md) design document to review current -mapping schema structure guidelines. New work should follow the new design as much as possible. When mapping work is -completed, this directory should be removed. \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/CE/CodeableConcept.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/CE/CodeableConcept.yml deleted file mode 100644 index 065a9808fe4..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatypes/CE/CodeableConcept.yml +++ /dev/null @@ -1,112 +0,0 @@ -# $schema: ./../../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -coding: - generateList: true - expressionType: nested - vars: - code: String, CE.1 - display: String, CE.2 - system: SYSTEM_URL, CE.3 - expressionsMap: - code: - type: String - expressionType: HL7Spec - valueOf: CE.1 - display: - type: String - expressionType: HL7Spec - valueOf: CE.2 - system: - type: SYSTEM_URL - expressionType: HL7Spec - valueOf: CE.3 - extension_ce-coding: - generateList: true - condition: $code NOT_NULL || $display NOT_NULL || $system NOT_NULL - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: ce-coding - valueString: - value: coding - extension_ce-coding-system: - condition: $coding-system NOT_NULL - generateList: true - expressionType: nested - vars: - coding-system: String, CE.3 - expressionsMap: - url: - type: SYSTEM_URL - value: ce-coding-system - valueString: - value: $coding-system - -coding_alt: - generateList: true - expressionType: nested - vars: - altCode: String, CE.4 - altDisplay: String, CE.5 - altSystem: SYSTEM_URL, CE.6 - expressionsMap: - code: - type: String - expressionType: HL7Spec - valueOf: CE.4 - display: - type: String - expressionType: HL7Spec - valueOf: CE.5 - system: - type: SYSTEM_URL - expressionType: HL7Spec - valueOf: CE.6 - extension_cwe-coding: - condition: $altCode NOT_NULL || $altDisplay NOT_NULL || $altSystem NOT_NULL - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: cwe-coding - valueString: - value: alt-coding - extension_cwe-coding-system: - condition: $coding-system NOT_NULL - generateList: true - expressionType: nested - vars: - coding-system: String, CE.6 - expressionsMap: - url: - type: SYSTEM_URL - value: cwe-coding-system - valueString: - value: $coding-system - -extension: - generateList: true - expressionType: nested - expressions: - - generateList: true - expressionType: nested - condition: $hl7v2Field NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2Field - valueString: - type: STRING - valueOf: $hl7v2Field - - generateList: true - expressionType: nested - condition: $hl7v2Component NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2Component - valueString: - type: STRING - valueOf: $hl7v2Component \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/CWE/Quantity.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/CWE/Quantity.yml deleted file mode 100644 index 7e0775bcf28..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/datatypes/CWE/Quantity.yml +++ /dev/null @@ -1,46 +0,0 @@ -# $schema: ./../../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -code: - condition: $identifier NOT_NULL && $nameOfCodingSystem NOT_NULL - type: STRING - expressionType: HL7Spec - valueOf: CWE.1 - vars: - identifier: CWE.1 - nameOfCodingSystem: CWE.3 - -unit: - expressionType: nested - vars: - identifier: CWE.1 - text: CWE.2 - expressions: - - condition: $text NULL && $identifier NOT_NULL - type: STRING - valueOf: CWE.1 - expressionType: HL7Spec - - condition: $text NOT_NULL - type: STRING - valueOf: CWE.2 - expressionType: HL7Spec - -system: - condition: $identifier NOT_NULL && $nameOfCodingSystem NOT_NULL - type: SYSTEM_URL - expressionType: HL7Spec - valueOf: CWE.1 - vars: - identifier: CWE.1 - nameOfCodingSystem: CWE.3 - -extension: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: 'cwe-quantity' - valueCodeableConcept: - valueOf: datatypes/CWE/CodeableConcept - expressionType: resource - specs: CWE \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/HD/Location.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/HD/Location.yml index 1956b8ab2d7..73ccbe8759e 100644 --- a/prime-router/metadata/HL7/catchall/hl7/datatypes/HD/Location.yml +++ b/prime-router/metadata/HL7/catchall/hl7/datatypes/HD/Location.yml @@ -67,8 +67,16 @@ extension_3-universalIdType: valueOf: HD.3 physicalType: - valueOf: datatype/CodeableConcept_var - expressionType: resource - constants: - code: si - system: "http://terminology.hl7.org/CodeSystem/location-physical-type" \ No newline at end of file + expressionType: nested + generateList: true + expressionsMap: + coding: + expressionType: nested + generateList: true + expressionsMap: + code: + type: STRING + value: si + system: + type: STRING + value: "http://terminology.hl7.org/CodeSystem/location-physical-type" \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/NDL/PractitionerRole.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/NDL/PractitionerRole.yml index 07585af7828..b450f6aaecc 100644 --- a/prime-router/metadata/HL7/catchall/hl7/datatypes/NDL/PractitionerRole.yml +++ b/prime-router/metadata/HL7/catchall/hl7/datatypes/NDL/PractitionerRole.yml @@ -136,11 +136,18 @@ extension: type: SYSTEM_URL value: event-performerFunction valueCodeableConcept: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: $performerParticipationType - constants: - system: "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" + expressionType: nested + generateList: true + expressionsMap: + coding: + expressionType: nested + generateList: true + expressionsMap: + code: + type: STRING + value: $performerParticipationType + system: + type: STRING + value: "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" - expressionType: resource valueOf: datatypes/NDL/NDLExtension \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml index 4634744061b..18218c076fa 100644 --- a/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml +++ b/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml @@ -35,12 +35,20 @@ identifier: valueOf: XON.10 type: condition: $xon7 NOT_NULL - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: String, XON.7 - constants: - system: "http://terminology.hl7.org/CodeSystem/v2-0203" + expressionType: nested + generateList: true + expressionsMap: + coding: + expressionType: nested + generateList: true + expressionsMap: + code: + valueOf: XON.7 + type: STRING + expressionType: HL7Spec + system: + type: STRING + value: "http://terminology.hl7.org/CodeSystem/v2-0203" extension_1-checkDigitSchema: condition: $xon5 NOT_NULL generateList: true diff --git a/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionHierarchicDesignator.yml b/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionHierarchicDesignator.yml deleted file mode 100644 index cc6a2e22122..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionHierarchicDesignator.yml +++ /dev/null @@ -1,69 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -url: - condition: $urlValue NOT_NULL - type: SYSTEM_URL - valueOf: $urlValue - -extension_1-namespaceId: - condition: $value NOT_NULL - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, HD.1 - constants: - KEY_NAME_SUFFIX: String - urlValue: namespace-id - -extension_2-universalIdISO: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $universalIdType EQUALS ISO - vars: - idStr: String, HD.2 - value: $urlPrefix + HD.2 - universalIdType: String, HD.3 - constants: - urlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: universal-id - -extension_3-universalIdUUID: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $universalIdType EQUALS UUID - vars: - idStr: String, HD.2 - value: $urlPrefix + HD.2 - universalIdType: String, HD.3 - constants: - urlPrefix: "urn:uuid:" - KEY_NAME_SUFFIX: Uuid - urlValue: universal-id - -extension_4-universalIdNullType: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL && $universalIdType NULL - vars: - value: String, HD.2 - universalIdType: String, HD.3 - constants: - KEY_NAME_SUFFIX: String - urlValue: universal-id - -extension_5-universalIdUnknownType: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL && $universalIdType NOT_EQUALS ISO && $universalIdType NOT_EQUALS UUID - vars: - value: String, HD.2 - universalIdType: String, HD.3 - constants: - KEY_NAME_SUFFIX: String - urlValue: universal-id diff --git a/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionMeta.yml b/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionMeta.yml deleted file mode 100644 index 4a0c120b70c..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/extension/ExtensionMeta.yml +++ /dev/null @@ -1,74 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -security: - condition: $code NOT_NULL - valueOf: datatype/Coding - expressionType: resource - vars: - code: MSH.8 - display: MSH.8 - -tag_1: - condition: $code NOT_NULL - valueOf: datatype/Coding - generateList: true - expressionType: resource - vars: - code: MSH.11.1 - constants: - system: v2-0103 - -tag_2: - condition: $code NOT_NULL - valueOf: datatype/Coding - generateList: true - expressionType: resource - vars: - code: MSH.11.2 - constants: - system: v2-0207 - -extension_1: - generateList: true - valueOf: extension/Extension - expressionType: resource - vars: - value: String, MSH.12.1 - constants: - KEY_NAME_SUFFIX: String - urlValue: source-data-model-version - -# Patient las update facility universal ID -extension_2: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - vars: - idStr: String, PID.34.2 - value: $oidUrlPrefix + PID.34.2 - systemStr: String, PID.34.3 - constants: - oidUrlPrefix: "urn:oid:" - KEY_NAME_SUFFIX: Oid - urlValue: last-updated-facility-universal-id - -# Patient las update facility namespace -extension_3: - generateList: true - valueOf: extension/Extension - expressionType: resource - condition: $value NOT_NULL - vars: - value: String, PID.34.1 - constants: - KEY_NAME_SUFFIX: String - urlValue: last-updated-facility-namespace-id - -# Patient last updated -lastUpdated: - type: STRING - valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)" - expressionType: JEXL - vars: - dateTimeIn: PID.33 diff --git a/prime-router/metadata/HL7/catchall/hl7/message/deprecated.md b/prime-router/metadata/HL7/catchall/hl7/message/deprecated.md deleted file mode 100644 index c2a958f19c5..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/message/deprecated.md +++ /dev/null @@ -1,6 +0,0 @@ -## Deprecated location - -Use of this location for mapping schema is deprecated. Please see -the [Mapping schema file structure](../../../../docs/design/design/mapping-schemas.md) design document to review current -mapping schema structure guidelines. New work should follow the new design as much as possible. When mapping work is -completed, this directory should be removed. \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Device.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Device.yml deleted file mode 100644 index 326fc5b0fac..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Device.yml +++ /dev/null @@ -1,108 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Device -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -# The FHIR Device resource doesn't have any required fields. -# However we do not want empty Device resources. -# Thefore wherever Device is referenced make sure to verify the value is NOT_NULL. -identifier_1: - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - specs: EI - vars: - valueIn: EI.1 | HD.1 - systemCX: EI.2 - -identifier_2: - condition: $idStr NOT_NULL && $code EQUALS ISO - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - constants: - system: v2-0301 - urlPrefix: "urn:oid:" - -identifier_3: - condition: $idStr NOT_NULL && $code EQUALS UUID - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - constants: - system: v2-0301 - urlPrefix: "urn:uuid:" - -identifier_4: - condition: $idStr NOT_NULL && $code EQUALS DNS - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - constants: - system: v2-0301 - urlPrefix: "urn:dns:" - -identifier_5: - condition: $idStr NOT_NULL && $code EQUALS URI - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - constants: - system: v2-0301 - urlPrefix: "urn:uri:" - -identifier_6: - condition: $idStr NOT_NULL && $code EQUALS CLIA - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - constants: - system: v2-0301 - urlPrefix: "urn:clia:" - -identifier_7: - condition: $idStr NOT_NULL && $code NOT_EQUALS ISO && $code NOT_EQUALS UUID && $code NOT_EQUALS DNS && $code NOT_EQUALS URI && $code NOT_EQUALS CLIA - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $urlPrefix + HD.2 - idStr: String, HD.2 - code: String, HD.3 - urlPrefix: "urn:id:" - -deviceName: - condition: $deviceName NOT_NULL - expressionType: nested - generateList: true - expressionsMap: - name: - type: STRING - valueOf: $deviceName - expressionType: HL7Spec - type: - type: STRING - value: user-friendly-name \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Location.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Location.yml deleted file mode 100644 index 7d9894a00e2..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Location.yml +++ /dev/null @@ -1,122 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Location -id_1: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -mode_1: - type: STRING - condition: $poc NOT_NULL || $room NOT_NULL || $bed NOT_NULL - value: instance - -mode_2: - type: STRING - condition: $hd1 NULL && $facility NOT_NULL - vars: - hd1: String, HD.1 - value: instance - -physicalType_1: - valueOf: datatype/CodeableConcept_var - condition: $facility NOT_NULL && $room NULL && $bed NULL - expressionType: resource - constants: - code: si - system: "http://terminology.hl7.org/CodeSystem/location-physical-type" - -physicalType_2: - valueOf: datatype/CodeableConcept_var - condition: $room NOT_NULL && $bed NULL - expressionType: resource - constants: - code: ro - system: "http://terminology.hl7.org/CodeSystem/location-physical-type" - -physicalType_3: - valueOf: datatype/CodeableConcept_var - condition: $bed NOT_NULL - expressionType: resource - constants: - code: bd - system: "http://terminology.hl7.org/CodeSystem/location-physical-type" - -physicalType_4: - valueOf: datatype/CodeableConcept_var - condition: $universalIdType EQUALS ISO || $universalIdType EQUALS UUID - expressionType: resource - vars: - universalIdType: String, HD.3 - constants: - code: si - system: "http://terminology.hl7.org/CodeSystem/location-physical-type" - -extension_1: - valueOf: extension/Extension - condition: $poc NOT_NULL - expressionType: resource - generateList: true - vars: - value: String, $poc - constants: - KEY_NAME_SUFFIX: String - urlValue: point-of-care - -extension_2-location-facility: - condition: $locationFacility NOT_NULL - generateList: true - expressionType: resource - valueOf: extension/ExtensionHierarchicDesignator - specs: PL.4 - vars: - locationFacility: PL.4 - constants: - urlValue: location-facility - -identifier_1: - condition: $bed NOT_NULL - valueOf: datatype/Identifier - expressionType: resource - vars: - value: $room + $locationJoinChar + $bed - -identifier_2: - condition: $bed NULL && $room NOT_NULL - valueOf: datatype/Identifier - expressionType: resource - vars: - value: $room - -identifier_3-HD-unknown: - condition: $value NOT_NULL && $universalIdType NOT_EQUALS ISO && $universalIdType NOT_EQUALS UUID - valueOf: datatype/Identifier - expressionType: resource - vars: - value: String, HD.2 - -identifier_4-HD-ISO: - condition: $idStr NOT_NULL && $universalIdType EQUALS ISO - valueOf: datatype/Identifier - expressionType: resource - vars: - idStr: String, HD.2 - value: $urlPrefix + HD.2 - universalIdType: String, HD.3 - constants: - urlPrefix: "urn:oid:" - -identifier_5-HD-UUID: - condition: $idStr NOT_NULL && $universalIdType EQUALS UUID - valueOf: datatype/Identifier - expressionType: resource - vars: - idStr: String, HD.2 - value: $urlPrefix + HD.2 - universalIdType: String, HD.3 - constants: - urlPrefix: "urn:uuid:" - -name: - type: STRING - valueOf: $name \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/MessageSender.yml b/prime-router/metadata/HL7/catchall/hl7/resource/MessageSender.yml deleted file mode 100644 index ba02c2ef10f..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/MessageSender.yml +++ /dev/null @@ -1,86 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Organization - -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -# Namespace ID -identifier_1: - condition: $id NOT_NULL - valueOf: datatype/Identifier_Gen - generateList: true - expressionType: resource - vars: - id: String, MSH.4.1 - -# Universal ID for OIDs -identifier_2: - valueOf: datatype/Identifier_Gen - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - generateList: true - expressionType: resource - vars: - idStr: String, MSH.4.2 - id: $oidUrlPrefix + MSH.4.2 - systemStr: String, MSH.4.3 - constants: - oidUrlPrefix: "urn:oid:" - typeCode: ISO - typeCodeSystem: v2-0301 - -# Universal ID for UUIDs -identifier_3: - valueOf: datatype/Identifier_Gen - condition: $idStr NOT_NULL && $systemStr EQUALS UUID - generateList: true - expressionType: resource - vars: - idStr: String, MSH.4.2 - id: $uuidUrlPrefix + MSH.4.2 - systemStr: String, MSH.4.3 - constants: - uuidUrlPrefix: "urn:uuid:" - typeCode: ISO - typeCodeSystem: v2-0301 - -# Universal ID for CLIA -identifier_4: - valueOf: datatype/Identifier_Gen - condition: $idStr NOT_NULL && $systemStr EQUALS CLIA - generateList: true - expressionType: resource - vars: - idStr: String, MSH.4.2 - id: $uuidUrlPrefix + MSH.4.2 - systemStr: String, MSH.4.3 - constants: - uuidUrlPrefix: "urn:clia:" - typeCode: CLIA - typeCodeSystem: v2-0301 - -# Universal ID for DNS -identifier_5: - valueOf: datatype/Identifier_Gen - condition: $idStr NOT_NULL && $systemStr EQUALS DNS - generateList: true - expressionType: resource - vars: - idStr: String, MSH.4.2 - id: $dnsUrlPrefix + MSH.4.2 - systemStr: String, MSH.4.3 - constants: - dnsUrlPrefix: "urn:dns:" - typeCode: DNS - typeCodeSystem: v2-0301 - -address: - valueOf: datatype/Address - expressionType: resource - generateList: true - vars: - country: MSH.17 - - diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Organization.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Organization.yml deleted file mode 100644 index a590bf10a35..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Organization.yml +++ /dev/null @@ -1,202 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -# Used by most organizations -# $orgIdValue would be missing because not passed in such as for IN1 / IN2 -resourceType: Organization -id_1: - condition: $orgIdValue NULL - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -# When there is IN1 / IN2 record but there is NO TENANT -# $orgIdValue must be passed in to control which IN1 / IN2 is used, and prevent bleed -id_2: - condition: $orgIdValue NOT_NULL && $TENANT NULL - type: VALID_ID - valueOf: $orgIdValue - -# When there is IN1 / IN2 record and there IS a TENANT -# $orgIdValue must be passed in to control which IN1 / IN2 is used, and prevent bleed -id_3: - condition: $orgIdValue NOT_NULL && $TENANT NOT_NULL - type: VALID_ID - valueOf: $orgIdWithTenantPrefix - vars: - orgIdWithTenantPrefix: $TENANT + $period + $orgIdValue - constants: - period: "." # period is constant used between concatention in $orgIdWithTenantPrefix - -# Used by most organizations -identifier_1: - condition: $id NOT_NULL - valueOf: datatype/Identifier_Gen - generateList: true - expressionType: resource - vars: - id: HD.1 - -identifier_2: - condition: $orgIdValue NULL && $id NOT_NULL - valueOf: datatype/Identifier_Gen - generateList: true - expressionType: resource - vars: - id: CWE.1 | CE.1 - system: CWE.3 | CE.3 - -# Used by IN1/Coverage (Insurance) organizations, which have a more complex identifier -identifier_3: - condition: $orgIdValue NOT_NULL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $orgIdValue - systemCX: $orgIdSystem - start: $orgIdStart - end: $orgIdEnd - code: $orgIdTypeCode - coding: $orgIdTypeCoding # $coding takes priority over $code - -# Must check for empty valueIn because coding could be set -identifier_4: - condition: $valueIn NOT_NULL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: $orgCompanyPlanCode # IN1.35 passed in from Coverage - # No CXsystem - # No code - -identifier_5: - condition: $name NOT_NULL - generateList: true - expressionType: resource - valueOf: datatype/Identifier_XON - specs: XON - vars: - name: XON.1 - -name_v1: - type: STRING - condition: $idValue NULL - valueOf: CWE.2 | CE.2 | XON.1 | $orgName - expressionType: HL7Spec - vars: - idValue: CWE.1 | CE.1 | XON.10 | XON.3 - -name_v2: - type: STRING - condition: $idValue NOT_NULL - valueOf: CWE.2 | CE.2 | XON.1 - expressionType: HL7Spec - vars: - idValue: CWE.1 | CE.1 | XON.10 | XON.3 - -alias: - type: STRING - valueOf: CWE.5 | CE.5 - expressionType: HL7Spec - -address: - valueOf: datatype/Address - generateList: true - expressionType: resource - specs: $orgAddressXAD - -contact: - valueOf: secondary/Contact - generateList: true - expressionType: resource - specs: $orgContactXCN - vars: - # May be provided to create a purpose in the Contact element - code: $orgContactPurposeCode - system_code: $orgContactPurposeSystemCode - display: $orgContactPurposeDisplay - text: $orgContactPurposeText - contactPointXTN: $orgContactPointXTN - contactPointAddressXAD: $orgContactPointAddressXAD - contactName: $orgContactName - -extension_1: - generateList: true - expressionType: nested - condition: $code EQUALS A - vars: - code: String, XON.2 - expressionsMap: - url: - type: SYSTEM_URL - value: organization-name-type - valueCoding: - valueOf: datatype/Coding - expressionType: resource - vars: - code: String, XON.2 - system: SYSTEM_URL, $systemCode - constants: - display: "Alias name" - systemCode: "v2-0204" - -extension_2: - generateList: true - expressionType: nested - condition: $code EQUALS L - vars: - code: String, XON.2 - expressionsMap: - url: - type: SYSTEM_URL - value: organization-name-type - valueCoding: - valueOf: datatype/Coding - expressionType: resource - vars: - code: String, XON.2 - system: SYSTEM_URL, $systemCode - constants: - display: "Legal name" - systemCode: "v2-0204" - -extension_3: - generateList: true - expressionType: nested - condition: $code EQUALS D - vars: - code: String, XON.2 - expressionsMap: - url: - type: SYSTEM_URL - value: organization-name-type - valueCoding: - valueOf: datatype/Coding - expressionType: resource - vars: - code: String, XON.2 - system: SYSTEM_URL, $systemCode - constants: - display: "Display name" - systemCode: "v2-0204" - -extension_4: - generateList: true - expressionType: nested - condition: $code EQUALS SL - vars: - code: String, XON.2 - expressionsMap: - url: - type: SYSTEM_URL - value: organization-name-type - valueCoding: - valueOf: datatype/Coding - expressionType: resource - vars: - code: String, XON.2 - system: SYSTEM_URL, $systemCode - constants: - display: "Stock exchange listing name" - systemCode: "v2-0204" diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Patient.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Patient.yml deleted file mode 100644 index 1c3b66dcb55..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Patient.yml +++ /dev/null @@ -1,562 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Patient -# Represents data that needs to be extracted for a Patient Resource in FHIR -# reference: https://www.hl7.org/fhir/patient.html -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -identifier_1: - condition: $patientIdentifier NOT_NULL - valueOf: datatype/Identifier_SystemID - generateList: true - expressionType: resource - specs: PID.3 - vars: - patientIdentifier: String, PID.3 - -# When the Coverage.subscriber from IN1.17 is NOT self use PID.19 for SSN identifier -identifier_2a: - condition: $valueIn NOT_NULL && $subscriberValue NOT_EQUALS SEL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: String, PID.19 # subscriber SSN - subscriberValue: String, IN1.17.1 # subscriber relationship - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: SS - display: Social Security number -# There is no text for PID.19 - -# When IN1.17 is empty and the Coverage.subscriber from IN2.72 is NOT self use PID.19 for SSN identifier -identifier_2b: - condition: $valueIn NOT_NULL && $valueIN117 NULL && $subscriberValue NOT_EQUALS 01 - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: String, PID.19 # subscriber SSN - subscriberValue: String, IN2.72 # subscriber relationship - valueIN117: IN1.17.1 - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: SS - display: Social Security number -# There is no text for PID.19 - -# When IN1.17 and IN2.72 are both empty use PID.19 for SSN identifier -# (Required edge case because NOT_EQUALS is not the same as NULL) -identifier_2c: - condition: $valueIn NOT_NULL && $valueIN117 NULL && $valueIN272 NULL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: String, PID.19 # subscriber SSN - valueIN272: String, IN2.72 # subscriber relationship - valueIN117: IN1.17.1 - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: SS - display: Social Security number -# There is no text for PID.19 - -# When the Coverage.subscriber from IN1.17 IS self use PID.19 / IN2.2 for SSN identifier -identifier_2d: - condition: $valueIn NOT_NULL && $subscriberValue EQUALS SEL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: String, PID.19 | IN2.2 # subscriber SSN - subscriberValue: String, IN1.17 # subscriber relationship - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: SS - display: Social Security number -# There is no text for PID.19 - -# When ORM message, set the pid. -identifier_2e: - condition: $valueIn NOT_NULL && $valueIN117 NULL && $subscriberValue EQUALS 01 - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: String, PID.19 | IN2.2 # subscriber SSN - valueIN117: IN1.17.1 - subscriberValue: String, IN2.72 # subscriber relationship - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: SS - display: Social Security number -# There is no text for PID.19 - -identifier_3: - condition: $valueIn NOT_NULL - valueOf: datatype/Identifier_var - generateList: true - # There is no authority for PID.19 - expressionType: resource - # Gets the Driver's license from PID.20, formats and adds it as an ID - vars: - valueIn: String, PID.20.1 - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - code: DL - display: Driver's license number -# There is no text for PID.20 - -identifier_4: - condition: $mrgIdentifier NOT_NULL - valueOf: datatype/Identifier_SystemID - generateList: true - expressionType: resource - specs: MRG.1 - vars: - mrgIdentifier: MRG.1 - constants: - use: old -# Add the old MR # from the MRG segment - -# identifier_5a and _5b are two parts to complex logic -# Only include IN1.49 as an identifier when the subscriber is not self AND a relatedPerson is created -identifier_5a: - condition: $valueIn NOT_NULL && $subscriberValue NOT_EQUALS SEL && $createRelatedPerson EQUALS TRUE - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - specs: IN1.49 - vars: - valueIn: String, IN1.49.1 - systemCX: IN1.49.4 - code: IN1.49.5 - subscriberValue: String, IN1.17.1 # subscriber relationship - createRelatedPerson: RELATED_PERSON_NEEDED_IN117, IN1.17 - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - -identifier_5b: - condition: $valueIn NOT_NULL && $valueIN117 NULL && $subscriberValue NOT_EQUALS 01 && $createRelatedPerson EQUALS TRUE - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - specs: IN1.49 - vars: - valueIn: String, IN1.49.1 - systemCX: IN1.49.4 - code: IN1.49.5 - subscriberValue: String, IN2.72 # subscriber relationship - createRelatedPerson: RELATED_PERSON_NEEDED_IN272, IN2.72 - valueIN117: IN1.17.1 - constants: - system: http://terminology.hl7.org/CodeSystem/v2-0203 - -# identifier_6a and _6b are two parts to complex logic -# Only include when the subscriber is self, uses IN1.17 -identifier_6a: - condition: $valueIn NOT_NULL && $valueIN117 EQUALS SEL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: IN2.61 | IN1.36 - valueIN117: String, IN1.17.1 # subscriber relationship - # No systemCX set for this identifier - constants: - system: "http://terminology.hl7.org/CodeSystem/v2-0203" - code: "MB" - display: "Member Number" - -# Only include when the subscriber is self -# IN2.72 only gets used if IN1.17 priority is empty (see identifier_6a) -identifier_6b: - condition: $valueIn NOT_NULL && $valueIN117 NULL && $valueIN272 EQUALS 01 - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: IN2.61 | IN1.36 - valueIN117: IN1.17.1 - valueIN272: String, IN2.72 # subscriber relationship - # No systemCX set for this identifier - constants: - system: "http://terminology.hl7.org/CodeSystem/v2-0203" - code: "MB" - display: "Member Number" - -identifier_7: - condition: $valueIn NOT_NULL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: IN2.8 - # No systemCX set for this identifier - constants: - system: "http://terminology.hl7.org/CodeSystem/v2-0203" - code: "MA" - display: "Patient Medicaid number" - -identifier_8: - condition: $valueIn NOT_NULL - valueOf: datatype/Identifier_var - generateList: true - expressionType: resource - vars: - valueIn: IN2.6 - # No systemCX set for this identifier - constants: - system: "http://terminology.hl7.org/CodeSystem/v2-0203" - code: "MC" - display: "Patient's Medicare number" - -name: - valueOf: datatype/HumanName - generateList: true - expressionType: resource - specs: PID.5 - -gender: - type: ADMINISTRATIVE_GENDER - valueOf: PID.8 - expressionType: HL7Spec - -address: - valueOf: datatype/Address - generateList: true - expressionType: resource - specs: PID.11 - vars: - # Used in Address to create district for patient address - # In future, they could be processed in a DataValueResolver. - distPatientCounty: String, PID.12 - distAddressCountyParish: String, PID.11.9 - distPatient: PID - -telecom_1: - condition: $valueIn NOT_NULL - valueOf: datatypes/XTN/ContactPoint - generateList: true - expressionType: resource - specs: PID.14 - vars: - valueIn: PID.14 - constants: - useCode: work - -telecom_2: - condition: $valueIn NOT_NULL - valueOf: datatypes/XTN/ContactPoint - generateList: true - expressionType: resource - specs: PID.13 - vars: - valueIn: PID.13 - constants: - useCode: home - -# The yaml is processed in reverse order, therefore -# Put the PID.13 last in yaml so it is first to be processed -birthDate: - type: DATE - valueOf: PID.7 - expressionType: HL7Spec - -_birthDate: - condition: $pid7 NOT_NULL - vars: - pid7: PID.7 - dateTimeIn: PID.7, GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID) - isTime: PID.7, GeneralUtils.dateTimeWithZoneId(isTime,ZONEID).length() > 10 - expressionType: nested - expressionsMap: - # this extension is needed to comply with the official HL7v2-to-FHIR mapping - extension_1: - condition: $dateTimeIn NOT_NULL && $isTime EQUALS "true" - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: birthTime - valueDateTime: - valueOf: $dateTimeIn - expressionType: HL7Spec - # this extension is needed to reliably translate back to HL7 from FHIR - extension_2: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $pid7 - expressionType: HL7Spec - -multipleBirthBoolean_1: - condition: $multBool NOT_NULL && $multInt NULL - type: BOOLEAN - valueOf: PID.24 - expressionType: HL7Spec - vars: - multBool: PID.24 - multInt: PID.25 - -multipleBirthBoolean_2: - condition: $multBool EQUALS N - type: BOOLEAN - valueOf: PID.24 - expressionType: HL7Spec - vars: - multBool: String, PID.24 - multInt: PID.25 - -multipleBirthInteger_1: - condition: $multBool NULL && $multInt NOT_NULL - type: INTEGER - valueOf: PID.25 - expressionType: HL7Spec - vars: - multBool: String, PID.24 - multInt: PID.25 - -multipleBirthInteger_2: - condition: $multBool EQUALS Y && $multInt NOT_NULL - type: INTEGER - valueOf: PID.25 - expressionType: HL7Spec - vars: - multBool: String, PID.24 - multInt: PID.25 - -deceasedBoolean: - condition: $deceasedBool NOT_NULL && $deceasedDateTime NULL - type: BOOLEAN - valueOf: PID.30 - expressionType: HL7Spec - vars: - deceasedBool: PID.30 - deceasedDateTime: PID.29 - -deceasedDateTime: - condition: $dateTimeIn NOT_NULL - type: STRING - valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)" - expressionType: JEXL - vars: - dateTimeIn: PID.29 - -_deceasedDateTime: - expressionType: nested - condition: $pid29 NOT_NULL - vars: - pid29: PID.29 - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: pid29 - expressionType: HL7Spec - -maritalStatus: - valueOf: datatype/CodeableConcept - expressionType: resource - condition: $coding NOT_NULL - vars: - coding: MARITAL_STATUS, PID.16 - text: String, PID.16.2 - -contact: - vars: - nk1: NK1 - condition: $nk1 NOT_NULL - valueOf: secondary/PatientContact - expressionType: resource - generateList: true - -generalPractitioner: - condition: $practitionerVal NOT_NULL - valueOf: resource/Practitioner - generateList: true - expressionType: reference - specs: PD1.4 - vars: - practitionerVal: PD1.4 - -extension: - generateList: true - expressionType: nested - expressions: - - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: mothersMaidenName - valueHumanName: - valueOf: datatype/HumanName - expressionType: resource - condition: $pid6 NOT_NULL - specs: PID.6 - vars: - pid6: PID.6 - - - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: mothers-identifier - valueIdentifier: - valueOf: datatype/Identifier - expressionType: resource - specs: PID.21 - vars: - pid21: PID.21 - - - - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: "religion" - valueCodeableConcept: - valueOf: datatype/CodeableConcept - expressionType: resource - condition: $coding NOT_NULL - vars: - coding: RELIGIOUS_AFFILIATION_CC, PID.17 - text: String, PID.17.2 - primaryCode: PID.17.1 - primaryDisplay: PID.17.2 - constants: - primarySystem: 'http://terminology.hl7.org/CodeSystem/v2-0006' - - - expressionType: nested - specs: PID.10 - generateList: true - expressionsMap: - url: - type: SYSTEM_URL - value: "race" - valueCodeableConcept: - valueOf: datatype/CodeableConcept - expressionType: resource - specs: CWE - - - expressionType: nested - generateList: true - expressionsMap: - url: - type: SYSTEM_URL - value: ethnic-group - valueCodeableConcept: - valueOf: datatype/CodeableConcept - expressionType: resource - specs: PID.22 - - - expressionType: nested - generateList: true - expressionsMap: - url: - type: SYSTEM_URL - value: patient-animal - valueCodeableConcept: - valueOf: datatype/CodeableConcept - expressionType: resource - specs: PID.35 - - - expressionType: nested - generateList: true - specs: NTE - expressionsMap: - url: - type: SYSTEM_URL - value: patient-notes - valueAnnotation: - valueOf: datatype/Annotation - expressionType: resource - - - expressionType: nested - condition: $tribalCitizenship NOT_NULL - generateList: true - vars: - tribalCitizenship: STRING_ALL, PID.39 - constants: - hl7v2Field: "PID.39" - expressionsMap: - url: - type: SYSTEM_URL - value: patient-citizenship - extension: - generateList: true - expressionType: nested - expressions: - - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: code - valueCodeableConcept: - valueOf: datatypes/CWE/CodeableConcept - expressionType: resource - specs: PID.39 - - -extension_mother_identifier: - generateList: true - expressionType: nested - expressions: - - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: mothersMaidenName - valueHumanName: - valueOf: datatype/HumanName - expressionType: resource - condition: $pid21 NOT_NULL - specs: PID.21 - vars: - pid21: PID.21 - -communication: - condition: $language NOT_NULL - valueOf: secondary/Communication - expressionType: resource - vars: - language: PID.15 - -active: - condition: $mrgSegment NOT_NULL - type: BOOLEAN - valueOf: "true" - vars: - mrgSegment: MRG - -link: - generateList: true - evaluateLater: true - expressionType: nested - condition: $mrgSegment NOT_NULL - vars: - mrgSegment: MRG - expressionsMap: - type: - type: STRING - valueOf: "replaces" - other: - required: true - valueOf: resource/PatientMRG - expressionType: reference \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Practitioner.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Practitioner.yml deleted file mode 100644 index c13ad6e0584..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Practitioner.yml +++ /dev/null @@ -1,84 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Practitioner -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -# The FHIR practitioner resource doesn't have any required fields. -# However, we do not want empty practitioner resources. -# Therefore, wherever Practitioner is referenced make sure to verify the value is NOT_NULL. -identifier_1: - valueOf: datatype/Identifier_SystemID - generateList: true - expressionType: resource - specs: XCN | CNN| NDL | PPN - vars: - systemID: XCN.9 | CNN.9 | NDL.9 | PPN.9 - value: XCN.1 | CNN.1 | NDL.1 | PPN.1 - typeSegment: XCN.13 - -name: - specs: XCN | CNN | NDL | PPN - valueOf: datatype/HumanName - generateList: true - expressionType: resource - -address: - valueOf: datatype/Address - expressionType: resource - generateList: true - specs: $addressSpec - -# useObrOrcCallbackNumber is used to work around an issue where variables with repeating HL7 fields do not -# support the repetitions, so we directly reference the field here in the SPECS property. Also, extensions -# do not support repetitions in this library. -telecom_1: - condition: $useObrOrcCallbackNumber NOT_NULL && $obr17 NULL - valueOf: datatype/ContactPoint - expressionType: resource - generateList: true - specs: ORC.14 - vars: - obr17: OBR.17 - -telecom_2: - condition: $useObrOrcCallbackNumber NOT_NULL && $obr17 NOT_NULL - valueOf: datatype/ContactPoint - expressionType: resource - generateList: true - specs: OBR.17 - vars: - obr17: OBR.17 - -extension_1: - generateList: true - condition: $locationName NOT_NULL - expressionType: nested - vars: - locationName: String, XCN.14.1 - expressionsMap: - url: - type: SYSTEM_URL - value: "assigning-facility" - valueReference: - valueOf: resource/Location - expressionType: reference - vars: - name: String, XCN.14.1 - -extension_2: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: identifier-type - valueCodeableConcept: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: String, XCN.13 - constants: - system: v2-0203 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/PractitionerRole.yml b/prime-router/metadata/HL7/catchall/hl7/resource/PractitionerRole.yml deleted file mode 100644 index 452dc86c8a3..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/PractitionerRole.yml +++ /dev/null @@ -1,45 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: PractitionerRole -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -practitioner: - condition: $rolePractitioner NOT_NULL - valueOf: resource/Practitioner - expressionType: reference - specs: $rolePractitioner - vars: - referenceDisplay: PERSON_DISPLAY_NAME, $rolePractitioner - addressSpec: $rolePractitionerAddress - -organization: - condition: $roleOrganization NOT_NULL - valueOf: resource/Organization - expressionType: reference - specs: $roleOrganization - vars: - orgAddressXAD: $roleOrganizationAddress - orgContactPointXTN: $roleOrganizationPhone - -code: - valueOf: datatype/CodeableConcept_var - expressionType: resource - generateList: true - -extension_1-performer-function: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: event-performerFunction - valueCodeableConcept: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: $performerParticipationType - constants: - system: "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/resource/Provenance.yml b/prime-router/metadata/HL7/catchall/hl7/resource/Provenance.yml deleted file mode 100644 index 159d6db1828..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/resource/Provenance.yml +++ /dev/null @@ -1,93 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -resourceType: Provenance -id: - type: STRING - valueOf: "GeneralUtils.generateResourceId()" - expressionType: JEXL - -target: - valueOf: datatype/Reference - generateList: true - expressionType: resource - specs: $DiagnosticReport - -recorded: - type: STRING - valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)" - expressionType: JEXL - vars: - dateTimeIn: MSH.7 -_recorded: - expressionType: nested - condition: $msh7 NOT_NULL - vars: - msh7: MSH.7 - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $msh7 - expressionType: HL7Spec - -agent_1: - # condition: $orgName NOT_NULL - valueOf: secondary/ProvenanceAgent - generateList: true - expressionType: resource - vars: - orgName: MSH.4.1 - altId: MSH.4.2 - countryCode: MSH.17 - orgSpec: MSH.4 - constants: - participantType: "author" - # Observation Organization needs an ADMIN purpose - orgContactPurposeCode: "ADMIN" - orgContactPurposeSystemCode: "contactentity-type" - orgContactPurposeDisplay: "Administrative" - orgContactPurposeText: "Organization Medical Director" - orgIdSystem: http://terminology.hl7.org/CodeSystem/v2-0301 - -agent_2: - condition: $practitionerSpec NOT_NULL - valueOf: secondary/ProvenanceAgent - generateList: true - expressionType: resource - vars: - practitionerSpec: ORC.12 - constants: - participantType: "author" - -entity: - valueOf: secondary/ProvenanceEntity - generateList: true - expressionType: resource - -activity_1: - valueOf: datatype/CodeableConcept_var - expressionType: resource - condition: $code NOT_NULL - vars: - display: MSH.9.3 - code: MSH.9.2 - system: SYSTEM_URL, $system_code - constants: - system_code: "v2-0003" - -activity_2: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - display: MSH.9.1 + $activityJoinChar + MSH.9.2 - code: MSH.9.2 - system: SYSTEM_URL, $system_code - constants: - activityJoinChar: "_" - system_code: "v2-0003" \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Collection.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Collection.yml deleted file mode 100644 index 5fc9f3dde48..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Collection.yml +++ /dev/null @@ -1,117 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -collectedDateTime: - condition: $end NULL - type: STRING - valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)" - expressionType: JEXL - vars: - dateTimeIn: SPM.17.1 | OBR.7 - end: SPM.17.2 | OBR.8 -_collectedDateTime: - condition: $dateTimeIn NOT_NULL && $end NULL - expressionType: nested - vars: - dateTimeIn: SPM.17.1 | OBR.7 - end: SPM.17.2 | OBR.8 - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $dateTimeIn - expressionType: HL7Spec - -collectedPeriod: - condition: $endDate NOT_NULL - vars: - startDate: SPM.17.1 | OBR.7 - endDate: SPM.17.2 | OBR.8 - expressionType: nested - expressionsMap: - start: - valueOf: "GeneralUtils.dateTimeWithZoneId(startDate,ZONEID)" - expressionType: JEXL - _start: - expressionType: nested - condition: $startDate NOT_NULL - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $startDate - expressionType: HL7Spec - end: - valueOf: "GeneralUtils.dateTimeWithZoneId(endDate,ZONEID)" - expressionType: JEXL - _end: - expressionType: nested - condition: $endDate NOT_NULL - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $endDate - expressionType: HL7Spec - -quantity: - valueOf: datatypes/CQ/Quantity - expressionType: resource - specs: SPM.12 | OBR.9 - -method: - condition: $spm7 NOT_NULL - valueOf: datatype/CodeableConcept - expressionType: resource - specs: SPM.7 - vars: - spm7: SPM.7 - -bodySite: - condition: $valueIn NOT_NULL - valueOf: datatype/CodeableConcept - expressionType: resource - specs: SPM.8 - vars: - valueIn: SPM.8 - -extension_1-bodySiteModifier: - condition: $spm9 NOT_NULL - generateList: true - expressionType: nested - vars: - spm9: SPM.9 - expressionsMap: - url: - type: SYSTEM_URL - value: specimen-source-site-modifier - valueCodeableConcept: - valueOf: datatype/CodeableConcept - expressionType: resource - specs: SPM.9 - -collector: - condition: $practitionerVal NOT_NULL - valueOf: resource/Practitioner - generateList: true - expressionType: reference - specs: OBR.10 - vars: - practitionerVal: OBR.10 diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Contact.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Contact.yml deleted file mode 100644 index b9a026479db..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Contact.yml +++ /dev/null @@ -1,27 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -purpose: - valueOf: datatype/CodeableConcept_var - condition: $code NOT_NULL || $display NOT_NULL || $system_code NOT_NULL || $text NOT_NULL - generateList: true - expressionType: resource - vars: - system: SYSTEM_URL, $system_code - -name: - valueOf: datatype/HumanName - expressionType: resource - specs: XCN | $contactName - -telecom: - condition: $contactPointXTN NOT_NULL - valueOf: datatypes/XTN/ContactPoint - generateList: true - expressionType: resource - specs: $contactPointXTN - -address: - valueOf: datatype/Address - expressionType: resource - specs: $contactPointAddressXAD - diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Container.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Container.yml deleted file mode 100644 index d679c6b7e9e..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Container.yml +++ /dev/null @@ -1,22 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -type: - condition: $containerTypeCWE NOT_NULL - valueOf: datatype/CodeableConcept - generateList: true - expressionType: resource - specs: $containerTypeCWE - -specimenQuantity: - condition: $specimenQuantity NOT_NULL - valueOf: datatype/Quantity - expressionType: resource - vars: - value: String, $specimenQuantity - -additiveCodeableConcept: - condition: $specimenAdditive NOT_NULL - generateList: true - valueOf: datatype/CodeableConcept - expressionType: resource - specs: $specimenAdditive \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Destination.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Destination.yml deleted file mode 100644 index b0e4995efa5..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Destination.yml +++ /dev/null @@ -1,137 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -name: - condition: $msh25 NOT_NULL - type: STRING - valueOf: MSH.5.1 - expressionType: HL7Spec - vars: - msh25: MSH.25 - -endpoint_1: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr EQUALS ISO - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - constants: - urlPrefix: "urn:oid:" - -endpoint_2: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr EQUALS UUID - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - constants: - urlPrefix: "urn:uuid:" - -endpoint_3: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr EQUALS DNS - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - constants: - urlPrefix: "urn:dns:" - -endpoint_4: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr EQUALS URI - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - constants: - urlPrefix: "urn:uri:" - -endpoint_5: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr EQUALS CLIA - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - constants: - urlPrefix: "urn:clia:" - -endpoint_6: - condition: $msh25 NULL && $idStr NOT_NULL && $systemStr NOT_EQUALS UUID && $systemStr NOT_EQUALS ISO && $systemStr NOT_EQUALS DNS && $systemStr NOT_EQUALS URI && $systemStr NOT_EQUALS CLIA - type: URL - valueOf: $idValue - expressionType: HL7Spec - vars: - msh25: MSH.25 - idStr: MSH.5.2 - idValue: $urlPrefix + MSH.5.2 - systemStr: String, MSH.5.3 - -endpoint_7: - condition: $msh25 NOT_NULL - type: URL - valueOf: MSH.25 - expressionType: HL7Spec - vars: - msh25: MSH.25 - -receiver_1: - condition: $idStr NOT_NULL && $orgIdSystem EQUALS ISO - valueOf: resource/Organization - expressionType: reference - specs: MSH.6 - vars: - orgName: String, MSH.6.1 - orgIdValue: $urlPrefix + MSH.6.2 - orgIdSystem: String, MSH.6.3 - idStr: String, MSH.6.2 - constants: - urlPrefix: "urn:oid:" - -receiver_2: - condition: $idStr NOT_NULL && $orgIdSystem EQUALS UUID - valueOf: resource/Organization - expressionType: reference - specs: MSH.6 - vars: - orgName: String, MSH.6.1 - orgIdValue: $urlPrefix + MSH.6.2 - orgIdSystem: String, MSH.6.3 - idStr: String, MSH.6.2 - constants: - urlPrefix: "urn:uuid:" - -receiver_3: - condition: $idStr NULL && $orgName NOT_NULL - valueOf: resource/Organization - expressionType: reference - specs: MSH.6 - vars: - orgName: String, MSH.6.1 - idStr: String, MSH.6.2 - -target: - condition: $msh5 NOT_NULL - valueOf: resource/Device - generateList: true - expressionType: reference - specs: MSH.5 - vars: - msh5: MSH.5 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/EncounterLocation.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/EncounterLocation.yml deleted file mode 100644 index 20fd1c8b998..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/EncounterLocation.yml +++ /dev/null @@ -1,53 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -status_1: - type: STRING - condition: $patientClass EQUALS $patientClassPlanned - value: planned - vars: - patientClass: String, PV1.2.1 - constants: - patientClassPlanned: P - -status_2: - type: STRING - condition: $patientClass NOT_EQUALS $patientClassPlanned - value: active - vars: - patientClass: String, PV1.2.1 - constants: - patientClassPlanned: P - -location: - generateList: true - valueOf: resource/Location - expressionType: reference - specs: PV1.3 - vars: - poc: String, PL.1 - bed: String, PL.3 - room: String, PL.2 - facility: String, PL.4 - constants: - locationJoinChar: "," - -location_all: - generateList: true - expressionType: nested - expressions: - - expressionType: nested - expressionsMap: - location: - expressionType: reference - valueOf: datatypes/PL/Location - specs: PV1.6 - extension: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7-use - valueString: - type: STRING - value: 'prior-patient-location' \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Hospitalization.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Hospitalization.yml deleted file mode 100644 index 4b29fa43241..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Hospitalization.yml +++ /dev/null @@ -1,71 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -preAdmissionIdentifier: - valueOf: datatype/Identifier - generateList: true - expressionType: resource - specs: PV1.5 - -# added condition to filter out if empty -admitSource: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: PV1.14 - vars: - valueIn: PV1.14 - -# added condition to filter out if empty -reAdmission: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: PV1.13 - vars: - valueIn: PV1.13 - -# added condition to filter out if empty -dietPreference: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: PV1.38 - vars: - valueIn: PV1.38 - -# added condition to filter out if empty -specialCourtesy: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - generateList: true - expressionType: resource - specs: PV1.16 - vars: - valueIn: PV1.16 - -# added condition to filter out if empty -specialArrangement: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - generateList: true - expressionType: resource - specs: PV1.15 | OBR.30 | OBR.43 - vars: - valueIn: PV1.15 | OBR.30 | OBR.43 - -# added condition to filter out if empty -dischargeDisposition: - valueOf: datatype/CodeableConcept - condition: $valueIn NOT_NULL - expressionType: resource - specs: PV1.36 - vars: - valueIn: PV1.36 - -destination: - vars: - pv137: STRING_ALL, PV1.37 - condition: $pv137 NOT_NULL - valueOf: datatypes/DLD/Location - expressionType: reference - specs: PV1.37 \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/PatientContact.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/PatientContact.yml deleted file mode 100644 index 4b1b32c1f04..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/PatientContact.yml +++ /dev/null @@ -1,132 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -name: - valueOf: datatypes/XPN/HumanName - generateList: true - expressionType: resource - specs: NK1.2 - -relationship_1: - condition: $valueIn NOT_NULL - valueOf: datatype/CodeableConcept - expressionType: resource - generateList: true - specs: NK1.3 - vars: - valueIn: NK1.3 - -relationship_2: - condition: $hl7System EQUALS HL70063 && $hl7Code EQUALS OTH - valueOf: datatype/CodeableConcept - expressionType: resource - generateList: true - vars: - hl7Code: String, NK1.3.1 - hl7System: String, NK1.3.3 - constants: - primaryCode: U - primaryCodeSystem: PatientContactRelationship - primaryCodeDisplay: Unknown - -relationship_3: - condition: $hl7System EQUALS HL70063 && $hl7Code EQUALS UNK - valueOf: datatype/CodeableConcept - expressionType: resource - generateList: true - vars: - hl7Code: String, NK1.3.1 - hl7System: String, NK1.3.3 - constants: - primaryCode: U - primarySystem: PatientContactRelationship - primaryDisplay: Unknown - -address_1: - generateList: true - valueOf: datatype/Address - expressionType: resource - specs: NK1.4 - -telecom: - condition: $valueIn NOT_NULL - valueOf: datatype/ContactPoint - generateList: true - expressionType: resource - specs: NK1.5 - vars: - valueIn: NK1.5 - -telecom_business: - condition: $valueIn NOT_NULL - valueOf: datatype/ContactPoint - generateList: true - expressionType: resource - specs: NK1.6 - vars: - valueIn: NK1.6 - constants: - use: work - -period: - vars: - startDate: NK1.8 - endDate: NK1.9 - condition: $startDate NOT_NULL || $endDate NOT_NULL - expressionType: nested - expressionsMap: - start: - valueOf: "GeneralUtils.dateTimeWithZoneId(startDate,ZONEID)" - expressionType: JEXL - _start: - expressionType: nested - condition: $startDate NOT_NULL - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $startDate - expressionType: HL7Spec - end: - valueOf: "GeneralUtils.dateTimeWithZoneId(endDate,ZONEID)" - expressionType: JEXL - _end: - expressionType: nested - condition: $endDate NOT_NULL - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $endDate - expressionType: HL7Spec - -telecom_3-next-of-kin-telecomm-info: - condition: $valueIn NOT_NULL - valueOf: datatypes/XTN/ContactPoint - generateList: true - expressionType: resource - specs: NK1.40 - vars: - valueIn: NK1.40 - constants: - hl7v2Field: "next-of-kin-telecomm-info" - -organization: - condition: $XADAddress NOT_NULL || $XONOrganization NOT_NULL - expressionType: reference - valueOf: datatypes/XON/Organization - specs: NK1.13 - vars: - XADAddress: NK1.32 - XONOrganization: NK1.13 diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceAgent.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceAgent.yml deleted file mode 100644 index c473b76437e..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceAgent.yml +++ /dev/null @@ -1,21 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -type: - valueOf: datatype/CodeableConcept_var - expressionType: resource - vars: - code: $participantType - constants: - system: provenance-participant-type - -who_1: - condition: $orgSpec NOT_NULL - valueOf: resource/Organization - expressionType: reference - specs: $orgSpec - -who_2: - condition: $practitionerSpec NOT_NULL - valueOf: resource/Practitioner - expressionType: reference - specs: $practitionerSpec \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceEntity.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceEntity.yml deleted file mode 100644 index f9916f03e69..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/ProvenanceEntity.yml +++ /dev/null @@ -1,15 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -role: - type: STRING - value: source - -what: - valueOf: resource/Device - expressionType: reference - vars: - deviceName: MSH.3.1 - code: MSH.3.2 - display: MSH.3.1 - constants: - system: http://terminology.hl7.org/NamingSystem/uri \ No newline at end of file diff --git a/prime-router/metadata/HL7/catchall/hl7/secondary/Source.yml b/prime-router/metadata/HL7/catchall/hl7/secondary/Source.yml deleted file mode 100644 index bac0578c7d7..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/secondary/Source.yml +++ /dev/null @@ -1,174 +0,0 @@ -# $schema: ./../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -name_1: - type: STRING - valueOf: MSH.3 - expressionType: HL7Spec - -# For all other ID types -name_2: - type: URL - condition: $idStr NOT_NULL && $systemStr NOT_EQUALS ISO && $systemStr NOT_EQUALS UUID && $systemStr NOT_EQUALS DNS && $systemStr NOT_EQUALS URI && $systemStr NOT_EQUALS CLIA - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - systemStr: String, MSH.3.3 - value: MSH.3.1 + $dash + MSH.3.3 + $colon + MSH.3.2 - constants: - dash: "-" - colon: ":" - -name_3: - type: URL - condition: $idStr NOT_NULL && $systemStr NULL - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - systemStr: String, MSH.3.3 - value: MSH.3.1 + $dash + $colon + MSH.3.2 - constants: - dash: "-" - colon: ":" - -# For OIDs -endpoint_1: - type: URL - condition: $idStr NOT_NULL && $systemStr EQUALS ISO - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - value: $oidUrlPrefix + MSH.3.2 - systemStr: String, MSH.3.3 - constants: - oidUrlPrefix: "urn:oid:" - -# For UUIDs -endpoint_2: - type: URL - condition: $idStr NOT_NULL && $systemStr EQUALS UUID - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - value: $oidUrlPrefix + MSH.3.2 - systemStr: String, MSH.3.3 - constants: - oidUrlPrefix: "urn:uuid:" - -# For DNS -endpoint_3: - type: URL - condition: $idStr NOT_NULL && $systemStr EQUALS DNS - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - value: $oidUrlPrefix + MSH.3.2 - systemStr: String, MSH.3.3 - constants: - oidUrlPrefix: "urn:dns:" - -# For CLIA -endpoint_4: - type: URL - condition: $idStr NOT_NULL && $systemStr EQUALS CLIA - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - value: $oidUrlPrefix + MSH.3.2 - systemStr: String, MSH.3.3 - constants: - oidUrlPrefix: "urn:clia:" - -# For URIs -endpoint_5: - type: URL - condition: $idStr NOT_NULL && $systemStr EQUALS URI - valueOf: $value - expressionType: HL7Spec - vars: - idStr: String, MSH.3.2 - value: $oidUrlPrefix + MSH.3.2 - systemStr: String, MSH.3.3 - constants: - oidUrlPrefix: "urn:uri:" - -version: - type: STRING - valueOf: SFT.2 - expressionType: HL7Spec - -software: - type: STRING - valueOf: SFT.3 - expressionType: HL7Spec - -extension_1: - generateList: true - condition: $value NOT_NULL - valueOf: extension/Extension - expressionType: resource - vars: - value: String, SFT.4 - constants: - KEY_NAME_SUFFIX: String - urlValue: software-binary-id - -extension_2: - generateList: true - condition: $value NOT_NULL - valueOf: extension/Extension - expressionType: resource - vars: - value: String, SFT.5 - constants: - KEY_NAME_SUFFIX: String - urlValue: source-software-description - -extension_3-sft-install-date: - generateList: true - expressionType: nested - condition: $dateTimeIn NOT_NULL - vars: - dateTimeIn: SFT.6, GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID) - hl7Date: SFT.6 - expressionsMap: - url: - type: SYSTEM_URL - value: software-install-date - valueDateTime: - valueOf: $dateTimeIn - expressionType: HL7Spec - _valueDateTime: - expressionType: nested - expressionsMap: - extension_1: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: hl7v2-date-time - valueString: - type: STRING - valueOf: $hl7Date - expressionType: HL7Spec - -extension_4: - condition: $sft1 NOT_NULL - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: "software-vendor-org" - valueReference: - valueOf: resource/Organization - expressionType: reference - specs: SFT.1 - vars: - sft1: SFT.1 diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/MSH/segments/SFT/Source.yml b/prime-router/metadata/HL7/catchall/hl7/segments/MSH/segments/SFT/Source.yml deleted file mode 100644 index 578749497c9..00000000000 --- a/prime-router/metadata/HL7/catchall/hl7/segments/MSH/segments/SFT/Source.yml +++ /dev/null @@ -1,77 +0,0 @@ -# $schema: ./../../../../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json - -_endpoint: - expressionType: nested - expressionsMap: - extension: - generateList: true - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: data-absent-reason - valueCode: - value: "unknown" - -software: - expressionType: HL7Spec - type: STRING - valueOf: SFT.3 - -version: - expressionType: HL7Spec - type: STRING - valueOf: SFT.2 - -extension: - expressionType: nested - generateList: true - expressions: - - expressionType: nested - vars: - sft4: STRING, SFT.4 - condition: $sft4 NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: software-binary-id - valueString: - type: STRING - expressionType: HL7Spec - valueOf: SFT.4 - - vars: - sft5: STRING, SFT.5 - condition: $sft5 NOT_NULL - expressionType: nested - expressionsMap: - url: - type: SYSTEM_URL - value: source-software-description - valueString: - type: STRING - expressionType: HL7Spec - valueOf: SFT.5 - - expressionType: nested - vars: - sft6: STRING, SFT.6 - condition: $sft6 NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: software-install-date - valueString: - type: STRING - expressionType: HL7Spec - valueOf: SFT.6 - - expressionType: nested - vars: - sft1: STRING_ALL, SFT.1 - condition: $sft1 NOT_NULL - expressionsMap: - url: - type: SYSTEM_URL - value: software-vendor-org - valueReference: - valueOf: datatypes/XON/Organization - expressionType: reference - specs: SFT.1 \ No newline at end of file diff --git a/prime-router/settings/STLTs/CA/ca-phl.yml b/prime-router/settings/STLTs/CA/ca-phl.yml index 852cce78ff1..cb66c7b1199 100644 --- a/prime-router/settings/STLTs/CA/ca-phl.yml +++ b/prime-router/settings/STLTs/CA/ca-phl.yml @@ -14,7 +14,7 @@ - name: "ca-phl" description: "California Public Health Lab" jurisdiction: "STATE" - stateCode: "AL" + stateCode: "CA" senders: - name: "etor-nbs-results" organizationName: "ca-phl" diff --git a/prime-router/src/main/kotlin/cli/MappingCommands.kt b/prime-router/src/main/kotlin/cli/MappingCommands.kt new file mode 100644 index 00000000000..2dd3c4e7280 --- /dev/null +++ b/prime-router/src/main/kotlin/cli/MappingCommands.kt @@ -0,0 +1,147 @@ +package gov.cdc.prime.router.cli + +import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.CliktError +import com.github.ajalt.clikt.parameters.options.flag +import com.github.ajalt.clikt.parameters.options.option +import com.github.ajalt.clikt.parameters.types.file +import java.io.File +import java.io.IOException + +/** + * A CLI command class for handling data mapping tasks such as finding unreferenced files. + * This command can be extended to include more functionality in the future. + */ +class MappingCommands : + CliktCommand( + name = "data-mapping", + help = "CLI tool for data mapping tasks" +) { + /** + * The directory to scan for unreferenced files. + * This option is required when the `--find-unreferenced` flag is provided. + */ + private val inputDir by option("-d", "--directory", help = "Directory to scan for unreferenced files") + .file(true, canBeDir = true, mustBeReadable = true) + + /** + * Output file to write the list of unreferenced files. + * If provided, the results will be written to this file instead of being printed to the console. + */ + private val outputFile by option("-o", "--output-file", help = "Output file for unreferenced files") + .file() + + /** + * Flag to trigger the action of finding unreferenced files in the specified directory. + * When this flag is set, the command will search for files that are not referenced by any other files in the directory. + */ + private val findUnreferencedFiles by option( + "--find-unreferenced", + help = "Find unreferenced files in the directory" + ) + .flag(default = false) + + /** + * Main entry point for the command. + * If the `--find-unreferenced` flag is set, the command will find and print/write the unreferenced files. + * If no option is provided, a help message is displayed. + */ + override fun run() { + // If findUnreferencedFiles option is set, call the corresponding function + if (findUnreferencedFiles) { + if (inputDir == null) { + throw CliktError("You must specify a directory with --directory to find unreferenced files.") + } + findUnreferencedFiles(inputDir!!) + } else { + echo("No command specified. Use --help to find available options.") + } + } + + /** + * Main method to find unreferenced files in the given directory. + */ + private fun findUnreferencedFiles(directory: File) { + if (!directory.isDirectory) { + throw CliktError("The specified path '${directory.absolutePath}' is not a directory.") + } + + val allFiles = getAllFiles(directory) + + // Extract relative file paths without extensions + val relativePathsWithoutExtension = allFiles.map { + it.relativeTo(directory).path.removeSuffix(".${it.extension}") + } + + // Set of relative file paths that are referenced in other files + val referencedFiles = mutableSetOf() + + // Search for each relative path in other files + allFiles.forEach { file -> + referencedFiles.addAll(searchFileForReferences(file, relativePathsWithoutExtension)) + } + + // Find unreferenced files by checking which relative paths weren't found + val unreferencedFiles = allFiles.filter { + it.relativeTo(directory).path.removeSuffix(".${it.extension}") !in referencedFiles + }.sorted() + + // Output the result + if (unreferencedFiles.isNotEmpty()) { + if (outputFile != null) { + outputFile!!.writeText(unreferencedFiles.joinToString("\n") { it.absolutePath }) + echo("Wrote unreferenced files list to ${outputFile!!.absolutePath}") + } else { + echo("The following files are not referenced by any other files:") + unreferencedFiles.forEach { echo(it.absolutePath) } + echo( + """ + + Reminder: The paths are relative to the input directory. The input dir should be the top level of the mapping suite + """.trimIndent() + ) + } + } else { + echo("All files are referenced.") + } + } + + /** + * Searches the content of a file for references to relative file paths without the extension. + * + * @param file The file whose contents will be searched. + * @param relativePathsWithoutExtension A list of relative file paths without extensions to search for. + * @return A set of relative paths that were found as references within the file's content. + */ + private fun searchFileForReferences(file: File, relativePathsWithoutExtension: List): Set { + val referencedFiles = mutableSetOf() + try { + val content = file.readText() + + // Search for relative paths without extensions + relativePathsWithoutExtension.forEach { relativePath -> + // Build regex: match the path if it's followed by a path delimiter (/) or end of word + val regex = Regex( + "\\b$relativePath(\\.\\w+)?\\b" // Match with or without file extension + ) + + // If the pattern is found, add the relative path to referenced files + if (regex.containsMatchIn(content)) { + referencedFiles.add(relativePath) + } + } + } catch (e: IOException) { + // Ignore unreadable files (e.g., binary files or permission issues) + } + return referencedFiles + } + + /** + * Recursively collects all file paths in a given directory. + * It walks through the directory and gathers all regular files (ignores directories). + * + * @param directory The root directory to start searching from. + * @return A list of all files found in the directory. + */ + private fun getAllFiles(directory: File): List = directory.walkTopDown().filter { it.isFile }.toList() +} \ No newline at end of file diff --git a/prime-router/src/main/kotlin/cli/main.kt b/prime-router/src/main/kotlin/cli/main.kt index d930724a661..b078996cbcd 100644 --- a/prime-router/src/main/kotlin/cli/main.kt +++ b/prime-router/src/main/kotlin/cli/main.kt @@ -300,6 +300,7 @@ fun main(args: Array) = RouterCli() ValidateTranslationSchemaCommand(), SyncTranslationSchemaCommand(), ValidateYAMLCommand(), - PIIRemovalCommands() + PIIRemovalCommands(), + MappingCommands() ).context { terminal = Terminal(ansiLevel = AnsiLevel.TRUECOLOR) } .main(args) \ No newline at end of file diff --git a/prime-router/src/test/kotlin/cli/MappingCommandsTests.kt b/prime-router/src/test/kotlin/cli/MappingCommandsTests.kt new file mode 100644 index 00000000000..1fa5d8c2db8 --- /dev/null +++ b/prime-router/src/test/kotlin/cli/MappingCommandsTests.kt @@ -0,0 +1,76 @@ +package gov.cdc.prime.router.cli + +import assertk.assertThat +import assertk.assertions.contains +import assertk.assertions.doesNotContain +import com.github.ajalt.clikt.testing.test +import java.io.File +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.createTempDirectory +import kotlin.io.path.deleteRecursively +import kotlin.test.Test + +class MappingCommandsTest { + + private val command = MappingCommands() + + @Test + fun `should throw error when no directory is provided`() { + // Simulate running the command without providing a directory + val result = command.test( + "--find-unreferenced" + ) + // Ensure an error message is output + assertThat(result.stderr).contains("You must specify a directory") + } + + @OptIn(ExperimentalPathApi::class) + @Test + fun `should list unreferenced files in a directory`() { + val tempDir = createTempDirectory() + + // Create some test files + val file1 = File(tempDir.toString(), "file1.yml").apply { writeText("file1 content") } + val file2 = File(tempDir.toString(), "file2.yml").apply { writeText("Referencing file1: file1") } + + // Test the command + val result = command.test( + "--find-unreferenced", "--directory", tempDir.toString() + ) + + assertThat(result.stdout).contains(file2.absolutePath) + assertThat(result.stdout).doesNotContain(file1.absolutePath) + + // Cleanup + file1.delete() + file2.delete() + tempDir.deleteRecursively() + } + + @OptIn(ExperimentalPathApi::class) + @Test + fun `should write output to a file`() { + val tempDir = createTempDirectory() + val outputFile = File(tempDir.toString(), "output.txt") + + // Create some test files + val file1 = File(tempDir.toString(), "file1.yml").apply { writeText("file1 content") } + val file2 = File(tempDir.toString(), "file2.yml").apply { writeText("Referencing file1: file1") } + + // Test the command with output file option + command.test( + "--find-unreferenced", "--directory", tempDir.toString(), "--output-file", outputFile.absolutePath + ) + + // Check that the output file contains the correct data + val outputContent = outputFile.readText() + assertThat(outputContent).contains(file2.absolutePath) + assertThat(outputContent).doesNotContain(file1.absolutePath) + + // Cleanup + file1.delete() + file2.delete() + outputFile.delete() + tempDir.deleteRecursively() + } +} \ No newline at end of file diff --git a/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt b/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt index c0b172b699e..86686f264fe 100644 --- a/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt +++ b/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt @@ -134,8 +134,9 @@ class ValidateYMLCommandTests { "--type organizations --dir src/test/resources/yaml_validation/failure/recursive", ansiLevel = AnsiLevel.TRUECOLOR ) + val outputNormalized = result.stdout.replace("\\", "/") - assertThat(result.stdout).contains( + assertThat(outputNormalized).contains( "src/test/resources/yaml_validation/failure/recursive contains no YAML files!" ) assertThat(result.stderr).contains("No YAML files being validated!") diff --git a/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_FULLELR.fhir b/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_FULLELR.fhir index 8fd37b82a79..9ccf36c7252 100644 --- a/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_FULLELR.fhir +++ b/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_FULLELR.fhir @@ -326,12 +326,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -4643,12 +4637,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -4992,12 +4980,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -5377,12 +5359,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -5726,12 +5702,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -6111,12 +6081,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -6460,12 +6424,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -7890,12 +7848,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -8271,12 +8223,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -8626,12 +8572,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -8981,12 +8921,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -9343,12 +9277,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -9698,12 +9626,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -10053,12 +9975,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -10408,12 +10324,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -10763,12 +10673,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -11118,12 +11022,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -11473,12 +11371,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -15786,12 +15678,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -15956,12 +15842,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -17140,12 +17020,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -17310,12 +17184,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -18494,12 +18362,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -18664,12 +18526,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } diff --git a/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_MARSOTC.fhir b/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_MARSOTC.fhir index 3d051063f08..097f4e1f6d6 100644 --- a/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_MARSOTC.fhir +++ b/prime-router/src/test/resources/fhirengine/smoketest/Expected_HL7_to_FHIR_MARSOTC.fhir @@ -730,12 +730,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -911,12 +905,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } diff --git a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_1_20230220-0001.fhir b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_1_20230220-0001.fhir index e2366821180..c9f00aedf81 100644 --- a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_1_20230220-0001.fhir +++ b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_1_20230220-0001.fhir @@ -465,12 +465,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -1469,12 +1463,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -4841,12 +4829,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } diff --git a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_2_20230220-0001.fhir b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_2_20230220-0001.fhir index 869ae0da8e2..85506bc3b54 100644 --- a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_2_20230220-0001.fhir +++ b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_AOE_2_20230220-0001.fhir @@ -459,12 +459,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -1463,12 +1457,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -4835,12 +4823,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } diff --git a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20230831-0001.fhir b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20230831-0001.fhir index 93508649dae..17e218b8700 100644 --- a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20230831-0001.fhir +++ b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20230831-0001.fhir @@ -25,12 +25,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -185,12 +179,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0301", "code" : "ISO" } @@ -217,12 +205,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -244,12 +226,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -275,12 +251,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0301", "code" : "DNS" } @@ -305,12 +275,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -334,12 +298,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0119", "code" : "NW" } @@ -358,12 +316,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "VN", "display" : "Visit number" @@ -376,12 +328,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "CMS" } ] @@ -392,12 +338,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "MN Public Health Lab" } ] @@ -414,12 +354,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "PLAC", "display" : "Placer Identifier" @@ -469,12 +403,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "54089-8", "display" : "Newborn screening panel American Health Information Community (AHIC)" @@ -512,12 +440,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -539,12 +461,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -566,12 +482,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -583,12 +493,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -643,12 +547,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -670,12 +568,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -685,12 +577,6 @@ { "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/organization-name-type", "valueCoding" : { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0204", "code" : "L", "display" : "Legal name" @@ -719,12 +605,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -750,12 +630,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -783,12 +657,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -810,12 +678,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -839,12 +701,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://unitsofmeasure.org", "code" : "g", "display" : "gram" @@ -867,12 +723,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "8339-4", "display" : "BIRTH WEIGHT MEASURED" @@ -919,12 +769,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -948,12 +792,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://unitsofmeasure.org", "code" : "wk", "display" : "week" @@ -976,12 +814,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57714-8", "display" : "OBSTETRIC ESTIMATION OF GESTATIONAL AGE" @@ -1028,12 +860,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1067,12 +893,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57713-0", "display" : "INFANT FACTORS THAT AFFECT NEWBORN SCREENING INTERPRETATION" @@ -1094,12 +914,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA12419-0", "display" : "INFANT IN NICU AT TIME OF SPECIMEN COLLECTION" @@ -1122,12 +936,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1161,12 +969,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNDSIB", "display" : "DOES THE BABY HAVE A DECEASED SIBLING?" @@ -1188,12 +990,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1216,12 +1012,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1255,12 +1045,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNDEFECT", "display" : "DOES THE BABY HAVE BIRTH DEFECTS?" @@ -1282,12 +1066,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1310,12 +1088,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1349,12 +1121,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNFAM", "display" : "FAMILY HISTORY OF DISORDER ON MN SCREENING PANEL" @@ -1376,12 +1142,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1404,12 +1164,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1443,12 +1197,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "67704-7", "display" : "FEEDING TYPES" @@ -1470,12 +1218,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA12418-2", "display" : "TPN" @@ -1498,12 +1240,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1537,12 +1273,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "67704-7", "display" : "FEEDING TYPES" @@ -1564,12 +1294,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA16914-6", "display" : "BREAST MILK" @@ -1592,12 +1316,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1631,12 +1349,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57723-9", "display" : "UNIQUE BAR CODE NUMBER OF CURRENT SAMPLE" @@ -1658,12 +1370,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "0516199364" } ] @@ -1684,12 +1390,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1723,12 +1423,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62328-0", "display" : "DISCHARGE PROVIDER PRACTICE PHONE NUMBER" @@ -1764,12 +1458,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1803,12 +1491,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62324-9", "display" : "POST-DISCHARGE PROVIDER NAME" @@ -1844,12 +1526,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1883,12 +1559,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62326-4", "display" : "POST-DISCHARGE PROVIDER PRACTICE NAME" @@ -1924,12 +1594,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1944,12 +1608,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://snomed.info/sct", "code" : "440500007", "display" : "Blood spot specimen" @@ -1978,22 +1636,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -2011,12 +1657,6 @@ "activity" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0003", "code" : "ORM", "display" : "ORM_ORM" @@ -2028,12 +1668,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type", "code" : "author" } @@ -2047,12 +1681,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type", "code" : "author" } @@ -2087,22 +1715,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -2114,12 +1730,6 @@ "purpose" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/contactentity-type", "code" : "ADMIN", "display" : "Administrative" @@ -2145,22 +1755,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -2172,12 +1770,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -2232,23 +1824,11 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P", "display" : "Epic" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P", "display" : "Epic" @@ -2260,12 +1840,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/NamingSystem/uri", "code" : "Epic", "display" : "Epic" @@ -2296,22 +1870,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } diff --git a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20231013-0002.fhir b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20231013-0002.fhir index 1911df7fcdc..c0978f5706d 100644 --- a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20231013-0002.fhir +++ b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_OML_20231013-0002.fhir @@ -25,12 +25,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -117,12 +111,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -136,12 +124,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0301", "code" : "DNS" } @@ -166,12 +148,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -203,12 +179,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -230,12 +200,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -249,12 +213,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0301", "code" : "DNS" } @@ -279,12 +237,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -308,12 +260,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0119", "code" : "NW" } @@ -332,12 +278,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "VN", "display" : "Visit number" @@ -350,12 +290,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "CMS" } ] @@ -366,12 +300,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "MN Public Health Lab" } ] @@ -388,12 +316,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "PLAC", "display" : "Placer Identifier" @@ -409,12 +331,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "54089-8", "display" : "Newborn screening panel American Health Information Community (AHIC)" @@ -444,12 +360,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -474,12 +384,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -504,12 +408,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -521,12 +419,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -581,12 +473,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -608,12 +494,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -623,12 +503,6 @@ { "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/organization-name-type", "valueCoding" : { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0204", "code" : "L", "display" : "Legal name" @@ -657,12 +531,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -688,12 +556,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -721,12 +583,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -748,12 +604,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -777,12 +627,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://unitsofmeasure.org", "code" : "g", "display" : "gram" @@ -805,12 +649,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "8339-4", "display" : "BIRTH WEIGHT MEASURED" @@ -849,12 +687,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -878,12 +710,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://unitsofmeasure.org", "code" : "wk", "display" : "week" @@ -906,12 +732,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57714-8", "display" : "OBSTETRIC ESTIMATION OF GESTATIONAL AGE" @@ -950,12 +770,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -989,12 +803,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57713-0", "display" : "INFANT FACTORS THAT AFFECT NEWBORN SCREENING INTERPRETATION" @@ -1008,12 +816,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA12419-0", "display" : "INFANT IN NICU AT TIME OF SPECIMEN COLLECTION" @@ -1036,12 +838,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1075,12 +871,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNDSIB", "display" : "DOES THE BABY HAVE A DECEASED SIBLING?" @@ -1094,12 +884,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1122,12 +906,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1161,12 +939,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNDEFECT", "display" : "DOES THE BABY HAVE BIRTH DEFECTS?" @@ -1180,12 +952,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1208,12 +974,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1247,12 +1007,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "MNFAM", "display" : "FAMILY HISTORY OF DISORDER ON MN SCREENING PANEL" @@ -1266,12 +1020,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "99MDH", "code" : "N", "display" : "No" @@ -1294,12 +1042,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1333,12 +1075,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "67704-7", "display" : "FEEDING TYPES" @@ -1352,12 +1088,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA12418-2", "display" : "TPN" @@ -1380,12 +1110,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1419,12 +1143,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "67704-7", "display" : "FEEDING TYPES" @@ -1438,12 +1156,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "LA16914-6", "display" : "BREAST MILK" @@ -1466,12 +1178,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1505,12 +1211,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "57723-9", "display" : "UNIQUE BAR CODE NUMBER OF CURRENT SAMPLE" @@ -1524,12 +1224,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "code" : "0516199364" } ] @@ -1550,12 +1244,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1589,12 +1277,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62328-0", "display" : "DISCHARGE PROVIDER PRACTICE PHONE NUMBER" @@ -1622,12 +1304,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1661,12 +1337,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62324-9", "display" : "POST-DISCHARGE PROVIDER NAME" @@ -1694,12 +1364,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1733,12 +1397,6 @@ "code" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://loinc.org", "code" : "62326-4", "display" : "POST-DISCHARGE PROVIDER PRACTICE NAME" @@ -1766,12 +1424,6 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" } @@ -1786,12 +1438,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://snomed.info/sct", "code" : "440500007", "display" : "Blood spot specimen" @@ -1822,22 +1468,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -1847,12 +1481,6 @@ "activity" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0003", "code" : "ORM", "display" : "ORM_ORM" @@ -1864,12 +1492,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type", "code" : "author" } @@ -1883,12 +1505,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type", "code" : "author" } @@ -1923,22 +1539,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -1950,12 +1554,6 @@ "purpose" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/contactentity-type", "code" : "ADMIN", "display" : "Administrative" @@ -1981,22 +1579,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } @@ -2008,12 +1594,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -2068,23 +1648,11 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P", "display" : "Epic" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P", "display" : "Epic" @@ -2096,12 +1664,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/NamingSystem/uri", "code" : "Epic", "display" : "Epic" @@ -2132,22 +1694,10 @@ ], "tag" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0103", "code" : "P" }, { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0207", "code" : "P" } diff --git a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_RADx_MARS_20230406-0002.fhir b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_RADx_MARS_20230406-0002.fhir index 861ae95aa52..4aaff1e9acf 100644 --- a/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_RADx_MARS_20230406-0002.fhir +++ b/prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_RADx_MARS_20230406-0002.fhir @@ -163,12 +163,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0301", "code" : "ISO" } @@ -489,12 +483,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -1478,12 +1466,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } @@ -4870,12 +4852,6 @@ "dataAbsentReason" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/data-absent-reason", "code" : "unknown" } diff --git a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oml_20240319-001.fhir b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oml_20240319-001.fhir index 720e3e86110..89311771508 100644 --- a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oml_20240319-001.fhir +++ b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oml_20240319-001.fhir @@ -732,12 +732,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -818,12 +812,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -891,12 +879,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } diff --git a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001-with-enrichment.fhir b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001-with-enrichment.fhir index 84618c0e3e0..79b994c95a1 100644 --- a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001-with-enrichment.fhir +++ b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001-with-enrichment.fhir @@ -734,12 +734,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -820,12 +814,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -893,12 +881,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } diff --git a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001.fhir b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001.fhir index 771c65eeb38..1848c5a801e 100644 --- a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001.fhir +++ b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_orm_20230809-001.fhir @@ -732,12 +732,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -818,12 +812,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } @@ -891,12 +879,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "NPI" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-dns.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-dns.fhir index be08e00f8bb..7bb4496262a 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-dns.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-dns.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -113,10 +109,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-empty-hd3.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-empty-hd3.fhir index ce99cd90f1d..0ad8b94f6eb 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-empty-hd3.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-empty-hd3.fhir @@ -46,10 +46,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -107,10 +103,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-iso.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-iso.fhir index f221a49abab..3a875dccaf5 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-iso.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-iso.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -113,10 +109,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-uuid.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-uuid.fhir index d6260b1cfd1..7ca28f14fa3 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-uuid.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/hd/HD-to-Location-uuid.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -113,10 +109,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-everything-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-everything-valued.fhir index b78448816af..6a9c8072e75 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-everything-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-everything-valued.fhir @@ -224,10 +224,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -315,10 +311,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -402,10 +394,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -496,10 +484,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -549,10 +533,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -640,10 +620,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-msh6-msh23-valued-msh5-msh25-not-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-msh6-msh23-valued-msh5-msh25-not-valued.fhir index 8be78fd3a88..e5889989e54 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-msh6-msh23-valued-msh5-msh25-not-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/MSH-to-MessageHeader-msh6-msh23-valued-msh5-msh25-not-valued.fhir @@ -85,10 +85,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -179,10 +175,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-msh6-not-valued-msh23-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-msh6-not-valued-msh23-valued.fhir index b48f43ade20..345330a7c9e 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-msh6-not-valued-msh23-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-msh6-not-valued-msh23-valued.fhir @@ -63,10 +63,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -157,10 +153,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-prefers-msh6.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-prefers-msh6.fhir index 15ee5b2d4a3..a8237943e9f 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-prefers-msh6.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/msh/hd/HD-to-Destination-prefers-msh6.fhir @@ -97,10 +97,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -191,10 +187,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/ndl/NDL-to-PractitionerRole.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/ndl/NDL-to-PractitionerRole.fhir index cef72fe5e76..24340ff9155 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/ndl/NDL-to-PractitionerRole.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/ndl/NDL-to-PractitionerRole.fhir @@ -387,10 +387,6 @@ "url" : "http://hl7.org/fhir/StructureDefinition/event-performerFunction", "valueCodeableConcept" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "TRANS" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/nte/NTE-to-annotation.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/nte/NTE-to-annotation.fhir index eeef0e20302..611f53f3d5a 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/nte/NTE-to-annotation.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/nte/NTE-to-annotation.fhir @@ -528,12 +528,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-not-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-not-valued.fhir index 9bd4fd061db..230b967a62f 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-not-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-not-valued.fhir @@ -176,10 +176,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -270,10 +266,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-obx24-not-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-obx24-not-valued.fhir index ce5ac3ef9dc..e81fc9fb864 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-obx24-not-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-obx24-not-valued.fhir @@ -231,12 +231,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -359,12 +353,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-valued.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-valued.fhir index ad1dd1c309c..8e260cb1c46 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-valued.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-obx25-valued.fhir @@ -319,10 +319,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -410,10 +406,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-st-value.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-st-value.fhir index 47b1485431a..ad5828eb4f5 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-st-value.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/obx/OBX-to-Observation-st-value.fhir @@ -1362,12 +1362,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -1486,12 +1480,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-obr-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-obr-populated.fhir index b787b6cc7a5..d86386bb0fd 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-obr-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-obr-populated.fhir @@ -3668,12 +3668,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "TRANS" } @@ -3974,12 +3968,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "TRANS" } @@ -4280,12 +4268,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "SPRF" } @@ -4586,12 +4568,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "SPRF" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-obr-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-obr-populated.fhir index fa5c1e98ef3..74402359566 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-obr-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-obr-populated.fhir @@ -1645,12 +1645,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -1769,12 +1763,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2170,12 +2158,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2294,12 +2276,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -4830,12 +4806,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "TRANS" } @@ -5136,12 +5106,6 @@ "valueCodeableConcept" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType", "code" : "SPRF" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-populated.fhir index 7ec961e929e..e46452d67c1 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-orc-populated.fhir @@ -1282,12 +1282,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -1406,12 +1400,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2015,12 +2003,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2139,12 +2121,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2176,12 +2152,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2300,12 +2270,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-requester-practitionerrole-orc21-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-requester-practitionerrole-orc21-populated.fhir index 0aeb1c71764..56f131f3c2f 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-requester-practitionerrole-orc21-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orcobr/orc_obr-to-servicerequest_diagnosticreport-requester-practitionerrole-orc21-populated.fhir @@ -317,10 +317,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -408,10 +404,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -455,10 +447,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -546,10 +534,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orur01/oru_r01-full.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orur01/oru_r01-full.fhir index 60702f4e7ce..b66247c7613 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orur01/oru_r01-full.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/orur01/oru_r01-full.fhir @@ -334,12 +334,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -1865,12 +1859,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -1997,12 +1985,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2034,12 +2016,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2166,12 +2142,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2275,12 +2245,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2407,12 +2371,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -2444,12 +2402,6 @@ "physicalType" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } @@ -2576,12 +2528,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } @@ -3224,12 +3170,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -3509,12 +3449,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -3950,12 +3884,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -5151,12 +5079,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -5430,12 +5352,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -5989,12 +5905,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } @@ -6152,12 +6062,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "XX" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-blank-14-10-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-blank-14-10-populated.fhir index 5267e5ff91a..3ff511a1327 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-blank-14-10-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-blank-14-10-populated.fhir @@ -846,10 +846,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -937,10 +933,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -964,10 +956,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1055,10 +1043,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1134,10 +1118,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1231,10 +1211,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1257,10 +1233,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1354,10 +1326,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-populated.fhir index 834306ebcd9..6029112e55b 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pd1/pd1-to-patient-pd1-14-1-populated.fhir @@ -818,10 +818,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -915,10 +911,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -942,10 +934,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1039,10 +1027,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1118,10 +1102,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1215,10 +1195,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1242,10 +1218,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1339,10 +1311,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pid/pid.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pid/pid.fhir index e7d8641202a..f32893b77d0 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pid/pid.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pid/pid.fhir @@ -84,12 +84,6 @@ "activity" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0003", "code" : "R01", "display" : "ORU_R01" @@ -101,12 +95,6 @@ "type" : { "coding" : [ { - "extension" : [ - { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } - ], "system" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type", "code" : "author" } diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-n.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-n.fhir index b8b495a5c64..58aed12f9a9 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-n.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-n.fhir @@ -1098,10 +1098,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1189,10 +1185,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1216,10 +1208,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1307,10 +1295,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-y.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-y.fhir index 2d4618b966d..f9ec63b8693 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-y.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter-pv22-y.fhir @@ -1098,10 +1098,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1189,10 +1185,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1216,10 +1208,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1307,10 +1295,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter.fhir index 3be13ac7795..20b0b5286a6 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/pv1pv2/PV1-PV2-to-Encounter.fhir @@ -1098,10 +1098,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1189,10 +1185,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -1216,10 +1208,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -1307,10 +1295,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated-xon3-empty.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated-xon3-empty.fhir index 7a2d1217c8a..433bbadb687 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated-xon3-empty.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated-xon3-empty.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -118,10 +114,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -171,10 +163,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -240,10 +228,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated.fhir index 1beaec64cf7..b7514ec17e3 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization-xon10-populated.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -121,10 +117,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -174,10 +166,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -246,10 +234,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization.fhir b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization.fhir index 51f52686a1c..45aed61d0bc 100644 --- a/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization.fhir +++ b/prime-router/src/testIntegration/resources/datatests/mappinginventory/catchall/xon/xon-to-organization.fhir @@ -49,10 +49,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -140,10 +136,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] @@ -193,10 +185,6 @@ "name" : "Hospital A", "physicalType" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/location-physical-type", "code" : "si" } ] @@ -284,10 +272,6 @@ } ], "type" : { "coding" : [ { - "extension" : [ { - "url" : "https://reportstream.cdc.gov/fhir/StructureDefinition/code-index-name", - "valueString" : "identifier" - } ], "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MD" } ] diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index c166e033acd..d372ead6770 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -12,10 +12,10 @@ repositories { } dependencies { - implementation("org.apache.commons:commons-lang3:3.15.0") + implementation("org.apache.commons:commons-lang3:3.17.0") testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1") - testImplementation("org.apache.commons:commons-compress:1.26.2") + testImplementation("org.apache.commons:commons-compress:1.27.1") } tasks.test { diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index 4f3f4c9294e..5c99ee9f63e 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -1,10 +1,10 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { - id("org.springframework.boot") version "3.3.2" + id("org.springframework.boot") version "3.3.4" id("io.spring.dependency-management") version "1.1.6" id("reportstream.project-conventions") - kotlin("plugin.spring") version "2.0.0" + kotlin("plugin.spring") version "2.0.20" } group = "gov.cdc.prime" @@ -29,9 +29,9 @@ dependencies { testImplementation("org.xmlunit:xmlunit-core:2.10.0") testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0") - testImplementation("org.apache.commons:commons-compress:1.26.2") + testImplementation("org.apache.commons:commons-compress:1.27.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.9.0") implementation(project(":shared")) }