Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment of 2024-11-14 #16545

Merged
merged 5 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/operations/ @cdcgov/PRIME-ReportStream-DevOps
/CODEOWNERS @cdcgov/PRIME-ReportStream-DevOps
/prime-router/ @cdcgov/PRIME-ReportStream-CODEOWNERS-backend
/prime-router/src/main/resources/metadata/fhir_transforms/senders/Flexion @cdcgov/trusted-intermediary
/prime-router/settings/STLTs/Flexion @cdcgov/trusted-intermediary

# The CODEOWNERS file takes the last matching line into account. You can make definitions with empty owners to specify paths/files without an owner.
/prime-router/settings/prod/
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/alert_PD_schedule_Slack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
- cron: "7 13 * * Mon" #UTC-5

env:
channel: prime-reportstream-engineering
channel: temp-cdc-rs-notifications
# prime-reportstream-engineering

jobs:
pre_job:
Expand Down Expand Up @@ -82,7 +83,7 @@ jobs:
🔸"Next": *"${{ env.Schedules_oncallSchedule_3_NextPersonName }}"* : \`"${{ env.Schedules_oncallSchedule_3_NextFrom }}"\` _until_ \`"${{ env.Schedules_oncallSchedule_3_NextUntil }}"\`
icon-emoji: ':alarm_clock:'
channel: ${{ env.channel }}
webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}
color: good

PDAlert_WeekDays:
Expand Down Expand Up @@ -133,5 +134,5 @@ jobs:
❗"Now": *"${{ env.Schedules_oncallSchedule_3_OnCallPersonName }}"*
icon-emoji: ':alarm_clock:'
channel: ${{ env.channel }}
webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}
color: good
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@
- id: "obx-observation"
url: "https://reportstream.cdc.gov/fhir/StructureDefinition/obx-observation"

# PRT
- id: "prt-extension"
url: "https://reportstream.cdc.gov/fhir/StructureDefinition/prt-extension"

# SPM -> Specimen
- id: "specimen-source-site-modifier"
url: "https://reportstream.cdc.gov/fhir/StructureDefinition/specimen-source-site-modifier"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# $schema: ./../../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json

resourceType: Identifier

value:
type: STRING
valueOf: CX.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ start:
dateTimeIn: $start
_start:
expressionType: nested
condition: $dateTimeIn NOT_NULL
condition: $start NOT_NULL
expressionsMap:
extension_1:
generateList: true
Expand All @@ -20,7 +20,7 @@ _start:
value: hl7v2-date-time
valueString:
type: STRING
valueOf: $dateTimeIn
valueOf: $start
expressionType: HL7Spec

end:
Expand All @@ -32,7 +32,7 @@ end:
dateTimeIn: $end
_end:
expressionType: nested
condition: $dateTimeOut NOT_NULL
condition: $end NOT_NULL
expressionsMap:
extension_1:
generateList: true
Expand All @@ -43,5 +43,5 @@ _end:
value: hl7v2-date-time
valueString:
type: STRING
valueOf: $dateTimeOut
valueOf: $end
expressionType: HL7Spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ deviceIdentifier:
extension:
expressionType: nested
generateList: true
vars:
ei2: EI.2
ei3: EI.3
ei4: EI.4
condition: $ei2 NOT_NULL || $ei3 NOT_NULL || $ei4 NOT_NULL
expressions:
- expressionType: nested
expressionsMap:
Expand All @@ -19,6 +24,7 @@ extension:
expressionType: nested
expressions:
- expressionType: nested
condition: $ei2 NOT_NULL
expressionsMap:
url:
type: SYSTEM_URL
Expand All @@ -28,6 +34,7 @@ extension:
expressionType: HL7Spec
valueOf: EI.2
- expressionType: nested
condition: $ei3 NOT_NULL
expressionsMap:
url:
type: SYSTEM_URL
Expand All @@ -37,6 +44,7 @@ extension:
expressionType: HL7Spec
valueOf: EI.3
- expressionType: nested
condition: $ei4 NOT_NULL
expressionsMap:
url:
type: SYSTEM_URL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ extension_1-assigning-authority:
ei2: EI.2
ei3: EI.3
ei4: EI.4
condition: $ei2 NOT_NULL || $ei3 NOT_NULL || $ei4 NOT_NULL
expressionsMap:
url:
type: SYSTEM_URL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ extension_2-universalId:

extension_3-universalIdType:
generateList: true
vars:
universalIdType: String, HD.3
condition: $universalIdType NOT_NULL
expressionType: nested
expressionsMap:
url:
Expand All @@ -44,7 +47,7 @@ extension_3-universalIdType:
expressionType: HL7Spec

extension_4-universalIdUnknownType:
condition: $universalIdType NOT_EQUALS ISO && $universalIdType NOT_EQUALS UUID
condition: $universalId NOT_NULL && $universalIdType NOT_EQUALS ISO && $universalIdType NOT_EQUALS UUID
generateList: true
expressionType: nested
expressionsMap:
Expand All @@ -56,10 +59,11 @@ extension_4-universalIdUnknownType:
valueOf: HD.2
expressionType: HL7Spec
vars:
universalId: String, HD.2
universalIdType: String, HD.3

extension_5-universalIdUnknownType:
condition: $universalIdType NULL
condition: $universalId NOT_NULL && $universalIdType NULL
generateList: true
expressionType: nested
expressionsMap:
Expand All @@ -71,4 +75,5 @@ extension_5-universalIdUnknownType:
valueOf: HD.2
expressionType: HL7Spec
vars:
universalId: String, HD.2
universalIdType: String, HD.3
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ identifier_1:
valueOf: HD.2

extension_1-unknownUniversalIdType:
condition: $universalId NOT_EQUALS ISO && $universalId NOT_EQUALS UUID
condition: $universalId NOT_NULL && $universalIdType NOT_EQUALS ISO && $universalIdType NOT_EQUALS UUID
generateList: true
expressionType: nested
expressionsMap:
Expand All @@ -37,10 +37,11 @@ extension_1-unknownUniversalIdType:
type: STRING
valueOf: HD.2
vars:
universalId: STRING, HD.3
universalId: String, HD.2
universalIdType: STRING, HD.3

extension_2-unknownUniversalIdType:
condition: $universalId NULL
condition: $universalId NOT_NULL && $universalIdType NULL
generateList: true
expressionType: nested
expressionsMap:
Expand All @@ -52,7 +53,8 @@ extension_2-unknownUniversalIdType:
type: STRING
valueOf: HD.2
vars:
universalId: STRING, HD.3
universalId: String, HD.2
universalIdType: STRING, HD.3

extension_3-universalIdType:
generateList: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# $schema: ./../../../../../json_schema/fhir/hl7-to-fhir-mapping-resource-template.json

value:
type: STRING
valueOf: PLN.1
expressionType: HL7Spec

type:
valueOf: datatypes/CWE/CodeableConcept
specs: PLN.2
expressionType: resource

period:
vars:
endDate: PLN.4
condition: $endDate NOT_NULL
expressionType: nested
expressionsMap:
end:
valueOf: "GeneralUtils.dateTimeWithZoneId(endDate,ZONEID)"
expressionType: JEXL
_end:
expressionType: nested
expressionsMap:
extension_1:
generateList: true
expressionType: nested
expressionsMap:
url:
type: SYSTEM_URL
value: hl7v2-date-time
valueString:
type: STRING
valueOf: $endDate
expressionType: HL7Spec

extension:
generateList: true
expressionType: nested
expressionsMap:
url:
type: STRING
value: PLN.3
valueString:
type: STRING
expressionType: HL7Spec
valueOf: PLN.3
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ identifier:
xcn11: String, XCN.11
xcn12: String, XCN.12
xcn13: String, XCN.13
xcn14: String, XCN.14
expressionsMap:
value:
type: STRING
Expand Down Expand Up @@ -88,6 +89,18 @@ identifier:
valueOf: XCN.12
type: STRING
expressionType: HL7Spec
extension_3-assigningFacility:
condition: $xcn14 NOT_NULL
generateList: true
expressionType: nested
expressionsMap:
url:
type: SYSTEM_URL
value: identifier-location
valueReference:
expressionType: reference
valueOf: datatypes/HD/Location
specs: XCN.14

name:
expressionType: nested
Expand Down
Loading
Loading