Skip to content

Commit 76c5381

Browse files
oslynnoslynn
authored
Merge branch 'master' into oo/oslynn/15664/Update_REST_Transport_For_Oracle-rln-etor-nbs-results
2 parents f70db46 + 851a1da commit 76c5381

File tree

10 files changed

+744
-3
lines changed

10 files changed

+744
-3
lines changed

‎.environment/gitleaks/gitleaks-config.toml

+1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ title = "PRIME ReportStream Gitleaks Configuration"
206206
'\"apiKey\"',
207207
'api-key\" to \"oracle123\"',
208208
'Authorization-Type: \"username/password\"',
209+
'cdctiautomated_sa'
209210
]
210211
paths = [
211212
'.terraform/modules/',

‎operations/app/terraform/modules/function_app/locals.tf

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ locals {
1818
"RS_OKTA_authkey" = var.RS_OKTA_authKey
1919
"RS_OKTA_ClientId" = var.RS_OKTA_clientId
2020
"ETOR_TI_baseurl" = var.etor_ti_base_url
21+
"cdctiautomated" = var.cdctiautomated_sa
2122
# Manage client secrets via a Key Vault
2223
"CREDENTIAL_STORAGE_METHOD" = "AZURE"
2324
"CREDENTIAL_KEY_VAULT_NAME" = var.client_config_key_vault_name

‎operations/app/terraform/modules/function_app/~inputs.tf

+3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ variable "RS_OKTA_authKey" {}
9090
variable "RS_OKTA_clientId" {}
9191
variable "RS_OKTA_scope" {}
9292
variable "etor_ti_base_url" {}
93+
variable "cdctiautomated_sa" {
94+
default = ""
95+
}
9396

9497
variable "subnets" {
9598
description = "A set of all available subnet combinations"

‎operations/app/terraform/vars/staging/data.tf

+6
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,10 @@ data "azurerm_key_vault_secret" "RS_OKTA_authKey" {
9393
name = "functionapp-RS-OKTA-authkey"
9494
key_vault_id = data.azurerm_key_vault.app_config.id
9595

96+
}
97+
98+
data "azurerm_key_vault_secret" "cdctiautomated_sa" {
99+
name = "functionapp-cdctiautomated"
100+
key_vault_id = data.azurerm_key_vault.app_config.id
101+
96102
}

‎operations/app/terraform/vars/staging/main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ module "function_app" {
160160
RS_OKTA_clientId = data.azurerm_key_vault_secret.RS_OKTA_clientId.value
161161
RS_OKTA_authKey = data.azurerm_key_vault_secret.RS_OKTA_authKey.value
162162
etor_ti_base_url = local.init.etor_ti_base_url
163+
cdctiautomated_sa = data.azurerm_key_vault_secret.cdctiautomated_sa.value
163164
}
164165

165166
module "front_door" {

‎prime-router/src/main/resources/metadata/fhir_transforms/senders/SimpleReport/simple-report-sender-transform.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,12 @@ elements:
627627
values:
628628
partial: A
629629
corrected: C
630+
entered-in-error: C
630631
amended: C
631632
final: F
632633
preliminary: P
633634
cancelled: X
634635

635-
636636
# Observation
637637
- name: sr-observation-value-type-cwe
638638
condition: '%resource.value is CodeableConcept'

‎prime-router/src/testIntegration/resources/datatests/FHIR_to_HL7/sample_CO_20240403.hl7

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MSH|^~\&|CDC PRIME - Atlanta, Georgia (Dekalb)^2.16.840.1.114222.4.1.237821^ISO|CDC PRIME^11D2030855^CLIA|CO-ELR|CO|20240321222008+0000||ORU^R01^ORU_R01|a375227a-751f-4035-8e0b-e81322f356c9|P|2.5.1|||NE|NE|USA|UNICODE UTF-8|ENG^English^ISO||PHLabReport-NoAck^ELR_Receiver^2.16.840.1.113883.9.11^ISOSFT|Centers for Disease Control and Prevention|0.2-SNAPSHOT|PRIME ReportStream|0.2-SNAPSHOT||20240321194832+0000PID|1||10083d1d-dc8b-4ea0-91fa-8744cf0f013b^^^Testing Lab&12D4567890&CLIA^PI^Testing Lab&12D4567890&CLIA||Wolf^Karolann^^^^^L||19700201|F||1002-5^native^^^^^2.5.1^^native|123 Main st^^Austtin^TX^78731^USA||(800) 232 4636^PRS^CP^^1^800^2324636^^^^^(800) 232 4636|^NET^Internet^[email protected]||||||||H^Hispanic or Latino^HL70189^^^^2.9^^Hispanic or Latino||||||||NORC|RE|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|||||||||1245319599^McTester^Phil^^^^^^NPI&2.16.840.1.113883.4.6&ISO^L^^^NPI||(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|20240321222008+0000||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|321 Ocean Drive^^Houston^TX^77001^USAOBR|1|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|95422-2^Influenza virus A and B and SARS-CoV-2 (COVID-19) RNA panel - Respiratory system specimen by NAA with probe detection^LN|||20240321220508+0000|||||||||1245319599^McTester^Phil^^^^^^NPI&2.16.840.1.113883.4.6&ISO^L^^^NPI|(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|||||20240321222008+0000OBX|1|CWE|92141-1^Influenza virus B RNA [Presence] in Respiratory system specimen by NAA with probe detection^LN^^^^^^Flu B||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USANTE|1||Corrected Result: DUPLICATE_TESTOBX|2|CWE|95423-0^Influenza virus A and B and SARS-CoV-2 (COVID-19) identified in Respiratory system specimen by NAA with probe detection^LN^^^^^^COVID-19||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USAOBX|3|CWE|92142-9^Influenza virus A RNA [Presence] in Respiratory system specimen by NAA with probe detection^LN^^^^^^Flu A||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USAOBX|4|CWE|95419-8^Has symptoms related to condition of interest^LN^^^^2.69^^Has symptoms related to condition of interest||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|5|DT|11368-8^Illness or injury onset date and time^LN^^^^^^Illness or injury onset date and time||20240321000000+0000|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|6|CWE|82810-3^Pregnancy status^LN^^^^2.68^^Pregnancy status||60001007^Not pregnant^SCT|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|7|CWE|95418-0^Employed in a healthcare setting^LN^^^^2.69^^Employed in a healthcare setting||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|8|CWE|95421-4^Resides in a congregate care setting^LN^^^^2.69^^Resides in a congregate care setting||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|9|CWE|76691-5^Gender identity^LN^^^^^^Gender identity||446151000124109^Male gender identity^SCT|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTSPM|1|a375227a-751f-4035-8e0b-e81322f356c9&Testing Lab&12D4567890&CLIA^a375227a-751f-4035-8e0b-e81322f356c9&Testing Lab&12D4567890&CLIA||258467004^Nasopharyngeal washings^SCT^^^^2.67^^Nasopharyngeal washings||||87100004^Topography unknown (body structure)^SCT^^^^^^Topography unknown (body structure)|||||||||20240321220508+0000|20240321220508+0000
1+
MSH|^~\&|CDC PRIME - Atlanta, Georgia (Dekalb)^2.16.840.1.114222.4.1.237821^ISO|CDC PRIME^11D2030855^CLIA|CO-ELR|CO|20240321222008+0000||ORU^R01^ORU_R01|a375227a-751f-4035-8e0b-e81322f356c9|P|2.5.1|||NE|NE|USA|UNICODE UTF-8|ENG^English^ISO||PHLabReport-NoAck^ELR_Receiver^2.16.840.1.113883.9.11^ISOSFT|Centers for Disease Control and Prevention|0.2-SNAPSHOT|PRIME ReportStream|0.2-SNAPSHOT||20240321194832+0000PID|1||10083d1d-dc8b-4ea0-91fa-8744cf0f013b^^^Testing Lab&12D4567890&CLIA^PI^Testing Lab&12D4567890&CLIA||Wolf^Karolann^^^^^L||19700201|F||1002-5^native^^^^^2.5.1^^native|123 Main st^^Austtin^TX^78731^USA||(800) 232 4636^PRS^CP^^1^800^2324636^^^^^(800) 232 4636|^NET^Internet^[email protected]||||||||H^Hispanic or Latino^HL70189^^^^2.9^^Hispanic or Latino||||||||NORC|RE|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|||||||||1245319599^McTester^Phil^^^^^^NPI&2.16.840.1.113883.4.6&ISO^L^^^NPI||(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|20240321222008+0000||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|321 Ocean Drive^^Houston^TX^77001^USAOBR|1|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|a375227a-751f-4035-8e0b-e81322f356c9^Testing Lab^12D4567890^CLIA|95422-2^Influenza virus A and B and SARS-CoV-2 (COVID-19) RNA panel - Respiratory system specimen by NAA with probe detection^LN|||20240321220508+0000|||||||||1245319599^McTester^Phil^^^^^^NPI&2.16.840.1.113883.4.6&ISO^L^^^NPI|(530) 867 5309^WPN^PH^^1^530^8675309^^^^^(530) 867 5309|||||20240321222008+0000|||COBX|1|CWE|92141-1^Influenza virus B RNA [Presence] in Respiratory system specimen by NAA with probe detection^LN^^^^^^Flu B||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USANTE|1||Corrected Result: DUPLICATE_TESTOBX|2|CWE|95423-0^Influenza virus A and B and SARS-CoV-2 (COVID-19) identified in Respiratory system specimen by NAA with probe detection^LN^^^^^^COVID-19||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USAOBX|3|CWE|92142-9^Influenza virus A RNA [Presence] in Respiratory system specimen by NAA with probe detection^LN^^^^^^Flu A||260373001^Detected^SCT|||A^Abnormal^HL70078^^^^2.7|||W|||20240321220508+0000|12D4567890^Testing Lab^CLIA||Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay^^^^^^^Influenza SARS-CoV-2 (Flu SC2) Multiplex Assay_Centers for Disease Control and Prevention (CDC)|10190302000222^^DII|20240321222008+0000||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USAOBX|4|CWE|95419-8^Has symptoms related to condition of interest^LN^^^^2.69^^Has symptoms related to condition of interest||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|5|DT|11368-8^Illness or injury onset date and time^LN^^^^^^Illness or injury onset date and time||20240321000000+0000|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|6|CWE|82810-3^Pregnancy status^LN^^^^2.68^^Pregnancy status||60001007^Not pregnant^SCT|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|7|CWE|95418-0^Employed in a healthcare setting^LN^^^^2.69^^Employed in a healthcare setting||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|8|CWE|95421-4^Resides in a congregate care setting^LN^^^^2.69^^Resides in a congregate care setting||Y^Yes^HL70136|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTOBX|9|CWE|76691-5^Gender identity^LN^^^^^^Gender identity||446151000124109^Male gender identity^SCT|||^^^^^^2.7|||F|||20240321220508+0000|12D4567890^Testing Lab^CLIA||||||||Testing Lab^L^^^^CLIA&2.16.840.1.113883.4.7&ISO^XX^^^12D4567890|123 Beach Way^^Houston^TX^77001^USA|||||QSTSPM|1|a375227a-751f-4035-8e0b-e81322f356c9&Testing Lab&12D4567890&CLIA^a375227a-751f-4035-8e0b-e81322f356c9&Testing Lab&12D4567890&CLIA||258467004^Nasopharyngeal washings^SCT^^^^2.67^^Nasopharyngeal washings||||87100004^Topography unknown (body structure)^SCT^^^^^^Topography unknown (body structure)|||||||||20240321220508+0000|20240321220508+0000

0 commit comments

Comments
 (0)