Updating the integration test and fixing an error

CDCgov · Oct 10, 2024 · 2b6aa08 · 2b6aa08
1 parent 4d18a79
commit 2b6aa08
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/ORU_R01/ORU_R01-deidentified.yml b/prime-router/src/main/resources/metadata/hl7_mapping/ORU_R01/ORU_R01-deidentified.yml
@@ -95,17 +95,32 @@ elements:
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-1 ]
 
   # ORC 2
-  - name: placer-order-number
+  - name: placer-order-number-orc-2
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-2 ]
 
   # ORC 3.1
-  - name: filler-order-number
+  - name: filler-order-number-orc-3-1
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-3 ]
 
+  # ORC 3.2
+  - name: orc-3-2
+    value: [ '""' ]
+    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-3-2 ]
+
+  # ORC 3.3
+  - name: orc-3-3
+    value: [ '""' ]
+    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-3-3 ]
+
+  # ORC 3.4
+  - name: orc-3-4
+    value: [ '""' ]
+    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-3-4 ]
+
   # ORC 4
-  - name: placer-group-number
+  - name: placer-group-number-orc-4
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-4 ]
 
@@ -138,14 +153,14 @@ elements:
     hl7Spec: [/PATIENT_RESULT/ORDER_OBSERVATION/ORC-12-3]
 
   # ORC 14
-  - name: call-back-phone-number-ocr
+  - name: call-back-phone-number-ocr-14
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-14 ]
 
   # ORC 21
-  - name: ordering-facility-name
+  - name: ordering-facility-name-orc-21
     value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-22-1 ]
+    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-21-1 ]
 
   # ORC 22.1
   - name: ordering-facility-street1
@@ -231,17 +246,17 @@ elements:
     hl7Spec: [/PATIENT_RESULT/ORDER_OBSERVATION/ORC-24-9]
 
   # ORC 25
-  - name: order-status-modifier
+  - name: order-status-modifier-orc-25
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-25 ]
 
   # ORC 29
-  - name: order-type
+  - name: order-type-orc-29
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-29 ]
 
   # ORC 33
-  - name: alternate-placer-order-number
+  - name: alternate-placer-order-number-orc-33
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/ORC-33 ]
 
@@ -250,7 +265,7 @@ elements:
     condition: 'false'
 
   # OBR 2.1
-  - name: placer-order-number
+  - name: placer-order-number-obr-2-1
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBR-2-1 ]
 

diff --git a/.../src/testIntegration/resources/datatests/HL7_to_FHIR_to_HL7/ORU_deidentified-expected.hl7 b/.../src/testIntegration/resources/datatests/HL7_to_FHIR_to_HL7/ORU_deidentified-expected.hl7
@@ -1,9 +1,8 @@
 MSH|^~\&|MMTC.STAG^2.16.840.1.113883.3.8589.4.2.106.2^ISO|CAREEVOLUTION^00Z0000024^CLIA|AIMS.INTEGRATION.STG^2.16.840.1.114222.4.3.15.2^ISO|AIMS.PLATFORM^2.16.840.1.114222.4.1.217446^ISO|20240412110603-0500||ORU^R01^ORU_R01|20240412110603_ff98cc992d5146e7916a5f0b873e534f|T|2.5.1|||NE|NE|||||PHLabReport-NoAck^ELR251R1_Rcvr_Prof^2.16.840.1.113883.9.11^ISO
 SFT|CAREEVOLUTION|2022|MMTC.STAG|16948||20240311
-PID|1||92041f50874c4595955d47f7ae4981c5^^^MMTC.STAG&2.16.840.1.113883.3.8589.4.2.106.2&ISO^PI||<deidentified>^<deidentified>^<deidentified>^^^^S||<deidentified>||||<deidentified>^<deidentified>^<deidentified>^PIDSTATE!^<deidentified>^USA^^^PIDCOUNTY!||^^^<deidentified>^^<deidentified>^<deidentified>^^^^^<deidentified>
-ORC|RE||^MMTC.STAG^2.16.840.1.113883.3.8589.4.2.106.2^ISO||||||||||||||||||SA.OTCSelfReport
-OBR|1||^MMTC.STAG^2.16.840.1.113883.3.8589.4.2.106.2^ISO|97097-0^SARS-CoV-2 (COVID-19) Ag [Presence] in Upper respiratory specimen by Rapid immunoassay^LN^^^^2.71|||||||||||||||||||||F
-OBX|1|CWE|97097-0^SARS-CoV-2 (COVID-19) Ag [Presence] in Upper respiratory specimen by Rapid immunoassay^LN^^^^2.71||260373001^Detected^SCT^^^^20200901||||||F||||00Z0000042||BD Veritor At-Home COVID-19 Test_Becton, Dickinson and Company (BD)_EUA^^99ELR^^^^Vunknown||20240412230603||||SA.OTCSelfReport^^^^^&2.16.840.1.113883.3.8589.4.1.152&ISO^XX^^^00Z0000042|14 Fake AtHome Test Street^^Fake City
+PID|1||92041f50874c4595955d47f7ae4981c5^^^MMTC.STAG&2.16.840.1.113883.3.8589.4.2.106.2&ISO^PI||Deidentified^Deidentified^Deidentified||Deidentified||||Deidentified^Deidentified^Deidentified^PIDSTATE!^PIDPOSTAL!^USA^^^PIDCOUNTY!||^^^Deidentified^^Deidentified^Deidentified^^^^^PIDUNFORMATPHONE!
+OBR|1||^MMTC.STAG^2.16.840.1.113883.3.8589.4.2.106.2^ISO|97097-0^SARS-CoV-2 (COVID-19) Ag [Presence] in Upper respiratory specimen by Rapid immunoassay^LN^^^^2.71|||DATE!|||||||||||||||DATE!|||F
+OBX|1|CWE|97097-0^SARS-CoV-2 (COVID-19) Ag [Presence] in Upper respiratory specimen by Rapid immunoassay^LN^^^^2.71||260373001^Detected^SCT^^^^20200901||||||F||||00Z0000042||BD Veritor At-Home COVID-19 Test_Becton, Dickinson and Company (BD)_EUA^^99ELR^^^^Vunknown||20240412230603||||SA.OTCSelfReport^^^^^&2.16.840.1.113883.3.8589.4.1.152&ISO^XX^^^00Z0000042
 OBX|2|NM|35659-2^Age at specimen collection^LN^^^^2.71||44|a^year^UCUM^^^^2.1|||||F||||00Z0000042||||||||SA.OTCSelfReport^^^^^&2.16.840.1.113883.3.8589.4.1.152&ISO^XX^^^00Z0000042|14 Fake AtHome Test Street^^Fake City|||||QST
 OBX|3|CWE|95419-8^Whether patient has symptoms related to condition of interest^LN^^^^2.71||Y^Yes^HL70136^^^^2.5.1||||||F||||00Z0000042||||||||SA.OTCSelfReport^^^^^&2.16.840.1.113883.3.8589.4.1.152&ISO^XX^^^00Z0000042|14 Fake AtHome Test Street^^Fake City|||||QST
 OBX|4|DT|65222-2^Date and time of symptom onset^LN^^^^2.71||20240411||||||F||||00Z0000042||||||||SA.OTCSelfReport^^^^^&2.16.840.1.113883.3.8589.4.1.152&ISO^XX^^^00Z0000042|14 Fake AtHome Test Street^^Fake City|||||QST