Skip to content

Commit bceb9a0

Browse files
Adding some missing transforms from azure and fixing Message Testing API
1 parent 164926e commit bceb9a0

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

prime-router/settings/organizations.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@
11611161
conditionFilter:
11621162
# Accept all conditions except Covid results in the LIVD look up table
11631163
# Covid flows through the Covid pipeline
1164-
- "%resource.livdTableLookup('Component').contains('coronavirus').not()"
1164+
- "%resource.interpretation.coding.code = 'A' and (%resource.code.coding.extension('https://reportstream.cdc.gov/fhir/StructureDefinition/condition-code').value.where(code in ('840539006')).exists())"
11651165
timing:
11661166
operation: MERGE
11671167
numberPerDay: 1440 # Every minute

prime-router/src/main/kotlin/azure/ReportFunction.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class ReportFunction(
192192
null
193193
}
194194
val bundle = if (result.bundle != null) {
195-
result.bundle.toString()
195+
FhirTranscoder.encode(result.bundle!!)
196196
} else {
197197
null
198198
}

prime-router/src/main/kotlin/cli/ProcessFhirCommands.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class ProcessFhirCommands : CliktCommand(
260260

261261
val senderSchemaName = when {
262262
senderSchema != null -> senderSchema
263-
senderSchemaParam != null -> senderSchemaParam
263+
isCli && senderSchemaParam != null -> senderSchemaParam
264264
else -> null
265265
}
266266

@@ -272,7 +272,7 @@ class ProcessFhirCommands : CliktCommand(
272272
receiver != null && receiver.enrichmentSchemaNames.isNotEmpty() -> {
273273
receiver.enrichmentSchemaNames.joinToString(",")
274274
}
275-
enrichmentSchemaNames != null -> enrichmentSchemaNames
275+
isCli && enrichmentSchemaNames != null -> enrichmentSchemaNames
276276
else -> null
277277
}
278278

@@ -470,19 +470,19 @@ class ProcessFhirCommands : CliktCommand(
470470
}
471471

472472
val receiverTransformSchemaName = when {
473-
receiver != null && receiver.schemaName.isNotEmpty() -> receiver.enrichmentSchemaNames.joinToString(",")
474-
receiverSchema != null -> receiverSchema
473+
receiver != null && receiver.schemaName.isNotEmpty() -> receiver.schemaName
474+
isCli && receiverSchema != null -> receiverSchema
475475
else -> null
476476
}
477477

478478
if (receiverTransformSchemaName != null) {
479479
val message = FhirToHl7Converter(
480-
receiverSchema!!,
480+
receiverTransformSchemaName,
481481
BlobAccess.BlobContainerMetadata.build("metadata", Environment.get().storageEnvVar),
482482
context = FhirToHl7Context(
483483
CustomFhirPathFunctions(),
484484
config = HL7TranslationConfig(
485-
hl7Configuration,
485+
hl7Configuration = hl7Configuration,
486486
receiver
487487
),
488488
translationFunctions = CustomTranslationFunctions(),

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

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ constants:
66
patient: 'Bundle.entry.resource.ofType(Patient)'
77
specimen: 'Bundle.entry.resource.ofType(Specimen)'
88
elements:
9+
- name: sender-identifier
10+
resource: 'Bundle.entry.resource.ofType(MessageHeader)'
11+
bundleProperty: '%resource.extension("https://reportstream.cdc.gov/fhir/StructureDefinition/sender-id").value[x]'
12+
value: [ '"SimpleReport"' ]
913

1014
# MSH
1115
- name: sending-application-target-msh3-extension

prime-router/src/main/resources/metadata/hl7_mapping/receivers/STLTs/PA/PA-receiver-transform.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,7 @@ elements:
6161
resource: 'Bundle.entry.resource.ofType(Patient).extension("http://ibm.com/fhir/cdm/StructureDefinition/local-race-cd")'
6262
condition: '%resource.value[x].coding[0].code = "UNK" or %resource.value.coding[0].code = "ASKU"'
6363
value: [ '"U"' ]
64-
hl7Spec: [ '%{PID}-10-1' ]
64+
hl7Spec: [ '%{PID}-10-1' ]
65+
66+
- name: observation-result-with-aoe
67+
resource: "Bundle.entry.resource.ofType(Observation).where(code.coding.extension('https://reportstream.cdc.gov/fhir/StructureDefinition/condition-code').value.where(code in ('AOE')).exists().not())"

0 commit comments

Comments
 (0)