-| 0 | | | | | | | | | | | | | | | | | When mapping a location in, e.g., PV1 to Encounter or PR1 to Procedure, one must reference the most granular Location availabile in PL, e.g., Bed, from the resource that references the Location resource, and then add additional Locations using Location.partOf to reference the next less granular Location. For example, if PL.3 Bed is the most granular, the reference Encounter or Procedure to Location must reference the location for the Bed.
+ |
| 0 | | | | | | | | | | | | | | | | | When mapping a location in, e.g., PV1 to Encounter or PR1 to Procedure, one must reference the most granular Location availabile in PL, e.g., Bed, from the resource that references the Location resource, and then add additional Locations using Location.partOf to reference the next less granular Location. For example, if PL.3 Bed is the most granular, the reference Encounter or Procedure to Location must reference the location for the Bed.
From most granular to least, the default sequence would be Bed to Room to Floor to Point of Core to Building to Facility. If a particular location is not present in PL, the reference goes to the next higher level. One may locally need to adjust the default sequencing based on local implementation.
For example, if PV1-3 of a message contains a room, bed, and point of care, then Encounter.location.location must reference the Location resource for PV1-3.3 (PL1.3) and that Location reference has a Location.partOf that reference the Location reference for PV1-3.2 (PL1.2) which then in turn references the Point of Care location using Location.partOf that references PV1-3.1 (PL.1). Local variations on which PL component is more or less granular may vary.
While normally the meaning of [n] notation does not imply sequence when used within a map, in this map the first [n] notation in the column J cells is only to clarify the default granularity progression. |
-| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.mode) | | Location.code | 0 | 1 | | | "instance" | |
-| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.physicalType.coding.code) | | Location.code | 0 | 1 | | | /extension??-poc/ | |
-| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.physicalType.coding.system) | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
-| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
-| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "ro" | |
-| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
-| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
-| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "bd" | |
-| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
-| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
-| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "si" | |
-| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 5 | PL.5 | Location Status | IS | 0 | 1 | | | | | | | | | | | | |
-| 6 | PL.6 | Person Location Type | IS | 0 | 1 | | | | | | | | | | | | |
-| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
-| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "bu" | |
-| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
-| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
-| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
-| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "lvl" | |
-| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
-| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
-| 9 | PL.9 | Location Description | ST | 0 | 1 | | | | Location..location(Location.Location.description) | | Location.string | 0 | 1 | | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.3 VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.2 VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.1 VALUE AND PL.2 NOT VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.8 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL3.NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.7 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.4 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED AND PL.7 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.3 VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.2 VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.1 VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.8 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL3.NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.7 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.4 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED AND PL.7 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
-| 11 | PL.11 | Assigning Authority for Location | HD | 0 | 1 | | | | Location..identifier.assigner(Location.Organization) | | Reference | | | HD[Organization] | | | |
-| 11 | PL.11 | Assigning Authority for Location | HD | 0 | 1 | | | | Location..identifier.assigner(Location.Organization) | | Reference | | | HD[Organization] | | | |
+| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.mode) | | Location.code | 0 | 1 | | | "instance" | |
+| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.physicalType.coding.code) | | Location.code | 0 | 1 | | | /extension??-poc/ | |
+| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..location(Location.Location.physicalType.coding.system) | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 1 | PL.1 | Point of Care | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
+| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
+| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "ro" | |
+| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 2 | PL.2 | Room | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
+| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
+| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "bd" | |
+| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 3 | PL.3 | Bed | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
+| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
+| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "si" | |
+| 4 | PL.4 | Facility | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 5 | PL.5 | Location Status | IS | 0 | 1 | | | | | | | | | | | | |
+| 6 | PL.6 | Person Location Type | IS | 0 | 1 | | | | | | | | | | | | |
+| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
+| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "bu" | |
+| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 7 | PL.7 | Building | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
+| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..identifier | | Location.Identifier | | | HD[Identifier] | | | |
+| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..mode | | Location.code | 0 | 1 | | | "instance" | |
+| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..physicalType.coding.code | | Location.code | 0 | 1 | | | "lvl" | |
+| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..physicalType.coding.system | | Location.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/location-physical-type" | |
+| 8 | PL.8 | Floor | HD | 0 | 1 | | | | Location..partOf.reference(Location.Location) | | Location.string | 0 | 1 | | | | |
+| 9 | PL.9 | Location Description | ST | 0 | 1 | | | | Location..location(Location.Location.description) | | Location.string | 0 | 1 | | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.3 VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.2 VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.1 VALUE AND PL.2 NOT VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.8 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL3.NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.7 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.4 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED AND PL.7 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-Organization] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.3 VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.2 VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.1 VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.8 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL3.NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.7 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 10 | PL.10 | Comprehensive Location Identifier | EI | 0 | 1 | IF PL.11 VALUED AND IF PL.4 VALUED AND PL.1 NOT VALUED AND PL.2 NOT VALUED AND PL.3 NOT VALUED AND PL.8 NOT VALUED AND PL.7 NOT VALUED | | | Location..identifier | | Location.Identifier | | | EI[Identifier-DefaultAssigner] | | | |
+| 11 | PL.11 | Assigning Authority for Location | HD | 0 | 1 | | | | Location..identifier.assigner(Location.Organization) | | Reference | | | HD[Organization] | | | |
+| 11 | PL.11 | Assigning Authority for Location | HD | 0 | 1 | | | | Location..identifier.assigner(Location.Organization) | | Reference | | | HD[Organization] | | | |
diff --git a/input/includes/ConceptMap-datatype-pln-to-identifier-intro.md b/input/includes/ConceptMap-datatype-pln-to-identifier-intro.md
index e9ab0423..e28e0912 100644
--- a/input/includes/ConceptMap-datatype-pln-to-identifier-intro.md
+++ b/input/includes/ConceptMap-datatype-pln-to-identifier-intro.md
@@ -4,8 +4,8 @@ This ConceptMap represents the mapping from the HL7 V2 PLN Data Type to the FHIR
-| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Proviance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ADT_A01.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 1 | ADT_A01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ADT_A01.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
| 3 | ADT_A01.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A01.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A01.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A01.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A01.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A01.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A01.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
+| 4 | ADT_A01.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A01.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A01.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A01.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A01.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
| 6 | ADT_A01.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
-| 8 | ADT_A01.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
-| 9 | ADT_A01.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 10 | ADT_A01.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 11 | ADT_A01.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
-| 12 | ADT_A01:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 13 | ADT_A01:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
+| 8 | ADT_A01.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
+| 9 | ADT_A01.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 10 | ADT_A01.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 11 | ADT_A01.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
+| 12 | ADT_A01:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 13 | ADT_A01:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
| 13 | ADT_A01:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.3 EQUALS "HL70443" AND ROL-3.1 IS NOT "PP" | (element("3.1")!="PP")or(element("3.3")!="HL70443") | When the ROL includes entries with roles in Table HL70443 other than "PP", then they may be candidates for CareTeam, but not all. That is implementation specific. | CareTeam | ROL[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
| 14 | ADT_A01:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | If only person information | Patient | PRT[Patient-GeneralPractitioner-Practitioner] | | |
-| 14 | ADT_A01:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 15 | ADT_A01.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
-| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 NOT IN ("EMR", "E", "F", "I", "S") | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 NOT IN ("EMR", "E", "F", "I", "S") | | | Patient | NK1[Patient] | | |
-| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 IN ("EMR", "E", "F", "I", "S") | | | Patient | NK1[Patient] | | |
-| 15.2 | ADT_A01.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 15.2 | ADT_A01.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 15.3 | /ADT_A01.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
-| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 17 | ADT_A01.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 18 | ADT_A01:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 19 | ADT_A01:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
-| 20 | ADT_A01:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 21 | ADT_A01.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 22 | ADT_A01.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 14 | ADT_A01:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
+| 15 | ADT_A01.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
+| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 NOT IN ("EMR", "E", "F", "I", "S") | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
+| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 NOT IN ("EMR", "E", "F", "I", "S") | | | Patient | NK1[Patient] | | |
+| 15.1 | ADT_A01.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 0 | -1 | IF NK1-3.1 IN ("EMR", "E", "F", "I", "S") | | | Patient | NK1[Patient] | | |
+| 15.2 | ADT_A01.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 15.2 | ADT_A01.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 15.3 | /ADT_A01.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
+| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 16 | ADT_A01.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 17 | ADT_A01.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 18 | ADT_A01:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 19 | ADT_A01:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
+| 20 | ADT_A01:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 21 | ADT_A01.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 22 | ADT_A01.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 22.1 | ADT_A01.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 22.1 | ADT_A01.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 22.2 | ADT_A01.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 22.3 | /ADT_A01.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 23 | ADT_A01.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
-| 24 | ADT_A01.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
+| 22.2 | ADT_A01.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 22.3 | /ADT_A01.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 23 | ADT_A01.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
+| 24 | ADT_A01.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
| 25 | ADT_A01.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of the patient | Condition | DG1[Condition] | Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource |
| 25 | ADT_A01.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of an encounter | Encounter | DG1[Encounter] | Encounter[1].diagnosis.reference=Condition[1].id | |
| 25 | ADT_A01.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of a episode of care | EpisodeOfCare | DG1[EpisodeOfCare] | EpisodeOfCare.patient.reference=Patient[1].id;
EpisodeOfCare.diagnosis.reference=Condition[1].id | |
-| 26 | ADT_A01.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
-| 27 | ADT_A01.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
-| 27.1 | ADT_A01.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
-| 27.2 | ADT_A01.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 27.3 | ADT_A01.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 27.4 | /ADT_A01.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
-| 28 | ADT_A01.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
-| 29 | ADT_A01.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
-| 29.1 | ADT_A01.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 29.2 | ADT_A01.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
-| 29.3 | ADT_A01.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam | IN3[CareTeam] | CareTeam.subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
-| 29.4 | ADT_A01.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 29.5 | ADT_A01.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.6 | ADT_A0.INSURANCE.AUTHORIZATION | [{ | --- AUTHORIZATION begin | 0 | -1 | | | | | | | |
-| 29.6.1 | ADT_A01.INSURANCE.AUTHORIZATION.AUT | AUT | Authorization Record | 0 | -1 | | | | | | | |
-| 29.6.2 | ADT_A01.INSURANCE.AUTHORIZATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.6.3 | /ADT_A01.INSURANCE.AUTHORIZATION | }] | --- AUTHORIZATION end | | | | | | | | | |
-| 29.7 | ADT_A01.INSURANCE.REFERRAL | [{ | --- REFERRAL begin | 0 | -1 | | | | | | | |
-| 29.7.1 | ADT_A01.INSURANCE.REFERRAL.RF1 | RF1 | Referral Information | 0 | -1 | | | | | | | |
-| 29.7.2 | ADT_A01.INSURANCE.REFERRAL.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.7.3 | /ADT_A01.INSURANCE.REFERRAL | }] | --- REFERRAL end | | | | | | | | | |
-| 29.8 | /ADT_A01.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
-| 30 | ADT_A01.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
-| 31 | ADT_A01.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
-| 32 | ADT_A01.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
-| 33 | ADT_A01.PDA | [ PDA ] | Patient Death and Autopsy | 0 | 1 | | | | | | | |
+| 26 | ADT_A01.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
+| 27 | ADT_A01.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
+| 27.1 | ADT_A01.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
+| 27.2 | ADT_A01.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 27.3 | ADT_A01.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 27.4 | /ADT_A01.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
+| 28 | ADT_A01.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
+| 29 | ADT_A01.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
+| 29.1 | ADT_A01.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 29.2 | ADT_A01.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
+| 29.3 | ADT_A01.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam | IN3[CareTeam] | CareTeam.subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
+| 29.4 | ADT_A01.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 29.5 | ADT_A01.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.6 | ADT_A0.INSURANCE.AUTHORIZATION | [{ | --- AUTHORIZATION begin | 0 | -1 | | | | | | | |
+| 29.6.1 | ADT_A01.INSURANCE.AUTHORIZATION.AUT | AUT | Authorization Record | 0 | -1 | | | | | | | |
+| 29.6.2 | ADT_A01.INSURANCE.AUTHORIZATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.6.3 | /ADT_A01.INSURANCE.AUTHORIZATION | }] | --- AUTHORIZATION end | | | | | | | | | |
+| 29.7 | ADT_A01.INSURANCE.REFERRAL | [{ | --- REFERRAL begin | 0 | -1 | | | | | | | |
+| 29.7.1 | ADT_A01.INSURANCE.REFERRAL.RF1 | RF1 | Referral Information | 0 | -1 | | | | | | | |
+| 29.7.2 | ADT_A01.INSURANCE.REFERRAL.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.7.3 | /ADT_A01.INSURANCE.REFERRAL | }] | --- REFERRAL end | | | | | | | | | |
+| 29.8 | /ADT_A01.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
+| 30 | ADT_A01.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
+| 31 | ADT_A01.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
+| 32 | ADT_A01.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
+| 33 | ADT_A01.PDA | [ PDA ] | Patient Death and Autopsy | 0 | 1 | | | | | | | |
diff --git a/input/includes/ConceptMap-message-adt-a02-to-bundle-intro.md b/input/includes/ConceptMap-message-adt-a02-to-bundle-intro.md
index 2724612a..c33b6ad7 100644
--- a/input/includes/ConceptMap-message-adt-a02-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-adt-a02-to-bundle-intro.md
@@ -4,46 +4,46 @@ This ConceptMap represents the mapping from the HL7 V2 ADT_A02 Message to the FH
-| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Proviance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ADT_A02.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | b | | | | | |
+| 1 | ADT_A02.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ADT_A02.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | b | | | | | |
| 3 | ADT_A02.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A02.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A02.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A02.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A02.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A02.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A02.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
+| 4 | ADT_A02.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A02.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A02.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A02.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A02.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
| 6 | ADT_A02.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 7 | ADT_A02.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A02.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
-| 8 | ADT_A02.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
-| 9 | ADT_A02.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 10 | ADT_A02.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 11 | ADT_A02.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
-| 12 | ADT_A02:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messages as well. That is considered out of scope as. |
-| 13 | ADT_A02:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
+| 7 | ADT_A02.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A02.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
+| 8 | ADT_A02.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
+| 9 | ADT_A02.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 10 | ADT_A02.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 11 | ADT_A02.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
+| 12 | ADT_A02:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messages as well. That is considered out of scope as. |
+| 13 | ADT_A02:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
| 13 | ADT_A02:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.3 EQUALS "HL70443" AND ROL-3.1 IS NOT "PP" | (element("3.1")!="PP")or(element("3.3")!="HL70443") | When the ROL includes entries with roles in Table HL70443 other than "PP", then they may be candidates for CareTeam, but not all. That is implementation specific. | CareTeam | ROL[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 14 | ADT_A02:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-Practitioner] | | |
-| 14 | ADT_A02:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 16 | ADT_A02.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 17 | ADT_A02:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 18 | ADT_A02:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
-| 19 | ADT_A02:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 20 | ADT_A02.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 21 | ADT_A02.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 14 | ADT_A02:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-Practitioner] | | |
+| 14 | ADT_A02:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
+| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 15 | ADT_A02.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 16 | ADT_A02.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 17 | ADT_A02:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 18 | ADT_A02:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
+| 19 | ADT_A02:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 20 | ADT_A02.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 21 | ADT_A02.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 21.1 | ADT_A02.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 21.1 | ADT_A02.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 21.2 | ADT_A02.OBSERVATION.OBX | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 21.3 | /ADT_A02.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 22 | ADT_A02.PDA | [ PDA ] | Patient Death and Autopsy | 0 | 1 | | | | | | | |
+| 21.2 | ADT_A02.OBSERVATION.OBX | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 21.3 | /ADT_A02.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 22 | ADT_A02.PDA | [ PDA ] | Patient Death and Autopsy | 0 | 1 | | | | | | | |
diff --git a/input/includes/ConceptMap-message-adt-a05-to-bundle-intro.md b/input/includes/ConceptMap-message-adt-a05-to-bundle-intro.md
index d9054413..49a7e521 100644
--- a/input/includes/ConceptMap-message-adt-a05-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-adt-a05-to-bundle-intro.md
@@ -4,82 +4,82 @@ This ConceptMap represents the mapping from the HL7 V2 ADT_A05 Message to the FH
-| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ADT_A05.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 1 | ADT_A05.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ADT_A05.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
| 3 | ADT_A05.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A05.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A05.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A05.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A05.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A05.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A05.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
+| 4 | ADT_A05.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A05.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A05.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A05.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A05.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
| 6 | ADT_A05.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 7 | ADT_A05.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
-| 8 | ADT_A05.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
-| 9 | ADT_A05.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 10 | ADT_A05.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 11 | ADT_A05.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
-| 12 | ADT_A05:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 13 | ADT_A05:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
+| 7 | ADT_A05.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
+| 8 | ADT_A05.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
+| 9 | ADT_A05.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 10 | ADT_A05.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 11 | ADT_A05.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
+| 12 | ADT_A05:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 13 | ADT_A05:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
| 13 | ADT_A05:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.3 EQUALS "HL70443" AND ROL-3.1 IS NOT "PP" | (element("3.1")!="PP")or(element("3.3")!="HL70443") | When the ROL includes entries with roles in Table HL70443 other than "PP", then they may be candidates for CareTeam, but not all. That is implementation specific. | CareTeam | ROL[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 14 | ADT_A05:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-PractitionerRole] | | |
-| 14 | ADT_A05:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 15 | ADT_A05.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
-| 15.1 | ADT_A05.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 15.1 | ADT_A05.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | Patient | NK1[Patient] | | |
-| 15.2 | ADT_A05.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 15.2 | ADT_A05.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 15.3 | /ADT_A05.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
-| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 17 | ADT_A05.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 18 | ADT_A05:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 19 | ADT_A05:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
-| 20 | ADT_A05:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 21 | ADT_A05.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 22 | ADT_A05.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 14 | ADT_A05:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-PractitionerRole] | | |
+| 14 | ADT_A05:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
+| 15 | ADT_A05.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
+| 15.1 | ADT_A05.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
+| 15.1 | ADT_A05.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | Patient | NK1[Patient] | | |
+| 15.2 | ADT_A05.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 15.2 | ADT_A05.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 15.3 | /ADT_A05.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
+| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 16 | ADT_A05.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 17 | ADT_A05.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 18 | ADT_A05:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 19 | ADT_A05:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
+| 20 | ADT_A05:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 21 | ADT_A05.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 22 | ADT_A05.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 22.1 | ADT_A05.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 22.1 | ADT_A05.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 22.2 | ADT_A05.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 22.3 | /ADT_A05.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 23 | ADT_A05.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
-| 24 | ADT_A05.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
+| 22.2 | ADT_A05.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 22.3 | /ADT_A05.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 23 | ADT_A05.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
+| 24 | ADT_A05.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
| 25 | ADT_A05.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of the patient | Condition | DG1[Condition] | Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource |
| 25 | ADT_A05.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of an encounter | Encounter | DG1[Encounter] | Encounter[1].diagnosis.reference=Condition[1].id | |
| 25 | ADT_A05.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of a episode of care | EpisodeOfCare | DG1[EpisodeOfCare] | EpisodeOfCare.patient.reference=Patient[1].id;
EpisodeOfCare.diagnosis.reference=Condition[1].id | |
-| 26 | ADT_A05.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
-| 27 | ADT_A05.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
-| 27.1 | ADT_A05.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
-| 27.2 | ADT_A05.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 27.3 | ADT_A05.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 27.4 | /ADT_A05.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
-| 28 | ADT_A05.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
-| 29 | ADT_A05.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
-| 29.1 | ADT_A05.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 29.2 | ADT_A05.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
-| 29.3 | ADT_A05.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam | IN3[CareTeam] | CareTeam.subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
-| 29.4 | ADT_A05.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 29.5 | ADT_A05.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.6 | ADT_A0.INSURANCE.AUTHORIZATION | [{ | --- AUTHORIZATION begin | 0 | -1 | | | | | | | |
-| 29.6.1 | ADT_A05.INSURANCE.AUTHORIZATION.AUT | AUT | Authorization Record | 1 | 1 | | | | | | | |
-| 29.6.2 | ADT_A05.INSURANCE.AUTHORIZATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.6.3 | /ADT_A05.INSURANCE.AUTHORIZATION | }] | --- AUTHORIZATION end | | | | | | | | | |
-| 29.7 | ADT_A05.INSURANCE.REFERRAL | [{ | --- REFERRAL begin | 0 | -1 | | | | | | | |
-| 29.7.1 | ADT_A05.INSURANCE.REFERRAL.RF1 | RF1 | Referral Information | 1 | 1 | | | | | | | |
-| 29.7.2 | ADT_A05.INSURANCE.REFERRAL.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 29.7.3 | /ADT_A05.INSURANCE.REFERRAL | }] | --- REFERRAL end | | | | | | | | | |
-| 29.8 | /ADT_A05.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
-| 30 | ADT_A05.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
-| 31 | ADT_A05.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
-| 32 | ADT_A05.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
+| 26 | ADT_A05.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
+| 27 | ADT_A05.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
+| 27.1 | ADT_A05.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
+| 27.2 | ADT_A05.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 27.3 | ADT_A05.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 27.4 | /ADT_A05.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
+| 28 | ADT_A05.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
+| 29 | ADT_A05.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
+| 29.1 | ADT_A05.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 29.2 | ADT_A05.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
+| 29.3 | ADT_A05.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam | IN3[CareTeam] | CareTeam.subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
+| 29.4 | ADT_A05.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 29.5 | ADT_A05.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.6 | ADT_A0.INSURANCE.AUTHORIZATION | [{ | --- AUTHORIZATION begin | 0 | -1 | | | | | | | |
+| 29.6.1 | ADT_A05.INSURANCE.AUTHORIZATION.AUT | AUT | Authorization Record | 1 | 1 | | | | | | | |
+| 29.6.2 | ADT_A05.INSURANCE.AUTHORIZATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.6.3 | /ADT_A05.INSURANCE.AUTHORIZATION | }] | --- AUTHORIZATION end | | | | | | | | | |
+| 29.7 | ADT_A05.INSURANCE.REFERRAL | [{ | --- REFERRAL begin | 0 | -1 | | | | | | | |
+| 29.7.1 | ADT_A05.INSURANCE.REFERRAL.RF1 | RF1 | Referral Information | 1 | 1 | | | | | | | |
+| 29.7.2 | ADT_A05.INSURANCE.REFERRAL.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 29.7.3 | /ADT_A05.INSURANCE.REFERRAL | }] | --- REFERRAL end | | | | | | | | | |
+| 29.8 | /ADT_A05.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
+| 30 | ADT_A05.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
+| 31 | ADT_A05.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
+| 32 | ADT_A05.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
diff --git a/input/includes/ConceptMap-message-adt-a06-to-bundle-intro.md b/input/includes/ConceptMap-message-adt-a06-to-bundle-intro.md
index 16130675..df9f6ea0 100644
--- a/input/includes/ConceptMap-message-adt-a06-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-adt-a06-to-bundle-intro.md
@@ -4,76 +4,76 @@ This ConceptMap represents the mapping from the HL7 V2 ADT_A06 Message to the FH
-| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ADT_A06.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 1 | ADT_A06.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ADT_A06.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
| 3 | ADT_A06.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A06.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A06.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A06.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A06.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A06.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A06.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[1].subject.reference=Patient[1].id | |
+| 4 | ADT_A06.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A06.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A06.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A06.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A06.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[1].subject.reference=Patient[1].id | |
| 6 | ADT_A06.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance[4].target.reference=Patient[1].id | |
-| 7 | ADT_A06.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
-| 8 | ADT_A06.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
-| 9 | ADT_A06.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 10 | ADT_A06.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 11 | ADT_A06.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
-| 12 | ADT_A06:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 13 | ADT_A06:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
+| 7 | ADT_A06.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
+| 8 | ADT_A06.OH1 | [{ OH1 }] | Employment Status | 0 | -1 | | | | | | | |
+| 9 | ADT_A06.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 10 | ADT_A06.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 11 | ADT_A06.OH4 | [{ OH4 }] | Combat Zone Work | 0 | -1 | | | | | | | |
+| 12 | ADT_A06:follow:PID.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PID/PD1 in the v2 message, is meant to only apply to the patient. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 13 | ADT_A06:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.1 EQUALS "PP" AND ROL-3.3 EQUALS "HL70443" | (element("3.1")="PP")and(element("3.3")="HL70443") | | Patient | ROL[Patient-GeneralPractitioner] | | |
| 13 | ADT_A06:follow:PID.ROL | [{ ROL }] | Role | 0 | -1 | IF ROL-3.3 EQUALS "HL70443" AND ROL-3.1 IS NOT "PP" | (element("3.1")!="PP")or(element("3.3")!="HL70443") | When the ROL includes entries with roles in Table HL70443 other than "PP", then they may be candidates for CareTeam, but not all. That is implementation specific. | CareTeam | ROL[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 14 | ADT_A06:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-Practitioner] | | |
-| 14 | ADT_A06:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
-| 15 | ADT_A06.MRG | [ MRG ] | Merge Information | 0 | 1 | | | | Account | MRG[Account] | Account[2].subject.reference=Patient[1].id | It will be left to implementation negotiation to determine whether disparate systems merely change the patient class, or close and open a new account. The current active account number should appear in field PID-18 - Patient Account Number; the prior account number can be included optionally in MRG-3 - Prior Patient Account Number.
+ |
| 14 | ADT_A06:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS "PP" | | | Patient | PRT[Patient-GeneralPractitioner-Practitioner] | | |
+| 14 | ADT_A06:follow:PID.PRT | [{ PRT }] | Participation | 0 | -1 | IF PRT-4 IS IN ("AD", "AP", "ARI", "AT", "CP", "FHCP", "OP", "PH", "PP", "PRI", "RP", "RT", "VP", "PO") | | | CareTeam | PRT[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | |
+| 15 | ADT_A06.MRG | [ MRG ] | Merge Information | 0 | 1 | | | | Account | MRG[Account] | Account[2].subject.reference=Patient[1].id | It will be left to implementation negotiation to determine whether disparate systems merely change the patient class, or close and open a new account. The current active account number should appear in field PID-18 - Patient Account Number; the prior account number can be included optionally in MRG-3 - Prior Patient Account Number.
Depending on the relationship between the old and new account, the implementer should consider whether Account.partOf should be used as well to link the two accounts appropriately. |
-| 16 | ADT_A06.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
-| 16.1 | ADT_A06.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 16.1 | ADT_A06.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | Patient | NK1[Patient] | | |
-| 16.2 | ADT_A06.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
-| 16.2 | ADT_A06.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
-| 16.3 | /ADT_A06.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
-| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource. Note also that per A06 and A07 trigger event definitions PV1-19 - Visit Number may also be changed during this event. |
-| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 18 | ADT_A06.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 19 | ADT_A06:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
-| 20 | ADT_A06:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
-| 21 | ADT_A06:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 22 | ADT_A06.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 23 | ADT_A06.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 16 | ADT_A06.NEXT_OF_KIN | [{ | --- NEXT_OF_KIN begin | 0 | -1 | | | | | | | |
+| 16.1 | ADT_A06.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
+| 16.1 | ADT_A06.NEXT_OF_KIN.NK1 | NK1 | Next of Kin / Associated Parties | 1 | 1 | | | | Patient | NK1[Patient] | | |
+| 16.2 | ADT_A06.NEXT_OF_KIN.OH2 | [{ OH2 }] | Past or Present Job | 0 | -1 | | | | | | | |
+| 16.2 | ADT_A06.NEXT_OF_KIN.OH3 | [ OH3 ] | Usual Work | 0 | 1 | | | | | | | |
+| 16.3 | /ADT_A06.NEXT_OF_KIN | }] | --- NEXT_OF_KIN end | | | | | | | | | |
+| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource. Note also that per A06 and A07 trigger event definitions PV1-19 - Visit Number may also be changed during this event. |
+| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 17 | ADT_A06.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 18 | ADT_A06.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 19 | ADT_A06:follow:PV1.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | FHIR does not yet support field level security tags. The ARV, when located with the PV1/PV2 in the v2 message, is meant to only apply to the encounter. However, technically it could point to other places in the messageas as well. That is considered out of scope as. |
+| 20 | ADT_A06:follow:PV1.ROL | [{ ROL }] | Role | 0 | -1 | | | | Encounter | ROL[Encounter-PractitionerRole] | | |
+| 21 | ADT_A06:follow:PV1.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 22 | ADT_A06.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 23 | ADT_A06.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 23.1 | ADT_A06.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 23.1 | ADT_A06.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 23.2 | ADT_A06.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 23.3 | /ADT_A06.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 24 | ADT_A06.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
-| 25 | ADT_A06.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
+| 23.2 | ADT_A06.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 23.3 | /ADT_A06.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 24 | ADT_A06.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
+| 25 | ADT_A06.IAM | [{ IAM }] | Patient Advers Reaction Information | 0 | -1 | | | | | | | |
| 26 | ADT_A06.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of the patient | Condition | DG1[Condition] | Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource |
| 26 | ADT_A06.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of an encounter | Encounter | DG1[Encounter] | Encounter[1].diagnosis.reference=Condition[1].id | |
| 26 | ADT_A06.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of a episode of care | EpisodeOfCare | DG1[EpisodeOfCare] | EpisodeOfCare.patient.reference=Patient[1].id;
EpisodeOfCare.diagnosis.reference=Condition[1].id | |
-| 27 | ADT_A06.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
-| 28 | ADT_A06.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
-| 28.1 | ADT_A06.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
-| 28.2 | ADT_A06.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 28.3 | ADT_A06.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 28.4 | /ADT_A06.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
-| 29 | ADT_A06.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
-| 30 | ADT_A06.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
-| 30.1 | ADT_A06.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 30.2 | ADT_A06.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
-| 30.3 | ADT_A06.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam.participant | IN3[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
-| 30.4 | ADT_A06.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
-| 30.5 | ADT_A06.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 30.8 | /ADT_A06.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
-| 31 | ADT_A06.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
-| 32 | ADT_A06.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
-| 33 | ADT_A06.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
+| 27 | ADT_A06.DRG | [ DRG ] | Diagnosis Related Group | 0 | 1 | | | | | | | |
+| 28 | ADT_A06.PROCEDURE | [{ | --- PROCEDURE begin | 0 | -1 | | | | | | | |
+| 28.1 | ADT_A06.PROCEDURE.PR1 | PR1 | Procedures | 1 | 1 | | | | Procedure | PR1[Procedure] | Procedure.subject.reference=Patient[1].id | |
+| 28.2 | ADT_A06.PROCEDURE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 28.3 | ADT_A06.PROCEDURE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 28.4 | /ADT_A06.PROCEDURE | }] | --- PROCEDURE end | | | | | | | | | |
+| 29 | ADT_A06.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
+| 30 | ADT_A06.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
+| 30.1 | ADT_A06.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 30.2 | ADT_A06.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info. | 0 | 1 | | | | | | | |
+| 30.3 | ADT_A06.INSURANCE.IN3 | [{ IN3 }] | Insurance Additional Info - Cert. | 0 | -1 | | | | CareTeam.participant | IN3[CareTeam] | CareTeam[1].subject.reference=Patient[1].id | Incorporate IN3 content into the Coverage created from the IN1 segment. |
+| 30.4 | ADT_A06.INSURANCE.ROL | [{ ROL }] | Role | 0 | -1 | | | | | | | |
+| 30.5 | ADT_A06.INSURANCE.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 30.8 | /ADT_A06.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
+| 31 | ADT_A06.ACC | [ ACC ] | Accident Information | 0 | 1 | | | | | | | |
+| 32 | ADT_A06.UB1 | [ UB1 ] | Universal Bill Information | 0 | 1 | | | | | | | |
+| 33 | ADT_A06.UB2 | [ UB2 ] | Universal Bill 92 Information | 0 | 1 | | | | | | | |
diff --git a/input/includes/ConceptMap-message-adt-a09-to-bundle-intro.md b/input/includes/ConceptMap-message-adt-a09-to-bundle-intro.md
index 99dec317..3d7f11e0 100644
--- a/input/includes/ConceptMap-message-adt-a09-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-adt-a09-to-bundle-intro.md
@@ -4,33 +4,33 @@ This ConceptMap represents the mapping from the HL7 V2 ADT_A09 Message to the FH
-| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Proviance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Encounter | MSH[Encounter] | Encounter[1].subject.reference=Patient[1].id | |
-| 2 | ADT_A01.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 1 | ADT_A11.MSH | MSH | Message Header | 1 | 1 | | | | Encounter | MSH[Encounter] | Encounter[1].subject.reference=Patient[1].id | |
+| 2 | ADT_A01.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
| 3 | ADT_A11.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A11.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A11.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A11.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A11.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A11.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A11.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
+| 4 | ADT_A11.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A11.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A11.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A11.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A11.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account.subject.reference=Patient[1].id | |
| 6 | ADT_A11.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 7 | ADT_A11.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
-| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 9 | ADT_A11.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter[1].subject.reference=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 10 | ADT_A11.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 11 | ADT_A11.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 7 | ADT_A11.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[1].subject.reference=Patient[1].id | |
+| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 8 | ADT_A11.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 9 | ADT_A11.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter[1].subject.reference=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 10 | ADT_A11.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 11 | ADT_A11.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 11.1 | ADT_A11.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 11.1 | ADT_A11.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 11.2 | /ADT_A11.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 11.2 | /ADT_A11.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
| 12 | ADT_A11.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of the patient | Condition | DG1[Condition] | Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource |
| 12 | ADT_A11.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of an encounter | Encounter | DG1[Encounter] | Encounter[1].diagnosis.reference=Condition[1].id | |
| 12 | ADT_A11.DG1 | [{ DG1 }] | Diagnosis Information | 0 | -1 | | | If in context of a episode of care | EpisodeOfCare | DG1[EpisodeOfCare] | EpisodeOfCare.patient.reference=Patient[1].id;
diff --git a/input/includes/ConceptMap-message-adt-a17-to-bundle-intro.md b/input/includes/ConceptMap-message-adt-a17-to-bundle-intro.md
index 0ba417c1..1864cd4e 100644
--- a/input/includes/ConceptMap-message-adt-a17-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-adt-a17-to-bundle-intro.md
@@ -4,46 +4,46 @@ This ConceptMap represents the mapping from the HL7 V2 ADT_A17 Message to the FH
|
| HL7 v2 | Condition (IF True, args) | HL7 FHIR | Comments |
|---|
| Sort Order | Identifier | Syntax | Name | Cardinality - Min | Cardinality - Max | Computable ANTLR | Computable FHIRPath | Narrative | Primary Target | Segment Map | References |
|---|
-| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
+| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource. |
| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Proviance resource instance to the relevant FHIR resources generated. |
-| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ADT_A17.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 1 | ADT_A17.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ADT_A17.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
| 3 | ADT_A17.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 3 | ADT_A17.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 4 | ADT_A17.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 5 | ADT_A17.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
-| 5 | ADT_A17.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
-| 6 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 6 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[1].subject.reference=Patient[1].id | |
+| 4 | ADT_A17.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 5 | ADT_A17.EVN | EVN | Event Type | 1 | 1 | | | | Provenance | EVN[Provenance] | Provenance[3].target.reference=MessageHeader[1].id | |
+| 5 | ADT_A17.EVN | EVN | Event Type | 1 | 1 | IF EVN-5 NOT VALUED AND (MSH-22 IS VALUED OR MSH-4 IS VALUED) | | | Provenance | MSH[Provenance-Operator] | Provenance[3].target.reference=MessageHeader[1].id | If EVN-5 is not valued, then the MSH may have either the sending responsible organization (MSH-22) or the sending facility (MSH-4) to reasonable approximate the agent relevant for this Provenance instance. |
+| 6 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 6 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[1].subject.reference=Patient[1].id | |
| 6 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance[4].target.reference=Patient[1].id | |
-| 7 | ADT_A17.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[3].subject.reference=Patient[1].id | |
-| 8 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 8 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 9 | ADT_A17.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 10 | ADT_A17.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 12 | ADT_A17.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 7 | ADT_A17.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 7 | ADT_A01.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[3].subject.reference=Patient[1].id | |
+| 8 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 8 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 9 | ADT_A17.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 10 | ADT_A17.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 12 | ADT_A17.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 12.1 | ADT_A17.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[1].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 12.1 | ADT_A17.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[1].subject.reference=Patient[1].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 12.2 | ADT_A17.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 12.3 | /ADT_A17.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 13 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 13 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[2].subject.reference=Patient[2].id | |
+| 12.2 | ADT_A17.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 12.3 | /ADT_A17.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 13 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 13 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | | | | Account | PID[Account] | Account[2].subject.reference=Patient[2].id | |
| 13 | ADT_A17.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance[5].target.reference=Patient[2].id | |
-| 14 | ADT_A17.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[2].subject.reference=Patient[2].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 16 | ADT_A17.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 17 | ADT_A17.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
-| 18 | ADT_A17.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 14 | ADT_A17.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter[2].subject.reference=Patient[2].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 15 | ADT_A17.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 16 | ADT_A17.PV2 | [ PV2 ] | Patient Visit - Additional Info. | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 17 | ADT_A17.DB1 | [{ DB1 }] | Disability Information | 0 | -1 | | | | | | | |
+| 18 | ADT_A17.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 18.1 | ADT_A17.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation] | Observation[2].subject.reference=Patient[2].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
| 18.1 | ADT_A17.OBSERVATION.OBX | OBX | Observation/Result | 0 | -1 | | | Based on profiles, such as Vital Signs, certain observations are represented on the Observation, while others on its components. No computable guidance available yet. | Observation | OBX[Observation-Component] | Observation[2].subject.reference=Patient[2].id | One cannot determine whether this observation made during the PV1/PV2 communicated above, or from a prior visit/stay. It is therefore up to the implementer whether to populate Observation.encounter.reference with the Encounter[1].id or not. Only when the ADT message involves an event before the encounter occurs, e.g., the intiial registration, it is clear that the observation is NOT associated with Encounter[1]. |
-| 18.2 | ADT_A17.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
-| 18.3 | /ADT_A17.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 18.2 | ADT_A17.OBSERVATION.PRT | [{ PRT }] | Participation | 0 | -1 | | | | | | | |
+| 18.3 | /ADT_A17.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
diff --git a/input/includes/ConceptMap-message-mdm-t02-to-bundle-intro.md b/input/includes/ConceptMap-message-mdm-t02-to-bundle-intro.md
index 4b355c2e..5086d6ce 100644
--- a/input/includes/ConceptMap-message-mdm-t02-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-mdm-t02-to-bundle-intro.md
@@ -4,38 +4,38 @@ This ConceptMap represents the mapping from the HL7 V2 MDM_T02 Message to the FH
-| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
+| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 1 | OML_O21.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
| 2 | OML_O21.SFT | [{SFT}] | Software | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 2 | OML_O21.SFT | [{SFT}] | Software | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 3 | OML_O21.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 4 | OML_O21.NTE | [{NTE}] | Notes and Comments (for Header) | 0 | -1 | | | | | | | |
-| 5 | OML_O21.PATIENT | [ | --- PATIENT begin | 0 | 1 | | | | | | | |
-| 5.1 | OML_O21.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 3 | OML_O21.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 4 | OML_O21.NTE | [{NTE}] | Notes and Comments (for Header) | 0 | -1 | | | | | | | |
+| 5 | OML_O21.PATIENT | [ | --- PATIENT begin | 0 | 1 | | | | | | | |
+| 5.1 | OML_O21.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
| 5.1 | OML_O21.PATIENT.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 5.2 | OML_O21.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 5.2 | OML_O21.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[2].subject.reference=Patient[1].id | |
+| 5.2 | OML_O21.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 5.2 | OML_O21.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[2].subject.reference=Patient[1].id | |
| 5.3 | OML_O21.PATIENT.PRT | [{PRT}] | Participation (for Patient) | 0 | -1 | IF PRT-4.1 EQUALS "PP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="PP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | Patient[1].generalPractitioner.reference=PractitionerRole[1].id | Incorporate PRT content into the Patient created from the PID segment when the PRT contains practitioner related data. |
-| 5.3 | OML_O21.PATIENT.PRT | [{PRT}] | Participation (for Patient) | 0 | -1 | IF PRT-4.1 NOT EQUALS "PP" OR PRT-4.3 NOT EQUALS "HL70443" | (element("4.1"!)="PP")or(element("4.3")!="HL70443") | | RelatedPerson | PRT[RelatedPerson] | RelatedPerson[1].patient.reference=Patient[1].id | |
-| 5.4 | OML_O21.PATIENT.NTE | [{NTE}] | Notes and Comments (for Patient ID) | 0 | -1 | | | | | | | |
+| 5.3 | OML_O21.PATIENT.PRT | [{PRT}] | Participation (for Patient) | 0 | -1 | IF PRT-4.1 NOT EQUALS "PP" OR PRT-4.3 NOT EQUALS "HL70443" | (element("4.1"!)="PP")or(element("4.3")!="HL70443") | | RelatedPerson | PRT[RelatedPerson] | RelatedPerson[1].patient.reference=Patient[1].id | |
+| 5.4 | OML_O21.PATIENT.NTE | [{NTE}] | Notes and Comments (for Patient ID) | 0 | -1 | | | | | | | |
| 5.6 | OML_O21.PATIENT.NK1 | [{NK1}] | Next of Kin/Associated Parties | 0 | -1 | | | The FHIR location will depend on the nature of the data being exchanged and how the systems use next of kin data | RelatedPerson | NK1[RelatedPerson] | RelatedPerson[2].patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
| 5.6 | OML_O21.PATIENT.NK1 | [{NK1}] | Next of Kin/Associated Parties | 0 | -1 | | | The FHIR location will depend on the nature of the data being exchanged and how the systems use next of kin data | Patient | NK1[Patient] | | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 5.7 | OML_O21.PATIENT.ARV | [{ARV}] | Access Restrictions | 0 | -1 | | | | | | | |
-| 5.8 | OML_O21.PATIENT.PATIENT_VISIT | [ | --- PATIENT_VISIT begin | 0 | 1 | | | | | | | |
-| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject=Patient[PID] | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 5.8.2 | OML_O21.PATIENT.PATIENT_VISIT.PV2 | [ PV2 ] | Patient Visit- Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 5.8.3 | OML_O21.PATIENT.PATIENT_VISIT.PRT | [{PRT}] | Participation (for Patient Visit) | 0 | -1 | | | | PractitionerRole | PRT[PractitionerRole] | Encounter[1].participant.individual.reference=PractitionerRole[2].id | Incorporate PRT content into the Encounter created from the PV1 segment. |
-| 5.8.4 | /OML_O21.PATIENT.PATIENT_VISIT | ] | --- PATIENT_VISIT end | | | | | | | | | |
-| 5.9 | OML_O21.PATIENT.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
-| 5.9.1 | OML_O21.PATIENT.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | Coverage.subscriber=Patient[PID] | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 5.9.2 | OML_O21.PATIENT.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Information | 0 | 1 | | | | | | | |
-| 5.9.3 | OML_O21.PATIENT.INSURANCE.IN3 | [ IN3 ] | Insurance Additional Information, Certification | 0 | 1 | | | | Coverage | IN3[CareTeam] | | |
-| 5.9 | /OML_O21.PATIENT.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
-| 5.10 | OML_O21.PATIENT.GT1 | [ GT1 ] | Guarantor | 0 | 1 | | | | | | | |
-| 5.11 | OML_O21.PATIENT.AL1 | [{AL1}] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient=Patient[PID] | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
-| 5.12 | /OML_O21.PATIENT | ] | --- PATIENT end | | | | | | | | | |
-| 6 | OML_O21.ORDER | { | --- ORDER begin | 1 | -1 | | | | | | | |
-| 6.1 | OML_O21.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | ServiceRequest | ORC[ServiceRequest] | ServiceRequest.subject=Patient[PID] | Processing of each ORC segment results in the creation of a new ServiceRequest resource |
-| 6.1 | OML_O21.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Provenance | ORC[Provenance] | Provenance.target=ServiceRequest[ORC] | Using Provenance is the preferred way, but a local implementation may decide to add extensions to the main resource. As the use and guidance of Provenance matures we wil revisit this later. |
-| 6.2 | OML_O21.ORDER.PRT | [{PRT}] | Participation (for Common Order) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].requester.reference=PractitionerRole[3].id | |
-| 6.3 | OML_O21.ORDER.TIMING | [{ | --- TIMING begin | 0 | -1 | | | | | | | |
-| 6.3.1 | OML_O21.ORDER.TIMING.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | ServiceRequest | TQ1[ServiceRequest] | | |
-| 6.3.2 | OML_O21.ORDER.TIMING.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
-| 6.3.3 | /OML_O21.ORDER.TIMING | }] | --- TIMING end | | | | | | | | | |
-| 6.4 | OML_O21.ORDER.OBSERVATION_REQUEST | [ | --- OBSERVATION_REQUEST begin | 0 | 1 | | | | | | | |
-| 6.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBR | OBR | Observation Request | 1 | 1 | | | | ServiceRequest | OBR[ServiceRequest] | | Incorporate OBR content into the ServiceRequest created from the ORC segment in the same segment group. |
-| 6.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBR | OBR | Observation Request | 1 | 1 | | | | Specimen | OBR[Specimen] | | |
-| 6.4.2 | OML_O21.ORDER.OBSERVATION_REQUEST.TCD | [ TCD ] | Test Code Details | 0 | 1 | | | | | | | |
-| 6.4.3 | OML_O21.ORDER.OBSERVATION_REQUEST.NTE | [{NTE}] | Notes and Comments (for Detail) | 0 | -1 | | | | ServiceRequest | NTE[ServiceRequest] | | |
-| 6.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRT | [{PRT}] | Participation (for Observation Request) | 0 | -1 | IF PRT-4.1 EQUALS "SC" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="SC")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].specimen[1](Specimen.collection.collector.reference)=PractitionerRole[4].id | |
-| 6.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRT | [{PRT}] | Participation (for Observation Request) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].requester.reference=PractitionerRole[3].id | |
-| 6.4.5 | OML_O21.ORDER.OBSERVATION_REQUEST.CTD | [ CTD ] | Contact Data | 0 | 1 | | | | | | | |
-| 6.4.6 | OML_O21.ORDER.OBSERVATION_REQUEST.DG1 | [{DG1}] | Diagnosis | 0 | -1 | | | | Condition | DG1[Condition] | ServiceRequest[1].reasonReference.reference=Condition[1].id; Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource which is referenced in the ServiceRequest created by the ORC segment |
-| 6.4.7 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
-| 6.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
-| 6.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
-| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
-| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation location information. |
-| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation[1].performer.reference=PractitionerRole[7].id | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation practitioner information. |
-| 6.4.7.3 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.TCD | [ TCD ] | Test Code Detail | 0 | 1 | | | | | | | |
-| 6.4.7.4 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.NTE | [{NTE}] | Notes and Comments (for Results) | 0 | -1 | | | | Observation | NTE[Observation] | | |
-| 6.4.7.5 | /OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 6.4.8 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN | [{ | --- SPECIMEN begin | 0 | -1 | | | | | | | |
-| 6.4.8.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | | | | Specimen | SPM[Specimen] | ServiceRequest[1].specimen.reference=Specimen[SPM].id | |
-| 6.4.8.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | IF SPM-21 VALUED | | | | | ServiceRequest[1].specimen.#ext-rejectReason#=SPM-21 | This provides a reject reason for the specimen in context of the specific test as the specimen may still be usable for other tests. |
-| 6.4.8.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION | [{ | --- SPECIMEN_OBSERVATION begin | 0 | -1 | | | | | | | |
-| 6.4.8.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation/Result related to specimen | 1 | 1 | | | | | | | |
-| 6.4.8.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION.PRT | [{PRT}] | Participation (for Specimen Observation) | 0 | -1 | | | | | | | |
-| 6.4.8.2.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION | }] | --- SPECIMEN_OBSERVATION end | | | | | | | | | |
-| 6.4.8.3 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER | [{ | --- CONTAINER begin | 0 | -1 | | | | | | | |
-| 6.4.8.3.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.SAC | SAC | Specimen Container | 1 | 1 | | | | | | | |
-| 6.4.8.3.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION | [{ | --- CONTAINER_OBSERVATION begin | 0 | -1 | | | | | | | |
-| 6.4.8.3.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION.OBX | OBX | Observation/Result related to container | 1 | 1 | | | | | | | |
-| 6.4.8.3.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION.PRT | [{PRT}] | Participation (for Container Observation) | 0 | -1 | | | | | | | |
-| 6.4.8.3.2.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION | }] | --- CONTAINER_OBSERVATION end | | | | | | | | | |
-| 6.4.8.3.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER | }] | --- CONTAINER end | | | | | | | | | |
-| 6.4.8.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN | }] | --- SPECIMEN end | | | | | | | | | |
-| 6.4.9 | OML_O21.ORDER.OBSERVATION_REQUEST.SGH | [SGH] | Segment Group Header | | | | | | | | | |
-| 6.4.10 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT | [{ | --- PRIOR_RESULT begin | | | | | | | | | |
-| 6.4.10.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR | [ | --- PATIENT_PRIOR begin | | | | | | | | | |
-| 6.4.10.1.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PID | PID | Patient Identification– previous result | | | | | | | | | |
-| 6.4.10.1.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PD1 | [PD1] | Additional Demographics – previous result | | | | | | | | | |
-| 6.4.10.1.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PRT | [{PRT}] | Participation (for Patient Prior) | | | | | | | | | |
-| 6.4.10.1.5 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.ARV | [{ARV}] | Access Restrictions | | | | | | | | | |
-| 6.4.10.1.6 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR | ] | --- PATIENT_PRIOR end | | | | | | | | | |
-| 6.4.10.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR | [ | --- PATIENT_VISIT_PRIOR begin | | | | | | | | | |
-| 6.4.10.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PV1 | PV1 | Patient Visit– previous result | | | | | | | | | |
-| 6.4.10.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PV2 | [ PV2 ] | Patient Visit Add. Info – previous result | | | | | | | | | |
-| 6.4.10.2.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PRT | [{PRT}] | Participation (for Patient Visit Prior) | | | | | | | | | |
-| 6.4.10.2.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR | ] | --- PATIENT_VISIT_PRIOR end | | | | | | | | | |
-| 6.4.10.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.AL1 | [{AL1}] | Allergy Information- previous result | | | | | | | | | |
-| 6.4.10.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR | { | --- ORDER_PRIOR begin | | | | | | | | | |
-| 6.4.10.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.ORC | ORC | Common Order- previous result | | | | | | | | | |
-| 6.4.10.4.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.PRT | [{PRT}] | Participation | | | | | | | | | |
-| 6.4.10.4.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBR | OBR | Order Detail- previous result | | | | | | | | | |
-| 6.4.10.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.NTE | [{NTE}] | Notes and Comments- previous result | | | | | | | | | |
-| 6.4.10.4.5 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.PRT | [{PRT}] | Participation (for Order Prior) | | | | | | | | | |
-| 6.4.10.4.6 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR | [{ | --- TIMING_PRIOR begin | | | | | | | | | |
-| 6.4.10.4.6.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR.TQ1 | TQ1 | Timing/Quantity | | | | | | | | | |
-| 6.4.10.4.6.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | | | | | | | | | |
-| 6.4.10.4.6.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR | }] | --- TIMING_PRIOR end | | | | | | | | | |
-| 6.4.10.4.7 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR | { | --- OBSERVATION_PRIOR begin | | | | | | | | | |
-| 6.4.10.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.OBX | OBX | Observation/Result- previous result | | | | | | | | | |
-| 6.4.10.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.PRT | [{PRT}] | Participation (for Observation Prior) | | | | | | | | | |
-| 6.4.10.4.7.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.NTE | [{NTE}] | Notes and Comments- previous result | | | | | | | | | |
-| 6.4.10.4.7.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR | } | --- OBSERVATION_PRIOR end | | | | | | | | | |
-| 6.4.10.4.8 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR | } | --- ORDER_PRIOR end | | | | | | | | | |
-| 6.4.10.5 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT | }] | --- PRIOR_RESULT end | | | | | | | | | |
-| 6.4.11 | OML_O21.ORDER.OBSERVATION_REQUEST.SGT | [SGT] | Segment Group Trailer | | | | | | | | | |
-| 6.4.12 | /OML_O21.ORDER.OBSERVATION_REQUEST | ] | --- OBSERVATION_REQUEST end | | | | | | | | | |
-| 6.5 | OML_O21.ORDER.FT1 | [{FT1}] | Financial Transaction | | | | | | | | | |
-| 6.6 | OML_O21.ORDER.CTI | [{CTI}] | Clinical Trial Identification | | | | | | | | | |
-| 6.7 | OML_O21.ORDER.BLG | [ BLG ] | Billing Segment | | | | | | | | | |
-| 6.8 | /OML_O21.ORDER | } | --- ORDER end | | | | | | | | | |
+| 5.7 | OML_O21.PATIENT.ARV | [{ARV}] | Access Restrictions | 0 | -1 | | | | | | | |
+| 5.8 | OML_O21.PATIENT.PATIENT_VISIT | [ | --- PATIENT_VISIT begin | 0 | 1 | | | | | | | |
+| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject=Patient[PID] | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 5.8.1 | OML_O21.PATIENT.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 5.8.2 | OML_O21.PATIENT.PATIENT_VISIT.PV2 | [ PV2 ] | Patient Visit- Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 5.8.3 | OML_O21.PATIENT.PATIENT_VISIT.PRT | [{PRT}] | Participation (for Patient Visit) | 0 | -1 | | | | PractitionerRole | PRT[PractitionerRole] | Encounter[1].participant.individual.reference=PractitionerRole[2].id | Incorporate PRT content into the Encounter created from the PV1 segment. |
+| 5.8.4 | /OML_O21.PATIENT.PATIENT_VISIT | ] | --- PATIENT_VISIT end | | | | | | | | | |
+| 5.9 | OML_O21.PATIENT.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
+| 5.9.1 | OML_O21.PATIENT.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | IN1[Coverage] | Coverage.subscriber=Patient[PID] | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 5.9.2 | OML_O21.PATIENT.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Information | 0 | 1 | | | | | | | |
+| 5.9.3 | OML_O21.PATIENT.INSURANCE.IN3 | [ IN3 ] | Insurance Additional Information, Certification | 0 | 1 | | | | Coverage | IN3[CareTeam] | | |
+| 5.9 | /OML_O21.PATIENT.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
+| 5.10 | OML_O21.PATIENT.GT1 | [ GT1 ] | Guarantor | 0 | 1 | | | | | | | |
+| 5.11 | OML_O21.PATIENT.AL1 | [{AL1}] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient=Patient[PID] | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
+| 5.12 | /OML_O21.PATIENT | ] | --- PATIENT end | | | | | | | | | |
+| 6 | OML_O21.ORDER | { | --- ORDER begin | 1 | -1 | | | | | | | |
+| 6.1 | OML_O21.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | ServiceRequest | ORC[ServiceRequest] | ServiceRequest.subject=Patient[PID] | Processing of each ORC segment results in the creation of a new ServiceRequest resource |
+| 6.1 | OML_O21.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Provenance | ORC[Provenance] | Provenance.target=ServiceRequest[ORC] | Using Provenance is the preferred way, but a local implementation may decide to add extensions to the main resource. As the use and guidance of Provenance matures we wil revisit this later. |
+| 6.2 | OML_O21.ORDER.PRT | [{PRT}] | Participation (for Common Order) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].requester.reference=PractitionerRole[3].id | |
+| 6.3 | OML_O21.ORDER.TIMING | [{ | --- TIMING begin | 0 | -1 | | | | | | | |
+| 6.3.1 | OML_O21.ORDER.TIMING.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | ServiceRequest | TQ1[ServiceRequest] | | |
+| 6.3.2 | OML_O21.ORDER.TIMING.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
+| 6.3.3 | /OML_O21.ORDER.TIMING | }] | --- TIMING end | | | | | | | | | |
+| 6.4 | OML_O21.ORDER.OBSERVATION_REQUEST | [ | --- OBSERVATION_REQUEST begin | 0 | 1 | | | | | | | |
+| 6.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBR | OBR | Observation Request | 1 | 1 | | | | ServiceRequest | OBR[ServiceRequest] | | Incorporate OBR content into the ServiceRequest created from the ORC segment in the same segment group. |
+| 6.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBR | OBR | Observation Request | 1 | 1 | | | | Specimen | OBR[Specimen] | | |
+| 6.4.2 | OML_O21.ORDER.OBSERVATION_REQUEST.TCD | [ TCD ] | Test Code Details | 0 | 1 | | | | | | | |
+| 6.4.3 | OML_O21.ORDER.OBSERVATION_REQUEST.NTE | [{NTE}] | Notes and Comments (for Detail) | 0 | -1 | | | | ServiceRequest | NTE[ServiceRequest] | | |
+| 6.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRT | [{PRT}] | Participation (for Observation Request) | 0 | -1 | IF PRT-4.1 EQUALS "SC" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="SC")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].specimen[1](Specimen.collection.collector.reference)=PractitionerRole[4].id | |
+| 6.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRT | [{PRT}] | Participation (for Observation Request) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].requester.reference=PractitionerRole[3].id | |
+| 6.4.5 | OML_O21.ORDER.OBSERVATION_REQUEST.CTD | [ CTD ] | Contact Data | 0 | 1 | | | | | | | |
+| 6.4.6 | OML_O21.ORDER.OBSERVATION_REQUEST.DG1 | [{DG1}] | Diagnosis | 0 | -1 | | | | Condition | DG1[Condition] | ServiceRequest[1].reasonReference.reference=Condition[1].id; Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource which is referenced in the ServiceRequest created by the ORC segment |
+| 6.4.7 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 6.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 6.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
+| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation location information. |
+| 6.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.PRT | [{PRT}] | Participation (for OBX) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation[1].performer.reference=PractitionerRole[7].id | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation practitioner information. |
+| 6.4.7.3 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.TCD | [ TCD ] | Test Code Detail | 0 | 1 | | | | | | | |
+| 6.4.7.4 | OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION.NTE | [{NTE}] | Notes and Comments (for Results) | 0 | -1 | | | | Observation | NTE[Observation] | | |
+| 6.4.7.5 | /OML_O21.ORDER.OBSERVATION_REQUEST.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 6.4.8 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN | [{ | --- SPECIMEN begin | 0 | -1 | | | | | | | |
+| 6.4.8.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | | | | Specimen | SPM[Specimen] | ServiceRequest[1].specimen.reference=Specimen[SPM].id | |
+| 6.4.8.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | IF SPM-21 VALUED | | | | | ServiceRequest[1].specimen.#ext-rejectReason#=SPM-21 | This provides a reject reason for the specimen in context of the specific test as the specimen may still be usable for other tests. |
+| 6.4.8.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION | [{ | --- SPECIMEN_OBSERVATION begin | 0 | -1 | | | | | | | |
+| 6.4.8.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation/Result related to specimen | 1 | 1 | | | | | | | |
+| 6.4.8.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION.PRT | [{PRT}] | Participation (for Specimen Observation) | 0 | -1 | | | | | | | |
+| 6.4.8.2.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.SPECIMEN_OBSERVATION | }] | --- SPECIMEN_OBSERVATION end | | | | | | | | | |
+| 6.4.8.3 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER | [{ | --- CONTAINER begin | 0 | -1 | | | | | | | |
+| 6.4.8.3.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.SAC | SAC | Specimen Container | 1 | 1 | | | | | | | |
+| 6.4.8.3.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION | [{ | --- CONTAINER_OBSERVATION begin | 0 | -1 | | | | | | | |
+| 6.4.8.3.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION.OBX | OBX | Observation/Result related to container | 1 | 1 | | | | | | | |
+| 6.4.8.3.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION.PRT | [{PRT}] | Participation (for Container Observation) | 0 | -1 | | | | | | | |
+| 6.4.8.3.2.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER.CONTAINER_OBSERVATION | }] | --- CONTAINER_OBSERVATION end | | | | | | | | | |
+| 6.4.8.3.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN.CONTAINER | }] | --- CONTAINER end | | | | | | | | | |
+| 6.4.8.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.SPECIMEN | }] | --- SPECIMEN end | | | | | | | | | |
+| 6.4.9 | OML_O21.ORDER.OBSERVATION_REQUEST.SGH | [SGH] | Segment Group Header | | | | | | | | | |
+| 6.4.10 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT | [{ | --- PRIOR_RESULT begin | | | | | | | | | |
+| 6.4.10.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR | [ | --- PATIENT_PRIOR begin | | | | | | | | | |
+| 6.4.10.1.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PID | PID | Patient Identification– previous result | | | | | | | | | |
+| 6.4.10.1.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PD1 | [PD1] | Additional Demographics – previous result | | | | | | | | | |
+| 6.4.10.1.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.PRT | [{PRT}] | Participation (for Patient Prior) | | | | | | | | | |
+| 6.4.10.1.5 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR.ARV | [{ARV}] | Access Restrictions | | | | | | | | | |
+| 6.4.10.1.6 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.PATIENT_PRIOR | ] | --- PATIENT_PRIOR end | | | | | | | | | |
+| 6.4.10.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR | [ | --- PATIENT_VISIT_PRIOR begin | | | | | | | | | |
+| 6.4.10.2.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PV1 | PV1 | Patient Visit– previous result | | | | | | | | | |
+| 6.4.10.2.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PV2 | [ PV2 ] | Patient Visit Add. Info – previous result | | | | | | | | | |
+| 6.4.10.2.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR.PRT | [{PRT}] | Participation (for Patient Visit Prior) | | | | | | | | | |
+| 6.4.10.2.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.RESULT_VISIT_PRIOR | ] | --- PATIENT_VISIT_PRIOR end | | | | | | | | | |
+| 6.4.10.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.AL1 | [{AL1}] | Allergy Information- previous result | | | | | | | | | |
+| 6.4.10.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR | { | --- ORDER_PRIOR begin | | | | | | | | | |
+| 6.4.10.4.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.ORC | ORC | Common Order- previous result | | | | | | | | | |
+| 6.4.10.4.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.PRT | [{PRT}] | Participation | | | | | | | | | |
+| 6.4.10.4.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBR | OBR | Order Detail- previous result | | | | | | | | | |
+| 6.4.10.4.4 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.NTE | [{NTE}] | Notes and Comments- previous result | | | | | | | | | |
+| 6.4.10.4.5 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.PRT | [{PRT}] | Participation (for Order Prior) | | | | | | | | | |
+| 6.4.10.4.6 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR | [{ | --- TIMING_PRIOR begin | | | | | | | | | |
+| 6.4.10.4.6.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR.TQ1 | TQ1 | Timing/Quantity | | | | | | | | | |
+| 6.4.10.4.6.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | | | | | | | | | |
+| 6.4.10.4.6.3 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.TIMING_PRIOR | }] | --- TIMING_PRIOR end | | | | | | | | | |
+| 6.4.10.4.7 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR | { | --- OBSERVATION_PRIOR begin | | | | | | | | | |
+| 6.4.10.4.7.1 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.OBX | OBX | Observation/Result- previous result | | | | | | | | | |
+| 6.4.10.4.7.2 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.PRT | [{PRT}] | Participation (for Observation Prior) | | | | | | | | | |
+| 6.4.10.4.7.3 | OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR.NTE | [{NTE}] | Notes and Comments- previous result | | | | | | | | | |
+| 6.4.10.4.7.4 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR.OBSERVATION_PRIOR | } | --- OBSERVATION_PRIOR end | | | | | | | | | |
+| 6.4.10.4.8 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT.ORDER_PRIOR | } | --- ORDER_PRIOR end | | | | | | | | | |
+| 6.4.10.5 | /OML_O21.ORDER.OBSERVATION_REQUEST.PRIOR_RESULT | }] | --- PRIOR_RESULT end | | | | | | | | | |
+| 6.4.11 | OML_O21.ORDER.OBSERVATION_REQUEST.SGT | [SGT] | Segment Group Trailer | | | | | | | | | |
+| 6.4.12 | /OML_O21.ORDER.OBSERVATION_REQUEST | ] | --- OBSERVATION_REQUEST end | | | | | | | | | |
+| 6.5 | OML_O21.ORDER.FT1 | [{FT1}] | Financial Transaction | | | | | | | | | |
+| 6.6 | OML_O21.ORDER.CTI | [{CTI}] | Clinical Trial Identification | | | | | | | | | |
+| 6.7 | OML_O21.ORDER.BLG | [ BLG ] | Billing Segment | | | | | | | | | |
+| 6.8 | /OML_O21.ORDER | } | --- ORDER end | | | | | | | | | |
diff --git a/input/includes/ConceptMap-message-orm-o01-to-bundle-intro.md b/input/includes/ConceptMap-message-orm-o01-to-bundle-intro.md
index de3eb297..4dd5e77b 100644
--- a/input/includes/ConceptMap-message-orm-o01-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-orm-o01-to-bundle-intro.md
@@ -4,64 +4,64 @@ This ConceptMap represents the mapping from the HL7 V2 ORM_O01 Message to the FH
-| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
+| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 2 | ORM_O01.NTE | [{ NTE }] | Notes and Comments (for Header) | 0 | -1 | | | | | | | Incorporate SFT content for each of the SFT instances into the MessageHeader created from the MSH segment. |
-| 3 | ORM_O01.PATIENT | [ | PATIENT begin | 0 | 1 | | | | | | | |
-| 3.1 | ORM_O01.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 1 | ORM_O01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 2 | ORM_O01.NTE | [{ NTE }] | Notes and Comments (for Header) | 0 | -1 | | | | | | | Incorporate SFT content for each of the SFT instances into the MessageHeader created from the MSH segment. |
+| 3 | ORM_O01.PATIENT | [ | PATIENT begin | 0 | 1 | | | | | | | |
+| 3.1 | ORM_O01.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
| 3.1 | ORM_O01.PATIENT.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 3.2 | ORM_O01.PATIENT.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 3.2 | ORM_O01.PATIENT.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[2].subject.reference=Patient[1].id | |
-| 3.3 | ORM_O01.PATIENT.NTE | [{ NTE }] | Notes and Comments (for Patient ID) | 0 | -1 | | | | | | | |
-| 3.4 | ORM_O01.PATIENT.VISIT | [ | PATIENT_VISIT begin | 0 | 1 | | | | | | | |
-| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 3.4.2 | ORM_O01.PATIENT.VISIT.PV2 | [ PV2 ] | Patient Visit- Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 3.4.3 | /ORM_O01.PATIENT.VISIT | ] | PATIENT_VISIT end | | | | | | | | | |
-| 3.5 | ORM_O01.PATIENT.INSURANCE | [{ | INSURANCE begin | 0 | -1 | | | | | | | |
-| 3.5.1 | ORM_O01.PATIENT.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | | | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 3.5.2 | ORM_O01.PATIENT.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info | 0 | 1 | | | | Coverage | | | Incorporate IN2 content into the Coverage created from the IN1 segment. |
-| 3.5.3 | ORM_O01.PATIENT.INSURANCE.IN3 | [ IN3 ] | Insurance Add'l Info – Cert. | 0 | 1 | | | | Coverage | | | Incorporate IN3 content into the Coverage created from the IN1 segment. |
-| 3.5.4 | /ORM_O01.PATIENT.INSURANCE | }] | INSURANCE end | | | | | | | | | |
-| 3.6 | ORM_O01.PATIENT.GT1 | [ GT1 ] | Guarantor | 0 | 1 | | | | | | | |
-| 3.7 | ORM_O01.PATIENT.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
-| 3.8 | /ORM_O01.PATIENT | ] | PATIENT end | | | | | | | | | |
-| 4 | ORM_O01.ORDER | { | ORDER begin | 1 | -1 | | | | | | | |
-| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | ServiceRequest | ORC[ServiceRequest] | ServiceRequest[1].subject.reference=Patient[1].id | Processing of each ORC segment results in the creation of a new ServiceRequest resource |
-| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | h | | Task | | | Processing of each ORC segment results in the creation of a new Task resource which is linked back to the ServiceRequest created for the same ORC segment. =*= The creation of a Task resource and its inclusion in the FHIR bundle should only happen when the receiving system is responsible for fulfillment of the ServiceRequest. Other systems may receive notification of the order, but should not receive a Task Resource if they are not the intended filler system. =*= The actual value of the ORC-1 Order Control Code will yield different population of the Task resource. |
-| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Provenance | ORC[Provenance] | Provenance[2].target=ServiceRequest[1] | |
-| 4.2.begin | ORM_O01.ORDER_DETAIL | [ | ORDER_DETAIL begin | 0 | 1 | | | | | | | |
-| 4.2.1.begin | ORM_O01.ORDER_DETAIL.CHOICE | < | | 1 | 1 | | | | | | | |
-| 4.2.1.1 | ORM_O01.ORDER_DETAIL.CHOICE.OBR | OBR | Order Detail Segment OBR, etc. | 0 | 1 | IF PID VALUED | | | ServiceRequest | OBR[ServiceRequest] | | Incorporate OBR content into the ServiceRequest created from the ORC segment in the same segment group. |
-| 4.2.1.1 | ORM_O01.ORDER_DETAIL.CHOICE.OBR | OBR | Order Detail Segment OBR, etc. | 0 | 1 | IF PID NOT VALUED | | | SupplyRequest | OBR[ServiceRequest] | | |
-| 4.2.1.2 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
-| 4.2.1.3 | ORM_O01.ORDER_DETAIL.CHOICE.RQD | RQD | Requisition Detail | 0 | 1 | | | | | | | |
-| 4.2.1.4 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
-| 4.2.1.5 | ORM_O01.ORDER_DETAIL.CHOICE.RQ1 | RQ1 | Requisition Detail-1 | 0 | 1 | | | | | | | |
-| 4.2.1.6 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
-| 4.2.1.7 | ORM_O01.ORDER_DETAIL.CHOICE.RXO | RXO | Pharmacy/Treatment Order | 0 | 1 | | | | MedicationRequest | RXO[MedicationRequest] | | |
-| 4.2.1.8 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
-| 4.2.1.9 | ORM_O01.ORDER_DETAIL.CHOICE.ODS | ODS | Dietary Orders, Supplements, and Preferences | 0 | 1 | IF PID NOT VALUED | | | SupplyRequest | | | |
-| 4.2.1.10 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
-| 4.2.1.11 | ORM_O01.ORDER_DETAIL.CHOICE.ODT | ODT | Diet Tray Instructions | 0 | 1 | | | | | | | |
-| 4.2.1.12 | /ORM_O01.ORDER_DETAIL.CHOICE | > | | | | | | | | | | |
-| 4.2.2 | ORM_O01.ORDER_DETAIL.NTE | [{ NTE }] | Notes and Comments (for Detail) | 0 | -1 | | | | ServiceRequest.note | NTE[ServiceRequest] | | |
-| 4.2.3 | ORM_O01.ORDER_DETAIL.CTD | [ CTD ] | Contact Data 1 | 0 | 1 | | | | | | | |
-| 4.2.4 | ORM_O01.ORDER_DETAIL.DG1 | [{ DG1 }] | Diagnosis | 0 | -1 | | | | ServiceRequest.reasonReference(Condition) | DG1[Condition] | Condition.subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource which is referenced in the ServiceRequest created by the ORC segment |
- | | | | | | | | | | | | |
-| 4.2.5 | ORM_O01.ORDER_DETAIL.OBSERVATION | [{ | OBSERVATION begin | 0 | -1 | | | | | | | |
-| 4.2.5.1 | ORM_O01.ORDER_DETAIL.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
-| 4.2.5.1 | ORM_O01.ORDER_DETAIL.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
-| 4.2.5.2 | ORM_O01.ORDER_DETAIL.OBSERVATION.NTE | [{ NTE }] | Notes and Comments (for Results) | 0 | -1 | | | | | | | |
-| 4.2.5.3 | /ORM_O01.ORDER_DETAIL.OBSERVATION | }] | OBSERVATION end | | | | | | | | | |
-| 4.2.6 | /ORM_O01.ORDER_DETAIL | ] | ORDER_DETAIL end | | | | | | | | | |
-| 4.3 | ORM_O01.ORDER.FT1 | [{ FT1 }] | Financial Transaction | 0 | -1 | | | | | | | |
-| 4.4 | ORM_O01.ORDER.CTI | [{ CTI }] | Clinical Trial Identification | 0 | -1 | | | | | | | |
-| 4.5 | ORM_O01.ORDER.BLG | [ BLG ] | Billing Segment | 0 | 1 | | | | | | | |
-| 4.6 | /ORM_O01.ORDER | } | ORDER end | | | | | | | | | |
+| 3.2 | ORM_O01.PATIENT.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 3.2 | ORM_O01.PATIENT.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[2].subject.reference=Patient[1].id | |
+| 3.3 | ORM_O01.PATIENT.NTE | [{ NTE }] | Notes and Comments (for Patient ID) | 0 | -1 | | | | | | | |
+| 3.4 | ORM_O01.PATIENT.VISIT | [ | PATIENT_VISIT begin | 0 | 1 | | | | | | | |
+| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 3.4.1 | ORM_O01.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 3.4.2 | ORM_O01.PATIENT.VISIT.PV2 | [ PV2 ] | Patient Visit- Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 3.4.3 | /ORM_O01.PATIENT.VISIT | ] | PATIENT_VISIT end | | | | | | | | | |
+| 3.5 | ORM_O01.PATIENT.INSURANCE | [{ | INSURANCE begin | 0 | -1 | | | | | | | |
+| 3.5.1 | ORM_O01.PATIENT.INSURANCE.IN1 | IN1 | Insurance | 1 | 1 | | | | Coverage | | | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 3.5.2 | ORM_O01.PATIENT.INSURANCE.IN2 | [ IN2 ] | Insurance Additional Info | 0 | 1 | | | | Coverage | | | Incorporate IN2 content into the Coverage created from the IN1 segment. |
+| 3.5.3 | ORM_O01.PATIENT.INSURANCE.IN3 | [ IN3 ] | Insurance Add'l Info – Cert. | 0 | 1 | | | | Coverage | | | Incorporate IN3 content into the Coverage created from the IN1 segment. |
+| 3.5.4 | /ORM_O01.PATIENT.INSURANCE | }] | INSURANCE end | | | | | | | | | |
+| 3.6 | ORM_O01.PATIENT.GT1 | [ GT1 ] | Guarantor | 0 | 1 | | | | | | | |
+| 3.7 | ORM_O01.PATIENT.AL1 | [{ AL1 }] | Allergy Information | 0 | -1 | | | | AllergyIntolerance | AL1[AllergyIntolerance] | AllergyIntolerance.patient.reference=Patient[1].id | Processing of the AL1 segment results in the creation of a new AllergyIntolerance resource |
+| 3.8 | /ORM_O01.PATIENT | ] | PATIENT end | | | | | | | | | |
+| 4 | ORM_O01.ORDER | { | ORDER begin | 1 | -1 | | | | | | | |
+| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | ServiceRequest | ORC[ServiceRequest] | ServiceRequest[1].subject.reference=Patient[1].id | Processing of each ORC segment results in the creation of a new ServiceRequest resource |
+| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | h | | Task | | | Processing of each ORC segment results in the creation of a new Task resource which is linked back to the ServiceRequest created for the same ORC segment. =*= The creation of a Task resource and its inclusion in the FHIR bundle should only happen when the receiving system is responsible for fulfillment of the ServiceRequest. Other systems may receive notification of the order, but should not receive a Task Resource if they are not the intended filler system. =*= The actual value of the ORC-1 Order Control Code will yield different population of the Task resource. |
+| 4.1 | ORM_O01.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Provenance | ORC[Provenance] | Provenance[2].target=ServiceRequest[1] | |
+| 4.2.begin | ORM_O01.ORDER_DETAIL | [ | ORDER_DETAIL begin | 0 | 1 | | | | | | | |
+| 4.2.1.begin | ORM_O01.ORDER_DETAIL.CHOICE | < | | 1 | 1 | | | | | | | |
+| 4.2.1.1 | ORM_O01.ORDER_DETAIL.CHOICE.OBR | OBR | Order Detail Segment OBR, etc. | 0 | 1 | IF PID VALUED | | | ServiceRequest | OBR[ServiceRequest] | | Incorporate OBR content into the ServiceRequest created from the ORC segment in the same segment group. |
+| 4.2.1.1 | ORM_O01.ORDER_DETAIL.CHOICE.OBR | OBR | Order Detail Segment OBR, etc. | 0 | 1 | IF PID NOT VALUED | | | SupplyRequest | OBR[ServiceRequest] | | |
+| 4.2.1.2 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
+| 4.2.1.3 | ORM_O01.ORDER_DETAIL.CHOICE.RQD | RQD | Requisition Detail | 0 | 1 | | | | | | | |
+| 4.2.1.4 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
+| 4.2.1.5 | ORM_O01.ORDER_DETAIL.CHOICE.RQ1 | RQ1 | Requisition Detail-1 | 0 | 1 | | | | | | | |
+| 4.2.1.6 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
+| 4.2.1.7 | ORM_O01.ORDER_DETAIL.CHOICE.RXO | RXO | Pharmacy/Treatment Order | 0 | 1 | | | | MedicationRequest | RXO[MedicationRequest] | | |
+| 4.2.1.8 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
+| 4.2.1.9 | ORM_O01.ORDER_DETAIL.CHOICE.ODS | ODS | Dietary Orders, Supplements, and Preferences | 0 | 1 | IF PID NOT VALUED | | | SupplyRequest | | | |
+| 4.2.1.10 | ORM_O01.ORDER_DETAIL.CHOICE | | | | | | | | | | | | |
+| 4.2.1.11 | ORM_O01.ORDER_DETAIL.CHOICE.ODT | ODT | Diet Tray Instructions | 0 | 1 | | | | | | | |
+| 4.2.1.12 | /ORM_O01.ORDER_DETAIL.CHOICE | > | | | | | | | | | | |
+| 4.2.2 | ORM_O01.ORDER_DETAIL.NTE | [{ NTE }] | Notes and Comments (for Detail) | 0 | -1 | | | | ServiceRequest.note | NTE[ServiceRequest] | | |
+| 4.2.3 | ORM_O01.ORDER_DETAIL.CTD | [ CTD ] | Contact Data 1 | 0 | 1 | | | | | | | |
+| 4.2.4 | ORM_O01.ORDER_DETAIL.DG1 | [{ DG1 }] | Diagnosis | 0 | -1 | | | | ServiceRequest.reasonReference(Condition) | DG1[Condition] | Condition.subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource which is referenced in the ServiceRequest created by the ORC segment |
+ | | | | | | | | | | | | |
+| 4.2.5 | ORM_O01.ORDER_DETAIL.OBSERVATION | [{ | OBSERVATION begin | 0 | -1 | | | | | | | |
+| 4.2.5.1 | ORM_O01.ORDER_DETAIL.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 4.2.5.1 | ORM_O01.ORDER_DETAIL.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 4.2.5.2 | ORM_O01.ORDER_DETAIL.OBSERVATION.NTE | [{ NTE }] | Notes and Comments (for Results) | 0 | -1 | | | | | | | |
+| 4.2.5.3 | /ORM_O01.ORDER_DETAIL.OBSERVATION | }] | OBSERVATION end | | | | | | | | | |
+| 4.2.6 | /ORM_O01.ORDER_DETAIL | ] | ORDER_DETAIL end | | | | | | | | | |
+| 4.3 | ORM_O01.ORDER.FT1 | [{ FT1 }] | Financial Transaction | 0 | -1 | | | | | | | |
+| 4.4 | ORM_O01.ORDER.CTI | [{ CTI }] | Clinical Trial Identification | 0 | -1 | | | | | | | |
+| 4.5 | ORM_O01.ORDER.BLG | [ BLG ] | Billing Segment | 0 | 1 | | | | | | | |
+| 4.6 | /ORM_O01.ORDER | } | ORDER end | | | | | | | | | |
diff --git a/input/includes/ConceptMap-message-oru-r01-to-bundle-intro.md b/input/includes/ConceptMap-message-oru-r01-to-bundle-intro.md
index dab6fdfd..32e94fd2 100644
--- a/input/includes/ConceptMap-message-oru-r01-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-oru-r01-to-bundle-intro.md
@@ -4,100 +4,100 @@ This ConceptMap represents the mapping from the HL7 V2 ORU_R01 Message to the FH
-| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
+| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 1 | ORU_R01.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
| 2 | ORU_R01.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 2 | ORU_R01.SFT | [{ SFT }] | Software Segment | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 3 | ORU_R01.UAC | [UAC] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 4 | ORU_R01.PATIENT_RESULT | { | --- PATIENT_RESULT begin | 1 | -1 | | | | | | | |
-| 4.1 | ORU_R01.PATIENT_RESULT.PATIENT | [ | --- PATIENT begin | 0 | 1 | | | | | | | |
-| 4.1.1 | ORU_R01.PATIENT_RESULT.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 3 | ORU_R01.UAC | [UAC] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 4 | ORU_R01.PATIENT_RESULT | { | --- PATIENT_RESULT begin | 1 | -1 | | | | | | | |
+| 4.1 | ORU_R01.PATIENT_RESULT.PATIENT | [ | --- PATIENT begin | 0 | 1 | | | | | | | |
+| 4.1.1 | ORU_R01.PATIENT_RESULT.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
| b | ORU_R01.PATIENT_RESULT.PATIENT.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 4.1.2 | ORU_R01.PATIENT_RESULT.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 4.1.2 | ORU_R01.PATIENT_RESULT.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[4].subject.reference=Patient[1].id | |
+| 4.1.2 | ORU_R01.PATIENT_RESULT.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 4.1.2 | ORU_R01.PATIENT_RESULT.PATIENT.PD1 | [PD1] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[4].subject.reference=Patient[1].id | |
| 4.1.3 | ORU_R01.PATIENT_RESULT.PATIENT.PRT | [{PRT}] | Participation (for Patient) | 0 | -1 | IF PRT-4.1 EQUALS "PP" AND PRT-4.3 EQUALS "HL70443" | (PRT.element(4.1)="PP")and(PRT.element(4.3)="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | Patient[1].generalPractitioner.reference=PractitionerRole[1].id | Incorporate PRT content into the Patient created from the PID segment when the PRT contains practitioner related data.
If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.1.3 | ORU_R01.PATIENT_RESULT.PATIENT.PRT | [{PRT}] | Participation (for Patient) | 0 | -1 | IF PRT-4.1 NOT EQUALS "PP" OR PRT-4.3 NOT EQUALS "HL70443" | (PRT.element(4.1)!="PP")or(PRT.element(4.3)!="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | RelatedPerson | PRT[RelatedPerson] | RelatedPerson.patient.reference=Patient[1].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.1.4 | ORU_R01.PATIENT_RESULT.PATIENT.NTE | [{NTE}] | Notes and Comments | 0 | -1 | | | | | | | |
+| 4.1.4 | ORU_R01.PATIENT_RESULT.PATIENT.NTE | [{NTE}] | Notes and Comments | 0 | -1 | | | | | | | |
| 4.1.5 | ORU_R01.PATIENT_RESULT.PATIENT.NK1 | [{NK1}] | Next of Kin/Associated Parties | 0 | -1 | | | The FHIR location will depend on the nature of the data being exchanged and how the systems use next of kin data | RelatedPerson | NK1[RelatedPerson] | RelatedPerson.patient.reference=Patient[1].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
| 4.1.5 | ORU_R01.PATIENT_RESULT.PATIENT.NK1 | [{NK1}] | Next of Kin/Associated Parties | 0 | -1 | | | The FHIR location will depend on the nature of the data being exchanged and how the systems use next of kin data | Patient | NK1[Patient] | | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 4.1.6 | ORU_R01.PATIENT_RESULT.PATIENT.ARV | [{ARV}] | Access Restrictions | 0 | -1 | | | | | | | |
-| 4.1.7 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION | [{ | --- PATIENT_OBSERVATION begin | 0 | -1 | | | | | | | |
-| 4.1.7.1 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[1].subject.reference=Patient[1].id | |
-| 4.1.7.1 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[1].subject.reference=Patient[1].id | Note that when OBX-5 repeats, the standard mapping is to use Observation.component (see OBX[Observation-Component] map) rather than creating separate Observation instances. However, we are aware that some profiles and implementation guides do separate the OBX into multiple observations depending on the OBX-2 value. This is an example of a non-standard interpretation as the OBX should have been separated into multiple OBX segments to start. Please consider the local profiles and implementation guides on how to manage these variants. |
+| 4.1.6 | ORU_R01.PATIENT_RESULT.PATIENT.ARV | [{ARV}] | Access Restrictions | 0 | -1 | | | | | | | |
+| 4.1.7 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION | [{ | --- PATIENT_OBSERVATION begin | 0 | -1 | | | | | | | |
+| 4.1.7.1 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[1].subject.reference=Patient[1].id | |
+| 4.1.7.1 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[1].subject.reference=Patient[1].id | Note that when OBX-5 repeats, the standard mapping is to use Observation.component (see OBX[Observation-Component] map) rather than creating separate Observation instances. However, we are aware that some profiles and implementation guides do separate the OBX into multiple observations depending on the OBX-2 value. This is an example of a non-standard interpretation as the OBX should have been separated into multiple OBX segments to start. Please consider the local profiles and implementation guides on how to manage these variants. |
| 4.1.7.2 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-10 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | Device | PRT[Device] | Observation[1].device.reference=Device.id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.1.7.2 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | Observation | PRT[Observation-Location] | | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.1.7.2 | ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-5 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | Observation.performer.reference=PractitionerRole[1].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.1.7.3 | /ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION | }] | --- PATIENT_OBSERVATION end | | | | | | | | | |
-| 4.1.8 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT | [ | --- VISIT begin | 0 | 1 | | | | | | | |
-| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 4.1.8.2 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV2 | [PV2] | Patient Visit - Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter.subject.reference=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 4.1.7.3 | /ORU_R01.PATIENT_RESULT.PATIENT.PATIENT_OBSERVATION | }] | --- PATIENT_OBSERVATION end | | | | | | | | | |
+| 4.1.8 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT | [ | --- VISIT begin | 0 | 1 | | | | | | | |
+| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Encounter | PV1[Encounter] | Encounter.subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 4.1.8.1 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 4.1.8.2 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PV2 | [PV2] | Patient Visit - Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter.subject.reference=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
| 4.1.8.3 | ORU_R01.PATIENT_RESULT.PATIENT.VISIT.PRT | [{PRT}] | Participation (for Patient Visit) | 0 | -1 | | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | Encounter[1].participant.individual.reference=PractitionerRole[2].id | Incorporate PRT content into the Encounter created from the PV1 segment.
If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.1.8.4 | /ORU_R01.PATIENT_RESULT.PATIENT.VISIT | ] | --- VISIT end | | | | | | | | | |
-| 4.1.9 | /ORU_R01.PATIENT_RESULT.PATIENT | ] | --- PATIENT end | | | | | | | | | |
-| 4.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION | { | --- ORDER_OBSERVATION begin | 1 | -1 | | | | | | | |
-| 4.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER | [ | --- COMMON_ORDER begin | 0 | 1 | | | | | | | |
-| 4.2.1.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORC | ORC | Order common | 1 | 1 | | | | DiagnosticReport | ORC[DiagnosticReport] | DiagnosticReport[1].encounter.reference=Encounter[1].id | Processing of each ORC segment results in the creation of a new DiagnosticReport resource |
+| 4.1.8.4 | /ORU_R01.PATIENT_RESULT.PATIENT.VISIT | ] | --- VISIT end | | | | | | | | | |
+| 4.1.9 | /ORU_R01.PATIENT_RESULT.PATIENT | ] | --- PATIENT end | | | | | | | | | |
+| 4.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION | { | --- ORDER_OBSERVATION begin | 1 | -1 | | | | | | | |
+| 4.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER | [ | --- COMMON_ORDER begin | 0 | 1 | | | | | | | |
+| 4.2.1.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORC | ORC | Order common | 1 | 1 | | | | DiagnosticReport | ORC[DiagnosticReport] | DiagnosticReport[1].encounter.reference=Encounter[1].id | Processing of each ORC segment results in the creation of a new DiagnosticReport resource |
| 4.2.1.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORC | ORC | Order common | 1 | 1 | | | If a ServiceRequest needs to be created for the receiver. | ServiceRequest | ORC[ServiceRequest] | DiagnosticReport[1].basedOn.reference=ServiceRequest[1].id | |
| 4.2.1.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.PRT | [{PRT}] | Participation (for Observation) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | ServiceRequest[1].requester.reference=PractitionerRole[3].id | |
-| 4.2.1.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT | [ | --- ORDER_DOCUMENT begin | 0 | 1 | | | | | | | Will be addressed with FHIR R5. |
-| 4.2.1.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT.OBX | OBX | Observation containing Document | 1 | 1 | | | | | | | |
+| 4.2.1.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT | [ | --- ORDER_DOCUMENT begin | 0 | 1 | | | | | | | Will be addressed with FHIR R5. |
+| 4.2.1.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT.OBX | OBX | Observation containing Document | 1 | 1 | | | | | | | |
| 4.2.1.3.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT.PRT | [{PRT}] | Participation | 0 | -1 | | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | | | | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.2.1.3.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT.TXA | TXA | Transcription Document Header | 1 | 1 | | | | | | | |
-| 4.2.1.3.4 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT | ] | --- ORDER DOCUMENT end | | | | | | | | | |
-| 4.2.1.4 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER | ] | --- COMMON ORDER end | | | | | | | | | |
-| 4.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBR | OBR | Observations Request | 1 | 1 | | | | DiagnosticReport | OBR[DiagnosticReport] | | Incorporate OBR content into the DiagnosticReport created from the ORC segment in the same segment group. |
-| 4.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBR | OBR | Observations Request | 1 | 1 | | | | Specimen | OBR[Specimen] | DiagnosticReport[1].specimen.reference=Specimen.id | The OBR specimen data yields one Specimen resource that all Observations generated for the same OBR need to reference. |
+| 4.2.1.3.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT.TXA | TXA | Transcription Document Header | 1 | 1 | | | | | | | |
+| 4.2.1.3.4 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER.ORDER_DOCUMENT | ] | --- ORDER DOCUMENT end | | | | | | | | | |
+| 4.2.1.4 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.COMMON_ORDER | ] | --- COMMON ORDER end | | | | | | | | | |
+| 4.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBR | OBR | Observations Request | 1 | 1 | | | | DiagnosticReport | OBR[DiagnosticReport] | | Incorporate OBR content into the DiagnosticReport created from the ORC segment in the same segment group. |
+| 4.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBR | OBR | Observations Request | 1 | 1 | | | | Specimen | OBR[Specimen] | DiagnosticReport[1].specimen.reference=Specimen.id | The OBR specimen data yields one Specimen resource that all Observations generated for the same OBR need to reference. |
| 4.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBR | OBR | Observations Request | 1 | 1 | IF ORC VALUED | | If a ServiceRequest needs to be created for the receiver. | ServiceRequest | OBR[ServiceRequest] | | Mapping to ServiceRequest as well is needed if the receiver is not the originator of the order to which this results message responds. This mapping will be completed once OMG/OML mapping is sufficiently completed. We will add the other segment mappings below to ServiceRequest then as well. |
-| 4.2.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.NTE | {[NTE]} | Notes and comments | 0 | -1 | | | | | | | |
+| 4.2.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.NTE | {[NTE]} | Notes and comments | 0 | -1 | | | | | | | |
| 4.2.4 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.PRT | [{PRT}] | Participation (for Observation) | 0 | -1 | IF PRT-4.1 IN ("ARI","TN","TR") AND PRT-4.3 EQUALS "HL70443" | PRT.element(4.1) in ("ARI","TN", "TR")and(PRT.element(4.3)="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | DiagnosticReport[1].performer.reference=PractitionerRole[4].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.2.4 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.PRT | [{PRT}] | Participation (for Observation) | 0 | -1 | IF PRT-4.1 EQUALS "PRI" AND PRT-4.3 EQUALS "HL70443" | (PRT.element(4.1)="PRI")and(PRT.element(4.3)="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | DiagnosticReport[1].resultsInterpreter.reference=PractitionerRole[5].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.2.4 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.PRT | [{PRT}] | Participation (for Observation) | 0 | -1 | IF PRT-4.1 EQUALS "SC" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="SC")and(element("4.3")="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | DiagnosticReport[1].specimen[1](Specimen.collection.collector.reference)=PractitionerRole[6].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.2.4 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.PRT | [{PRT}] | Participation (for Observation) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | DiagnosticReport[1].requester.reference=PractitionerRole[3].id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.2.4.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY | [{ | --- TIMING_QTY begin | 0 | -1 | | | | | | | |
-| 4.2.4.1.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | | | | |
-| 4.2.4.1.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
-| 4.2.4.1.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY | }] | --- TIMING_QTY end | | | | | | | | | |
-| 4.2.4.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.CTD | [CTD] | Contact Data | 0 | 1 | | | | | | | |
-| 4.2.4.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
-| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 AND OBX-29 NOT IN ("QST", "SCI") | | | Observation | OBX[Observation] | DiagnosticReport.result.reference=Observation[2].id
+ |
| 4.2.4.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY | [{ | --- TIMING_QTY begin | 0 | -1 | | | | | | | |
+| 4.2.4.1.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | | | | |
+| 4.2.4.1.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY.TQ2 | [{TQ2}] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
+| 4.2.4.1.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.TIMING_QTY | }] | --- TIMING_QTY end | | | | | | | | | |
+| 4.2.4.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.CTD | [CTD] | Contact Data | 0 | 1 | | | | | | | |
+| 4.2.4.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 AND OBX-29 NOT IN ("QST", "SCI") | | | Observation | OBX[Observation] | DiagnosticReport.result.reference=Observation[2].id
Observation[2].subject.reference=Patient[1].id;
Observation[2].encounter.reference=Encounter[1].id | Implementers should consider the use case where OBX-5 repeats in a given OBX segment. Because the Observation value element is not allowed to repeat, multiple occurrences of OBX-5 must be handled either through the creation of multiple Observation resources, the use of Observation components, the concatenation of the results into a single value or another solution appropriate for the data and the implementation.
Note that it is not clear that every OBX represents a results that can be associated with the encounter during which it was ordered/performed. |
-| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 AND OBX-29 NOT IN ("QST", "SCI") | | | Observation | OBX[Observation-Component] | DiagnosticReport.result.reference=Observation[2].id
+ |
| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 AND OBX-29 NOT IN ("QST", "SCI") | | | Observation | OBX[Observation-Component] | DiagnosticReport.result.reference=Observation[2].id
Observation[2].subject.reference=Patient[1].id;
Observation[2].encounter.reference=Encounter[1].id | Implementers should consider the use case where OBX-5 repeats in a given OBX segment. Because the Observation value element is not allowed to repeat, multiple occurrences of OBX-5 must be handled either through the creation of multiple Observation resources, the use of Observation components, the concatenation of the results into a single value or another solution appropriate for the data and the implementation. When multiple OBX segments are tranformed into Observation components in a single Observation resource, implementers should consider how the metadata associated with the result (eg performer, status, date/time, etc) are populated. If the OBX segments being combined into a single resource contain different metadata, it must be considered whether or not the use of components is appropriate. |
-| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 AND OBX-29 IN ("QST", "SCI") | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
-| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 AND OBX-29 AND OBX-29 IN ("QST", "SCI") | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 AND OBX-29 IN ("QST", "SCI") | | | Observation | OBX[Observation] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
+| 4.2.4.3.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.OBX | OBX | Observation related to OBR | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 AND OBX-29 AND OBX-29 IN ("QST", "SCI") | | | Observation | OBX[Observation-Component] | ServiceRequest[1].supportingInfo.reference=Observation[1].id; Observation[1].subject.id=Patient[1].id | |
| 4.2.4.3.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-10 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | Device | PRT[Device] | Observation[2].device.reference=Device.id | If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.2.4.3.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | Observation | PRT[Observation-Location] | | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation location information.
If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
| 4.2.4.3.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | IF PRT-5 VALUED | | If PRT-2 is valued to "D", delete, then the implementer needs to consider whether to create a Device with Device.status = "inactive". | PractitionerRole | PRT[PractitionerRole] | Observation[2].performer.reference=PractitionerRole[7].id | Incorporate PRT content into the Observation created from the OBX segment in the same segment group when it represents observation practitioner information.
If PRT-2 is set to "D" and "inactive" cannot be used, please submit a JIRA with context and rationale. |
-| 4.2.4.3.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.NTE | {[NTE]} | Notes and comments | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
-| 4.2.4.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 4.2.5 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.FT1 | [{FT1}] | Financial Transaction | 0 | -1 | | | | | | | |
-| 4.2.6 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.CTI | {[CTI]} | Clinical Trial Identification | 0 | -1 | | | | | | | |
-| 4.2.7 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN | [{ | --- SPECIMEN begin | 0 | -1 | | | | | | | |
-| 4.2.7.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | | | | Specimen | SPM[Specimen] | DiagnosticReport[1].specimen.reference=Specimen[n].id | |
-| 4.2.7.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION | [{ | --- SPECIMEN_OBSERVATION begin | 0 | -1 | | | | | | | |
-| 4.2.7.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id
-Observation[3].focus.reference=Specimen[n].id | |
-| 4.2.7.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id
-Observation[3].focus.reference=Specimen[n].id | |
-| 4.2.7.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | | | | | | | |
-| 4.2.7.2.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION | }] | --- SPECIMEN_OBSERVATION end | | | | | | | | | |
-| 4.2.7.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN | }] | --- SPECIMEN end | | | | | | | | | |
-| 4.2.8 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION | } | --- ORDER_OBSERVATION end | | | | | | | | | |
-| 4.3 | /ORU_R01.PATIENT_RESULT | } | --- PATIENT_RESULT end | | | | | | | | | |
-| 5 | ORU_R01.DSC | [DSC] | Continuation Pointer | | | | | | | | | |
+| 4.2.4.3.3 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION.NTE | {[NTE]} | Notes and comments | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
+| 4.2.4.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 4.2.5 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.FT1 | [{FT1}] | Financial Transaction | 0 | -1 | | | | | | | |
+| 4.2.6 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.CTI | {[CTI]} | Clinical Trial Identification | 0 | -1 | | | | | | | |
+| 4.2.7 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN | [{ | --- SPECIMEN begin | 0 | -1 | | | | | | | |
+| 4.2.7.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPM | SPM | Specimen | 1 | 1 | | | | Specimen | SPM[Specimen] | DiagnosticReport[1].specimen.reference=Specimen[n].id | |
+| 4.2.7.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION | [{ | --- SPECIMEN_OBSERVATION begin | 0 | -1 | | | | | | | |
+| 4.2.7.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[3].subject.reference=Patient[1].id
+Observation[3].focus.reference=Specimen[n].id | |
+| 4.2.7.2.1 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.OBX | OBX | Observation (for Patient ID) | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[3].subject.reference=Patient[1].id
+Observation[3].focus.reference=Specimen[n].id | |
+| 4.2.7.2.2 | ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION.PRT | [{PRT}] | Participation (Observation Participation) | 0 | -1 | | | | | | | |
+| 4.2.7.2.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN.SPECIMEN_OBSERVATION | }] | --- SPECIMEN_OBSERVATION end | | | | | | | | | |
+| 4.2.7.3 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION.SPECIMEN | }] | --- SPECIMEN end | | | | | | | | | |
+| 4.2.8 | /ORU_R01.PATIENT_RESULT.ORDER_OBSERVATION | } | --- ORDER_OBSERVATION end | | | | | | | | | |
+| 4.3 | /ORU_R01.PATIENT_RESULT | } | --- PATIENT_RESULT end | | | | | | | | | |
+| 5 | ORU_R01.DSC | [DSC] | Continuation Pointer | | | | | | | | | |
diff --git a/input/includes/ConceptMap-message-siu-s12-to-bundle-intro.md b/input/includes/ConceptMap-message-siu-s12-to-bundle-intro.md
index b6ba3a0a..103eef45 100644
--- a/input/includes/ConceptMap-message-siu-s12-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-siu-s12-to-bundle-intro.md
@@ -4,47 +4,47 @@ This ConceptMap represents the mapping from the HL7 V2 SIU_S12 Message to the FH
-| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
-| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | . |
-| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | |
-| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | | | | Appointment | SCH[Appointment] | Appointment.participant.actor=Patient[1].id | |
-| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | IF SCH-26 or SCH-27 VALUED | | | ServiceRequest | SCH[ServiceRequest] | Appointment[1].basedOn=ServiceRequest[1..n].id
-ServiceRequest[1..n].subject=Patient[1].id | |
-| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | | | | Provenance | SCH[Provenance] | | |
-| 3 | SIU_S12.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | Appointment | NTE[Appointment-Comment] | Appointment.participant.actor=Patient[1].id | Because multiple NTE segments in a message all need to map to a single Appointment.comment element, the content of the NTEs will need to be concatenated together in R4 |
-| 4 | SIU_S12.PATIENT | [{ | --- PATIENT begin | 0 | -1 | | | | | | | |
-| 4.1 | SIU_S12.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
-| 4.1 | SIU_S12.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Appointment | PID[Appointment] | Appointment.participant.actor=Patient[1].id | |
+| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
+| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | . |
+| 1 | SIU_S12.MSH | MSH | Message Header | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | |
+| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | | | | Appointment | SCH[Appointment] | Appointment.participant.actor=Patient[1].id | |
+| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | IF SCH-26 or SCH-27 VALUED | | | ServiceRequest | SCH[ServiceRequest] | Appointment[1].basedOn=ServiceRequest[1..n].id
+ServiceRequest[1..n].subject=Patient[1].id | |
+| 2 | SIU_S12.SCH | SCH | Schedule Activity Information | 1 | 1 | | | | Provenance | SCH[Provenance] | | |
+| 3 | SIU_S12.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | Appointment | NTE[Appointment-Comment] | Appointment.participant.actor=Patient[1].id | Because multiple NTE segments in a message all need to map to a single Appointment.comment element, the content of the NTEs will need to be concatenated together in R4 |
+| 4 | SIU_S12.PATIENT | [{ | --- PATIENT begin | 0 | -1 | | | | | | | |
+| 4.1 | SIU_S12.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 4.1 | SIU_S12.PATIENT.PID | PID | Patient Identification | 1 | 1 | | | | Appointment | PID[Appointment] | Appointment.participant.actor=Patient[1].id | |
| 4.1 | SIU_S12.PATIENT.PID | PID | Patient Identification | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | | | | Patient | PV1[Patient] | | |
-| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 4.3 | SIU_S12.PATIENT.PV2 | [ PV2 ] | Patient Visit - Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter.subject=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 4.4 | SIU_S12.PATIENT.OBX | [ { OBX } ] | Observation/Result | 0 | -1 | | | | Observation | OBX[Observation] | Observation.subject=Patient[1].id | |
+| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | | | | Encounter | PV1[Encounter] | Encounter[1].subject.reference=Patient[1].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
+| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | | | | Patient | PV1[Patient] | | |
+| 4.2 | SIU_S12.PATIENT.PV1 | [ PV1 ] | Patient Visit | 0 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 4.3 | SIU_S12.PATIENT.PV2 | [ PV2 ] | Patient Visit - Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | Encounter.subject=Patient[1].id | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 4.4 | SIU_S12.PATIENT.OBX | [ { OBX } ] | Observation/Result | 0 | -1 | | | | Observation | OBX[Observation] | Observation.subject=Patient[1].id | |
| 4.5 | SIU_S12.PATIENT.DG1 | [ { DG1 } ] | Diagnosis | 0 | -1 | | | If in context of the patient | Condition | DG1[Condition] | Condition[1].subject.reference=Patient[1].id | Processing of the DG1 segment results in the creation of a new Condition resource |
-| 4.6 | SIU_S12.PATIENT | }] | --- PATIENT end | 0 | -1 | | | | | | | |
-| 5 | SIU_S12.RESOURCES | { | --- RESOURCES begin RGS | 1 | -1 | | | | | | | |
-| 5.1 | SIU_S12.RESOURCES.RGS | RGS | Resource Group Segment | 1 | 1 | | | | | | | |
-| 5.2 | SIU_S12.RESOURCES.SERVICE | [{ | --- SERVICE begin AIS | 0 | -1 | | | | | | | |
+| 4.6 | SIU_S12.PATIENT | }] | --- PATIENT end | 0 | -1 | | | | | | | |
+| 5 | SIU_S12.RESOURCES | { | --- RESOURCES begin RGS | 1 | -1 | | | | | | | |
+| 5.1 | SIU_S12.RESOURCES.RGS | RGS | Resource Group Segment | 1 | 1 | | | | | | | |
+| 5.2 | SIU_S12.RESOURCES.SERVICE | [{ | --- SERVICE begin AIS | 0 | -1 | | | | | | | |
| 5.2.1 | SIU_S12.RESOURCES.SERVICE.AIS | AIS | Appointment Information - Service | 1 | 1 | | | Determine which AIS populates Appointment if there is more than one AIS. | Appointment | AIS[Appointment] | | |
-| 5.2.1 | SIU_S12.RESOURCES.SERVICE.AIS | AIS | Appointment Information - Service | 1 | 1 | IF SCH-26 IS VALUED OR SCH-27 IS VALUED | | | ServiceRequest | AIS[ServiceRequest] | | Note that each ServiceRequest being created includes data from SCH segment.
+ |
| 5.2.1 | SIU_S12.RESOURCES.SERVICE.AIS | AIS | Appointment Information - Service | 1 | 1 | IF SCH-26 IS VALUED OR SCH-27 IS VALUED | | | ServiceRequest | AIS[ServiceRequest] | | Note that each ServiceRequest being created includes data from SCH segment.
If SCH-26 and SCH-27 repeat, then the implementer needs to determine how to align this with potentially repeating AIS segments. |
| 5.2.2 | SIU_S12.RESOURCES.SERVICE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | Determine which AIS populates Appointment if there is more than one AIS. | Appointment | NTE[Appointment-Comment] | Appointment.participant.actor=Patient[1].id | Because multiple NTE segments in a message all need to map to a single Appointment.comment element, the content of the NTEs will need to be concatenated together in R4 |
-| 5.2.3 | SIU_S12.RESOURCES.SERVICE | }] | --- SERVICE end | 0 | -1 | | | | | | | |
-| 5.3 | SIU_S12.RESOURCES.GENERAL_RESOURCE | [{ | --- GENERAL_RESOURCE begin AIG | 0 | -1 | | | | | | | |
+| 5.2.3 | SIU_S12.RESOURCES.SERVICE | }] | --- SERVICE end | 0 | -1 | | | | | | | |
+| 5.3 | SIU_S12.RESOURCES.GENERAL_RESOURCE | [{ | --- GENERAL_RESOURCE begin AIG | 0 | -1 | | | | | | | |
| 5.3.1 | SIU_S12.RESOURCES.GENERAL_RESOURCE.AIG | AIG | Appointment Information - General Resource | 1 | 1 | | | Determine which AIG populates Appointment if there is more than one AIG. | Appointment | AIG[Appointment] | | |
-| 5.3.2 | SIU_S12.RESOURCES.GENERAL_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
-| 5.3.3 | SIU_S12.RESOURCES.GENERAL_RESOURCE | }] | --- GENERAL_RESOURCE end | 0 | -1 | | | | | | | |
-| 5.4 | SIU_S12.RESOURCES.LOCATION_RESOURCE | [{ | --- LOCATION_RESOURCE begin AIL | 0 | -1 | | | | | | | |
+| 5.3.2 | SIU_S12.RESOURCES.GENERAL_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
+| 5.3.3 | SIU_S12.RESOURCES.GENERAL_RESOURCE | }] | --- GENERAL_RESOURCE end | 0 | -1 | | | | | | | |
+| 5.4 | SIU_S12.RESOURCES.LOCATION_RESOURCE | [{ | --- LOCATION_RESOURCE begin AIL | 0 | -1 | | | | | | | |
| 5.4.1 | SIU_S12.RESOURCES.LOCATION_RESOURCE.AIL | AIL | Appointment Information - Location Resource | 1 | -1 | | | Determine which AIL populates Appointment if there is more than one AIL. | Appointment | AIL[Appointment] | | |
-| 5.4.2 | SIU_S12.RESOURCES.LOCATION_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
-| 5.4.3 | SIU_S12.RESOURCES.LOCATION_RESOURCE | }] | --- LOCATION_RESOURCE end | 0 | -1 | | | | | | | |
-| 5.5 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE | [{ | --- PERSONNEL_RESOURCE begin AIP | 0 | -1 | | | | | | | |
-| 5.5.1 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE.AIP | AIP | Appointment Information - Personnel Resource | 1 | -1 | | | | Appointment | AIP[Appointment] | | |
-| 5.5.2 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
-| 5.5.3 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE | }] | --- PERSONNEL_RESOURCE end | 0 | -1 | | | | | | | |
-| 5.6 | SIU_S12.RESOURCES | } | --- RESOURCES end | 1 | -1 | | | | | | | |
+| 5.4.2 | SIU_S12.RESOURCES.LOCATION_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
+| 5.4.3 | SIU_S12.RESOURCES.LOCATION_RESOURCE | }] | --- LOCATION_RESOURCE end | 0 | -1 | | | | | | | |
+| 5.5 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE | [{ | --- PERSONNEL_RESOURCE begin AIP | 0 | -1 | | | | | | | |
+| 5.5.1 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE.AIP | AIP | Appointment Information - Personnel Resource | 1 | -1 | | | | Appointment | AIP[Appointment] | | |
+| 5.5.2 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE.NTE | [ { NTE } ] | Notes and Comments | 0 | -1 | | | | | | | |
+| 5.5.3 | SIU_S12.RESOURCES.PERSONNEL_RESOURCE | }] | --- PERSONNEL_RESOURCE end | 0 | -1 | | | | | | | |
+| 5.6 | SIU_S12.RESOURCES | } | --- RESOURCES end | 1 | -1 | | | | | | | |
diff --git a/input/includes/ConceptMap-message-vxu-v04-to-bundle-intro.md b/input/includes/ConceptMap-message-vxu-v04-to-bundle-intro.md
index 13f9c996..762d170f 100644
--- a/input/includes/ConceptMap-message-vxu-v04-to-bundle-intro.md
+++ b/input/includes/ConceptMap-message-vxu-v04-to-bundle-intro.md
@@ -4,71 +4,71 @@ This ConceptMap represents the mapping from the HL7 V2 VXU_V04 Message to the FH
-| 1 | VXU_V04.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
-| 1 | VXU_V04.MSH | MSH | Message Header Segment | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
+| 1 | VXU_V04.MSH | MSH | Message Header | 1 | 1 | | | | Bundle | MSH[Bundle] | | |
+| 1 | VXU_V04.MSH | MSH | Message Header Segment | 1 | 1 | | | | MessageHeader | MSH[MessageHeader] | | Processing of the MSH segment results in the creation of a new MessageHeader resource |
| 1 | VXU_V04.MSH | MSH | Message Header Segment | 1 | 1 | | | If there is a source in MSH-4, or known based on the configuration. | Provenance | MSH[Provenance-Source] | Provenance[1].target.reference=Bundle.id; Provenance[1].target.reference=MessageHeader[1].id | If the FHIR transformation does not yield a FHIR message, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
-| 1 | VXU_V04.MSH | MSH | Message Header Segment | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
+| 1 | VXU_V04.MSH | MSH | Message Header Segment | 1 | 1 | | | | Provenance | MSH[Provenance-Transformation] | Provenance[2].target.reference=Bundle.id | If the FHIR transformation does not yield a FHIR Bunlde, but only a set of resource (APIs, repository, etc.) than one should consider attaching this Provenance resource instance to the relevant FHIR resources generated. |
| 2 | VXU_V04.SFT | [{ SFT }] | Software | 0 | -1 | | | If the software does represent not the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="derivation" | |
| 2 | VXU_V04.SFT | [{ SFT }] | Software | 0 | -1 | | | If the software represents the original source system | Provenance.entity.what(Device) | SFT[Device] | Provenance[1].entity.what.reference=Device.id
Provenance[1].entity.role="source" | |
-| 3 | VXU_V04.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
-| 4 | VXU_V04.PID | PID | Patient Identification Segment | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
+| 3 | VXU_V04.UAC | [ UAC ] | User Authentication Credential | 0 | 1 | | | | | | | |
+| 4 | VXU_V04.PID | PID | Patient Identification Segment | 1 | 1 | | | | Patient | PID[Patient] | | Processing of the PID segment results in the creation of a new Patient resource |
| 4 | VXU_V04.PID | PID | Patient Identification Segment | 1 | 1 | IF PID-33 AND PID-34 VALUED | | One may drop PID-33 from the condition if PID-34 Last Update Facility is still sufficient without a date. | Provenance | PID[Provenance-Patient] | Provenance.target.reference=Patient[1].id | |
-| 5 | VXU_V04.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
-| 5 | VXU_V04.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[3].subject.reference=Patient[1].id | |
-| 6 | VXU_V04.NK1 | [{ NK1 }] | Next of Kin/Associated Parties | 0 | -1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson.patient.reference=Patient[PID].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
-| 6 | VXU_V04.NK1 | [{ NK1 }] | Next of Kin/Associated Parties | 0 | -1 | | | | Patient | NK1[Patient] | | |
-| 7 | VXU_V04.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
-| 8 | VXU_V04.PATIENT_VISIT | [ | --- PATIENT_VISIT begin | 0 | 1 | | | | | | | |
+| 5 | VXU_V04.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | | | | Patient | PD1[Patient] | | Incorporate PD1 content into the Patient created from the PID segment. |
+| 5 | VXU_V04.PD1 | [ PD1 ] | Additional Demographics | 0 | 1 | IF PD1-7 VALUED | | | Observation | PD1[Observation-LivingWill] | Observation[3].subject.reference=Patient[1].id | |
+| 6 | VXU_V04.NK1 | [{ NK1 }] | Next of Kin/Associated Parties | 0 | -1 | | | | RelatedPerson | NK1[RelatedPerson] | RelatedPerson.patient.reference=Patient[PID].id | Typically, each NK1 will be translated to either a new RelatedPerson resource or added as a new occurrence of Patient.contact, but it's possible to insert the NK1 data into both structures. |
+| 6 | VXU_V04.NK1 | [{ NK1 }] | Next of Kin/Associated Parties | 0 | -1 | | | | Patient | NK1[Patient] | | |
+| 7 | VXU_V04.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 8 | VXU_V04.PATIENT_VISIT | [ | --- PATIENT_VISIT begin | 0 | 1 | | | | | | | |
| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | Only if the system wants to know about the encounter related to the immunization event | Encounter | PV1[Encounter] | Encounter.subject.reference=Patient[PID].id | Processing of the PV1 segment results in the creation of a new Encounter resource |
-| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
-| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
-| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
-| 8.2 | VXU_V04.PATIENT_VISIT.PV2 | [ PV2 ] | Patient Visit – Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
-| 8.3 | VXU_V04.PATIENT_VISIT.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
-| 8.4 | /VXU_V04.PATIENT_VISIT | ] | --- PATIENT_VISIT end | | | | | | | | | |
-| 9 | VXU_V04.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
-| 10 | VXU_V04.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
-| 10.1 | VXU_V04.INSURANCE | IN1 | Insurance | 1 | 1 | | | | | | | Processing of the IN1 segment results in the creation of a new Coverage resource |
-| 10.2 | VXU_V04.INSURANCE | [ IN2 ] | Insurance Additional Information | 0 | 1 | | | | | | | Incorporate IN2 content into the Coverage created from the IN1 segment. |
-| 10.3 | VXU_V04.INSURANCE | [ IN3 ] | Insurance Additional Information, Certification | 0 | 1 | | | | | | | Incorporate IN3 content into the Coverage created from the IN1 segment. |
-| 10.4 | /VXU_V04.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
-| 11 | VXU_V04.PERSON_OBSERVATION | [{ | --- PERSON_OBSERVATION begin | 0 | -1 | | | | | | | |
-| 11.1 | VXU_V04.PERSON_OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[1].subject.reference=Patient[1].id | |
-| 11.1 | VXU_V04.PERSON_OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[1].subject.reference=Patient[1].id | |
-| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
-| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | At this time we don't know of a use case for sending a location PRT to a patient level observations. We've provided a mapping from PRT to Location but not way to link it to other resources in the Bundle. If there is a known use case, please comment on it so that we can develop a solution. |
-| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation.performer.reference=PractitionerRole[1].id | |
-| 11.3 | VXU_V04.PERSON_OBSERVATION.NTE | [{ NTE }] | Notes (Regarding Patient Observation) | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
-| 11.4 | /VXU_V04.PERSON_OBSERVATION | }] | --- PERSON_OBSERVATION end | | | | | | | | | |
-| 12 | VXU_V04.ORDER | [{ | --- ORDER begin | 0 | -1 | | | | | | | |
-| 12.1 | VXU_V04.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Immunization | ORC[Immunization] | Immunzation.patient.reference=Patient[1].id | Processing of each ORC segment results in the creation of a new Immunization resource |
+| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-43 VALUED | | | EncounterHistory | PV1[EncounterHistory] | EncounterHistory.subject.reference=Patient[1].id | |
+| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | | | | Patient | PV1[Patient] | | |
+| 8.1 | VXU_V04.PATIENT_VISIT.PV1 | PV1 | Patient Visit | 1 | 1 | IF PV1-20 VALUE | | | Coverage | PV1[Coverage] | Coverage.beneficiary.reference=Patient[1].id | |
+| 8.2 | VXU_V04.PATIENT_VISIT.PV2 | [ PV2 ] | Patient Visit – Additional Info | 0 | 1 | | | | Encounter | PV2[Encounter] | | Incorporate PV2 content into the Encounter created from the PV1 segment. |
+| 8.3 | VXU_V04.PATIENT_VISIT.ARV | [{ ARV }] | Access Restrictions | 0 | -1 | | | | | | | |
+| 8.4 | /VXU_V04.PATIENT_VISIT | ] | --- PATIENT_VISIT end | | | | | | | | | |
+| 9 | VXU_V04.GT1 | [{ GT1 }] | Guarantor | 0 | -1 | | | | | | | |
+| 10 | VXU_V04.INSURANCE | [{ | --- INSURANCE begin | 0 | -1 | | | | | | | |
+| 10.1 | VXU_V04.INSURANCE | IN1 | Insurance | 1 | 1 | | | | | | | Processing of the IN1 segment results in the creation of a new Coverage resource |
+| 10.2 | VXU_V04.INSURANCE | [ IN2 ] | Insurance Additional Information | 0 | 1 | | | | | | | Incorporate IN2 content into the Coverage created from the IN1 segment. |
+| 10.3 | VXU_V04.INSURANCE | [ IN3 ] | Insurance Additional Information, Certification | 0 | 1 | | | | | | | Incorporate IN3 content into the Coverage created from the IN1 segment. |
+| 10.4 | /VXU_V04.INSURANCE | }] | --- INSURANCE end | | | | | | | | | |
+| 11 | VXU_V04.PERSON_OBSERVATION | [{ | --- PERSON_OBSERVATION begin | 0 | -1 | | | | | | | |
+| 11.1 | VXU_V04.PERSON_OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | | Observation | OBX[Observation] | Observation[1].subject.reference=Patient[1].id | |
+| 11.1 | VXU_V04.PERSON_OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | | Observation | OBX[Observation-Component] | Observation[1].subject.reference=Patient[1].id | |
+| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
+| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | At this time we don't know of a use case for sending a location PRT to a patient level observations. We've provided a mapping from PRT to Location but not way to link it to other resources in the Bundle. If there is a known use case, please comment on it so that we can develop a solution. |
+| 11.2 | VXU_V04.PERSON_OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation.performer.reference=PractitionerRole[1].id | |
+| 11.3 | VXU_V04.PERSON_OBSERVATION.NTE | [{ NTE }] | Notes (Regarding Patient Observation) | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
+| 11.4 | /VXU_V04.PERSON_OBSERVATION | }] | --- PERSON_OBSERVATION end | | | | | | | | | |
+| 12 | VXU_V04.ORDER | [{ | --- ORDER begin | 0 | -1 | | | | | | | |
+| 12.1 | VXU_V04.ORDER.ORC | ORC | Common Order | 1 | 1 | | | | Immunization | ORC[Immunization] | Immunzation.patient.reference=Patient[1].id | Processing of each ORC segment results in the creation of a new Immunization resource |
| 12.1 | VXU_V04.ORDER.ORC | ORC | Common Order | 1 | 1 | | | Only if the system wants to know about the order that lead to the immunization event | ServiceRequest | ORC[ServiceRequest] | ServiceRequest.subject.reference=Patient[1].id | Processing of each ORC segment results in the creation of a new ServiceRequest resource if the receiving system wants to know about the order that lead to the immunization event |
| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | Immunization.performer.actor.reference=PractitionerRole[2].id | Processing of each PRT segment typically results in the creation of a new Practitioner or PractitionerRole resource.
The decision between creating a Practitioner or PractitionerRole resource may depend on the availability of data related to the practitioner's role elsewhere in the message.
It may be possible to reuse a Practitioner resource in the bundle created from somewhere else in the bundle rather than creating a new resource for each PRT segment (eg, the same administering practictioner resource could be pointed to from multiple order segment groups) - if an implementer decides to do this, the system must be certain that it's the same person (same name, ID, etc) potentially even playing the same role (if the bundle uses PractitionerRole in addition to Practitioner). |
-| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.code | | | |
-| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.system | | | |
-| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | Immunization.performer.actor.reference=PractitionerRole[3].id | |
-| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.code | | | |
-| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.system | | | |
-| 12.3 | VXU_V04.ORDER.TIMING | [{ | --- TIMING begin | 0 | -1 | | | | | | | |
-| 12.3.1 | VXU_V04.ORDER.TIMING.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | | | | |
-| 12.3.2 | VXU_V04.ORDER.TIMING.TQ2 | [{ TQ2 }] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
-| 12.3.3 | /VXU_V04.ORDER.TIMING | }] | --- TIMING end | | | | | | | | | |
-| 12.4 | VXU_V04.ORDER.RXA | RXA | Pharmacy Administration Segment | 1 | 1 | | | | Immunization | RXA[Immunization] | | Incorporate RXA content into the Immunization created from the ORC segment in the same segment group. |
-| 12.5 | VXU_V04.ORDER.RXR | [ RXR ] | Pharmacy Route | 0 | 1 | | | | Immunization | RXR[Immunization] | | Incorporate RXR content into the Immunization created from the ORC segment in the same segment group. |
-| 12.6 | VXU_V04.ORDER.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
+| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.code | | | |
+| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "OP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="OP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.system | | | |
+| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | PractitionerRole | PRT[PractitionerRole] | Immunization.performer.actor.reference=PractitionerRole[3].id | |
+| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.code | | | |
+| 12.2 | VXU_V04.ORDER.PRT | [{PRT}] | Participation (for ORC) | 0 | -1 | IF PRT-4.1 EQUALS "AP" AND PRT-4.3 EQUALS "HL70443" | (element("4.1")="AP")and(element("4.3")="HL70443") | | Immunization.performer.function.coding.system | | | |
+| 12.3 | VXU_V04.ORDER.TIMING | [{ | --- TIMING begin | 0 | -1 | | | | | | | |
+| 12.3.1 | VXU_V04.ORDER.TIMING.TQ1 | TQ1 | Timing/Quantity | 1 | 1 | | | | | | | |
+| 12.3.2 | VXU_V04.ORDER.TIMING.TQ2 | [{ TQ2 }] | Timing/Quantity Order Sequence | 0 | -1 | | | | | | | |
+| 12.3.3 | /VXU_V04.ORDER.TIMING | }] | --- TIMING end | | | | | | | | | |
+| 12.4 | VXU_V04.ORDER.RXA | RXA | Pharmacy Administration Segment | 1 | 1 | | | | Immunization | RXA[Immunization] | | Incorporate RXA content into the Immunization created from the ORC segment in the same segment group. |
+| 12.5 | VXU_V04.ORDER.RXR | [ RXR ] | Pharmacy Route | 0 | 1 | | | | Immunization | RXR[Immunization] | | Incorporate RXR content into the Immunization created from the ORC segment in the same segment group. |
+| 12.6 | VXU_V04.ORDER.OBSERVATION | [{ | --- OBSERVATION begin | 0 | -1 | | | | | | | |
| 12.6.1 | VXU_V04.ORDER.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count LESS THAN OR EQUALS 1 | | Some observations about the immunization may map to elements within the Immuniation resource rather than an independent Observation resource. For example, funding source, patient eligibility and educational material are often sent as OBX segments but map to Immunization elements. Specific guidance on how to map, e.g., the US CDC implementation guide on immunizations, will be provided separately at a future time TBD. | Observation | OBX[Observation] | Observation[2].subject.reference=Patient[1].id; Observation[2].partOf.reference=Immunization[1].id | |
| 12.6.1 | VXU_V04.ORDER.OBSERVATION.OBX | OBX | Observation/Result | 1 | 1 | IF OBX-5 LST.count GREATER THAN 1 | | Some observations about the immunization may map to elements within the Immuniation resource rather than an independent Observation resource. For example, funding source, patient eligibility and educational material are often sent as OBX segments but map to Immunization elements. Specific guidance on how to map, e.g., the US CDC implementation guide on immunizations, will be provided separately at a future time TBD. | Observation | OBX[Observation-Component] | Observation[2].subject.reference=Patient[1].id; Observation[2].partOf.reference=Immunization[1].id | |
-| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
-| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | |
-| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation[2].performer.reference=PractitionerRole[1].id | |
-| 12.6.3 | VXU_V04.ORDER.OBSERVATION.NTE | [{ NTE }] | Notes (Regarding Immunization) | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
-| 12.6.4 | /VXU_V04.ORDER.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
-| 12.7 | /VXU_V04.ORDER | }] | --- ORDER end | | | | | | | | | |
+| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-10 VALUED | | | Device | PRT[Device] | Observation[1].device.reference=Device.id | |
+| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-9 VALUED OR IF PRT-14 VALUED | | | Observation | PRT[Observation-Location] | | |
+| 12.6.2 | VXU_V04.ORDER.OBSERVATION.PRT | [{ PRT }] | Participation (for Observation) | 0 | -1 | IF PRT-5 VALUED | | | PractitionerRole | PRT[PractitionerRole] | Observation[2].performer.reference=PractitionerRole[1].id | |
+| 12.6.3 | VXU_V04.ORDER.OBSERVATION.NTE | [{ NTE }] | Notes (Regarding Immunization) | 0 | -1 | | | | Observation.note | NTE[ServiceRequest] | | |
+| 12.6.4 | /VXU_V04.ORDER.OBSERVATION | }] | --- OBSERVATION end | | | | | | | | | |
+| 12.7 | /VXU_V04.ORDER | }] | --- ORDER end | | | | | | | | | |
diff --git a/input/includes/ConceptMap-segment-aig-to-appointment-intro.md b/input/includes/ConceptMap-segment-aig-to-appointment-intro.md
index a4531e7a..74357317 100644
--- a/input/includes/ConceptMap-segment-aig-to-appointment-intro.md
+++ b/input/includes/ConceptMap-segment-aig-to-appointment-intro.md
@@ -4,19 +4,19 @@ This ConceptMap represents the mapping from the HL7 V2 AIG Segment to the FHIR A
-| 1 | OBR-1 | Set ID – OBR | SI | 0 | 1 | | | | | | | | | | | | |
+| 1 | OBR-1 | Set ID – OBR | SI | 0 | 1 | | | | | | | | | | | | |
| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | | | If ORC-2 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier | | DiagnosticReport.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | | | If ORC-2 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier.type.coding.code | | DiagnosticReport.code | 0 | 1 | | | "PLAC" | |
| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | | | If ORC-2 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier.type.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | | | If ORC-3 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier | | DiagnosticReport.Identifier | 0 | 1 | EI[Identifier-Extension] | | | |
| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | | | If ORC-3 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier.type.coding.code | | DiagnosticReport.code | 0 | 1 | | | "FILL" | |
| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | | | If ORC-3 of the same ORC/OBR pair is not valued OR there is ORC segment in the current ORDER_OBSERVATION segment group | DiagnosticReport.identifier.type.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 4 | OBR-4 | Universal Service Identifier | CWE | 1 | 1 | | | | DiagnosticReport.code | | DiagnosticReport.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
-| 5 | OBR-5 | Priority | ID | 0 | 1 | | | | | | | | | | | | |
-| 6 | OBR-6 | Requested Date/Time | TS | 0 | 1 | | | | | | | | | | | | |
-| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | IF OBR-8 NOT VALUED | | | DiagnosticReport.effectiveDateTime | | DiagnosticReport.dateTime | 0 | 1 | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
-| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | IF OBR-8 VALUED | | | DiagnosticReport.effectivePeriod.start | | DiagnosticReport.dateTime | 0 | 1 | | | | |
-| 8 | OBR-8 | Observation End Date/Time | DTM | 0 | 1 | | | | DiagnosticReport.effectivePeriod.end | | DiagnosticReport.dateTime | 0 | 1 | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
-| 9 | OBR-9 | Collection Volume | CQ | 0 | 1 | | | | | | | | | | | | |
-| 10 | OBR-10 | Collector Identifier | XCN | 0 | -1 | | | | | | | | | | | | |
-| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | | | | | | | | | | | | |
-| 12 | OBR-12 | Danger Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 13 | OBR-13 | Relevant Clinical Information | CWE | 0 | -1 | | | | | | | | | | | | |
-| 14 | OBR-14 | Specimen Received Date/Time * | TS | 0 | 1 | | | | | | | | | | | | |
-| 15 | OBR-15 | Specimen Source | CM | 0 | 1 | | | | | | | | | | | | |
-| 16 | OBR-16 | Ordering Provider | XCN | 0 | -1 | | | | | | | | | | | | |
-| 17 | OBR-17 | Order Callback Phone Number | XTN | 0..2 | 2 | | | | | | | | | | | | |
-| 18 | OBR-18 | Placer Field 1 | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
-| 19 | OBR-19 | Placer Field 2 | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
-| 20 | OBR-20 | Filler Field 1 + | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
-| 21 | OBR-21 | Filler Field 2 + | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
-| 22 | OBR-22 | Results Rpt/Status Chng – Date/Time + | DTM | 0 | 1 | | | | DiagnosticReport.issued | | DiagnosticReport.instant | 0 | 1 | | | | |
-| 23 | OBR-23 | Charge to Practice + | MOC | 0 | 1 | | | | | | | | | | | | |
-| 24 | OBR-24 | Diagnostic Serv Sect ID | ID | 0 | 1 | | | | DiagnosticReport.category | | DiagnosticReport.CodeableConcept | 0 | -1 | ID[CodeableConcept] | DiagnosticServiceSection | | |
-| 25 | OBR-25 | Result Status + | ID | 0 | 1 | IF OBR-25 VALUED | | | DiagnosticReport.status | | DiagnosticReport.code | 1 | 1 | | ResultStatus[Non-Queries] | | |
+| 4 | OBR-4 | Universal Service Identifier | CWE | 1 | 1 | | | | DiagnosticReport.code | | DiagnosticReport.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
+| 5 | OBR-5 | Priority | ID | 0 | 1 | | | | | | | | | | | | |
+| 6 | OBR-6 | Requested Date/Time | TS | 0 | 1 | | | | | | | | | | | | |
+| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | IF OBR-8 NOT VALUED | | | DiagnosticReport.effectiveDateTime | | DiagnosticReport.dateTime | 0 | 1 | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
+| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | IF OBR-8 VALUED | | | DiagnosticReport.effectivePeriod.start | | DiagnosticReport.dateTime | 0 | 1 | | | | |
+| 8 | OBR-8 | Observation End Date/Time | DTM | 0 | 1 | | | | DiagnosticReport.effectivePeriod.end | | DiagnosticReport.dateTime | 0 | 1 | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
+| 9 | OBR-9 | Collection Volume | CQ | 0 | 1 | | | | | | | | | | | | |
+| 10 | OBR-10 | Collector Identifier | XCN | 0 | -1 | | | | | | | | | | | | |
+| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | | | | | | | | | | | | |
+| 12 | OBR-12 | Danger Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 13 | OBR-13 | Relevant Clinical Information | CWE | 0 | -1 | | | | | | | | | | | | |
+| 14 | OBR-14 | Specimen Received Date/Time * | TS | 0 | 1 | | | | | | | | | | | | |
+| 15 | OBR-15 | Specimen Source | CM | 0 | 1 | | | | | | | | | | | | |
+| 16 | OBR-16 | Ordering Provider | XCN | 0 | -1 | | | | | | | | | | | | |
+| 17 | OBR-17 | Order Callback Phone Number | XTN | 0..2 | 2 | | | | | | | | | | | | |
+| 18 | OBR-18 | Placer Field 1 | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
+| 19 | OBR-19 | Placer Field 2 | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
+| 20 | OBR-20 | Filler Field 1 + | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
+| 21 | OBR-21 | Filler Field 2 + | ST | 0 | 1 | | | | | | | | | | | | If this field is valued, the implementer must decide how to map this as the content varies by implementation. |
+| 22 | OBR-22 | Results Rpt/Status Chng – Date/Time + | DTM | 0 | 1 | | | | DiagnosticReport.issued | | DiagnosticReport.instant | 0 | 1 | | | | |
+| 23 | OBR-23 | Charge to Practice + | MOC | 0 | 1 | | | | | | | | | | | | |
+| 24 | OBR-24 | Diagnostic Serv Sect ID | ID | 0 | 1 | | | | DiagnosticReport.category | | DiagnosticReport.CodeableConcept | 0 | -1 | ID[CodeableConcept] | DiagnosticServiceSectionID | | |
+| 25 | OBR-25 | Result Status + | ID | 0 | 1 | IF OBR-25 VALUED | | | DiagnosticReport.status | | DiagnosticReport.code | 1 | 1 | | ResultStatus[Non-Queries] | | |
| 25 | OBR-25 | Result Status + | ID | 0 | 1 | IF OBR-25 NOT VALUED ERROR | | If OBR-25 is not valued, that is an error on the v2 side as in this use case it is required. | | | | | | | | | |
-| 26 | OBR-26 | Parent Result + | PRL | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
-| 27 | OBR-27 | Quantity/Timing | TQ | 0 | -1 | | | | | | | | | | | | |
-| 28 | OBR-28 | Result Copies To | XCN | 0 | -1 | | | | | | | | | | | | This will be mapped in next phase. |
-| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
-| 30 | OBR-30 | Transportation Mode | ID | 0 | 1 | | | | | | | | | | | | |
-| 31 | OBR-31 | Reason for Study | CWE | 0 | -1 | | | | | | | | | | | | |
-| 32 | OBR-32 | Principal Result Interpreter + | NDL | 0 | 1 | | | | DiagnosticReport.resultsInterpreter(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.PractitionerRole) | 0 | -1 | NDL[PractitionerRole] | | | |
-| 33 | OBR-33 | Assistant Result Interpreter + | NDL | 0 | -1 | | | | | | | | | | | | |
-| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.PractitionerRole) | 0 | -1 | NDL[PractitionerRole] | | | |
-| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.url | | DiagnosticReport.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/event-performerFunction" | |
-| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.code | | DiagnosticReport.code | 0 | 1 | | | "SPRF" | |
-| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.Practitioner) | 0 | -1 | NDL[PractitionerRole] | | | |
-| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.url | | DiagnosticReport.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/event-performerFunction" | |
-| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.code | | DiagnosticReport.code | 0 | 1 | | | "TRANS" | |
-| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 36 | OBR-36 | Scheduled Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
-| 37 | OBR-37 | Number of Sample Containers * | NM | 0 | 1 | | | | | | | | | | | | |
-| 38 | OBR-38 | Transport Logistics of Collected Sample * | CWE | 0 | -1 | | | | | | | | | | | | |
-| 39 | OBR-39 | Collector's Comment * | CWE | 0 | -1 | | | | | | | | | | | | |
-| 40 | OBR-40 | Transport Arrangement Responsibility | CWE | 0 | 1 | | | | | | | | | | | | |
-| 41 | OBR-41 | Transport Arranged | ID | 0 | 1 | | | | | | | | | | | | |
-| 42 | OBR-42 | Escort Required | ID | 0 | 1 | | | | | | | | | | | | |
-| 43 | OBR-43 | Planned Patient Transport Comment | CWE | 0 | -1 | | | | | | | | | | | | |
-| 44 | OBR-44 | Procedure Code | CNE | 0 | 1 | | | | | | | | | | | | |
-| 45 | OBR-45 | Procedure Code Modifier | CNE | 0 | -1 | | | | | | | | | | | | |
-| 46 | OBR-46 | Placer Supplemental Service Information | CWE | 0 | -1 | | | | | | | | | | | | |
-| 47 | OBR-47 | Filler Supplemental Service Information | CWE | 0 | -1 | | | | | | | | | | | | |
-| 48 | OBR-48 | Medically Necessary Duplicate Procedure Reason | CWE | 0 | 1 | | | | | | | | | | | | |
-| 49 | OBR-49 | Result Handling | CWE | 0 | 1 | | | | | | | | | | | | |
-| 50 | OBR-50 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
-| 51 | OBR-51 | Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
-| 52 | OBR-52 | Parent Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
-| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | | | | | | | | | |
-| 54 | OBR-54 | Parent Order | EIP | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
+| 26 | OBR-26 | Parent Result + | PRL | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
+| 27 | OBR-27 | Quantity/Timing | TQ | 0 | -1 | | | | | | | | | | | | |
+| 28 | OBR-28 | Result Copies To | XCN | 0 | -1 | | | | | | | | | | | | This will be mapped in next phase. |
+| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
+| 30 | OBR-30 | Transportation Mode | ID | 0 | 1 | | | | | | | | | | | | |
+| 31 | OBR-31 | Reason for Study | CWE | 0 | -1 | | | | | | | | | | | | |
+| 32 | OBR-32 | Principal Result Interpreter + | NDL | 0 | 1 | | | | DiagnosticReport.resultsInterpreter(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.PractitionerRole) | 0 | -1 | NDL[PractitionerRole] | | | |
+| 33 | OBR-33 | Assistant Result Interpreter + | NDL | 0 | -1 | | | | | | | | | | | | |
+| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.PractitionerRole) | 0 | -1 | NDL[PractitionerRole] | | | |
+| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.url | | DiagnosticReport.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/event-performerFunction" | |
+| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.code | | DiagnosticReport.code | 0 | 1 | | | "SPRF" | |
+| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer(DiagnosticReport.PractitionerRole) | | Reference(DiagnosticReport.Practitioner) | 0 | -1 | NDL[PractitionerRole] | | | |
+| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.url | | DiagnosticReport.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/event-performerFunction" | |
+| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.code | | DiagnosticReport.code | 0 | 1 | | | "TRANS" | |
+| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | DiagnosticReport.performer.extension.valueCodeableConcept.coding.system | | DiagnosticReport.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 36 | OBR-36 | Scheduled Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
+| 37 | OBR-37 | Number of Sample Containers * | NM | 0 | 1 | | | | | | | | | | | | |
+| 38 | OBR-38 | Transport Logistics of Collected Sample * | CWE | 0 | -1 | | | | | | | | | | | | |
+| 39 | OBR-39 | Collector's Comment * | CWE | 0 | -1 | | | | | | | | | | | | |
+| 40 | OBR-40 | Transport Arrangement Responsibility | CWE | 0 | 1 | | | | | | | | | | | | |
+| 41 | OBR-41 | Transport Arranged | ID | 0 | 1 | | | | | | | | | | | | |
+| 42 | OBR-42 | Escort Required | ID | 0 | 1 | | | | | | | | | | | | |
+| 43 | OBR-43 | Planned Patient Transport Comment | CWE | 0 | -1 | | | | | | | | | | | | |
+| 44 | OBR-44 | Procedure Code | CNE | 0 | 1 | | | | | | | | | | | | |
+| 45 | OBR-45 | Procedure Code Modifier | CNE | 0 | -1 | | | | | | | | | | | | |
+| 46 | OBR-46 | Placer Supplemental Service Information | CWE | 0 | -1 | | | | | | | | | | | | |
+| 47 | OBR-47 | Filler Supplemental Service Information | CWE | 0 | -1 | | | | | | | | | | | | |
+| 48 | OBR-48 | Medically Necessary Duplicate Procedure Reason | CWE | 0 | 1 | | | | | | | | | | | | |
+| 49 | OBR-49 | Result Handling | CWE | 0 | 1 | | | | | | | | | | | | |
+| 50 | OBR-50 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
+| 51 | OBR-51 | Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
+| 52 | OBR-52 | Parent Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
+| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | | | | | | | | | |
+| 54 | OBR-54 | Parent Order | EIP | 0 | 1 | | | | | | | | | | | | This will be mapped in the next phase with micro and other structures. |
diff --git a/input/includes/ConceptMap-segment-obr-to-servicerequest-intro.md b/input/includes/ConceptMap-segment-obr-to-servicerequest-intro.md
index a548a3f0..98dd92b0 100644
--- a/input/includes/ConceptMap-segment-obr-to-servicerequest-intro.md
+++ b/input/includes/ConceptMap-segment-obr-to-servicerequest-intro.md
@@ -4,75 +4,75 @@ This ConceptMap represents the mapping from the HL7 V2 OBR Segment to the FHIR S
-| 0 | OBR | | | | | | | | ServiceRequest.intent | | | | | | | "order" | |
-| 1 | OBR-1 | Set ID – OBR | SI | 0 | 1 | | | | | | | | | | | | |
-| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
-| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | | extension??-fingerprint[1]=fingerprint(ORC-2,ORC-3,....) | | | | | | | To be resolved as part of parent-child guidance from the base standard, including reflex/add-on/micro. |
-| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FILL" | |
-| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 4 | OBR-4 | Universal Service Identifier | CWE | 1 | 1 | | | | ServiceRequest.code | | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 5 | OBR-5 | Priority | ID | 0 | 1 | | | | ServiceRequest.priority | | ServiceRequest.code | 0 | 1 | ID[code] | Priority | | |
-| 6 | OBR-6 | Requested Date/Time | TS | 0 | 1 | | | | ServiceRequest.occurrenceDateTime | | ServiceRequest.dateTime | 0 | 1 | | | | |
-| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | | | | | | | | | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
-| 8 | OBR-8 | Observation End Date/Time | DTM | 0 | 1 | | | | | | | | | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
-| 9 | OBR-9 | Collection Volume | CQ | 0 | 1 | | | | | | | | | | | | |
-| 10 | OBR-10 | Collector Identifier | XCN | 0 | -1 | | | | | | | | | | | | |
-| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 EQUALS "A" | element("11")="A" | | ServiceRequest.intent | | | | | | | "#add-on#" | |
-| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 EQUALS "G" | element("11")="G" | | ServiceRequest.intent | | ServiceRequest.code | 1 | 1 | | | "reflex-order" | |
-| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 NOT IN ("G","A") | element("11")! IN ("G","A") | | ServiceRequest.intent | | | | | | | "order" | |
-| 12 | OBR-12 | Danger Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 0 | OBR | | | | | | | | ServiceRequest.intent | | | | | | | "order" | |
+| 1 | OBR-1 | Set ID – OBR | SI | 0 | 1 | | | | | | | | | | | | |
+| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
+| 2 | OBR-2 | Placer Order Number | EI | 0 | 1 | IF ORC-2 NOT VALUED | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | | extension??-fingerprint[1]=fingerprint(ORC-2,ORC-3,....) | | | | | | | To be resolved as part of parent-child guidance from the base standard, including reflex/add-on/micro. |
+| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FILL" | |
+| 3 | OBR-3 | Filler Order Number | EI | 0 | 1 | IF ORC-3 NOT VALUED | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 4 | OBR-4 | Universal Service Identifier | CWE | 1 | 1 | | | | ServiceRequest.code | | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 5 | OBR-5 | Priority | ID | 0 | 1 | | | | ServiceRequest.priority | | ServiceRequest.code | 0 | 1 | ID[code] | ExtendedPriorityCodes | | |
+| 6 | OBR-6 | Requested Date/Time | TS | 0 | 1 | | | | ServiceRequest.occurrenceDateTime | | ServiceRequest.dateTime | 0 | 1 | | | | |
+| 7 | OBR-7 | Observation Date/Time | DTM | 0 | 1 | | | | | | | | | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
+| 8 | OBR-8 | Observation End Date/Time | DTM | 0 | 1 | | | | | | | | | | | | This should not be populated in a message corresponding to a ServiceRequest (eg ORM) |
+| 9 | OBR-9 | Collection Volume | CQ | 0 | 1 | | | | | | | | | | | | |
+| 10 | OBR-10 | Collector Identifier | XCN | 0 | -1 | | | | | | | | | | | | |
+| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 EQUALS "A" | element("11")="A" | | ServiceRequest.intent | | | | | | | "#add-on#" | |
+| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 EQUALS "G" | element("11")="G" | | ServiceRequest.intent | | ServiceRequest.code | 1 | 1 | | | "reflex-order" | |
+| 11 | OBR-11 | Specimen Action Code | ID | 0 | 1 | IF OBR-11 NOT IN ("G","A") | element("11")! IN ("G","A") | | ServiceRequest.intent | | | | | | | "order" | |
+| 12 | OBR-12 | Danger Code | CWE | 0 | 1 | | | | | | | | | | | | |
| 13 | OBR-13 | Relevant Clinical Information | CWE | 0 | -1 | | | If this does not represent fasting status | | supportingInfo.extension??-R5-SupportingInfo | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | If desired, implementers could map to supportingInfo using the Observation or other references if they know exactly what it is and have the relevant resource.code values to add. |
| 13 | OBR-13 | Relevant Clinical Information | CWE | 0 | -1 | | | If this represents fasting status then use OBR[Specimen] mapping. | | | | | | | | | |
-| 14 | OBR-14 | Specimen Received Date/Time * | TS | 0 | 1 | | | | | | | | | | | | |
-| 15 | OBR-15 | Specimen Source | CM | 0 | 1 | | | | | | | | | | | | |
-| 16 | OBR-16 | Ordering Provider | XCN | 0 | -1 | IF ORC-12 NOT VALUED | | | ServiceRequest.requester(ServiceRequest.Practitioner) | | Reference(ServiceRequest.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 17 | OBR-17 | Order Callback Phone Number | XTN | 0 | 2 | | | | ServiceRequest.requester.extension.url | | ServiceRequest.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/servicerequest-order-callback-phone-number" |
-| 17 | OBR-17 | Order Callback Phone Number | XTN | 0 | 2 | | | | ServiceRequest.requester.extension.valueContactPoint | | ServiceRequest.ContactPoint | 0 | 1 | XTN[ContactPoint] | | | |
-| 18 | OBR-18 | Placer Field 1 | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-18 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
-| 19 | OBR-19 | Placer Field 2 | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-19 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
-| 20 | OBR-20 | Filler Field 1 + | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-20 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
-| 21 | OBR-21 | Filler Field 2 + | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-21 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
-| 22 | OBR-22 | Results Rpt/Status Chng – Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
-| 23 | OBR-23 | Charge to Practice + | MOC | 0 | 1 | | | | | | | | | | | | |
-| 24 | OBR-24 | Diagnostic Serv Sect ID | ID | 0 | 1 | | | | | | | | | | | | |
-| 25 | OBR-25 | Result Status + | ID | 0 | 1 | | | | | | | | | | | | |
-| 26 | OBR-26 | Parent Result + | PRL | 0 | 1 | | | | | | | | | | | | To be resolved as part of parent-child guidance from the base standard, including reflex/add-on/micro. |
-| 27 | OBR-27 | Quantity/Timing | TQ | 0 | -1 | IF ORC-7 NOT VALUED AND ORC-6 NOT VALUED | | | ServiceRequest.$this | | | | | TQ[ServiceRequest] | | | |
-| 28 | OBR-28 | Result Copies To | XCN | 0 | -1 | | | | | | | | | | | | Deferred to a future iteration and considering Task to resolve. |
+| 14 | OBR-14 | Specimen Received Date/Time * | TS | 0 | 1 | | | | | | | | | | | | |
+| 15 | OBR-15 | Specimen Source | CM | 0 | 1 | | | | | | | | | | | | |
+| 16 | OBR-16 | Ordering Provider | XCN | 0 | -1 | IF ORC-12 NOT VALUED | | | ServiceRequest.requester(ServiceRequest.Practitioner) | | Reference(ServiceRequest.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 17 | OBR-17 | Order Callback Phone Number | XTN | 0 | 2 | | | | ServiceRequest.requester.extension.url | | ServiceRequest.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/servicerequest-order-callback-phone-number" |
+| 17 | OBR-17 | Order Callback Phone Number | XTN | 0 | 2 | | | | ServiceRequest.requester.extension.valueContactPoint | | ServiceRequest.ContactPoint | 0 | 1 | XTN[ContactPoint] | | | |
+| 18 | OBR-18 | Placer Field 1 | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-18 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
+| 19 | OBR-19 | Placer Field 2 | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-19 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
+| 20 | OBR-20 | Filler Field 1 + | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-20 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
+| 21 | OBR-21 | Filler Field 2 + | ST | 0 | 1 | | | | | | | | | | | | The use of OBR-21 is variable and the transformation of it is an implementation level decision. ServiceRequest.note exists to hold text, but should only be used if the content of the field doesn't require any context to be understood. |
+| 22 | OBR-22 | Results Rpt/Status Chng – Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
+| 23 | OBR-23 | Charge to Practice + | MOC | 0 | 1 | | | | | | | | | | | | |
+| 24 | OBR-24 | Diagnostic Serv Sect ID | ID | 0 | 1 | | | | | | | | | | | | |
+| 25 | OBR-25 | Result Status + | ID | 0 | 1 | | | | | | | | | | | | |
+| 26 | OBR-26 | Parent Result + | PRL | 0 | 1 | | | | | | | | | | | | To be resolved as part of parent-child guidance from the base standard, including reflex/add-on/micro. |
+| 27 | OBR-27 | Quantity/Timing | TQ | 0 | -1 | IF ORC-7 NOT VALUED AND ORC-6 NOT VALUED | | | ServiceRequest.$this | | | | | TQ[ServiceRequest] | | | |
+| 28 | OBR-28 | Result Copies To | XCN | 0 | -1 | | | | | | | | | | | | Deferred to a future iteration and considering Task to resolve. |
| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | IF OBR-29.1 VALUED AND OBR-50 NOT VALUED | | If OBR-29.2 is also valued, implementation needs to decide which one to use. | ServiceRequest.basedOn.identifier | | | | | | | | |
| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | IF OBR-29.1 VALUED AND OBR-50 NOT VALUED | | If OBR-29.2 is also valued, implementation needs to decide which one to use. | ServiceRequest.basedOn.type | | | | | | | "ServiceRequest" | |
| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | IF OBR-29.2 VALUED AND OBR-50 NOT VALUED | | If OBR-29.1 is also valued, implementation needs to decide which one to use. | ServiceRequest.basedOn.identifier | | | | | | | | |
| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | IF OBR-29.2 VALUED AND OBR-50 NOT VALUED | | If OBR-29.1 is also valued, implementation needs to decide which one to use. | ServiceRequest.basedOn.type | | | | | | | "ServiceRequest" | |
| 29 | OBR-29 | ParentResults Observation Identifier | EIP | 0 | 1 | | | If OBR-50 is valued, need something else that we have not figured out yet. | | extension??-parent.reference.id=ServiceRequest[??].extension??-fingerprint#[1](EIP.1,EIP.2,EIP,........) | | | | | | | |
-| 30 | OBR-30 | Transportation Mode | ID | 0 | 1 | | | | | | | | | | | | |
-| 31 | OBR-31 | Reason for Study | CWE | 0 | -1 | | | | ServiceRequest.reasonCode | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-| 32 | OBR-32 | Principal Result Interpreter + | NDL | 0 | 1 | | | | | | | | | | | | |
-| 33 | OBR-33 | Assistant Result Interpreter + | NDL | 0 | -1 | | | | | | | | | | | | |
-| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | | | | | | | | | |
-| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | | | | | | | | | |
-| 36 | OBR-36 | Scheduled Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
-| 37 | OBR-37 | Number of Sample Containers * | NM | 0 | 1 | | | | | | | | | | | | |
-| 38 | OBR-38 | Transport Logistics of Collected Sample * | CWE | 0 | -1 | | | | | | | | | | | | |
-| 39 | OBR-39 | Collector's Comment * | CWE | 0 | -1 | | | | | | | | | | | | |
-| 40 | OBR-40 | Transport Arrangement Responsibility | CWE | 0 | 1 | | | | | | | | | | | | |
-| 41 | OBR-41 | Transport Arranged | ID | 0 | 1 | | | | | | | | | | | | |
-| 42 | OBR-42 | Escort Required | ID | 0 | 1 | | | | | | | | | | | | |
-| 43 | OBR-43 | Planned Patient Transport Comment | CWE | 0 | -1 | | | | | | | | | | | | |
-| 44 | OBR-44 | Procedure Code | CNE | 0 | 1 | | | | | | | | | | | | |
-| 45 | OBR-45 | Procedure Code Modifier | CNE | 0 | -1 | | | | | | | | | | | | |
-| 46 | OBR-46 | Placer Supplemental Service Information | CWE | 0 | -1 | | | | ServiceRequest.orderDetail | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-| 47 | OBR-47 | Filler Supplemental Service Information | CWE | 0 | -1 | | | | ServiceRequest.orderDetail | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-| 48 | OBR-48 | Medically Necessary Duplicate Procedure Reason | CWE | 0 | 1 | | | | | | | | | | | | |
-| 49 | OBR-49 | Result Handling | CWE | 0 | 1 | | | | | | | | | | | | |
-| 50 | OBR-50 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | | | | | | | | |
-| 51 | OBR-51 | Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
-| 52 | OBR-52 | Parent Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
-| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
-| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 54 | OBR-54 | Parent Order | EIP | 0 | 1 | | | | | | | | | | | | |
+| 30 | OBR-30 | Transportation Mode | ID | 0 | 1 | | | | | | | | | | | | |
+| 31 | OBR-31 | Reason for Study | CWE | 0 | -1 | | | | ServiceRequest.reasonCode | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
+| 32 | OBR-32 | Principal Result Interpreter + | NDL | 0 | 1 | | | | | | | | | | | | |
+| 33 | OBR-33 | Assistant Result Interpreter + | NDL | 0 | -1 | | | | | | | | | | | | |
+| 34 | OBR-34 | Technician + | NDL | 0 | -1 | | | | | | | | | | | | |
+| 35 | OBR-35 | Transcriptionist + | NDL | 0 | -1 | | | | | | | | | | | | |
+| 36 | OBR-36 | Scheduled Date/Time + | DTM | 0 | 1 | | | | | | | | | | | | |
+| 37 | OBR-37 | Number of Sample Containers * | NM | 0 | 1 | | | | | | | | | | | | |
+| 38 | OBR-38 | Transport Logistics of Collected Sample * | CWE | 0 | -1 | | | | | | | | | | | | |
+| 39 | OBR-39 | Collector's Comment * | CWE | 0 | -1 | | | | | | | | | | | | |
+| 40 | OBR-40 | Transport Arrangement Responsibility | CWE | 0 | 1 | | | | | | | | | | | | |
+| 41 | OBR-41 | Transport Arranged | ID | 0 | 1 | | | | | | | | | | | | |
+| 42 | OBR-42 | Escort Required | ID | 0 | 1 | | | | | | | | | | | | |
+| 43 | OBR-43 | Planned Patient Transport Comment | CWE | 0 | -1 | | | | | | | | | | | | |
+| 44 | OBR-44 | Procedure Code | CNE | 0 | 1 | | | | | | | | | | | | |
+| 45 | OBR-45 | Procedure Code Modifier | CNE | 0 | -1 | | | | | | | | | | | | |
+| 46 | OBR-46 | Placer Supplemental Service Information | CWE | 0 | -1 | | | | ServiceRequest.orderDetail | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
+| 47 | OBR-47 | Filler Supplemental Service Information | CWE | 0 | -1 | | | | ServiceRequest.orderDetail | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
+| 48 | OBR-48 | Medically Necessary Duplicate Procedure Reason | CWE | 0 | 1 | | | | | | | | | | | | |
+| 49 | OBR-49 | Result Handling | CWE | 0 | 1 | | | | | | | | | | | | |
+| 50 | OBR-50 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | | | | | | | | |
+| 51 | OBR-51 | Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
+| 52 | OBR-52 | Parent Observation Group ID | EI | 0 | 1 | | | | | | | | | | | | |
+| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
+| 53 | OBR-53 | Alternate Placer Order Number | CX | 0 | -1 | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 54 | OBR-54 | Parent Order | EIP | 0 | 1 | | | | | | | | | | | | |
diff --git a/input/includes/ConceptMap-segment-obr-to-specimen-intro.md b/input/includes/ConceptMap-segment-obr-to-specimen-intro.md
index f67878ee..e83aee58 100644
--- a/input/includes/ConceptMap-segment-obr-to-specimen-intro.md
+++ b/input/includes/ConceptMap-segment-obr-to-specimen-intro.md
@@ -4,63 +4,63 @@ This ConceptMap represents the mapping from the HL7 V2 OBR Segment to the FHIR S
-| 1 | OBX-1 | Set ID – OBX | SI | 0 | 1 | | | | | | | | | | | | |
-| 2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | ValueType | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5 |
-| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
-| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.component.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
+| 1 | OBX-1 | Set ID – OBX | SI | 0 | 1 | | | | | | | | | | | | |
+| 2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | ValueType | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5 |
+| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
+| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.component.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
| 4 | OBX-4 | Observation Sub-ID | ST | 0 | 1 | | | Map to Observation.partOf or Observation.hasMember or Observation.DerivedFrom according to the implementation guidance for the v2 message at hand, otherwise map to the extension-sub-id to enable the final destination to determine how to structure the observations. | Observation.$this | | | | | OG[Extension-Subidentifier] | | | OBX-4 Sub Identifier would determine how to use Observation.partOf or Observation.hasMember or Observation.DerivedFrom, but is highly dependent on the local implementation of OBX-4 or an implementation guide (e.g., LRI, Clinical Genomics). That is not known at the standard level, so we cannot provide specific mapping guidance here. However, if the mapper does not have access to the syntax used and its meaning, we need to be able to pass on OBX-4 Sub Identifier to the final destination that should know how to then structure it using FHIR attributes. |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NM" | | | Observation.component.valueQuantity | | Observation.quantity | 0 | 1 | NM[Quantity] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NM" | | | Observation.component.valueQuantity | | Observation.quantity | 0 | 1 | NM[Quantity] | | | |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("ST", "FT", "TX") | | Any markup in ST, FT or TX data may not present properly given that valueString is a string data type | Observation.component.valueString | | Observation.string | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CF" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CF[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CNE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CNE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CWE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "IS" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | IS[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "DR" | | | Observation.component.valuePeriod | | Observation.Period | 0 | 1 | DR[Period] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("DTM", "DT") | | | Observation.component.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NR" | | | Observation.component.valueRange | | Observation.Range | 0 | 1 | NR[Range] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "VR" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+"-"+OBX-5.2 | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "TM" | | | Observation.component.valueTime | | Observation.time | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF (OBX-2 EQUALS "SN" AND OBX-5.1 EQUALS "<>" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio | | Observation.Ratio | 0 | 1 | SN[Ratio] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange | | Observation.Range | 0 | 1 | SN[Range] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "+" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.component.valueQuantity | | Observation.Quantity | 0 | 1 | SN[Quantity] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CF" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CF[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CNE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CNE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CWE" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "IS" | | | Observation.component.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | IS[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "DR" | | | Observation.component.valuePeriod | | Observation.Period | 0 | 1 | DR[Period] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("DTM", "DT") | | | Observation.component.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NR" | | | Observation.component.valueRange | | Observation.Range | 0 | 1 | NR[Range] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "VR" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+"-"+OBX-5.2 | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "TM" | | | Observation.component.valueTime | | Observation.time | 0 | 1 | | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF (OBX-2 EQUALS "SN" AND OBX-5.1 EQUALS "<>" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio | | Observation.Ratio | 0 | 1 | SN[Ratio] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange | | Observation.Range | 0 | 1 | SN[Range] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "+" | | | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.component.valueQuantity | | Observation.Quantity | 0 | 1 | SN[Quantity] | | | |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | | | If line 19 through 23 all fail while OBX-2 = SN | Observation.component.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NA" | | | Observation.component.valueSampledData | | Observation.SampledData | 0 | 1 | | | | Need to add text on converting from NA to SampledData |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NA" | | | Observation.component.valueSampledData | | Observation.SampledData | 0 | 1 | | | | Need to add text on converting from NA to SampledData |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | If none of the other observations in OBX-5 are not derived from the documentation included | Observation.component.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | Some implementers may include in OBX-5 the documentation that the other OBX-5 components are derived from. In that situations |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | If none of the other observations in OBX-5 are not derived from the documentation included | Observation.component.extension.valueAttachment | | Observation.Attachment | 1 | 1 | ED[Attachment] | | | We are for now addressing Base64 that cover .pdf, pictures and other binaries. If somebody does this, we will address those. |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | And if other observation in OBX-5 are derived from the documentation included | Observation.derivedFrom(Observation.DocumentReference) | | Reference | | | ED[DocumentReference] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "EI" | | | | | | | | | | | Requires more work to properly map. Use case: An OBX under OBR that points to the calibration/quality control/etc. settings/values/result/etc. that the other OBX-s under the OBR would be "subject" to. |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "EI" | | | | | | | | | | | Requires more work to properly map. Use case: An OBX under OBR that points to the calibration/quality control/etc. settings/values/result/etc. that the other OBX-s under the OBR would be "subject" to. |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | If none of the other observations in OBX-5 are not derived from the documentation referenced | Observation.component.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | If none of the other observations in OBX-5 are not derived from the documentation referenced | Observation.component.extension.valueAttachment | | Observation.Attachment | 1 | 1 | RP[Attachment] | | | To be resolved when we resolve DocumentReference and valueAttachment |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | And if other observation in OBX-5 are derived from the documentation being referenced | Observation.derivedFrom(Observation.DocumentReference) | | Reference | | | RP[DocumentReference] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 IN ("NA", "NM") | | | Observation.component.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.component.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange.low | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange.high | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio.numerator | | Observation.Quantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio.denominator | | Observation.Quantity | | | CWE[Quantity] | | | |
-| 7 | OBX-7 | References Range | ST | 0 | 1 | | | | Observation.component.referenceRange.text | | | | | | | | If OBX-7 is sufficiently parseable, then the low, high, type, appliesTo, and/or age may be used. |
-| 8 | OBX-8 | Interpretation Codes | CWE | 0 | -1 | | | | Observation.interpretation | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | InterpretationCode | | |
-| 9 | OBX-9 | Probability | NM | 0 | 1 | | | | | | | | | | | | |
-| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.uri | | Observation.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/observation-nature-of-abnormal-test" | |
-| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.valueCodeableConcept | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | NatureOfAbnormalTesting | | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | | | | Observation.status | | Observation.code | 1 | 1 | | ObservationStatus | | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status | | Observation.code | 1 | 1 | | ObservationStatus | | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.url | | Observation.uri | | | | | "http://hl7.org/fhir/StructureDefinition/alternate-codes" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.code | | Observation.CodeableConcept | | | | | "X" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.system | | Observation.string | | | | | "http://terminology.hl7.org/CodeSystem/v2-0085" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.code | | | | | | | "not-asked" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.system | | | | | | | "http://terminology.hl7.org/CodeSystem/data-absent-reason" | |
-| 12 | OBX-12 | Effective Date of Reference Range | DTM | 0 | 1 | | | | | | | | | | | | |
-| 13 | OBX-13 | User Defined Access Checks | ST | 0 | 1 | | | | | | | | | | | | |
-| 14 | OBX-14 | Date/Time of the Observation | DTM | 0 | 1 | | | | Observation.effectiveDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | | extension??-producerIdentifier | Observation.identifier | 0 | 1 | CWE[Identifier] | | | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.practitioner(Observation.Practitioner) | | Reference(Observation.PractitionerRole) | 0 | -1 | XCN[PractitionerRole] | | | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.string | 0 | -1 | | | "responsibleObserver" | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.uri | | | | | "http://terminology.hl7.org/CodeSystem/practitioner-role" | |
-| 17 | OBX-17 | Observation Method | CWE | 0 | -1 | | | | Observation.method | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.method is 0..1 while the source allows for multiple methods. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
-| 18 | OBX-18 | Equipment Instance Identifier | EI | 0 | -1 | | | | Observation.device(Observation.Device.identifier) | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/observation-analysis-date-time" |
-| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 20 | OBX-20 | Observation Site | CWE | 0 | -1 | | | | Observation.bodySite | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.bodySite is 0..1 while the source allows for multiple body sites. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
-| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier.type.coding.code | | Observation.code | 0 | 1 | | | "FILL" | |
-| 22 | OBX-22 | Mood Code | CNE | 0 | 1 | | | | | | | | | | | | |
-| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | | | | Observation.performer(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
-| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
-| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | | | | Observation.performer(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
-| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole) | | Reference(Observation.PractitionerRole) | 0 | 1 | XCN[PractitionerRole] | | | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.value) | | Observation.string | | | | | "MDIR" | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.uri | | | | | "http://terminology.hl7.org/CodeSystem/v2-0912" | |
-| 26 | OBX-26 | Patient Results Release Category | ID | 0 | 1 | | | | | | | | | | | | |
-| 27 | OBX-27 | Root Cause | CWE | 0 | 1 | | | | | | | | | | | | |
-| 28 | OBX-28 | Local Process Control | CWE | 0 | -1 | | | | | | | | | | | | |
-| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.code | | Observation.code | 0 | -1 | | | | |
-| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.system | | Observation.uri | 0 | -1 | | | | |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.code | | Observation.code | 0 | 1 | | | | |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.system | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
-| 31 | OBX-31 | Action Code | ID | 0 | 1 | | | | | | | | | | | | |
-| 32 | OBX-32 | Observation Value Absent Reason | CWE | 0 | -1 | | | | | | | | | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | Reference | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | Note that in v2 messages the observations that a calculated observation is derived from on and involve multiple specimens are typically not included with the message. To enable relating the calculated observation to the correct specimens it relates to, the v2 message should include the originating observations that in turn use OBX-33 to link to the correct specimens. Without that, and if there are multiple specimens in OBX-33, there is no standard method to correctly associate the observation with the correct specimens. The implementer will have to devise an appropriate method for that in their context. |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-PlacerAssignedIdentifier] | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 IN ("NA", "NM") | | | Observation.component.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.component.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange.low | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.component.valueRange.high | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio.numerator | | Observation.Quantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.component.valueRatio.denominator | | Observation.Quantity | | | CWE[Quantity] | | | |
+| 7 | OBX-7 | References Range | ST | 0 | 1 | | | | Observation.component.referenceRange.text | | | | | | | | If OBX-7 is sufficiently parseable, then the low, high, type, appliesTo, and/or age may be used. |
+| 8 | OBX-8 | Interpretation Codes | CWE | 0 | -1 | | | | Observation.interpretation | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | InterpretationCodes | | |
+| 9 | OBX-9 | Probability | NM | 0 | 1 | | | | | | | | | | | | |
+| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.uri | | Observation.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/observation-nature-of-abnormal-test" | |
+| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.valueCodeableConcept | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | NatureOfAbnormalTesting | | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | | | | Observation.status | | Observation.code | 1 | 1 | | ObservationResultStatusCodesInterpretation | | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.url | | Observation.uri | | | | | "http://hl7.org/fhir/StructureDefinition/alternate-codes" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.code | | Observation.CodeableConcept | | | | | "X" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.system | | Observation.string | | | | | "http://terminology.hl7.org/CodeSystem/v2-0085" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.code | | | | | | | "not-asked" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.system | | | | | | | "http://terminology.hl7.org/CodeSystem/data-absent-reason" | |
+| 12 | OBX-12 | Effective Date of Reference Range | DTM | 0 | 1 | | | | | | | | | | | | |
+| 13 | OBX-13 | User Defined Access Checks | ST | 0 | 1 | | | | | | | | | | | | |
+| 14 | OBX-14 | Date/Time of the Observation | DTM | 0 | 1 | | | | Observation.effectiveDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | | extension??-producerIdentifier | Observation.identifier | 0 | 1 | CWE[Identifier] | | | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.practitioner(Observation.Practitioner) | | Reference(Observation.PractitionerRole) | 0 | -1 | XCN[PractitionerRole] | | | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.string | 0 | -1 | | | "responsibleObserver" | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.uri | | | | | "http://terminology.hl7.org/CodeSystem/practitioner-role" | |
+| 17 | OBX-17 | Observation Method | CWE | 0 | -1 | | | | Observation.method | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.method is 0..1 while the source allows for multiple methods. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
+| 18 | OBX-18 | Equipment Instance Identifier | EI | 0 | -1 | | | | Observation.device(Observation.Device.identifier) | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/observation-analysis-date-time" |
+| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 20 | OBX-20 | Observation Site | CWE | 0 | -1 | | | | Observation.bodySite | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.bodySite is 0..1 while the source allows for multiple body sites. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
+| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier.type.coding.code | | Observation.code | 0 | 1 | | | "FILL" | |
+| 22 | OBX-22 | Mood Code | CNE | 0 | 1 | | | | | | | | | | | | |
+| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | | | | Observation.performer(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
+| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
+| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | | | | Observation.performer(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
+| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole) | | Reference(Observation.PractitionerRole) | 0 | 1 | XCN[PractitionerRole] | | | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.value) | | Observation.string | | | | | "MDIR" | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.uri | | | | | "http://terminology.hl7.org/CodeSystem/v2-0912" | |
+| 26 | OBX-26 | Patient Results Release Category | ID | 0 | 1 | | | | | | | | | | | | |
+| 27 | OBX-27 | Root Cause | CWE | 0 | 1 | | | | | | | | | | | | |
+| 28 | OBX-28 | Local Process Control | CWE | 0 | -1 | | | | | | | | | | | | |
+| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.code | | Observation.code | 0 | -1 | | | | |
+| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.system | | Observation.uri | 0 | -1 | | | | |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.code | | Observation.code | 0 | 1 | | | | |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.system | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
+| 31 | OBX-31 | Action Code | ID | 0 | 1 | | | | | | | | | | | | |
+| 32 | OBX-32 | Observation Value Absent Reason | CWE | 0 | -1 | | | | | | | | | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | Reference | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | Note that in v2 messages the observations that a calculated observation is derived from on and involve multiple specimens are typically not included with the message. To enable relating the calculated observation to the correct specimens it relates to, the v2 message should include the originating observations that in turn use OBX-33 to link to the correct specimens. Without that, and if there are multiple specimens in OBX-33, there is no standard method to correctly associate the observation with the correct specimens. The implementer will have to devise an appropriate method for that in their context. |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-PlacerAssignedIdentifier] | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
diff --git a/input/includes/ConceptMap-segment-obx-to-documentreference-intro.md b/input/includes/ConceptMap-segment-obx-to-documentreference-intro.md
index ec0666d3..4ee680ae 100644
--- a/input/includes/ConceptMap-segment-obx-to-documentreference-intro.md
+++ b/input/includes/ConceptMap-segment-obx-to-documentreference-intro.md
@@ -4,44 +4,44 @@ This ConceptMap represents the mapping from the HL7 V2 OBX Segment to the FHIR D
-| 1 | OBX-1 | Set ID – OBX | SI | 0 | 1 | | | | | | | | | | | | |
-| 2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | ValueType | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5. |
-| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | Note that in Observation there is category field that depending on implementation guide and/or realm is required. MSH-9.2 Trigger Event, the MSH-3 Sending Application and OBX-3 Observation Identifier's code system ontology would inform how to value Observation.category. |
+| 1 | OBX-1 | Set ID – OBX | SI | 0 | 1 | | | | | | | | | | | | |
+| 2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | ValueType | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5. |
+| 3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | Note that in Observation there is category field that depending on implementation guide and/or realm is required. MSH-9.2 Trigger Event, the MSH-3 Sending Application and OBX-3 Observation Identifier's code system ontology would inform how to value Observation.category. |
| 4 | OBX-4 | Observation Sub-ID | OG | 0 | 1 | | | Map to Observation.partOf or Observation.hasMember or Observation.DerivedFrom according to the implementation guidance for the v2 message at hand, otherwise map to the extension-sub-id to enable the final destination to determine how to structure the observations. | Observation.$this | | | | | OG[Extension-Subidentifier] | | | OBX-4 Sub Identifier would determine how to use Observation.partOf or Observation.hasMember or Observation.DerivedFrom, but is highly dependent on the local implementation of OBX-4 or an implementation guide (e.g., LRI, Clinical Genomics). That is not known at the standard level, so we cannot provide specific mapping guidance here. However, if the mapper does not have access to the syntax used and its meaning, we need to be able to pass on OBX-4 Sub Identifier to the final destination that should know how to then structure it using FHIR attributes. |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NM" | | | Observation.valueQuantity.value | | Observation.quantity | 0 | 1 | NM[Quantity] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NM" | | | Observation.valueQuantity.value | | Observation.quantity | 0 | 1 | NM[Quantity] | | | |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("ST", "FT", "TX") | | Any markup in ST, FT or TX data may not present properly given that valueString is a string data type | Observation.valueString | | Observation.string | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CF" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CF[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CNE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CNE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CWE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "IS" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | IS[CodeableConcept] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "DR" | | | Observation.valuePeriod | | Observation.Period | 0 | 1 | DR[Period] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("DTM", "DT") | | | Observation.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NR" | | | Observation.valueRange | | Observation.Range | 0 | 1 | NR[Range] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "VR" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+"-"+OBX-5.2 | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "TM" | | | Observation.valueTime | | Observation.time | 0 | 1 | | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF (OBX-2 EQUALS "SN" AND OBX-5.1 EQUALS "<>" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio | | Observation.Ratio | 0 | 1 | SN[Ratio] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange | | Observation.Range | 0 | 1 | SN[Range] | | | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "+" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.valueQuantity | | Observation.Quantity | 0 | 1 | SN[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CF" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CF[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CNE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CNE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "CWE" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "IS" | | | Observation.valueCodeableConcept | | Observation.CodeableConcept | 0 | 1 | IS[CodeableConcept] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "DR" | | | Observation.valuePeriod | | Observation.Period | 0 | 1 | DR[Period] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 IN ("DTM", "DT") | | | Observation.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NR" | | | Observation.valueRange | | Observation.Range | 0 | 1 | NR[Range] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "VR" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+"-"+OBX-5.2 | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "TM" | | | Observation.valueTime | | Observation.time | 0 | 1 | | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF (OBX-2 EQUALS "SN" AND OBX-5.1 EQUALS "<>" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio | | Observation.Ratio | 0 | 1 | SN[Ratio] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange | | Observation.Range | 0 | 1 | SN[Range] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "+" | | | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.valueQuantity | | Observation.Quantity | 0 | 1 | SN[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
| 5 | OBX-5 | Observation Value | varies | 0 | -1 | | | If line 19 through 23 all fail while OBX-2 = SN | Observation.valueString | | Observation.string | 0 | 1 | | | OBX-5.1+" "+OBX-5.2+" "+OBX-5.3+" "+OBX-5.4" "OBX-6" | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NA" | | | Observation.valueSampledData | | Observation.SampledData | | | | | | Need to add text on converting NA to SampledData |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | | Observation.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | | Observation.extension.valueAttachment | | Observation.Attachment | 1 | 1 | ED[Attachment] | | | We are for now addressing Base64 that cover .pdf, pictures and other binaries. If somebody does this, we will address those. |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "EI" | | | | | | | | | | | Requires more work to properly map. Use case: An OBX under OBR that points to the calibration/quality control/etc. settings/values/result/etc. that the other OBX-s under the OBR would be "subject" to. |
- | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | | Observation.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | |
-| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | | Observation.extension.valueAttachment | | Observation.Attachment | 1 | 1 | ED[Attachment] | | | To be resolved when we resolve DocumentReference and valueAttachment |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 IN ("NA", "NM") | | | Observation.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange.low | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange.high | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio.numerator | | Observation.Quantity | | | CWE[Quantity] | | | |
-| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio.denominator | | Observation.Quantity | | | CWE[Quantity] | | | |
-| 7 | OBX-7 | References Range | ST | 0 | 1 | | | | Observation.referenceRange.text | | Observation.string | 0 | -1 | | | | If OBX-7 is sufficiently parseable, then the low, high, type, appliesTo, and/or age may be used. |
-| 8 | OBX-8 | Interpretation Codes | CWE | 0 | -1 | | | | Observation.interpretation | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | InterpretationCode | | |
-| 9 | OBX-9 | Probability | NM | 0 | 1 | | | | | | | | | | | | |
-| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.uri | | Observation.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/observation-nature-of-abnormal-test" | |
-| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.valueCodeableConcept | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | NatureOfAbnormalTesting | | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | | | | Observation.status | | Observation.code | 1 | 1 | | ObservationStatus | | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.url | | Observation.uri | | | | | "http://hl7.org/fhir/StructureDefinition/alternate-codes" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.code | | Observation.CodeableConcept | | | | | "X" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.system | | Observation.string | | | | | "http://terminology.hl7.org/CodeSystem/v2-0085" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.code | | | | | | | "not-asked" | |
-| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.system | | | | | | | "http://terminology.hl7.org/CodeSystem/data-absent-reason" | |
-| 12 | OBX-12 | Effective Date of Reference Range | DTM | 0 | 1 | | | | | | | | | | | | |
-| 13 | OBX-13 | User Defined Access Checks | ST | 0 | 1 | | | | | | | | | | | | |
-| 14 | OBX-14 | Date/Time of the Observation | DTM | 0 | 1 | | | | Observation.effectiveDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | Observation.performer(Observation.Organization) | | Observation.identifier | 0 | 1 | CWE[Organization] | | | We are mapping this to an identifier considering the definition (used for a unique identifier of the producer), although that does not fit the use of the CWE data type in HL7 v2. Depending on context (e.g., US CLIA or IHE LTW, or ILW) this may reflect a location (US CLIA) or an organization (IHE LTW or ILW). |
-| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole) | | | | | | | | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.practitioner(Observation.Practitioner) | | Reference(Observation.PractitionerRole) | 0 | -1 | XCN[Practitioner] | | | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.CodeableConcept | 0 | -1 | | | "responsibleObserver" | |
-| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.CodeableConcept | 0 | -1 | | | "http://terminology.hl7.org/CodeSystem/practitioner-role" | |
-| 17 | OBX-17 | Observation Method | CWE | 0 | -1 | | | | Observation.method | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.method is 0..1 while the source allows for multiple methods. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
-| 18 | OBX-18 | Equipment Instance Identifier | EI | 0 | -1 | | | | Observation.device(Observation.Device.identifier) | | Observation.Identifier | 0 | 1 | EI[Identifier-Extension] | | | |
-| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/observation-analysis-date-time" |
-| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
-| 20 | OBX-20 | Observation Site | CWE | 0 | -1 | | | | Observation.bodySite | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.bodySite is 0..1 while the source allows for multiple body sites. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
-| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier.type.coding.code | | Observation.code | 0 | 1 | | | "FILL" | |
-| 22 | OBX-22 | Mood Code | CNE | 0 | 1 | | | | | | | | | | | | |
-| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 NOT VALUED | | | Observation.performer(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
-| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
-| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 NOT VALUED | | | Observation.performer(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
-| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.practitioner) | | Reference(Observation.PractitionerRole) | 0 | 1 | XCN[PractitionerRole] | | | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.code | | | | | "MDIR" | |
-| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | | | | | | "http://terminology.hl7.org/CodeSystem/v2-0912" | |
-| 26 | OBX-26 | Patient Results Release Category | ID | 0 | 1 | | | | | | | | | | | | |
-| 27 | OBX-27 | Root Cause | CWE | 0 | 1 | | | | | | | | | | | | |
-| 28 | OBX-28 | Local Process Control | CWE | 0 | -1 | | | | | | | | | | | | |
-| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.code | | Observation.code | 0 | -1 | | | | |
-| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.system | | Observation.uri | 0 | -1 | | | | |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | The sub type was necessary in v2 to distinguish purpose of the observation when it appears in a message in the same group (e.g., answers to ask at order entry questions with actual results ). Within FHIR flagging the observation may not be necessary, but that is not yet clear. Until then, we will keep the thought of needing an extension, but not create it yet. |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.code | | Observation.code | 0 | 1 | | | | |
-| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.system | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
-| 31 | OBX-31 | Action Code | ID | 0 | 1 | | | | | | | | | | | | |
-| 32 | OBX-32 | Observation Value Absent Reason | CWE | 0 | -1 | | | | | | | | | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | Reference | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | Note that in v2 messages the observations that a calculated observation is derived from on and involve multiple specimens are typically not included with the message. To enable relating the calculated observation to the correct specimens it relates to, the v2 message should include the originating observations that in turn use OBX-33 to link to the correct specimens. Without that, and if there are multiple specimens in OBX-33, there is no standard method to correctly associate the observation with the correct specimens. The implementer will have to devise an appropriate method for that in their context. |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-PlacerAssignedIdentifier] | | | |
-| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "NA" | | | Observation.valueSampledData | | Observation.SampledData | | | | | | Need to add text on converting NA to SampledData |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | | Observation.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "ED" AND IF OBX-5.4 EQUALS "Base64" | | | Observation.extension.valueAttachment | | Observation.Attachment | 1 | 1 | ED[Attachment] | | | We are for now addressing Base64 that cover .pdf, pictures and other binaries. If somebody does this, we will address those. |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "EI" | | | | | | | | | | | Requires more work to properly map. Use case: An OBX under OBR that points to the calibration/quality control/etc. settings/values/result/etc. that the other OBX-s under the OBR would be "subject" to. |
+ | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | | Observation.extension.url | | Observation.uri | 1 | 1 | | | "https://hl7.org/fhir/R5/StructureDefinition/extension-Observation.valueAttachment | |
+| 5 | OBX-5 | Observation Value | varies | 0 | -1 | IF OBX-2 EQUALS "RP" | | | Observation.extension.valueAttachment | | Observation.Attachment | 1 | 1 | ED[Attachment] | | | To be resolved when we resolve DocumentReference and valueAttachment |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 IN ("NA", "NM") | | | Observation.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 NOT IN (":", "/", "-", "+") | | | Observation.valueQuantity | | Observation.Quantity | | | CWE[Quantity] | | | Note that OBX-5 and OBX-6 resolve to different components for the same Quantity data type. |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange.low | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 EQUALS "-" | | | Observation.valueRange.high | | Observation.SimpleQuantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio.numerator | | Observation.Quantity | | | CWE[Quantity] | | | |
+| 6 | OBX-6 | Units | CWE | 0 | 1 | IF OBX-2 EQUALS "SN" AND OBX-5.1 NOT EQUALS "<>" AND OBX-5.3 IN (":", "/") | | | Observation.valueRatio.denominator | | Observation.Quantity | | | CWE[Quantity] | | | |
+| 7 | OBX-7 | References Range | ST | 0 | 1 | | | | Observation.referenceRange.text | | Observation.string | 0 | -1 | | | | If OBX-7 is sufficiently parseable, then the low, high, type, appliesTo, and/or age may be used. |
+| 8 | OBX-8 | Interpretation Codes | CWE | 0 | -1 | | | | Observation.interpretation | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | InterpretationCodes | | |
+| 9 | OBX-9 | Probability | NM | 0 | 1 | | | | | | | | | | | | |
+| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.uri | | Observation.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/observation-nature-of-abnormal-test" | |
+| 10 | OBX-10 | Nature of Abnormal Test | ID | 0 | -1 | | | | Observation.extension.valueCodeableConcept | | Observation.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | NatureOfAbnormalTesting | | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | | | | Observation.status | | Observation.code | 1 | 1 | | ObservationResultStatusCodesInterpretation | | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.url | | Observation.uri | | | | | "http://hl7.org/fhir/StructureDefinition/alternate-codes" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.code | | Observation.CodeableConcept | | | | | "X" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "X" | | | Observation.status.extension.valueCodeableConcept.coding.system | | Observation.string | | | | | "http://terminology.hl7.org/CodeSystem/v2-0085" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.code | | | | | | | "not-asked" | |
+| 11 | OBX-11 | Observation Result Status | ID | 1 | 1 | IF OBX-11 IS "N" | | | Observation.dataAbsentReason.coding.system | | | | | | | "http://terminology.hl7.org/CodeSystem/data-absent-reason" | |
+| 12 | OBX-12 | Effective Date of Reference Range | DTM | 0 | 1 | | | | | | | | | | | | |
+| 13 | OBX-13 | User Defined Access Checks | ST | 0 | 1 | | | | | | | | | | | | |
+| 14 | OBX-14 | Date/Time of the Observation | DTM | 0 | 1 | | | | Observation.effectiveDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | Observation.performer(Observation.Organization) | | Observation.identifier | 0 | 1 | CWE[Organization] | | | We are mapping this to an identifier considering the definition (used for a unique identifier of the producer), although that does not fit the use of the CWE data type in HL7 v2. Depending on context (e.g., US CLIA or IHE LTW, or ILW) this may reflect a location (US CLIA) or an organization (IHE LTW or ILW). |
+| 15 | OBX-15 | Producer's ID | CWE | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole) | | | | | | | | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.practitioner(Observation.Practitioner) | | Reference(Observation.PractitionerRole) | 0 | -1 | XCN[Practitioner] | | | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.CodeableConcept | 0 | -1 | | | "responsibleObserver" | |
+| 16 | OBX-16 | Responsible Observer | XCN | 0 | -1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | Observation.CodeableConcept | 0 | -1 | | | "http://terminology.hl7.org/CodeSystem/practitioner-role" | |
+| 17 | OBX-17 | Observation Method | CWE | 0 | -1 | | | | Observation.method | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.method is 0..1 while the source allows for multiple methods. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
+| 18 | OBX-18 | Equipment Instance Identifier | EI | 0 | -1 | | | | Observation.device(Observation.Device.identifier) | | Observation.Identifier | 0 | 1 | EI[Identifier-Extension] | | | |
+| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | | "http://hl7.org/fhir/StructureDefinition/observation-analysis-date-time" |
+| 19 | OBX-19 | Date/Time of the Analysis | DTM | 0 | 1 | | | | Observation.extension.valueDateTime | | Observation.dateTime | 0 | 1 | | | | |
+| 20 | OBX-20 | Observation Site | CWE | 0 | -1 | | | | Observation.bodySite | | Observation.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | The cardinality of Observation.bodySite is 0..1 while the source allows for multiple body sites. As we are not aware of anybody populating multiples in HL7 v2, we did not provide further mapping guidance. If you need to support multiples, please submit a gForge to OO for the HL7 v2 to FHIR mapping Implementation Guide. |
+| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier | | Observation.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 21 | OBX-21 | Observation Instance Identifier | EI | 0 | 1 | | | | Observation.identifier.type.coding.code | | Observation.code | 0 | 1 | | | "FILL" | |
+| 22 | OBX-22 | Mood Code | CNE | 0 | 1 | | | | | | | | | | | | |
+| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 NOT VALUED | | | Observation.performer(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
+| 23 | OBX-23 | Performing Organization Name | XON | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization) | | Reference(Observation.Organization) | 0 | -1 | XON[Organization] | | | |
+| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 NOT VALUED | | | Observation.performer(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
+| 24 | OBX-24 | Performing Organization Address | XAD | 0 | 1 | IF OBX-25 VALUED | | | Observation.performer(Observation.PractitionerRole.organization(Observation.Organization.address) | | Observation.Address | 0 | -1 | XAD[Address] | | | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.practitioner) | | Reference(Observation.PractitionerRole) | 0 | 1 | XCN[PractitionerRole] | | | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.code) | | Observation.code | | | | | "MDIR" | |
+| 25 | OBX-25 | Performing Organization Medical Director | XCN | 0 | 1 | | | | Observation.performer(Observation.PractitionerRole.code.coding.system) | | | | | | | "http://terminology.hl7.org/CodeSystem/v2-0912" | |
+| 26 | OBX-26 | Patient Results Release Category | ID | 0 | 1 | | | | | | | | | | | | |
+| 27 | OBX-27 | Root Cause | CWE | 0 | 1 | | | | | | | | | | | | |
+| 28 | OBX-28 | Local Process Control | CWE | 0 | -1 | | | | | | | | | | | | |
+| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.code | | Observation.code | 0 | -1 | | | | |
+| 29 | OBX-29 | Observation Type | ID | 0 | 1 | | | | Observation.category.coding.system | | Observation.uri | 0 | -1 | | | | |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.url | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | The sub type was necessary in v2 to distinguish purpose of the observation when it appears in a message in the same group (e.g., answers to ask at order entry questions with actual results ). Within FHIR flagging the observation may not be necessary, but that is not yet clear. Until then, we will keep the thought of needing an extension, but not create it yet. |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.code | | Observation.code | 0 | 1 | | | | |
+| 30 | OBX-30 | Observation Sub-Type | ID | 0 | 1 | | | | Observation.extension.valueCodeableConcept.coding.system | | Observation.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/observation-structure-type" | |
+| 31 | OBX-31 | Action Code | ID | 0 | 1 | | | | | | | | | | | | |
+| 32 | OBX-32 | Observation Value Absent Reason | CWE | 0 | -1 | | | | | | | | | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | Reference | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | Note that in v2 messages the observations that a calculated observation is derived from on and involve multiple specimens are typically not included with the message. To enable relating the calculated observation to the correct specimens it relates to, the v2 message should include the originating observations that in turn use OBX-33 to link to the correct specimens. Without that, and if there are multiple specimens in OBX-33, there is no standard method to correctly associate the observation with the correct specimens. The implementer will have to devise an appropriate method for that in their context. |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.uri | | | 0 | 1 | | | "http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.specimen | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT>1 | | | Observation.extension.valueReference(Observation.Group.member.entity(Observation.Specimen.identifier) | | | 0 | 1 | | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-PlacerAssignedIdentifier] | | | |
+| 33 | OBX-33 | Observation Related Specimen Identifier | EIP | 0 | -1 | IF OBX-33 COUNT=1 | | | Observation.specimen(Observation.Specimen.identifier) | | Observation.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
diff --git a/input/includes/ConceptMap-segment-orc-to-diagnosticreport-intro.md b/input/includes/ConceptMap-segment-orc-to-diagnosticreport-intro.md
index f94fcfc6..28e5dfea 100644
--- a/input/includes/ConceptMap-segment-orc-to-diagnosticreport-intro.md
+++ b/input/includes/ConceptMap-segment-orc-to-diagnosticreport-intro.md
@@ -4,48 +4,48 @@ This ConceptMap represents the mapping from the HL7 V2 ORC Segment to the FHIR D
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | IF ORC-5 NOT VALUED | ORC.element("5").empty() | | ServiceRequest.status | | ServiceRequest.code | 1 | 1 | | OrderControlCode[ServiceRequest.status] | | This is a complicated mapping where .status, .intent, and Task get involved that may have various localized interpretation. |
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.intent | | ServiceRequest.code | 1 | 1 | | | "order" | |
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/businessEvent" | |
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.url | | ServiceRequest.uri | 1 | 1 | | | "value" | |
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.valueCodeableConcept.coding.code | | ServiceRequest.code | 1 | 1 | | | | |
-| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.valueCodeableConcept.coding.system | | ServiceRequest.uri | 1 | 1 | | | "http://terminology.hl7.org/ValueSet/v2-0119" | |
-| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
-| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
-| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FILL" | |
-| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EIP[Identifier-PlacerAssignedIdentifier] | | | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | | | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PGN" | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | | | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FGN" | |
-| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 5 | ORC-5 | Order Status | ID | 0 | 1 | | | | ServiceRequest.status | | ServiceRequest.code | 1 | 1 | | OrderStatus | | |
-| 6 | ORC-6 | Response Flag | ID | 0 | 1 | | | | | | | | | | | | |
-| 7 | ORC-7 | Quantity/Timing | TQ | 0 | -1 | | | | ServiceRequest.$this | | | | | TQ[ServiceRequest] | | | |
-| 8 | ORC-8 | Parent Order | EIP | 0 | -1 | | | | | basedOn[1].extension??-parent.placer | | | | EIP[Identifier-PlacerAssignedIdentifier] | | ORC-8.1 | |
-| 8 | ORC-8 | Parent Order | EIP | 0 | -1 | | | | | basedOn[1].extension??-parent.filler | | | | EIP[Identifier-FillerAssignedIdentifier] | | ORC-8.2 | |
-| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | IF ORC.1 IS "NW" | ORC.element("1")="NW" | | ServiceRequest.authoredOn | | ServiceRequest.dateTime | 0 | 1 | | | | |
-| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/businessEvent" | |
-| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.extension.url | | ServiceRequest.uri | 1 | 1 | | | "date" | |
-| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.extension.valuedateTime | | ServiceRequest.dateTime | 1 | 1 | | | | |
-| 10 | ORC-10 | Entered By | XCN | 0 | -1 | | | | | | | | | | | | |
-| 11 | ORC-11 | Verified By | XCN | 0 | -1 | | | | | | | | | | | | |
-| 12 | ORC-12 | Ordering Provider | XCN | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.practitioner) | | Reference(ServiceRequest.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 13 | ORC-13 | Enterer's Location | PL | 0 | 1 | | | | | | | | | | | | |
-| 14 | ORC-14 | Call Back Phone Number | XTN | 0 | 2 | IF OBR-17 NOT VALUED | OBR.element("17").empty() | | ServiceRequest.extension.url | | ServiceRequest.uri | 0 | 2 | | | "http://hl7.org/fhir/StructureDefinition/servicerequest-order-callback-phone-number" | |
-| 14 | ORC-14 | Call Back Phone Number | XTN | 0 | 2 | IF OBR-17 NOT VALUED | OBR.element("17").empty() | | ServiceRequest.extension.valueContactPoint | | ServiceRequest.ContactPoint | 0 | 2 | XTN[ContactPoint] | | | |
-| 15 | ORC-15 | Order Effective Date/Time | DTM | 0 | 1 | | | | | | ServiceRequest.dateTime | 0 | 1 | | | | We are requesting ballot feedback on how systems are using ORC-15 today so that we can either establish a mapping or define a new extension |
-| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | IF ORC-5 NOT VALUED | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/request-statusReason" | |
-| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | IF ORC-5 NOT VALUED | | | ServiceRequest.extension.valueCodeableConcept | | ServiceRequest.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
-| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | | | | | extension??-orderControlCodeReason | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 17 | ORC-17 | Entering Organization | CWE | 0 | 1 | | | | | | | | | | | | |
-| 18 | ORC-18 | Entering Device | CWE | 0 | 1 | | | | | | | | | | | | |
-| 19 | ORC-19 | Action By | XCN | 0 | -1 | | | | | | | | | | | | |
-| 20 | ORC-20 | Advanced Beneficiary Notice Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 21 | ORC-21 | Ordering Facility Name | XON | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization) | | Reference(ServiceRequest.Organization) | 0 | 1 | XON[Organization] | | | PractitionerRole.location is an alternative mapping, we invite ballot comments on which element in PractitionerRole is best. |
-| 22 | ORC-22 | Ordering Facility Address | XAD | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization.address) | | ServiceRequest.Address | 0 | -1 | XAD[Address] | | | |
-| 23 | ORC-23 | Ordering Facility Phone Number | XTN | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization.telecom) | | ServiceRequest.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 24 | ORC-24 | Ordering Provider Address | XAD | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.practitioner(ServiceRequest.Practitioner.address) | | | | | XAD[Address] | | | We request feedback on whether this address is more directly related to the Practitioner rather than the PractitionerRole |
-| 25 | ORC-25 | Order Status Modifier | CWE | 0 | 1 | | | | | extension??-statusModifier | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 26 | ORC-26 | Advanced Beneficiary Notice Override Reason | CWE | 0 | 1 | | | | | | | | | | | | |
-| 27 | ORC-27 | Filler's Expected Availability Date/Time | DTM | 0 | 1 | | | | | | | | | | | | |
-| 28 | ORC-28 | Confidentiality Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 29 | ORC-29 | Order Type | CWE | 0 | 1 | | | | ServiceRequest.locationCode | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | OrderType | | |
-| 30 | ORC-30 | Enterer Authorization Mode | CNE | 0 | 1 | | | | | | | | | | | | |
-| 31 | ORC-31 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | basedOn[1].extension??-parent.service | ServiceRequest.CodeableConcept | | | CWE[CodeableConcept] | | | |
-| 32 | ORC-32 | Advanced Beneficiary Notice Date | DT | 0 | 1 | | | | | | | | | | | | |
-| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
-| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 34 | ORC-34 | Order Workflow Profile | CWE | 0 | -1 | | | | | | | | | | | | |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | IF ORC-5 NOT VALUED | ORC.element("5").empty() | | ServiceRequest.status | | ServiceRequest.code | 1 | 1 | | OrderControlCode[ServiceRequest.status] | | This is a complicated mapping where .status, .intent, and Task get involved that may have various localized interpretation. |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.intent | | ServiceRequest.code | 1 | 1 | | | "order" | |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/businessEvent" | |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.url | | ServiceRequest.uri | 1 | 1 | | | "value" | |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.valueCodeableConcept.coding.code | | ServiceRequest.code | 1 | 1 | | | | |
+| 1 | ORC-1 | Order Control | ID | 1 | 1 | | | | ServiceRequest.extension.extension.valueCodeableConcept.coding.system | | ServiceRequest.uri | 1 | 1 | | | "http://terminology.hl7.org/ValueSet/v2-0119" | |
+| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
+| 2 | ORC-2 | Placer Order Number | EI | 0 | 1 | IF OBR-2 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EI[Identifier-Extension] | | | |
+| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FILL" | |
+| 3 | ORC-3 | Filler Order Number | EI | 0 | 1 | IF OBR-3 NOT VALUED | OBR.element("3").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | EIP[Identifier-PlacerAssignedIdentifier] | | | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | | | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PGN" | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | | | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier | | ServiceRequest.Identifier | | | EIP[Identifier-FillerAssignedIdentifier] | | | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "FGN" | |
+| 4 | ORC-4 | Placer Group Number | EIP - This is EI in many versions including 2.9 | 0 | 1 | | | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 5 | ORC-5 | Order Status | ID | 0 | 1 | | | | ServiceRequest.status | | ServiceRequest.code | 1 | 1 | | OrderStatus | | |
+| 6 | ORC-6 | Response Flag | ID | 0 | 1 | | | | | | | | | | | | |
+| 7 | ORC-7 | Quantity/Timing | TQ | 0 | -1 | | | | ServiceRequest.$this | | | | | TQ[ServiceRequest] | | | |
+| 8 | ORC-8 | Parent Order | EIP | 0 | -1 | | | | | basedOn[1].extension??-parent.placer | | | | EIP[Identifier-PlacerAssignedIdentifier] | | ORC-8.1 | |
+| 8 | ORC-8 | Parent Order | EIP | 0 | -1 | | | | | basedOn[1].extension??-parent.filler | | | | EIP[Identifier-FillerAssignedIdentifier] | | ORC-8.2 | |
+| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | IF ORC.1 IS "NW" | ORC.element("1")="NW" | | ServiceRequest.authoredOn | | ServiceRequest.dateTime | 0 | 1 | | | | |
+| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/businessEvent" | |
+| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.extension.url | | ServiceRequest.uri | 1 | 1 | | | "date" | |
+| 9 | ORC-9 | Date/Time of Order Event | DTM | 0 | 1 | | | | ServiceRequest.extension.extension.valuedateTime | | ServiceRequest.dateTime | 1 | 1 | | | | |
+| 10 | ORC-10 | Entered By | XCN | 0 | -1 | | | | | | | | | | | | |
+| 11 | ORC-11 | Verified By | XCN | 0 | -1 | | | | | | | | | | | | |
+| 12 | ORC-12 | Ordering Provider | XCN | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.practitioner) | | Reference(ServiceRequest.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 13 | ORC-13 | Enterer's Location | PL | 0 | 1 | | | | | | | | | | | | |
+| 14 | ORC-14 | Call Back Phone Number | XTN | 0 | 2 | IF OBR-17 NOT VALUED | OBR.element("17").empty() | | ServiceRequest.extension.url | | ServiceRequest.uri | 0 | 2 | | | "http://hl7.org/fhir/StructureDefinition/servicerequest-order-callback-phone-number" | |
+| 14 | ORC-14 | Call Back Phone Number | XTN | 0 | 2 | IF OBR-17 NOT VALUED | OBR.element("17").empty() | | ServiceRequest.extension.valueContactPoint | | ServiceRequest.ContactPoint | 0 | 2 | XTN[ContactPoint] | | | |
+| 15 | ORC-15 | Order Effective Date/Time | DTM | 0 | 1 | | | | | | ServiceRequest.dateTime | 0 | 1 | | | | We are requesting ballot feedback on how systems are using ORC-15 today so that we can either establish a mapping or define a new extension |
+| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | IF ORC-5 NOT VALUED | | | ServiceRequest.extension.url | | ServiceRequest.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/request-statusReason" | |
+| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | IF ORC-5 NOT VALUED | | | ServiceRequest.extension.valueCodeableConcept | | ServiceRequest.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
+| 16 | ORC-16 | Order Control Code Reason | CWE | 0 | 1 | | | | | extension??-orderControlCodeReason | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 17 | ORC-17 | Entering Organization | CWE | 0 | 1 | | | | | | | | | | | | |
+| 18 | ORC-18 | Entering Device | CWE | 0 | 1 | | | | | | | | | | | | |
+| 19 | ORC-19 | Action By | XCN | 0 | -1 | | | | | | | | | | | | |
+| 20 | ORC-20 | Advanced Beneficiary Notice Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 21 | ORC-21 | Ordering Facility Name | XON | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization) | | Reference(ServiceRequest.Organization) | 0 | 1 | XON[Organization] | | | PractitionerRole.location is an alternative mapping, we invite ballot comments on which element in PractitionerRole is best. |
+| 22 | ORC-22 | Ordering Facility Address | XAD | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization.address) | | ServiceRequest.Address | 0 | -1 | XAD[Address] | | | |
+| 23 | ORC-23 | Ordering Facility Phone Number | XTN | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.organization(ServiceRequest.Organization.telecom) | | ServiceRequest.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 24 | ORC-24 | Ordering Provider Address | XAD | 0 | -1 | | | | ServiceRequest.requester(ServiceRequest.PractitionerRole.practitioner(ServiceRequest.Practitioner.address) | | | | | XAD[Address] | | | We request feedback on whether this address is more directly related to the Practitioner rather than the PractitionerRole |
+| 25 | ORC-25 | Order Status Modifier | CWE | 0 | 1 | | | | | extension??-statusModifier | ServiceRequest.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 26 | ORC-26 | Advanced Beneficiary Notice Override Reason | CWE | 0 | 1 | | | | | | | | | | | | |
+| 27 | ORC-27 | Filler's Expected Availability Date/Time | DTM | 0 | 1 | | | | | | | | | | | | |
+| 28 | ORC-28 | Confidentiality Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 29 | ORC-29 | Order Type | CWE | 0 | 1 | | | | ServiceRequest.locationCode | | ServiceRequest.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | OrderType | | |
+| 30 | ORC-30 | Enterer Authorization Mode | CNE | 0 | 1 | | | | | | | | | | | | |
+| 31 | ORC-31 | Parent Universal Service Identifier | CWE | 0 | 1 | | | | | basedOn[1].extension??-parent.service | ServiceRequest.CodeableConcept | | | CWE[CodeableConcept] | | | |
+| 32 | ORC-32 | Advanced Beneficiary Notice Date | DT | 0 | 1 | | | | | | | | | | | | |
+| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier | | ServiceRequest.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.code | | ServiceRequest.code | 0 | 1 | | | "PLAC" | |
+| 33 | ORC-33 | Alternate Placer Order Number | CX | 0 | -1 | IF OBR-53 NOT VALUED | OBR.element("2").empty() | | ServiceRequest.identifier.type.coding.system | | ServiceRequest.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 34 | ORC-34 | Order Workflow Profile | CWE | 0 | -1 | | | | | | | | | | | | |
diff --git a/input/includes/ConceptMap-segment-pd1-livingwill-to-observation-intro.md b/input/includes/ConceptMap-segment-pd1-livingwill-to-observation-intro.md
index 3d37fc84..01cdb63d 100644
--- a/input/includes/ConceptMap-segment-pd1-livingwill-to-observation-intro.md
+++ b/input/includes/ConceptMap-segment-pd1-livingwill-to-observation-intro.md
@@ -4,32 +4,32 @@ This ConceptMap represents the mapping from the HL7 V2 PD1 Segment to the FHIR O
-| 1 | PID-1 | Set ID - PID | SI | 0 | 1 | | | | | | | | | | | | |
-| 2 | PID-2 | Patient ID | CX | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 3 | PID-3 | Patient Identifier List | CX | 1 | -1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 4 | PID-4 | Alternate Patient ID - PID | CX | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 5 | PID-5 | Patient Name | XPN | 1 | -1 | | | | Patient.name | | Patient.HumanName | 0 | -1 | XPN[HumanName] | | | |
-| 6 | PID-6 | Mother's Maiden Name | XPN | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName" | |
-| 6 | PID-6 | Mother's Maiden Name | XPN | 0 | -1 | | | | Patient.extension.valueString | | Patient.string | 1 | 1 | XPN[String] | | | This may not be the second name if there are repeats in PID-5. ext.patientMothersMaiden (string) also exists if we prefer. |
-| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | | | | Patient.birthDate | | Patient.date | 0 | 1 | | | | PROPOSAL MOVE TO IG IMPLEMENTATION GUIDANCE SECTION: Use ISO 8601 to establish the re-formatting from HL7 v2 data type to HL7 FHIR data type, particularly when mapping a platform datetime to platform date. ADD OTHER REFERENCES ON HOW TO ACHIEVE THESE CONVERSIONS in Java, CSHarp, etc., etc. |
-| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | IF PID-7 LENGTH GREATER THAN 8 | | | Patient.birthDate.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-birthTime" | |
-| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | IF PID-7 LENGTH GREATER THAN 8 | | | Patient.birthDate.extension.valueDateTime | | Patient.dateTime | 1 | 1 | | | | |
-| 8 | PID-8 | Administrative Sex | CWE | 0 | 1 | | | | Patient.gender | | Patient.code | 0 | 1 | CWE[code] | Gender | | |
-| 9 | PID-9 | Patient Alias | XPN | 0 | -1 | | | | Patient.name | | Patient.HumanName | 0 | -1 | XPN[HumanName] | | | |
+| 1 | PID-1 | Set ID - PID | SI | 0 | 1 | | | | | | | | | | | | |
+| 2 | PID-2 | Patient ID | CX | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 3 | PID-3 | Patient Identifier List | CX | 1 | -1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 4 | PID-4 | Alternate Patient ID - PID | CX | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 5 | PID-5 | Patient Name | XPN | 1 | -1 | | | | Patient.name | | Patient.HumanName | 0 | -1 | XPN[HumanName] | | | |
+| 6 | PID-6 | Mother's Maiden Name | XPN | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName" | |
+| 6 | PID-6 | Mother's Maiden Name | XPN | 0 | -1 | | | | Patient.extension.valueString | | Patient.string | 1 | 1 | XPN[String] | | | This may not be the second name if there are repeats in PID-5. ext.patientMothersMaiden (string) also exists if we prefer. |
+| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | | | | Patient.birthDate | | Patient.date | 0 | 1 | | | | PROPOSAL MOVE TO IG IMPLEMENTATION GUIDANCE SECTION: Use ISO 8601 to establish the re-formatting from HL7 v2 data type to HL7 FHIR data type, particularly when mapping a platform datetime to platform date. ADD OTHER REFERENCES ON HOW TO ACHIEVE THESE CONVERSIONS in Java, CSHarp, etc., etc. |
+| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | IF PID-7 LENGTH GREATER THAN 8 | | | Patient.birthDate.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-birthTime" | |
+| 7 | PID-7 | Date/Time of Birth | DTM | 0 | 1 | IF PID-7 LENGTH GREATER THAN 8 | | | Patient.birthDate.extension.valueDateTime | | Patient.dateTime | 1 | 1 | | | | |
+| 8 | PID-8 | Administrative Sex | CWE | 0 | 1 | | | | Patient.gender | | Patient.code | 0 | 1 | CWE[code] | AdministrativeSex | | |
+| 9 | PID-9 | Patient Alias | XPN | 0 | -1 | | | | Patient.name | | Patient.HumanName | 0 | -1 | XPN[HumanName] | | | |
| 10 | PID-10 | Race | CWE | 0 | -1 | | | PID-10 is may map different based on local requirements and should use the local extension, e.g., US = US Core Race Extension, AUS = indiginous extension. | | local implementation | | | | | | | For an international document, it may not be possible to come up with a FHIR value set for race. Therefore the appropriate extension for the local implementation should be used based on preferably a country/realm specific extension, e.g., US Core Race Extension for the US or the Indiginous Extension for Australia. |
-| 11 | PID-11 | Patient Address | XAD | 0 | -1 | | | | Patient.address | | Patient.Address | 0 | -1 | XAD[Address] | | | |
-| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT EQUALS 1 AND PID-11.9 IS NOT VALUED | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | This may not be the second occurrence if PID-11 repeats. Because PID-11 can repeat but PID-12 cannot, it's not appropriate to include PID-12 in an iteration of .address populated from PID-11 |
-| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT EQUALS 1 AND PID-11.9 IS VALUED NOT EQUAL PID-12 | | | Patient.address.district | | Patient.string | | | ID[String] | | | |
-| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT GREATER THAN 1 | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | |
-| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 IS NOT VALUED | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | |
-| 13 | PID-13 | Phone Number - Home | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 13 | PID-13 | Phone Number - Home | XTN | 0 | -1 | IF PID-13.2 IS NOT VALUED | | | Patient.telecom.use | | | | | | | "home" | |
-| 14 | PID-14 | Phone Number - Business | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 14 | PID-14 | Phone Number - Business | XTN | 0 | -1 | IF PID-14.2 IS NOT VALUED | | | Patient.telecom.use | | | | | | | "work" | |
-| 15 | PID-15 | Primary Language | CWE | 0 | 1 | | | | Patient.communication.language | | Patient.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | Language | | During implementation, if you know that the value in PID-15 is the preferred patient language, then Patient.communication.preferred can be set to "true". |
-| 16 | PID-16 | Marital Status | CWE | 0 | 1 | | | | Patient.maritalStatus | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | MaritalStatus | | |
-| 17 | PID-17 | Religion | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-religion" | |
-| 17 | PID-17 | Religion | CWE | 0 | 1 | | | | Patient.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | Religion | | |
-| 18 | PID-18 | Patient Account Number | CX | 0 | 1 | | | | | | | | | | | | Mapped in PID[Account]. In some systems, PID-18 may contain a visit identifier. If that is the case for a given implementation, then a mapping to an Encounter may be more appropriate |
-| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.value | | Patient.string | 0 | 1 | | | | the value set for Identifier.type doesn't contain SSN but it does have SB (social beneficiary) |
+| 11 | PID-11 | Patient Address | XAD | 0 | -1 | | | | Patient.address | | Patient.Address | 0 | -1 | XAD[Address] | | | |
+| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT EQUALS 1 AND PID-11.9 IS NOT VALUED | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | This may not be the second occurrence if PID-11 repeats. Because PID-11 can repeat but PID-12 cannot, it's not appropriate to include PID-12 in an iteration of .address populated from PID-11 |
+| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT EQUALS 1 AND PID-11.9 IS VALUED NOT EQUAL PID-12 | | | Patient.address.district | | Patient.string | | | ID[String] | | | |
+| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 LST.COUNT GREATER THAN 1 | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | |
+| 12 | PID-12 | County Code | ID | 0 | 1 | IF PID-11 IS NOT VALUED | | | Patient.address.district | | Patient.string | 0 | 1 | ID[String] | | | |
+| 13 | PID-13 | Phone Number - Home | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 13 | PID-13 | Phone Number - Home | XTN | 0 | -1 | IF PID-13.2 IS NOT VALUED | | | Patient.telecom.use | | | | | | | "home" | |
+| 14 | PID-14 | Phone Number - Business | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 14 | PID-14 | Phone Number - Business | XTN | 0 | -1 | IF PID-14.2 IS NOT VALUED | | | Patient.telecom.use | | | | | | | "work" | |
+| 15 | PID-15 | Primary Language | CWE | 0 | 1 | | | | Patient.communication.language | | Patient.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | PrimaryLanguage | | During implementation, if you know that the value in PID-15 is the preferred patient language, then Patient.communication.preferred can be set to "true". |
+| 16 | PID-16 | Marital Status | CWE | 0 | 1 | | | | Patient.maritalStatus | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | MaritalStatus | | |
+| 17 | PID-17 | Religion | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-religion" | |
+| 17 | PID-17 | Religion | CWE | 0 | 1 | | | | Patient.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | Religion | | |
+| 18 | PID-18 | Patient Account Number | CX | 0 | 1 | | | | | | | | | | | | Mapped in PID[Account]. In some systems, PID-18 may contain a visit identifier. If that is the case for a given implementation, then a mapping to an Encounter may be more appropriate |
+| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.value | | Patient.string | 0 | 1 | | | | the value set for Identifier.type doesn't contain SSN but it does have SB (social beneficiary) |
| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | If in the US and various other jurisdictions | Patient.identifier.type.coding.code | | Patient.code | 0 | 1 | | | "SS" | |
| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | If outside the US for certain jurisdictions | Patient.identifier.type.coding.code | | Patient.code | 0 | 1 | | | "SB" | |
-| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.type.coding.system | | Patient.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.system | | Patient.uri | 0 | 1 | | | "http://hl7.org/fhir/sid/us-ssn." | If working in a jurisdiction other than the US and this field is used for the local SSN equivalent, a different system will need to be identified. |
-| 20 | PID-20 | Driver's License Number - Patient | DLN | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | 1 | DLN[Identifier] | | | |
-| 21 | PID-21 | Mother's Identifier | CX | 0 | -1 | | | | Patient.$this | | | | | CX[RelatedPerson-Mother] | | | |
+| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.type.coding.system | | Patient.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 19 | PID-19 | SSN Number - Patient | ST | 0 | 1 | | | | Patient.identifier.system | | Patient.uri | 0 | 1 | | | "http://hl7.org/fhir/sid/us-ssn." | If working in a jurisdiction other than the US and this field is used for the local SSN equivalent, a different system will need to be identified. |
+| 20 | PID-20 | Driver's License Number - Patient | DLN | 0 | 1 | | | | Patient.identifier | | Patient.Identifier | 0 | 1 | DLN[Identifier] | | | |
+| 21 | PID-21 | Mother's Identifier | CX | 0 | -1 | | | | Patient.$this | | | | | CX[RelatedPerson-Mother] | | | |
| 22 | PID-22 | Ethnic Group | CWE | 0 | -1 | | | If PID-22 is for administrative purposes use, then use your local extension, e.g., for US = US Core Ethnicity. | | local implementation | | | | | | | For an international document, it may not be possible to come up with a FHIR value set for ethnic group. Therefore the appropriate extension for the local implementation should be used based on preferably a country/realm specific extension, e.g., US Core Ethnicity for the US. |
-| 23 | PID-23 | Birth Place | ST | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-birthPlace" | |
-| 23 | PID-23 | Birth Place | ST | 0 | 1 | | | | Patient.extension.valueAddress.text | | Patient.string | 0 | 1 | | | | |
-| 24 | PID-24 | Multiple Birth Indicator | ID | 0 | 1 | IF PID-25 NOT VALUED | | | Patient.multipleBirthBoolean | | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/No | | |
-| 25 | PID-25 | Birth Order | NM | 0 | 1 | | | | Patient.multipleBirthInteger | | Patient.integer | 0 | 1 | | | | |
-| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-citizenship" | |
-| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
-| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set |
-| 27 | PID-27 | Veterans Military Status | CWE | 0 | 1 | | | | | extension??-veteranMilitaryStatus | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-nationality" | |
-| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
-| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set |
-| 29 | PID-29 | Patient Death Date and Time | DTM | 0 | 1 | | | | Patient.deceasedDateTime | | Patient.dateTime | 0 | 1 | | | | |
-| 30 | PID-30 | Patient Death Indicator | ID | 0 | 1 | IF PID-29 NOT VALUED | | | Patient.deceasedBoolean | | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/No | | |
-| 31 | PID-31 | Identity Unknown Indicator | ID | 0 | 1 | | | | | extension??-identityUnknown | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/No | | |
-| 32 | PID-32 | Identity Reliability Code | CWE | 0 | -1 | | | | | | | | | | | | |
-| 33 | PID-33 | Last Update Date/Time | DTM | 0 | 1 | | | | | | | | | | | | |
-| 34 | PID-34 | Last Update Facility | HD | 0 | 1 | | | | | | | | | | | | |
-| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/patient-animal" | |
-| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 0 | 1 | | | "species" | |
-| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/patient-animal" | |
-| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 0 | 1 | | | "breed" | |
-| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
-| 37 | PID-37 | Strain | ST | 0 | 1 | | | | | | | | | | | | If this is necessary, it should be an update to the existing animal extension |
-| 38 | PID-38 | Production Class Code | CWE | 0 | 2 | | | | | | | | | | | | |
-| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-citizenship" | |
-| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
-| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set. Also suggest that the extension should not be limited to "country". Consider adding a .type to the extension to distinguish tribal vs. "country" (or whatever we call it), or otherwise add an extension for tribal citizenship to accommodate the return flow. |
-| 40 | PID-40 | Patient Telecommunication Information | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 23 | PID-23 | Birth Place | ST | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-birthPlace" | |
+| 23 | PID-23 | Birth Place | ST | 0 | 1 | | | | Patient.extension.valueAddress.text | | Patient.string | 0 | 1 | | | | |
+| 24 | PID-24 | Multiple Birth Indicator | ID | 0 | 1 | IF PID-25 NOT VALUED | | | Patient.multipleBirthBoolean | | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/NoIndicator | | |
+| 25 | PID-25 | Birth Order | NM | 0 | 1 | | | | Patient.multipleBirthInteger | | Patient.integer | 0 | 1 | | | | |
+| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-citizenship" | |
+| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
+| 26 | PID-26 | Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set |
+| 27 | PID-27 | Veterans Military Status | CWE | 0 | 1 | | | | | extension??-veteranMilitaryStatus | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-nationality" | |
+| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
+| 28 | PID-28 | Nationality | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set |
+| 29 | PID-29 | Patient Death Date and Time | DTM | 0 | 1 | | | | Patient.deceasedDateTime | | Patient.dateTime | 0 | 1 | | | | |
+| 30 | PID-30 | Patient Death Indicator | ID | 0 | 1 | IF PID-29 NOT VALUED | | | Patient.deceasedBoolean | | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/NoIndicator | | |
+| 31 | PID-31 | Identity Unknown Indicator | ID | 0 | 1 | | | | | extension??-identityUnknown | Patient.boolean | 0 | 1 | ID[Boolean] | Yes/NoIndicator | | |
+| 32 | PID-32 | Identity Reliability Code | CWE | 0 | -1 | | | | | | | | | | | | |
+| 33 | PID-33 | Last Update Date/Time | DTM | 0 | 1 | | | | | | | | | | | | |
+| 34 | PID-34 | Last Update Facility | HD | 0 | 1 | | | | | | | | | | | | |
+| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/patient-animal" | |
+| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 0 | 1 | | | "species" | |
+| 35 | PID-35 | Taxonomic Classification Code | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.url | | Patient.uri | 0 | -1 | | | "http://hl7.org/fhir/StructureDefinition/patient-animal" | |
+| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.extension.url | | Patient.uri | 0 | 1 | | | "breed" | |
+| 36 | PID-36 | Breed Code | CWE | 0 | 1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | |
+| 37 | PID-37 | Strain | ST | 0 | 1 | | | | | | | | | | | | If this is necessary, it should be an update to the existing animal extension |
+| 38 | PID-38 | Production Class Code | CWE | 0 | 2 | | | | | | | | | | | | |
+| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.url | | Patient.uri | 1 | 1 | | | "http://hl7.org/fhir/StructureDefinition/patient-citizenship" | |
+| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.url | | Patient.uri | 1 | 1 | | | "code" | |
+| 39 | PID-39 | Tribal Citizenship | CWE | 0 | -1 | | | | Patient.extension.extension.valueCodeableConcept | | Patient.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | The standard extension does not include a value set. Also suggest that the extension should not be limited to "country". Consider adding a .type to the extension to distinguish tribal vs. "country" (or whatever we call it), or otherwise add an extension for tribal citizenship to accommodate the return flow. |
+| 40 | PID-40 | Patient Telecommunication Information | XTN | 0 | -1 | | | | Patient.telecom | | Patient.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
diff --git a/input/includes/ConceptMap-segment-pr1-to-procedure-intro.md b/input/includes/ConceptMap-segment-pr1-to-procedure-intro.md
index de474bd2..dc3fdeaa 100644
--- a/input/includes/ConceptMap-segment-pr1-to-procedure-intro.md
+++ b/input/includes/ConceptMap-segment-pr1-to-procedure-intro.md
@@ -4,38 +4,38 @@ This ConceptMap represents the mapping from the HL7 V2 PR1 Segment to the FHIR P
-| 1 | PRT-1 | Participation Instance ID | EI | 0 | 1 | | | | | | | | | | | | |
+| 1 | PRT-1 | Participation Instance ID | EI | 0 | 1 | | | | | | | | | | | | |
| 2 | PRT-2 | Action Code | ID | 1 | 1 | IF PRT-2 IS "D" | | inactivate the relationship between the mapped resource that the PRT segment is asociated with in the message with the PractitionerRole resource. | | | | | | | | | |
| 2 | PRT-2 | Action Code | ID | 1 | 1 | IF PRT-2 IS IN ("A", "S", "U", X") | | activate the relationship between the mapped resource that the PRT segment is asociated with in the message with the PractitionerRole resource. | | | | | | | | | Need to address Operation |
-| 3 | PRT-3 | Action Reason | CWE | 0 | 1 | | | | | | | | | | | | |
-| 4 | PRT-4 | Role of Participation | CWE | 1 | 1 | | | | PractitionerRole.code | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | Participation | | |
-| 5 | PRT-5 | Person | XCN | 0 | -1 | | | | PractitionerRole.practitioner | | Reference(PractitionerRole.Practitioner) | 0 | 1 | XCN[Practitioner] | | | While PRT may contain multiple persons within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
-| 6 | PRT-6 | Person Provider Type | CWE | 0 | 1 | | | | PractitionerRole.specialty | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-| 7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | PractitionerRole.organization | | PractitionerRole.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | OrganizationUnitType | | |
-| 8 | PRT-8 | Organization | XON | 0 | -1 | | | | PractitionerRole.organization | | Reference(PractitionerRole.Organization) | 0 | 1 | XON[Organization] | | | While PRT may contain multiple organizations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
-| 9 | PRT-9 | Location | PL | 0 | -1 | | | | PractitionerRole.location | | Reference(PractitionerRole.Location) | 0 | 1 | PL[Location] | | | While PRT may contain multiple locations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
-| 10 | PRT-10 | Device | EI | 0 | -1 | | | | | | | | | | | | |
-| 11 | PRT-11 | Begin Date/Time (arrival time) | DTM | 0 | 1 | | | | PractitionerRole.period.start | | PractitionerRole.dateTime | 0 | 1 | | | | |
-| 12 | PRT-12 | End Date/Time (departure time) | DTM | 0 | 1 | | | | PractitionerRole.period.end | | PractitionerRole.dateTime | 0 | 1 | | | | |
-| 13 | PRT-13 | Qualitative Duration | CWE | 0 | 1 | | | | | | | | | | | | |
-| 14 | PRT-14 | Address | XAD | 0 | -1 | | | | PractitionerRole.practitioner | | PractitionerRole.Address | 0 | -1 | XAD[Address] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 NOT VALUED | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "B" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "C" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "E" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
-| 16 | PRT-16 | UDI Device Identifier | EI | 0 | 1 | | | | | | | | | | | | |
-| 17 | PRT-17 | Device Manufacture Date | DTM | 0 | 1 | | | | | | | | | | | | |
-| 18 | PRT-18 | Device Expiry Date | DTM | 0 | 1 | | | | | | | | | | | | |
-| 19 | PRT-19 | Device Lot Number | ST | 0 | 1 | | | | | | | | | | | | |
-| 20 | PRT-20 | Device Serial Number | ST | 0 | 1 | | | | | | | | | | | | |
-| 21 | PRT-21 | Device Donation Identification | EI | 0 | 1 | | | | | | | | | | | | |
-| 22 | PRT-22 | Device Type | CNE | 0 | 1 | | | | | | | | | | | | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "B" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "B" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "C" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "C" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "E" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "E" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
-| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
-| 24 | PRT-24 | Contact Identifiers | PLN | 0 | -1 | | | | PractitionerRole.identifier | | PractitionerRole.Identifier | 0 | -1 | PLN[Identifier] | | | |
+| 3 | PRT-3 | Action Reason | CWE | 0 | 1 | | | | | | | | | | | | |
+| 4 | PRT-4 | Role of Participation | CWE | 1 | 1 | | | | PractitionerRole.code | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | Participation | | |
+| 5 | PRT-5 | Person | XCN | 0 | -1 | | | | PractitionerRole.practitioner | | Reference(PractitionerRole.Practitioner) | 0 | 1 | XCN[Practitioner] | | | While PRT may contain multiple persons within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
+| 6 | PRT-6 | Person Provider Type | CWE | 0 | 1 | | | | PractitionerRole.specialty | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
+| 7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | PractitionerRole.organization | | PractitionerRole.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
+| 8 | PRT-8 | Organization | XON | 0 | -1 | | | | PractitionerRole.organization | | Reference(PractitionerRole.Organization) | 0 | 1 | XON[Organization] | | | While PRT may contain multiple organizations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
+| 9 | PRT-9 | Location | PL | 0 | -1 | | | | PractitionerRole.location | | Reference(PractitionerRole.Location) | 0 | 1 | PL[Location] | | | While PRT may contain multiple locations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
+| 10 | PRT-10 | Device | EI | 0 | -1 | | | | | | | | | | | | |
+| 11 | PRT-11 | Begin Date/Time (arrival time) | DTM | 0 | 1 | | | | PractitionerRole.period.start | | PractitionerRole.dateTime | 0 | 1 | | | | |
+| 12 | PRT-12 | End Date/Time (departure time) | DTM | 0 | 1 | | | | PractitionerRole.period.end | | PractitionerRole.dateTime | 0 | 1 | | | | |
+| 13 | PRT-13 | Qualitative Duration | CWE | 0 | 1 | | | | | | | | | | | | |
+| 14 | PRT-14 | Address | XAD | 0 | -1 | | | | PractitionerRole.practitioner | | PractitionerRole.Address | 0 | -1 | XAD[Address] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 NOT VALUED | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "B" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "C" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "E" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 15 | PRT-15 | Telecommunication Address | XTN | 0 | -1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom | | PractitionerRole.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
+| 16 | PRT-16 | UDI Device Identifier | EI | 0 | 1 | | | | | | | | | | | | |
+| 17 | PRT-17 | Device Manufacture Date | DTM | 0 | 1 | | | | | | | | | | | | |
+| 18 | PRT-18 | Device Expiry Date | DTM | 0 | 1 | | | | | | | | | | | | |
+| 19 | PRT-19 | Device Lot Number | ST | 0 | 1 | | | | | | | | | | | | |
+| 20 | PRT-20 | Device Serial Number | ST | 0 | 1 | | | | | | | | | | | | |
+| 21 | PRT-21 | Device Donation Identification | EI | 0 | 1 | | | | | | | | | | | | |
+| 22 | PRT-22 | Device Type | CNE | 0 | 1 | | | | | | | | | | | | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "B" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "B" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "C" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "C" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "E" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23.1 IS "E" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "F" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "H" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom.extension.url | | PractitionerRole.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/iso21090-preferred" | |
+| 23 | PRT-23 | Preferred Method of Contact | CWE | 0 | 1 | IF PRT-23 IS "O" | | | PractitionerRole.telecom.extension.valueBoolean | | PractitionerRole.boolean | 0 | 1 | | | "true" | |
+| 24 | PRT-24 | Contact Identifiers | PLN | 0 | -1 | | | | PractitionerRole.identifier | | PractitionerRole.Identifier | 0 | -1 | PLN[Identifier] | | | |
diff --git a/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md b/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
index 6b16e8c5..0f4bb199 100644
--- a/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
+++ b/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
@@ -4,46 +4,46 @@ This ConceptMap represents the mapping from the HL7 V2 PRT Segment to the FHIR R
-| 1 | PV1-1 | Set ID - PV1 | SI | 0 | 1 | | | | | | | | | | | | |
-| 2 | PV1-2 | Patient Class | CWE | 1 | 1 | | | | Encounter.class | | Encounter.Coding | 1 | 1 | CWE[Coding] | PatientClass[EncounterClass] | | |
-| 2 | PV1-2 | Patient Class | CWE | 1 | 1 | IF PV1-45 NOT VALUED | | | Encounter.status | | Encounter.code | 1 | 1 | CWE[code] | PatientClass[EncounterStatus] | | |
-| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[location] | | | Recommended is to put the most granular location from the v2 segment in Encounter.location(Location) and then chain the less granular back to the most granular using Location.partOf. The additional Location instance do then not need to be linked directly in Encounter.location to avoid confusion on purpose and relationships. |
-| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | IF PV1-2.1 NOT EQUALS "P" | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "active" | |
-| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | IF PV1-2.1 EQUALS "P" | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "planned" | |
-| 4 | PV1-4 | Admission Type | CWE | 0 | 1 | | | | Encounter.type | | Encounter.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | AdmissionType | | |
-| 5 | PV1-5 | Preadmit Number | CX | 0 | 1 | | | | Encounter.hospitalization.preAdmissionIdentifier | | Encounter.Identifier | 0 | 1 | CX[Identifier] | | | |
-| 6 | PV1-6 | Prior Patient Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
-| 6 | PV1-6 | Prior Patient Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "completed" | |
-| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "ATND" | |
-| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.display | | Encounter.string | 0 | 1 | | | "attender" | |
-| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "REF" | |
-| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "referrer" | |
-| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "CON" | |
-| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "consultant" | |
-| 10 | PV1-10 | Hospital Service | CWE | 0 | 1 | | | | Encounter.serviceType | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | HospitalService | | |
-| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
-| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "active" | |
-| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.url | | Encounter.uri | | | | | "http://hl7.org/fhir/StructureDefinition/subject-locationClassification" | |
-| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.code | | Encounter.code | | | | | "temporary" | |
-| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.system | | Encounter.uri | | | | | " http://hl7.org/fhir/ValueSet/subject-location" | |
-| 12 | PV1-12 | Preadmit Test Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
-| 13 | PV1-13 | Re-admission Indicator | CWE | 0 | 1 | | | | Encounter.hospitalization.reAdmission | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ReadmissionIndicator | | |
-| 14 | PV1-14 | Admit Source | CWE | 0 | 1 | | | | Encounter.hospitalization.admitSource | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | Table 0023 doesn't have any suggested values, therefore there is no vocabulary mapping |
-| 15 | PV1-15 | Ambulatory Status | CWE | 0 | -1 | | | | | | | | | | | | |
-| 16 | PV1-16 | VIP Indicator | CWE | 0 | 1 | | | | Encounter.hospitalization.specialCourtesy | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | VIPIndicator | | Depending on the vocabulary used in PV1-16, this may require additional mapping. |
-| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "ADM" | |
-| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "admitter" | |
-| 18 | PV1-18 | Patient Type | CWE | 0 | 1 | | | | | | | | | | | | This field is widely used, but since the value set is user defined and there are no examples, implementations vary widely. It may fit for some Encounter.type, while others may want to reflect it on Patient or use another Encounter attribute. Consequently, the implementer has to determine where to map this. |
-| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.coding.code | | Encounter.code | | | | | "VN" | |
-| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.coding.system | | Encounter.uri | | | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
-| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.text | | Encounter.string | | | | | "visit number" | |
-| 20 | PV1-20 | Financial Class | FC | 0 | -1 | | | | | | | | | | | | |
-| 21 | PV1-21 | Charge Price Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
-| 22 | PV1-22 | Courtesy Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 23 | PV1-23 | Credit Rating | CWE | 0 | 1 | | | | | | | | | | | | |
-| 24 | PV1-24 | Contract Code | CWE | 0 | -1 | | | | | | | | | | | | |
-| 25 | PV1-25 | Contract Effective Date | DT | 0 | -1 | | | | | | | | | | | | |
-| 26 | PV1-26 | Contract Amount | NM | 0 | -1 | | | | | | | | | | | | |
-| 27 | PV1-27 | Contract Period | NM | 0 | -1 | | | | | | | | | | | | |
-| 28 | PV1-28 | Interest Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 29 | PV1-29 | Transfer to Bad Debt Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 30 | PV1-30 | Transfer to Bad Debt Date | DT | 0 | 1 | | | | | | | | | | | | |
-| 31 | PV1-31 | Bad Debt Agency Code | CWE | 0 | 1 | | | | | | | | | | | | |
-| 32 | PV1-32 | Bad Debt Transfer Amount | NM | 0 | 1 | | | | | | | | | | | | |
-| 33 | PV1-33 | Bad Debt Recovery Amount | NM | 0 | 1 | | | | | | | | | | | | |
-| 34 | PV1-34 | Delete Account Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
-| 35 | PV1-35 | Delete Account Date | DT | 0 | 1 | | | | | | | | | | | | |
-| 36 | PV1-36 | Discharge Disposition | CWE | 0 | 1 | | | | Encounter.hospitalization.dischargeDisposition | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | DischargeDisposition | | |
-| 37 | PV1-37 | Discharged to Location | DLD | 0 | 1 | | | | Encounter.hospitalization.destination(Encounter.Location) | | Reference(Encounter.Location) | 0 | 1 | DLD[Location-Discharge] | | /Encounter.hospitalization.destination.reference=Location[n].id/ | This location should be a new location resources instance. |
-| 38 | PV1-38 | Diet Type | CWE | 0 | 1 | | | | Encounter.hospitalization.dietPreference | | Encounter.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | DietType | | |
-| 39 | PV1-39 | Servicing Facility | CWE | 0 | 1 | | | | | | | | | | | | |
-| 40 | PV1-40 | Bed Status | IS | 0 | 1 | IF PV1-3.2 OR PV1-3.3 VALUED | | | Encounter.location.location(Encounter.Location.operationalStatus) | | Encounter.code | 0 | 1 | | BedStatus | | The operational status is on the Location resource where the implementer must determine which of the Encounter.location(Location) instances reflect the Bed or Room and apply it to the most granular available. |
-| 41 | PV1-41 | Account Status | CWE | 0 | 1 | | | | | | | | | | | | |
-| 42 | PV1-42 | Pending Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | "reserved" | |
-| 42 | PV1-42 | Pending Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | | "reserved" |
-| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
-| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "completed" | |
- | | | | | | | | | Encounter.location.extension.url | | Encounter.uri | | | | | "http://hl7.org/fhir/StructureDefinition/subject-locationClassification" | |
-| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.code | | Encounter.code | | | | | "temporary" | |
-| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.system | | Encounter.uri | | | | | " http://hl7.org/fhir/ValueSet/subject-location" | |
-| 44 | PV1-44 | Admit Date/Time | DTM | 0 | 1 | | | | Encounter.period.start | | Encounter.dateTime | 0 | 1 | | | | |
-| 45 | PV1-45 | Discharge Date/Time | DTM | 0 | 1 | | | | Encounter.period.end | | Encounter.dateTime | 0 | 1 | | | | |
-| 45 | PV1-45 | Discharge Date/Time | DTM | 0 | 1 | IF PV1-45 VALUED | | | Encounter.status | | Encounter.code | 1 | 1 | | | | |
-| 46 | PV1-46 | Current Patient Balance | NM | 0 | 1 | | | | | | | | | | | | |
-| 47 | PV1-47 | Total Charges | NM | 0 | 1 | | | | | | | | | | | | |
-| 48 | PV1-48 | Total Adjustments | NM | 0 | 1 | | | | | | | | | | | | |
-| 49 | PV1-49 | Total Payments | NM | 0 | 1 | | | | | | | | | | | | |
-| 50 | PV1-50 | Alternate Visit ID | CX | 0 | -1 | | | | Encounter.identifier | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
-| 51 | PV1-51 | Visit Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
-| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
-| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "PART" | |
-| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
-| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "Participation" | |
-| 53 | PV1-53 | Service Episode Description | ST | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.extension.url) | | Encounter.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/resource-instance-description" | |
-| 53 | PV1-53 | Service Episode Description | ST | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.extension.valueString) | | Encounter.string | 0 | 1 | | | | |
-| 54 | PV1-54 | Service Episode Identifier | CX | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.identifier) | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 1 | PV1-1 | Set ID - PV1 | SI | 0 | 1 | | | | | | | | | | | | |
+| 2 | PV1-2 | Patient Class | CWE | 1 | 1 | | | | Encounter.class | | Encounter.Coding | 1 | 1 | CWE[Coding] | PatientClass[EncounterClass] | | |
+| 2 | PV1-2 | Patient Class | CWE | 1 | 1 | IF PV1-45 NOT VALUED | | | Encounter.status | | Encounter.code | 1 | 1 | CWE[code] | PatientClass[EncounterStatus] | | |
+| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[location] | | | Recommended is to put the most granular location from the v2 segment in Encounter.location(Location) and then chain the less granular back to the most granular using Location.partOf. The additional Location instance do then not need to be linked directly in Encounter.location to avoid confusion on purpose and relationships. |
+| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | IF PV1-2.1 NOT EQUALS "P" | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "active" | |
+| 3 | PV1-3 | Assigned Patient Location | PL | 0 | 1 | IF PV1-2.1 EQUALS "P" | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "planned" | |
+| 4 | PV1-4 | Admission Type | CWE | 0 | 1 | | | | Encounter.type | | Encounter.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | AdmissionType | | |
+| 5 | PV1-5 | Preadmit Number | CX | 0 | 1 | | | | Encounter.hospitalization.preAdmissionIdentifier | | Encounter.Identifier | 0 | 1 | CX[Identifier] | | | |
+| 6 | PV1-6 | Prior Patient Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
+| 6 | PV1-6 | Prior Patient Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "completed" | |
+| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "ATND" | |
+| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 7 | PV1-7 | Attending Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.display | | Encounter.string | 0 | 1 | | | "attender" | |
+| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "REF" | |
+| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 8 | PV1-8 | Referring Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "referrer" | |
+| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "CON" | |
+| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 9 | PV1-9 | Consulting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "consultant" | |
+| 10 | PV1-10 | Hospital Service | CWE | 0 | 1 | | | | Encounter.serviceType | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | HospitalService | | |
+| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
+| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "active" | |
+| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.url | | Encounter.uri | | | | | "http://hl7.org/fhir/StructureDefinition/subject-locationClassification" | |
+| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.code | | Encounter.code | | | | | "temporary" | |
+| 11 | PV1-11 | Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.system | | Encounter.uri | | | | | " http://hl7.org/fhir/ValueSet/subject-location" | |
+| 12 | PV1-12 | Preadmit Test Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
+| 13 | PV1-13 | Re-admission Indicator | CWE | 0 | 1 | | | | Encounter.hospitalization.reAdmission | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ReadmissionIndicator | | |
+| 14 | PV1-14 | Admit Source | CWE | 0 | 1 | | | | Encounter.hospitalization.admitSource | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | | | Table 0023 doesn't have any suggested values, therefore there is no vocabulary mapping |
+| 15 | PV1-15 | Ambulatory Status | CWE | 0 | -1 | | | | | | | | | | | | |
+| 16 | PV1-16 | VIP Indicator | CWE | 0 | 1 | | | | Encounter.hospitalization.specialCourtesy | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | VIPIndicator | | Depending on the vocabulary used in PV1-16, this may require additional mapping. |
+| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "ADM" | |
+| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 17 | PV1-17 | Admitting Doctor | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "admitter" | |
+| 18 | PV1-18 | Patient Type | CWE | 0 | 1 | | | | | | | | | | | | This field is widely used, but since the value set is user defined and there are no examples, implementations vary widely. It may fit for some Encounter.type, while others may want to reflect it on Patient or use another Encounter attribute. Consequently, the implementer has to determine where to map this. |
+| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.coding.code | | Encounter.code | | | | | "VN" | |
+| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.coding.system | | Encounter.uri | | | | | "http://terminology.hl7.org/CodeSystem/v2-0203" | |
+| 19 | PV1-19 | Visit Number | CX | 0 | 1 | | | | Encounter.identifier.type.text | | Encounter.string | | | | | "visit number" | |
+| 20 | PV1-20 | Financial Class | FC | 0 | -1 | | | | | | | | | | | | |
+| 21 | PV1-21 | Charge Price Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
+| 22 | PV1-22 | Courtesy Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 23 | PV1-23 | Credit Rating | CWE | 0 | 1 | | | | | | | | | | | | |
+| 24 | PV1-24 | Contract Code | CWE | 0 | -1 | | | | | | | | | | | | |
+| 25 | PV1-25 | Contract Effective Date | DT | 0 | -1 | | | | | | | | | | | | |
+| 26 | PV1-26 | Contract Amount | NM | 0 | -1 | | | | | | | | | | | | |
+| 27 | PV1-27 | Contract Period | NM | 0 | -1 | | | | | | | | | | | | |
+| 28 | PV1-28 | Interest Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 29 | PV1-29 | Transfer to Bad Debt Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 30 | PV1-30 | Transfer to Bad Debt Date | DT | 0 | 1 | | | | | | | | | | | | |
+| 31 | PV1-31 | Bad Debt Agency Code | CWE | 0 | 1 | | | | | | | | | | | | |
+| 32 | PV1-32 | Bad Debt Transfer Amount | NM | 0 | 1 | | | | | | | | | | | | |
+| 33 | PV1-33 | Bad Debt Recovery Amount | NM | 0 | 1 | | | | | | | | | | | | |
+| 34 | PV1-34 | Delete Account Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
+| 35 | PV1-35 | Delete Account Date | DT | 0 | 1 | | | | | | | | | | | | |
+| 36 | PV1-36 | Discharge Disposition | CWE | 0 | 1 | | | | Encounter.hospitalization.dischargeDisposition | | Encounter.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | DischargeDisposition | | |
+| 37 | PV1-37 | Discharged to Location | DLD | 0 | 1 | | | | Encounter.hospitalization.destination(Encounter.Location) | | Reference(Encounter.Location) | 0 | 1 | DLD[Location-Discharge] | | /Encounter.hospitalization.destination.reference=Location[n].id/ | This location should be a new location resources instance. |
+| 38 | PV1-38 | Diet Type | CWE | 0 | 1 | | | | Encounter.hospitalization.dietPreference | | Encounter.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | DietType | | |
+| 39 | PV1-39 | Servicing Facility | CWE | 0 | 1 | | | | | | | | | | | | |
+| 40 | PV1-40 | Bed Status | IS | 0 | 1 | IF PV1-3.2 OR PV1-3.3 VALUED | | | Encounter.location.location(Encounter.Location.operationalStatus) | | Encounter.code | 0 | 1 | | BedStatus | | The operational status is on the Location resource where the implementer must determine which of the Encounter.location(Location) instances reflect the Bed or Room and apply it to the most granular available. |
+| 41 | PV1-41 | Account Status | CWE | 0 | 1 | | | | | | | | | | | | |
+| 42 | PV1-42 | Pending Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | "reserved" | |
+| 42 | PV1-42 | Pending Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | | "reserved" |
+| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.location(Encounter.Location) | | Reference(Encounter.Location) | 1 | 1 | PL[Location] | | | |
+| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.status | | Encounter.code | 0 | 1 | | | "completed" | |
+ | | | | | | | | | Encounter.location.extension.url | | Encounter.uri | | | | | "http://hl7.org/fhir/StructureDefinition/subject-locationClassification" | |
+| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.code | | Encounter.code | | | | | "temporary" | |
+| 43 | PV1-43 | Prior Temporary Location | PL | 0 | 1 | | | | Encounter.location.extension.valueCodeableConcept.coding.system | | Encounter.uri | | | | | " http://hl7.org/fhir/ValueSet/subject-location" | |
+| 44 | PV1-44 | Admit Date/Time | DTM | 0 | 1 | | | | Encounter.period.start | | Encounter.dateTime | 0 | 1 | | | | |
+| 45 | PV1-45 | Discharge Date/Time | DTM | 0 | 1 | | | | Encounter.period.end | | Encounter.dateTime | 0 | 1 | | | | |
+| 45 | PV1-45 | Discharge Date/Time | DTM | 0 | 1 | IF PV1-45 VALUED | | | Encounter.status | | Encounter.code | 1 | 1 | | | | |
+| 46 | PV1-46 | Current Patient Balance | NM | 0 | 1 | | | | | | | | | | | | |
+| 47 | PV1-47 | Total Charges | NM | 0 | 1 | | | | | | | | | | | | |
+| 48 | PV1-48 | Total Adjustments | NM | 0 | 1 | | | | | | | | | | | | |
+| 49 | PV1-49 | Total Payments | NM | 0 | 1 | | | | | | | | | | | | |
+| 50 | PV1-50 | Alternate Visit ID | CX | 0 | -1 | | | | Encounter.identifier | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
+| 51 | PV1-51 | Visit Indicator | CWE | 0 | 1 | | | | | | | | | | | | |
+| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.individual(Encounter.Practitioner) | | Reference(Encounter.Practitioner) | 0 | 1 | XCN[Practitioner] | | | |
+| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.coding.code | | Encounter.code | 0 | 1 | | | "PART" | |
+| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.coding.system | | Encounter.uri | 0 | 1 | | | "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" | |
+| 52 | PV1-52 | Other Healthcare Provider | XCN | 0 | -1 | | | | Encounter.participant.type.text | | Encounter.string | 0 | 1 | | | "Participation" | |
+| 53 | PV1-53 | Service Episode Description | ST | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.extension.url) | | Encounter.uri | 0 | 1 | | | "http://hl7.org/fhir/StructureDefinition/resource-instance-description" | |
+| 53 | PV1-53 | Service Episode Description | ST | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.extension.valueString) | | Encounter.string | 0 | 1 | | | | |
+| 54 | PV1-54 | Service Episode Identifier | CX | 0 | 1 | | | | Encounter.episodeOfCare(Encounter.EpisodeOfCare.identifier) | | Encounter.Identifier | 0 | -1 | CX[Identifier] | | | |
diff --git a/input/includes/ConceptMap-segment-pv1-to-encounterhistory-intro.md b/input/includes/ConceptMap-segment-pv1-to-encounterhistory-intro.md
index 186fd189..5e4c2d14 100644
--- a/input/includes/ConceptMap-segment-pv1-to-encounterhistory-intro.md
+++ b/input/includes/ConceptMap-segment-pv1-to-encounterhistory-intro.md
@@ -4,71 +4,71 @@ This ConceptMap represents the mapping from the HL7 V2 PV1 Segment to the FHIR E