Merge pull request #17019 from CDCgov/Flexion/1620-add-PD1-4

Add pd1-4 mapping to Patient.generalPractitioner
CDCgov · Jan 13, 2025 · 3408c7f · 3408c7f
2 parents c942a9a + 0b029d7
commit 3408c7f
Show file tree

Hide file tree

Showing 7 changed files with 2,771 additions and 2,011 deletions.
diff --git a/prime-router/docs/design/design/HL7v2-FHIR-Inventory.md b/prime-router/docs/design/design/HL7v2-FHIR-Inventory.md
@@ -146,8 +146,7 @@ implementation differs from what is in the spreadsheets.
 
 ### PD1 -> Patient
 
-- PD1.4 is deprecated in the HL7v2.7 and NIST HL7v2.5.1 specs. Further, the HAPI v2.7 model has set both fields to
-  NULLDT. Thus, this field is not being mapped.
+- PD1.4 Backwards compatible in NIST. Needed for ETOR NBS use case. Mapped to Patient.generalPractitioner.
 
 ### PV1 -> Patient
 

diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/PID/Patient.yml b/prime-router/metadata/HL7/catchall/hl7/segments/PID/Patient.yml
@@ -18,7 +18,7 @@ resourceType: Patient
 #    to Patient.link which includes a reference to RelatedPerson
 
 
-#  - PD1.4 Deprecated in NIST, set to NullDT in HAPI. Field not mapped
+#  - PD1.4 Backwards compatible in NIST. Needed for ETOR NBS use case. Mapped to Patient.generalPractitioner.
 
 id:
   type: STRING
@@ -423,14 +423,23 @@ meta:
           expressionType: reference
           specs: PID.34
 
-generalPractitioner_Organization:
-  condition: $pd13 NOT_NULL
+generalPractitioner:
+  expressionType: nested
   generateList: true
-  specs: PD1.3 *
   vars:
     pd13: STRING_ALL, PD1.3
-  valueOf: datatypes/XON/Organization
-  expressionType: reference
+    pd14: STRING_ALL, PD1.4
+  expressions:
+    - condition: $pd13 NOT_NULL
+      valueOf: datatypes/XON/Organization
+      expressionType: reference
+      specs: PD1.3 *
+      generateList: true
+    - condition: $pd14 NOT_NULL
+      valueOf: datatypes/XCN/Practitioner
+      expressionType: reference
+      specs: PD1.4 *
+      generateList: true
 
 extension:
   expressionType: nested

diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/resources/Patient/PD1.yml b/prime-router/src/main/resources/metadata/hl7_mapping/resources/Patient/PD1.yml
@@ -11,6 +11,13 @@ elements:
     constants:
       hl7XONField: '%{hl7PD1Field}-3(%{xonIndex})'
 
+  - name: patient-primary-provider
+    resource: '%resource.generalPractitioner.resolve().ofType(Practitioner)'
+    schema: classpath:/metadata/hl7_mapping/resources/Practitioner/XCN.yml
+    resourceIndex: xcnIndex
+    constants:
+      hl7XCNField: '%{hl7PD1Field}-4(%{xcnIndex})'
+
   - name: student-indicator
     condition: '%context.extension(%`rsext-studentStatus`).exists()'
     resource: '%resource.extension(%`rsext-studentStatus`).value'