Merge pull request #191 from microsoft/dotliquid

Merge v3.3 to main branch

data/Templates/Hl7v2/ADT_A01.liquid

@@ -1,12 +1,28 @@
-{
+{
     "resourceType": "Bundle",
     "type": "batch",
     "entry": [
         {% assign firstSegments = hl7v2Data | get_first_segments: 'PID|PD1|PV1|PV2|AVR|MSH' -%}
 
         {% evaluate messageHeaderId using 'ID/MessageHeader' MSH: firstSegments.MSH -%}
+        {% evaluate organizationId4 using 'ID/Organization' HD: firstSegments.MSH.4 -%}
+        {% evaluate organizationId6 using 'ID/Organization' HD: firstSegments.MSH.6 -%}
+        {% evaluate organizationId22 using 'ID/Organization' XON: firstSegments.MSH.22 -%}
+
+        {% if organizationId4 -%}
+            {% include 'Resource/Organization' MSH: firstSegments.MSH, ID: organizationId4 -%}
+        {% endif -%}
+
+        {% if organizationId6 -%}
+            {% include 'Resource/Organization' MSH: firstSegments.MSH, ID: organizationId6 -%}
+        {% endif -%}
+
+        {% if organizationId22 -%}
+            {% include 'Resource/Organization' MSH: firstSegments.MSH, ID: organizationId22 -%}
+        {% endif -%}
+
         {% if messageHeaderId -%}
-            {% include 'Resource/MessageHeader' MSH: firstSegments.MSH, ID: messageHeaderID -%}
+            {% include 'Resource/MessageHeader' MSH: firstSegments.MSH, Organization_ID_MSH_4: organizationId4, Organization_ID_MSH_6: organizationId6, ID: messageHeaderID -%}
         {% endif -%}
 
         {% evaluate patientId using 'ID/Patient' PID: firstSegments.PID, type: 'First' -%}
@@ -16,8 +32,29 @@
         {% endif -%}
 
         {% evaluate provenanceId using 'ID/Provenance' MSH: firstSegments.MSH, baseId: patientId -%}
+        {% evaluate practitionerId10 using 'ID/Practitioner' XCN: firstSegments.ORC.10 -%}
+        {% evaluate practitionerId11 using 'ID/Practitioner' XCN: firstSegments.ORC.11 -%}
+        {% evaluate practitionerId12 using 'ID/Practitioner' XCN: firstSegments.ORC.12 -%}
+        {% evaluate locationId using 'ID/Location' XON: firstSegments.ORC.21 -%}
+
+        {% if practitionerId10 -%}
+            {% include 'Resource/Practitioner' ORC: firstSegments.ORC, ID: practitionerId10 -%}
+        {% endif %}
+
+        {% if practitionerId11 -%}
+            {% include 'Resource/Practitioner' ORC: firstSegments.ORC, ID: practitionerId11 -%}
+        {% endif %}
+
+        {% if practitionerId12 -%}
+            {% include 'Resource/Practitioner' ORC: firstSegments.ORC, ID: practitionerId12 -%}
+        {% endif %}
+
+        {% if locationId -%}
+            {% include 'Resource/Location' ORC: firstSegments.ORC, ID: locationId -%}
+        {% endif -%}
+
         {% if provenanceId -%}
-            {% include 'Resource/Provenance' MSH: firstSegments.MSH, ORC: firstSegments.ORC, ID: provenanceId -%}
+            {% include 'Resource/Provenance' MSH: firstSegments.MSH, ORC: firstSegments.ORC, Organization_ID_MSH_4： organizationId4, Organization_ID_MSH_22： organizationId22, Practitioner_ID_ORC_10: practitionerId10, Practitioner_ID_ORC_11: practitionerId11, Practitioner_ID_ORC_12: practitionerId12, Location_ID_ORC_21: locationId, ID: provenanceId -%}
         {% endif -%}
 
         {% evaluate accountId using 'ID/Account' CX: firstSegments.PID.3 -%}
@@ -84,8 +121,19 @@
         {% assign obxSegmentLists = hl7v2Data | get_segment_lists: 'OBX' -%}
         {% for obxSegment in obxSegmentLists.OBX -%}
             {% evaluate observationId using 'ID/Observation' OBX: obxSegment, baseId: patientId -%}
+            {% evaluate practitionerId using 'ID/Practitioner' XCN: obxSegment.16 -%}
+            {% evaluate practitionerRoleId using 'ID/PractitionerRole' XCN: obxSegment.25 -%}
+
+            {% if practitionerId -%}
+                {% include 'Resource/Practitioner' OBX: obxSegment, ID: practitionerId -%}
+            {% endif -%}
+
+            {% if practitionerRoleId -%}
+                {% include 'Resource/PractitionerRole' OBX: obxSegment, ID: practitionerRoleId -%}
+            {% endif %}
+
             {% if observationId -%}
-                {% include 'Resource/Observation' OBX: obxSegment, ID: observationId -%}
+                {% include 'Resource/Observation' OBX: obxSegment, Practitioner_ID_OBX_16: practitionerId, PractitionerRole_ID_OBX_25: practitionerRoleId, ID: observationId -%}
                 {% if patientId -%}
                     {% include 'Reference/Observation/Subject' ID: observationId, REF: fullPatientId -%}
                 {% endif -%}
@@ -105,10 +153,15 @@
 
         {% assign dg1SegmentLists = hl7v2Data | get_segment_lists: 'DG1' -%}
         {% for dg1Segment in dg1SegmentLists.DG1 -%}
+            {% evaluate practitionerId using 'ID/Practitioner' XCN: dg1Segment.16 -%}
+            {% if practitionerId -%}
+                {% include 'Resource/Practitioner' DG1: dg1Segment, ID: practitionerId -%}
+            {% endif -%}
+
             {% evaluate conditionId using 'ID/Condition' DG1: dg1Segment, baseId: patientId -%}
             {% if conditionId -%}
                 {% assign fullConditionId = conditionId | prepend: 'Condition/' -%}
-                {% include 'Resource/Condition' DG1: dg1Segment, ID: conditionId -%}
+                {% include 'Resource/Condition' DG1: dg1Segment, Practitioner_ID_DG1_16: practitionerId, ID: conditionId -%}
                 {% if patientId -%}
                     {% include 'Reference/Condition/Subject' ID: conditionId, REF: fullPatientId -%}
                 {% endif -%}

data/Templates/Hl7v2/CodeSystem/_AccessRestrictionReasonCode.liquid

@@ -1,4 +1,4 @@
-{
+{
     "code" : "",
     "display" : "",
     "system" : "",

data/Templates/Hl7v2/CodeSystem/_AccessRestrictionValue.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'PersDEID' -%}
     "code" : "",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_Acknowledgements.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'AL' -%}
     "code" : "always",
     "display" : "Always",

data/Templates/Hl7v2/CodeSystem/_AddressType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'BA' -%}
     "code" : "",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_AdmissionType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "A",
     "display" : "Accident",

data/Templates/Hl7v2/CodeSystem/_AllergyCategory.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'DA' -%}
     "code" : "medication",
     "display" : "Medication",

data/Templates/Hl7v2/CodeSystem/_AllergyType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'DA' -%}
     "code" : "allergy",
     "display" : "Allergy",

data/Templates/Hl7v2/CodeSystem/_CodeSystemUrl.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'I9' -%}
     "system" : "http://hl7.org/fhir/sid/icd-9-cm",
     {% elsif inCode == 'I10' -%}

data/Templates/Hl7v2/CodeSystem/_CollectionMethodModifier.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'F' -%}
     "code" : "FROZ",
     "display" : "Frozen",

data/Templates/Hl7v2/CodeSystem/_CompletionStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'CP' -%}
     "code" : "completed",
     "display" : "Completed",

data/Templates/Hl7v2/CodeSystem/_ConfidentialityClassification.liquid

@@ -1,4 +1,4 @@
-{
+{
     "code" : "",
     "display" : "",
     "system" : "",

data/Templates/Hl7v2/CodeSystem/_ConsentRelationship.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '2' -%}
     "code" : "PRN",
     "display" : "Parent",

data/Templates/Hl7v2/CodeSystem/_ConsentStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "active",
     "display" : "Active",

data/Templates/Hl7v2/CodeSystem/_ContactRole.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'E' -%}
     "code" : "E",
     "display" : "Employer",

data/Templates/Hl7v2/CodeSystem/_Countries.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '' -%}
     "code" : "",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_DurationUnit.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '' -%}
     "code" : "s",
     "display" : "second",

data/Templates/Hl7v2/CodeSystem/_EncounterClass.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'E' -%}
     "code" : "EMER",
     "display" : "emergency",

data/Templates/Hl7v2/CodeSystem/_EncounterPriority.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '1' -%}
     "code" : "EM",
     "display" : "emergency",

data/Templates/Hl7v2/CodeSystem/_EncounterType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'E' -%}
     "code" : "in-progress",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_Gender.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'F' -%}
     "code" : "female",
     "display" : "Female",

data/Templates/Hl7v2/CodeSystem/_IDType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'ACSN' -%}
     "code" : "ACSN",
     "display" : "Accession ID",

data/Templates/Hl7v2/CodeSystem/_InterpretationCode.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '< ' -%}
     "code" : "<",
     "display" : "Off scale low",

data/Templates/Hl7v2/CodeSystem/_Language.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '' -%}
     "code" : "ar",
     "display" : "Arabic",

data/Templates/Hl7v2/CodeSystem/_LivingWill.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'Y' -%}
     "code" : "Y",
     "display" : "Yes, patient has a living will",

data/Templates/Hl7v2/CodeSystem/_MaritalStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "L",
     "display" : "Legally Separated",

data/Templates/Hl7v2/CodeSystem/_ModeofArrival.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "A",
     "display" : "Ambulance",

data/Templates/Hl7v2/CodeSystem/_NameAssemblyOrder.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'G' -%}
     "code" : "G",
     "display" : "Prefix Given Family Suffix",

data/Templates/Hl7v2/CodeSystem/_NameType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_ObservationStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "ammended",
     "display" : "Ammended",

data/Templates/Hl7v2/CodeSystem/_Operation.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "POST",
     "display" : "Create",

data/Templates/Hl7v2/CodeSystem/_OrderStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'CA' -%}
     "code" : "revoked",
     "display" : "Revoked",

data/Templates/Hl7v2/CodeSystem/_OrderType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'I' -%}
     "code" : "HOSP",
     "display" : "Hospital",

data/Templates/Hl7v2/CodeSystem/_OrganizationUnitType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'H' -%}
     "code" : "H",
     "display" : "Home",

data/Templates/Hl7v2/CodeSystem/_PreferredMethodofContact.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'B' -%}
     "code" : "B",
     "display" : "Beeper Number",

data/Templates/Hl7v2/CodeSystem/_Priority.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'S' -%}
     "code" : "stat",
     "display" : "STAT",

data/Templates/Hl7v2/CodeSystem/_ReadmissionIndicator.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'R' -%}
     "code" : "R",
     "display" : "Re-admission",

data/Templates/Hl7v2/CodeSystem/_RegistryStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "true",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_Relationship.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'SEL' -%}
     "code" : "ONESELF",
     "display" : "self",

data/Templates/Hl7v2/CodeSystem/_Religion.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == '' -%}
     "code" : "1001",
     "display" : "Adventist",

data/Templates/Hl7v2/CodeSystem/_ResultStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'O' -%}
     "code" : "registered",
     "display" : "Registered",

data/Templates/Hl7v2/CodeSystem/_Role.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'AD' -%}
     "code" : "ADM",
     "display" : "admitter",

data/Templates/Hl7v2/CodeSystem/_SecurityLabelHandlingInstructions.liquid

@@ -1,4 +1,4 @@
-{
+{
     "code" : "",
     "display" : "",
     "system" : "",

data/Templates/Hl7v2/CodeSystem/_SegmentActionCode.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'A' -%}
     "code" : "POST",
     "display" : "Create",

data/Templates/Hl7v2/CodeSystem/_SpecimenAvailability.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'Y' -%}
     "code" : "available",
     "display" : "Available",

data/Templates/Hl7v2/CodeSystem/_StudentStatus.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'F' -%}
     "code" : "F",
     "display" : "Full-time student",

data/Templates/Hl7v2/CodeSystem/_TelecomUseCode.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'PRN' -%}
     "code" : "home",
     "display" : "Home",

data/Templates/Hl7v2/CodeSystem/_UniversalIDType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'DNS' -%}
     "code" : "DNS",
     "display" : "An Internet host name, in accordance with RFC 1035; or an IP address. Either in ASCII or as integers, with periods between components (“dotted” notation).",

data/Templates/Hl7v2/CodeSystem/_ValueType.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'AUI' -%}
     "code" : "",
     "display" : "",

data/Templates/Hl7v2/CodeSystem/_Yes_No.liquid

@@ -1,4 +1,4 @@
-{
+{
     {% if inCode == 'Y' -%}
     "code" : "true",
     "display" : "",

data/Templates/Hl7v2/DataType/_CNN.liquid

@@ -1,4 +1,4 @@
-"identifier":
+"identifier":
 [
     {
         "value":"{{ CNN.1.Value }}",