update for DCipher (#16442)

CDCgov · Nov 5, 2024 · 9500375 · 9500375
1 parent 908d24e
commit 9500375
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 50 deletions.
diff --git a/prime-router/settings/STLTs/HHS-Protect/hhs-protect.yml b/prime-router/settings/STLTs/HHS-Protect/hhs-protect.yml
@@ -0,0 +1,52 @@
+- name: "hhsprotect"
+  description: "HHSProtect"
+  jurisdiction: "FEDERAL"
+  stateCode: null
+  countyName: null
+  filters: null
+  featureFlags: null
+  keys: null
+  senders: [ ]
+  receivers:
+    - name: "mars-otc-elr"
+      organizationName: "hhsprotect"
+      topic: "mars-otc-elr"
+      customerStatus: "active"
+      translation:
+        schemaName: "azure:/hl7_mapping/ORU_R01/ORU_R01-deidentified.yml"
+        format: "HL7"
+        useBatching: false
+        defaults: { }
+        nameFormat: "STANDARD"
+        receivingOrganization: null
+        type: "CUSTOM"
+      jurisdictionalFilter:
+        - "true"
+      qualityFilter: [ ]
+      routingFilter: [ ]
+      processingModeFilter: [ ]
+      reverseTheQualityFilter: false
+      conditionFilter: [ ]
+      mappedConditionFilter: [ ]
+      deidentify: true
+      deidentifiedValue: "<DEIDENTIFIED>"
+      timing:
+        operation: "MERGE"
+        numberPerDay: 1440
+        initialTime: "00:02"
+        timeZone: "EASTERN"
+        maxReportCount: 1000
+        whenEmpty:
+          action: "NONE"
+          onlyOncePerDay: false
+      description: ""
+      transport:
+        host: "sftp"
+        port: "22"
+        filePath: "./upload"
+        credentialName: "DEFAULT-SFTP"
+        type: "SFTP"
+      externalName: null
+      enrichmentSchemaNames: [ ]
+      timeZone: null
+      dateTimeFormat: "OFFSET"
diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/ORU_R01/OBX-deidentified.yml b/prime-router/src/main/resources/metadata/hl7_mapping/ORU_R01/OBX-deidentified.yml
@@ -0,0 +1,53 @@
+constants:
+  hl7ObservationPath: '/PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION(%{resultIndex})'
+
+elements:
+  # OBX 14.1
+  - name: obx-observation-date-time
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-14-1']
+
+  # OBX 24.1
+  - name: obx-test-performing-org-street-addr
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-1' ]
+
+  # OBX 24.2
+  - name: obx-test-performing-org-street-addr-2
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-2' ]
+
+  # OBX 24.3
+  - name: obx-test-performing-org-city
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-3' ]
+
+  # OBX 24.4
+  - name: obx-test-performing-org-state
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-4' ]
+
+  # OBX 24.5
+  - name: obx-test-performing-org-zip-code
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-5' ]
+
+  # OBX 24.6
+  - name: obx-test-performing-org-country
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-6' ]
+
+  # OBX 24.7
+  - name: obx-test-performing-org-address-type
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-7' ]
+
+  # OBX 24.8
+  - name: obx-test-performing-org-or-geo-dest
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-8' ]
+
+  # OBX 24.9
+  - name: obx-test-performing-org-county
+    value: [ '""' ]
+    hl7Spec: [ '%{hl7ObservationPath}/OBX-24-9' ]
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
@@ -314,55 +314,13 @@ elements:
     value: [ '""' ]
     hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBR-17-7 ]
 
-  # OBX 14.1
-  - name: obx-observation-date-time
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-14-1 ]
 
-  # OBX 24.1
-  - name: obx-test-performing-org-street-addr
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-1 ]
 
-  # OBX 24.2
-  - name: obx-test-performing-org-street-addr-2
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-2 ]
-
-  # OBX 24.3
-  - name: obx-test-performing-org-city
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-3 ]
-
-  # OBX 24.4
-  - name: obx-test-performing-org-state
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-4 ]
-
-  # OBX 24.5
-  - name: obx-test-performing-org-zip-code
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-5 ]
-
-  # OBX 24.6
-  - name: obx-test-performing-org-country
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-6 ]
-
-  # OBX 24.7
-  - name: obx-test-performing-org-address-type
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-7 ]
-
-  # OBX 24.8
-  - name: obx-test-performing-org-or-geo-dest
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-8 ]
-
-  # OBX 24.9
-  - name: obx-test-performing-org-county
-    value: [ '""' ]
-    hl7Spec: [ /PATIENT_RESULT/ORDER_OBSERVATION/OBSERVATION/OBX-24-9 ]
+  - name: obx-deidentified
+    resource: 'Bundle.entry.resource.ofType(Observation)'
+    condition: '%resource.count() > 0'
+    schema: classpath:/metadata/hl7_mapping/ORU_R01/OBX-deidentified.yml
+    resourceIndex: resultIndex
 
   # Suppress all notes as they may contain PII data
   - name: patient-note

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
@@ -3,7 +3,7 @@ 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||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
+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||||||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||||||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||||||QST
 SPM|1|^ff98cc992d5146e7916a5f0b873e534f&MMTC.STAG&2.16.840.1.113883.3.8589.4.2.106.2&ISO||697989009^Anterior nares swab^SCT^^^^20200901|||||||||||||20240412230603-0500|20240412230603-0500