From f523a2c1347e31112f0118582960283c2f159130 Mon Sep 17 00:00:00 2001
From: Sylvie <sschuresko@flexion.us>
Date: Wed, 11 Sep 2024 11:53:15 -0500
Subject: [PATCH] Update MSH-9 for OML messages to be consistent with the HL7
spec (#1300)
* Update MSH-9 for OML messages to be consistent with the HL7 spec
* update unit test to check for correct OML event coding
---------
Co-authored-by: Basilio Bogado <541149+basiliskus@users.noreply.github.com>
---
.../gov/hhs/cdc/trustedintermediary/e2e/OrderTest.groovy | 2 +-
examples/Other/004_OML_O21.fhir | 2 +-
...AL_OML_O21_NBS_Fully_Populated_2_fhir_transformation.fhir | 2 +-
...L_OML_O21_NBS_Fully_Populated_3_hl7_translation_final.hl7 | 2 +-
...Multiple_Races_Multiple_Births_2_fhir_transformation.fhir | 2 +-
...ultiple_Races_Multiple_Births_3_hl7_translation_final.hl7 | 2 +-
...AL_OML_O21_NBS_Incorrect_Units_2_fhir_transformation.fhir | 2 +-
...L_OML_O21_NBS_Incorrect_Units_3_hl7_translation_final.hl7 | 2 +-
...L_O21_NBS_Incorrect_Data_Types_2_fhir_transformation.fhir | 2 +-
..._O21_NBS_Incorrect_Data_Types_3_hl7_translation_final.hl7 | 2 +-
...21_NBS_Missing_Required_Fields_2_fhir_transformation.fhir | 2 +-
..._O21_NBS_Incorrect_Code_System_2_fhir_transformation.fhir | 2 +-
...O21_NBS_Incorrect_Code_System_3_hl7_translation_final.hl7 | 2 +-
...BS_Missing_Non_Required_Fields_2_fhir_transformation.fhir | 2 +-
...S_Missing_Non_Required_Fields_3_hl7_translation_final.hl7 | 2 +-
...e_Parent_Contant_Phone_Numbers_2_fhir_transformation.fhir | 2 +-
..._Parent_Contant_Phone_Numbers_3_hl7_translation_final.hl7 | 2 +-
...ML_O21_malformed_DTM_datatype_3_hl7_translation_final.hl7 | 2 +-
...ML_O21_malformed_XAD_datatype_3_hl7_translation_final.hl7 | 2 +-
..._invalid_text_as_txt_datatype_3_hl7_translation_final.hl7 | 2 +-
examples/Test/e2e/orders/001_OML_O21_short.fhir | 4 ++--
.../003_3_ORM_O01_short_linked_to_002_ORU_R01_short.fhir | 2 +-
.../cdc/trustedintermediary/external/hapi/HapiHelper.java | 5 +----
23 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/e2e/OrderTest.groovy b/e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/e2e/OrderTest.groovy
index 0c4d21141..d33bc31a8 100644
--- a/e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/e2e/OrderTest.groovy
+++ b/e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/e2e/OrderTest.groovy
@@ -89,7 +89,7 @@ class OrderTest extends Specification {
//test that the MessageHeader's event is now an OML_O21
parsedSentPayload.entry[0].resource.resourceType == "MessageHeader"
parsedSentPayload.entry[0].resource.eventCoding.code == "O21"
- parsedSentPayload.entry[0].resource.eventCoding.display.contains("OML")
+ parsedSentPayload.entry[0].resource.eventCoding.display == "OML^O21^OML_O21"
}
def "return a 400 response when request has unexpected format"() {
diff --git a/examples/Other/004_OML_O21.fhir b/examples/Other/004_OML_O21.fhir
index 7352a15ee..d02b69bf0 100644
--- a/examples/Other/004_OML_O21.fhir
+++ b/examples/Other/004_OML_O21.fhir
@@ -103,7 +103,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_2_fhir_transformation.fhir b/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_2_fhir_transformation.fhir
index bf36b352f..a921e1a11 100644
--- a/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_3_hl7_translation_final.hl7 b/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_3_hl7_translation_final.hl7
index 063c4780f..5c28e9a30 100644
--- a/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/003_AL_OML_O21_NBS_Fully_Populated_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^2.16.840.1.114222.4.1.181960^ISO|20240224134009||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^2.16.840.1.114222.4.1.181960^ISO|20240224134009||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||ONE^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|2801690163|||unknown
diff --git a/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_2_fhir_transformation.fhir b/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_2_fhir_transformation.fhir
index 03e91378f..882fcaa0c 100644
--- a/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_3_hl7_translation_final.hl7 b/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_3_hl7_translation_final.hl7
index 819cd7838..2643af202 100644
--- a/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/004_AL_OML_O21_NBS_Multiple_Races_Multiple_Births_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401180152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401180152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1256872^^^^MR||TWO^TESTCASE||202401150152-0500|M|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||2
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|5560411468|||unknown
diff --git a/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_2_fhir_transformation.fhir b/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_2_fhir_transformation.fhir
index 92f11cd5e..8f87aa1e1 100644
--- a/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_3_hl7_translation_final.hl7 b/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_3_hl7_translation_final.hl7
index 32dd41575..708939a2a 100644
--- a/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/005_AL_OML_O21_NBS_Incorrect_Units_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401200152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401200152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1256872^^^^MR||THREE^TESTCASE||202401160152-0500|U|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|8765411468|||unknown
diff --git a/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_2_fhir_transformation.fhir b/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_2_fhir_transformation.fhir
index 7a7956b13..27adf2763 100644
--- a/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_3_hl7_translation_final.hl7 b/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_3_hl7_translation_final.hl7
index ccbc3bde4..ea900a6f3 100644
--- a/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/006_AL_OML_O21_NBS_Incorrect_Data_Types_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401200152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistSouth^2.16.840.1.114222.4.1.000002^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202401200152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1256872^^^^MR||FOUR^TESTCASE||202401160152-0500|U|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|8765411468|||unknown
diff --git a/examples/Test/Orders/007_AL_OML_O21_NBS_Missing_Required_Fields_2_fhir_transformation.fhir b/examples/Test/Orders/007_AL_OML_O21_NBS_Missing_Required_Fields_2_fhir_transformation.fhir
index 2b572a172..71ef7a4a3 100644
--- a/examples/Test/Orders/007_AL_OML_O21_NBS_Missing_Required_Fields_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/007_AL_OML_O21_NBS_Missing_Required_Fields_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"source": {
"_endpoint": {
diff --git a/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_2_fhir_transformation.fhir b/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_2_fhir_transformation.fhir
index 63c81213f..413025ef9 100644
--- a/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_3_hl7_translation_final.hl7 b/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_3_hl7_translation_final.hl7
index bc2f9df35..5d304ff2b 100644
--- a/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/008_AL_OML_O21_NBS_Incorrect_Code_System_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||SIX^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|4560411583|||unknown
diff --git a/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_2_fhir_transformation.fhir b/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_2_fhir_transformation.fhir
index c9f661a5b..fb1a3fbe5 100644
--- a/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_3_hl7_translation_final.hl7 b/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_3_hl7_translation_final.hl7
index 72168dae6..27fe111e8 100644
--- a/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/009_AL_OML_O21_NBS_Missing_Non_Required_Fields_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||^TESTCASE|||F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|4560411583|||unknown
diff --git a/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_2_fhir_transformation.fhir b/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_2_fhir_transformation.fhir
index 6aacde669..6e14f196d 100644
--- a/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_2_fhir_transformation.fhir
+++ b/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_2_fhir_transformation.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_3_hl7_translation_final.hl7 b/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_3_hl7_translation_final.hl7
index bc2f9df35..5d304ff2b 100644
--- a/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/010_AL_OML_O21_NBS_Multiple_Parent_Contant_Phone_Numbers_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|202402240152||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||SIX^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|4560411583|||unknown
diff --git a/examples/Test/Orders/011_AL_OML_O21_malformed_DTM_datatype_3_hl7_translation_final.hl7 b/examples/Test/Orders/011_AL_OML_O21_malformed_DTM_datatype_3_hl7_translation_final.hl7
index 1d1405e9a..a9e46f63b 100644
--- a/examples/Test/Orders/011_AL_OML_O21_malformed_DTM_datatype_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/011_AL_OML_O21_malformed_DTM_datatype_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||ONE^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|2801690163|||unknown
diff --git a/examples/Test/Orders/012_AL_OML_O21_malformed_XAD_datatype_3_hl7_translation_final.hl7 b/examples/Test/Orders/012_AL_OML_O21_malformed_XAD_datatype_3_hl7_translation_final.hl7
index 3c9e24947..b4801e775 100644
--- a/examples/Test/Orders/012_AL_OML_O21_malformed_XAD_datatype_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/012_AL_OML_O21_malformed_XAD_datatype_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||ONE^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|2801690163|||unknown
diff --git a/examples/Test/Orders/013_AL_OML_O21_invalid_text_as_txt_datatype_3_hl7_translation_final.hl7 b/examples/Test/Orders/013_AL_OML_O21_invalid_text_as_txt_datatype_3_hl7_translation_final.hl7
index 00b81ebef..598da0ab7 100644
--- a/examples/Test/Orders/013_AL_OML_O21_invalid_text_as_txt_datatype_3_hl7_translation_final.hl7
+++ b/examples/Test/Orders/013_AL_OML_O21_invalid_text_as_txt_datatype_3_hl7_translation_final.hl7
@@ -1,4 +1,4 @@
-MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML - Laboratory order|Q1960841872T2476960690||2.5.1||||||8859/1
+MSH|^~\&|BaptistOracle^2.16.840.1.114222.4.1.000000^ISO|BaptistEast^2.16.840.1.114222.4.1.000001^ISO|ALlabNatus^2.16.840.1.114222.4.1.181960.2^ISO|ALlab^simulated-lab-id^ISO|20240224134009||OML^O21^OML_O21|Q1960841872T2476960690||2.5.1||||||8859/1
PID|1||1300974^^^^MR||ONE^TESTCASE||202402210152-0500|F|||1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery||||||||||||||1
NK1|1||MTH^mother|1234 GPCS WAY^^MONTGOMERY^Alabama^36117^USA^^^Montgomery
ORC|NW|2801690163|||unknown
diff --git a/examples/Test/e2e/orders/001_OML_O21_short.fhir b/examples/Test/e2e/orders/001_OML_O21_short.fhir
index b92732885..80ca4b64f 100644
--- a/examples/Test/e2e/orders/001_OML_O21_short.fhir
+++ b/examples/Test/e2e/orders/001_OML_O21_short.fhir
@@ -24,7 +24,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"source": {
"name": "CDC Trusted Intermediary",
@@ -64,7 +64,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
}
]
}
diff --git a/examples/Test/e2e/orders/003_3_ORM_O01_short_linked_to_002_ORU_R01_short.fhir b/examples/Test/e2e/orders/003_3_ORM_O01_short_linked_to_002_ORU_R01_short.fhir
index 8355f0f13..483008fb7 100644
--- a/examples/Test/e2e/orders/003_3_ORM_O01_short_linked_to_002_ORU_R01_short.fhir
+++ b/examples/Test/e2e/orders/003_3_ORM_O01_short_linked_to_002_ORU_R01_short.fhir
@@ -43,7 +43,7 @@
"eventCoding": {
"system": "http://terminology.hl7.org/CodeSystem/v2-0003",
"code": "O21",
- "display": "OML - Laboratory order"
+ "display": "OML^O21^OML_O21"
},
"destination": [
{
diff --git a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
index cc2efdc21..f808425a1 100644
--- a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
+++ b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
@@ -60,10 +60,7 @@ private HapiHelper() {}
public static final String EXTENSION_ALT_CODING = "alt-coding";
public static final Coding OML_CODING =
- new Coding(
- "http://terminology.hl7.org/CodeSystem/v2-0003",
- "O21",
- "OML - Laboratory order");
+ new Coding("http://terminology.hl7.org/CodeSystem/v2-0003", "O21", "OML^O21^OML_O21");
public static final String EXTENSION_OBR_URL =
"https://reportstream.cdc.gov/fhir/StructureDefinition/obr-observation-request";