Merge pull request #16659 from CDCgov/OML-Updates-Base

merge OML feature branch

Author: jack-h-wang

prime-router/metadata/HL7/catchall/hl7/message/OML_O21.yml

@@ -8,27 +8,48 @@ resources:
     repeats: false
     isReferenced: false
 
+  - resourceName: Provenance
+    segment: MSH
+    resourcePath: segments/MSH/Provenance-Source
+
+  - resourceName: Provenance
+    segment: MSH
+    resourcePath: segments/MSH/Provenance-Transformation
+
   - resourceName: Patient
     segment: .PID
     group: PATIENT
     resourcePath: segments/PID/Patient
     isReferenced: true
     repeats: false
+    additionalSegments:
+      - .PD1
+      - MSH
+      - .NTE
+      - .NK1
 
-  - resourceName: ServiceRequest
-    segment: .ORC
-    group: ORDER
-    resourcePath: segments/ORC/ServiceRequest
+  - resourceName: Provenance
+    segment: .PID
+    group: PATIENT
+    resourcePath: segments/PID/Provenance-Patient
+
+  - resourceName: RelatedPerson
+    segment: .NK1
+    group: PATIENT
+    resourcePath: segments/NK1/RelatedPerson
+    isReferenced: false
     repeats: true
+
+  - resourceName: Encounter
+    segment: .PV1
+    group: PATIENT.PATIENT_VISIT
+    resourcePath: segments/PV1/Encounter
     isReferenced: true
     additionalSegments:
-      - .OBSERVATION_REQUEST.OBR
-      - .OBSERVATION_REQUEST.NTE
-      - PATIENT.PATIENT_VISIT.PV1
+      - .PV2
       - MSH
-      - PATIENT.PID
 
-  - resourceName: Observation
+  - resourceName: OrderObservation
     segment: .OBSERVATION_REQUEST.OBSERVATION.OBX
     group: ORDER
     resourcePath: segments/OBX/Observation
@@ -40,11 +61,32 @@ resources:
       - .OBSERVATION_REQUEST.OBSERVATION.NTE
       - MSH
 
-  - resourceName: Specimen
-    segment: SPECIMEN.SPM
-    group: ORDER.OBSERVATION_REQUEST
+  - resourceName: OMLSpecimenSource
+    segment: .OBSERVATION_REQUEST.OBR
+    group: ORDER
+    resourcePath: segments/ORC/Specimen
+    isReferenced: true
+    repeats: true
+
+  - resourceName: OMLSpecimen
+    segment: .OBSERVATION_REQUEST.SPECIMEN.SPM
+    group: ORDER
     resourcePath: segments/SPM/Specimen
     repeats: true
     isReferenced: true
     additionalSegments:
-      - MSH
+      - MSH
+
+  - resourceName: ServiceRequest
+    segment: .ORC
+    group: ORDER
+    resourcePath: segments/ORC/ServiceRequest
+    repeats: true
+    isReferenced: true
+    additionalSegments:
+      - .OBSERVATION_REQUEST.OBR
+      - .OBSERVATION_REQUEST.NTE
+      - PATIENT.PATIENT_VISIT.PV1
+      - MSH
+      - PATIENT.PID
+      - .OBSERVATION_REQUEST.OBSERVATION.OBX

prime-router/metadata/HL7/catchall/hl7/message/ORM_O01.yml

@@ -8,27 +8,38 @@ resources:
     repeats: false
     isReferenced: false
 
+  - resourceName: Provenance
+    segment: MSH
+    resourcePath: segments/MSH/Provenance-Source
+
+  - resourceName: Provenance
+    segment: MSH
+    resourcePath: segments/MSH/Provenance-Transformation
+
   - resourceName: Patient
     segment: .PID
     group: PATIENT
     resourcePath: segments/PID/Patient
     isReferenced: true
     repeats: false
+    additionalSegments:
+      - .PD1
+      - .NTE
 
-  - resourceName: ServiceRequest
-    segment: .ORC
-    group: ORDER
-    resourcePath: segments/ORC/ServiceRequest
-    repeats: true
+  - resourceName: Provenance
+    segment: .PID
+    group: PATIENT
+    resourcePath: segments/PID/Provenance-Patient
+
+  - resourceName: Encounter
+    segment: .PV1
+    group: PATIENT.PATIENT_VISIT
+    resourcePath: segments/PV1/Encounter
     isReferenced: true
     additionalSegments:
-      - .ORDER_DETAIL.OBR
-      - .ORDER_DETAIL.NTE
-      - PATIENT.PATIENT_VISIT.PV1
-      - MSH
-      - PATIENT.PID
+      - .PV2
 
-  - resourceName: Observation
+  - resourceName: OrderObservation
     segment: .ORDER_DETAIL.OBSERVATION.OBX
     group: ORDER
     resourcePath: segments/OBX/Observation
@@ -38,15 +49,16 @@ resources:
       - .ORC
       - .ORDER_DETAIL.OBR
       - .ORDER_DETAIL.OBSERVATION.NTE
-      - MSH
 
-  - resourceName: Specimen
-    segment: .OBR
-    group: ORDER.ORDER_DETAIL
-    resourcePath: segments/SPM/Specimen
+  - resourceName: ServiceRequest
+    segment: .ORC
+    group: ORDER
+    resourcePath: segments/ORC/ServiceRequest
     repeats: true
     isReferenced: true
     additionalSegments:
-      - .OBSERVATION.OBX
-      - .OBSERVATION.NTE
-      - MSH
+      - .ORDER_DETAIL.OBR
+      - .ORDER_DETAIL.NTE
+      - PATIENT.PATIENT_VISIT.PV1
+      - PATIENT.PID
+      - .ORDER_DETAIL.OBSERVATION.OBX

prime-router/metadata/HL7/catchall/hl7/message/ORU_R01.yml

@@ -28,8 +28,8 @@ resources:
       - .NK1
 
   - resourceName: Provenance
-    group: PATIENT_RESULT.PATIENT
     segment: .PID
+    group: PATIENT_RESULT.PATIENT
     resourcePath: segments/PID/Provenance-Patient
 
   - resourceName: RelatedPerson
@@ -45,7 +45,7 @@ resources:
     resourcePath: segments/PV1/Encounter
     isReferenced: true
     additionalSegments:
-      - .PATIENT.VISIT.PV2
+      - .VISIT.PV2
       - MSH
 
   - resourceName: Observation

prime-router/metadata/HL7/catchall/hl7/segments/OBX/Observation.yml

@@ -18,7 +18,6 @@ resourceType: Observation
 # Not implementing OBX.32 not in mapping not in NIST
 # OBX.33 is repeatable but maps to specimen on Observation which is not, so it's all captured in OBXExtension
 
-
 id:
   type: STRING
   valueOf: "GeneralUtils.generateResourceId()"

prime-router/metadata/HL7/catchall/hl7/segments/ORC/OBRExtension.yml

@@ -34,6 +34,77 @@ extension:
           valueOf: datatypes/EI/Identifier
           expressionType: resource
           specs: OBR.3
+    - expressionType: nested
+      vars:
+        obr7: OBR.7
+      condition: $obr7 NOT_NULL
+      generateList: true
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.7
+        valueDateTime:
+          expressionType: nested
+          expressions:
+            - type: STRING
+              valueOf: "GeneralUtils.dateTimeWithZoneId(obr7,ZONEID)"
+              expressionType: JEXL
+        _valueDateTime:
+          expressionType: nested
+          expressionsMap:
+            extension:
+              generateList: true
+              expressionType: nested
+              expressionsMap:
+                url:
+                  type: SYSTEM_URL
+                  value: hl7v2-date-time
+                valueString:
+                  type: STRING
+                  valueOf: OBR.7
+                  expressionType: HL7Spec
+    - expressionType: nested
+      vars:
+        obr8: OBR.8
+      condition: $obr8 NOT_NULL
+      generateList: true
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.8
+        valueDateTime:
+          expressionType: nested
+          expressions:
+            - type: STRING
+              valueOf: "GeneralUtils.dateTimeWithZoneId(obr8,ZONEID)"
+              expressionType: JEXL
+        _valueDateTime:
+          expressionType: nested
+          expressionsMap:
+            extension:
+              generateList: true
+              expressionType: nested
+              expressionsMap:
+                url:
+                  type: SYSTEM_URL
+                  value: hl7v2-date-time
+                valueString:
+                  type: STRING
+                  valueOf: OBR.8
+                  expressionType: HL7Spec
+    - expressionType: nested
+      vars:
+        obr9: STRING, OBR.9
+      condition: $obr9 NOT_NULL
+      specs: OBR.9
+      generateList: true
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.9
+        valueQuantity:
+          expressionType: resource
+          valueOf: datatypes/CQ/Quantity
     - expressionType: nested
       vars:
         obr10: STRING_ALL, OBR.10
@@ -83,6 +154,97 @@ extension:
           expressionType: resource
           valueOf: datatypes/CWE/CodeableConcept
           specs: OBR.13
+    - expressionType: nested
+      vars:
+        obr14: STRING, OBR.14
+      condition: $obr14 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.14
+        valueDateTime:
+          type: STRING
+          valueOf: "GeneralUtils.dateTimeWithZoneId(dateTimeIn,ZONEID)"
+          expressionType: JEXL
+          vars:
+            dateTimeIn: OBR.14
+        _valueDateTime:
+          condition: $obr14 NOT_NULL
+          expressionType: nested
+          vars:
+            obr14: OBR.14
+          expressionsMap:
+            extension:
+              generateList: true
+              expressionType: nested
+              expressionsMap:
+                url:
+                  type: SYSTEM_URL
+                  value: hl7v2-date-time
+                valueString:
+                  type: STRING
+                  valueOf: $obr14
+                  expressionType: HL7Spec
+    - expressionType: nested
+      vars:
+        obr151: STRING_ALL, OBR.15.1
+      condition: $obr151 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.15.1
+        valueCodeableConcept:
+          valueOf: datatypes/CWE/CodeableConcept
+          expressionType: resource
+          specs: OBR.15.1
+    - expressionType: nested
+      vars:
+        obr152: STRING_ALL, OBR.15.2
+      condition: $obr152 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.15.2
+        valueCodeableConcept:
+          valueOf: datatypes/CWE/CodeableConcept
+          expressionType: resource
+          specs: OBR.15.2
+    - expressionType: nested
+      vars:
+        obr153: OBR.15.3
+      condition: $obr153 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.15.3
+        valueString:
+          type: STRING
+          valueOf: OBR.15.3
+          expressionType: HL7Spec
+    - expressionType: nested
+      vars:
+        obr154: STRING_ALL, OBR.15.4
+      condition: $obr154 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.15.4
+        valueCodeableConcept:
+          valueOf: datatypes/CWE/CodeableConcept
+          expressionType: resource
+          specs: OBR.15.4
+    - expressionType: nested
+      vars:
+        obr156: STRING_ALL, OBR.15.6
+      condition: $obr156 NOT_NULL
+      expressionsMap:
+        url:
+          type: STRING
+          value: OBR.15.6
+        valueCodeableConcept:
+          valueOf: datatypes/CWE/CodeableConcept
+          expressionType: resource
+          specs: OBR.15.6
     - expressionType: nested
       vars:
         obr16: STRING_ALL, OBR.16