Merge branch 'main' into josh/human-readable-reportable-conditions

CDCgov · Nov 19, 2024 · 8219d27 · 8219d27
2 parents 8d115f0 + 0d45dfb
commit 8219d27
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 2 deletions.
diff --git a/containers/ecr-viewer/src/app/api/fhirPath.yml b/containers/ecr-viewer/src/app/api/fhirPath.yml
@@ -125,7 +125,8 @@ specimenReceivedTime: "Observation.extension[0].extension.where(url = 'specimen
 specimenSource: "Observation.extension[0].extension.where(url = 'specimen source').valueString"
 observationReferenceValue: "Observation.extension[0].extension.where(url = 'observation entry reference value').valueString"
 observationComponent: "code.coding.display.first()"
-observationValue: (valueQuantity.value.toString() | valueString | valueCodeableConcept.coding.display | iif(interpretation.coding.display.exists(), ' (' | interpretation.coding.display | ')', '')).join('')
+# observationValue logic: <value> <units> (<interpretation>)
+observationValue: (valueQuantity.value.toString() | valueString | valueCodeableConcept.coding.display | iif(valueQuantity.unit.exists(), iif(valueQuantity.unit = '%', valueQuantity.unit, ' ' | valueQuantity.unit), '') | iif(interpretation.coding.display.exists(), ' (' | interpretation.coding.display | ')', '')).join('')
 observationReferenceRange: "referenceRange.text"
 observationDeviceReference: "device.reference"
 observationNote: "note.text"