fixes

CDCgov · Oct 30, 2024 · 0dd829d · 0dd829d
1 parent 4c6b53b
commit 0dd829d
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 98 deletions.
diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/DR/Period.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/DR/Period.yml
@@ -9,7 +9,7 @@ start:
     dateTimeIn: $start
 _start:
   expressionType: nested
-  condition: $dateTimeIn NOT_NULL
+  condition: $start NOT_NULL
   expressionsMap:
     extension_1:
       generateList: true
@@ -20,7 +20,7 @@ _start:
           value: hl7v2-date-time
         valueString:
           type: STRING
-          valueOf: $dateTimeIn
+          valueOf: $start
           expressionType: HL7Spec
 
 end:
@@ -32,7 +32,7 @@ end:
     dateTimeIn: $end
 _end:
   expressionType: nested
-  condition: $dateTimeOut NOT_NULL
+  condition: $end NOT_NULL
   expressionsMap:
     extension_1:
       generateList: true
@@ -43,5 +43,5 @@ _end:
           value: hl7v2-date-time
         valueString:
           type: STRING
-          valueOf: $dateTimeOut
+          valueOf: $end
           expressionType: HL7Spec
diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/EI/Device-udiCarrier.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/EI/Device-udiCarrier.yml
@@ -8,6 +8,11 @@ deviceIdentifier:
 extension:
   expressionType: nested
   generateList: true
+  vars:
+    ei2: EI.2
+    ei3: EI.3
+    ei4: EI.4
+  condition: $ei2 NOT_NULL || $ei3 NOT_NULL || $ei4 NOT_NULL
   expressions:
     - expressionType: nested
       expressionsMap:
@@ -19,6 +24,7 @@ extension:
           expressionType: nested
           expressions:
             - expressionType: nested
+              condition: $ei2 NOT_NULL
               expressionsMap:
                 url:
                   type: SYSTEM_URL
@@ -28,6 +34,7 @@ extension:
                   expressionType: HL7Spec
                   valueOf: EI.2
             - expressionType: nested
+              condition: $ei3 NOT_NULL
               expressionsMap:
                 url:
                   type: SYSTEM_URL
@@ -37,6 +44,7 @@ extension:
                   expressionType: HL7Spec
                   valueOf: EI.3
             - expressionType: nested
+              condition: $ei4 NOT_NULL
               expressionsMap:
                 url:
                   type: SYSTEM_URL

diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/EI/Identifier.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/EI/Identifier.yml
@@ -29,6 +29,7 @@ extension_1-assigning-authority:
     ei2: EI.2
     ei3: EI.3
     ei4: EI.4
+  condition: $ei2 NOT_NULL || $ei3 NOT_NULL || $ei4 NOT_NULL
   expressionsMap:
     url:
       type: SYSTEM_URL

diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/PRT/Device.yml b/prime-router/metadata/HL7/catchall/hl7/segments/PRT/Device.yml
@@ -43,13 +43,47 @@ manufactureDate:
   expressionType: JEXL
   vars:
     dateTimeIn: PRT.17
+_manufactureDate:
+  expressionType: nested
+  vars:
+    dateTimeIn: PRT.17
+  condition: $dateTimeIn NOT_NULL
+  expressionsMap:
+    extension_1:
+      generateList: true
+      expressionType: nested
+      expressionsMap:
+        url:
+          type: SYSTEM_URL
+          value: hl7v2-date-time
+        valueString:
+          type: STRING
+          valueOf: $dateTimeIn
+          expressionType: HL7Spec
 
 expirationDate:
   type: STRING
   valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)"
   expressionType: JEXL
   vars:
     dateTimeIn: PRT.18
+_expirationDate:
+  expressionType: nested
+  vars:
+    dateTimeIn: PRT.18
+  condition: $dateTimeIn NOT_NULL
+  expressionsMap:
+    extension_1:
+      generateList: true
+      expressionType: nested
+      expressionsMap:
+        url:
+          type: SYSTEM_URL
+          value: hl7v2-date-time
+        valueString:
+          type: STRING
+          valueOf: $dateTimeIn
+          expressionType: HL7Spec
 
 lotNumber:
   type: STRING

diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/PRT/PRTExtension.yml b/prime-router/metadata/HL7/catchall/hl7/segments/PRT/PRTExtension.yml
@@ -251,7 +251,7 @@ extension:
           value: PRT.21
           type: STRING
         valueIdentifier:
-          valueOf: datatypes/EI/Device-udiCarrier
+          valueOf: datatypes/EI/Identifier
           specs: PRT.21
           expressionType: resource
     - expressionType: nested
@@ -280,7 +280,7 @@ extension:
           expressionType: resource
     - expressionType: nested
       vars:
-        prt15: STRING_ALL, PRT.24
+        prt24: STRING_ALL, PRT.24
       condition: $prt24 NOT_NULL
       specs: PRT.24 *
       generateList: true

diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/resources/Device/PRT.yml b/prime-router/src/main/resources/metadata/hl7_mapping/resources/Device/PRT.yml
@@ -31,13 +31,13 @@ elements:
     schema: classpath:/metadata/hl7_mapping/datatypes/device-udiCarrier/EI.yml
 
   - name: device-manufacture-date
-    resource: '%resource.manufactureDate.value'
+    resource: '%resource.manufactureDate'
     constants:
       dtmFieldPath: '%{hl7PRTFieldPath}-17'
     schema: classpath:/metadata/hl7_mapping/datatypes/dateTime/DTMorDT.yml
 
   - name: device-expiry-date
-    resource: '%resource.expirationDate.value'
+    resource: '%resource.expirationDate'
     constants:
       dtmFieldPath: '%{hl7PRTFieldPath}-18'
     schema: classpath:/metadata/hl7_mapping/datatypes/dateTime/DTMorDT.yml
@@ -51,13 +51,13 @@ elements:
     hl7Spec: [ '%{hl7PRTFieldPath}-20' ]
 
   - name: device-donation-identification
-    resource: '%resource.distinctIdentifier.extension'
+    resource: '%resource.distinctIdentifier'
     schema: classpath:/metadata/hl7_mapping/datatypes/identifier/EI.yml
     constants:
       hl7EIField: '%{hl7PRTFieldPath}-21'
 
   - name: device-type
-    resource: '%resource.type.value'
+    resource: '%resource.type'
     schema: classpath:/metadata/hl7_mapping/datatypes/codeableConcept/CNE.yml
     constants:
       cneFieldPath: '%{hl7PRTFieldPath}-22'
diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/resources/Device/PRTExtension.yml b/prime-router/src/main/resources/metadata/hl7_mapping/resources/Device/PRTExtension.yml
@@ -89,7 +89,7 @@ elements:
 
   - name: PRT.24
     resource: '%resource.extension.where(url = "PRT.24").value'
-    schema: classpath:/metadata/hl7_mapping/datatypes/Identifier/PLN.yml
+    schema: classpath:/metadata/hl7_mapping/datatypes/identifier/PLN.yml
     resourceIndex: contactIdentifierIndex
     constants:
-      hl7TelecomField: '%{hl7PRTFieldPath}-24(%{contactIdentifierIndex})'
+      plnField: '%{hl7PRTFieldPath}-24(%{contactIdentifierIndex})'