add cxidentifier to organization, remove in1.15 from in1extension

CDCgov · Dec 28, 2024 · 2b268aa · 2b268aa
1 parent 937df2f
commit 2b268aa
Show file tree

Hide file tree

Showing 7 changed files with 757 additions and 765 deletions.
diff --git a/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml b/prime-router/metadata/HL7/catchall/hl7/datatypes/XON/Organization.yml
@@ -14,85 +14,92 @@ name:
 
 identifier:
   expressionType: nested
-  vars:
-    xon3: XON.3
-    xon4: XON.4
-    xon5: XON.5
-    xon6: XON.6
-    xon7: XON.7
-    xon8: XON.8
-    xon10: String, XON.10
-  expressionsMap:
-    value_1:
-      condition: $xon10 NULL
-      type: STRING
-      expressionType: HL7Spec
-      valueOf: XON.3
-    value_2:
-      condition: $xon10 NOT_NULL
-      type: STRING
-      expressionType: HL7Spec
-      valueOf: XON.10
-    type:
-      condition: $xon7 NOT_NULL
+  expressions:
+    - condition: $CXIdentifier NOT_NULL
+      valueOf: datatypes/CX/Identifier
+      expressionType: resource
+      specs: $CXIdentifier
+    - condition: $CXIdentifier NULL
       expressionType: nested
-      generateList: true
+      vars:
+        xon3: XON.3
+        xon4: XON.4
+        xon5: XON.5
+        xon6: XON.6
+        xon7: XON.7
+        xon8: XON.8
+        xon10: String, XON.10
       expressionsMap:
-        coding:
+        value_1:
+          condition: $xon10 NULL
+          type: STRING
+          expressionType: HL7Spec
+          valueOf: XON.3
+        value_2:
+          condition: $xon10 NOT_NULL
+          type: STRING
+          expressionType: HL7Spec
+          valueOf: XON.10
+        type:
+          condition: $xon7 NOT_NULL
           expressionType: nested
           generateList: true
           expressionsMap:
-            code:
-              valueOf: XON.7
+            coding:
+              expressionType: nested
+              generateList: true
+              expressionsMap:
+                code:
+                  valueOf: XON.7
+                  type: STRING
+                  expressionType: HL7Spec
+                system:
+                  type: STRING
+                  value: "http://terminology.hl7.org/CodeSystem/v2-0203"
+        extension_1-checkDigitSchema:
+          condition: $xon5 NOT_NULL
+          generateList: true
+          expressionType: nested
+          expressionsMap:
+            url:
+              type: SYSTEM_URL
+              value: naming-system-check-digit
+            valueCode:
+              valueOf: XON.5
               type: STRING
               expressionType: HL7Spec
-            system:
+        extension_2-checkDigit:
+          condition: $xon4 NOT_NULL
+          generateList: true
+          expressionType: nested
+          expressionsMap:
+            url:
+              type: SYSTEM_URL
+              value: identifier-check-digit
+            valueString:
               type: STRING
-              value: "http://terminology.hl7.org/CodeSystem/v2-0203"
-    extension_1-checkDigitSchema:
-      condition: $xon5 NOT_NULL
-      generateList: true
-      expressionType: nested
-      expressionsMap:
-        url:
-          type: SYSTEM_URL
-          value: naming-system-check-digit
-        valueCode:
-          valueOf: XON.5
-          type: STRING
-          expressionType: HL7Spec
-    extension_2-checkDigit:
-      condition: $xon4 NOT_NULL
-      generateList: true
-      expressionType: nested
-      expressionsMap:
-        url:
-          type: SYSTEM_URL
-          value: identifier-check-digit
-        valueString:
-          type: STRING
-          expressionType: HL7Spec
-          valueOf: XON.4
-    extension_3-assigningAuthority:
-      condition: $xon6 NOT_NULL
-      generateList: true
-      expressionType: resource
-      valueOf: datatypes/HD/ExtensionAssigningAuthority
-      specs: XON.6
-    extension_4-location:
-      condition: $xon8 NOT_NULL
-      generateList: true
-      expressionType: nested
-      vars:
-        xon8: String, XON.8
-      expressionsMap:
-        url:
-          type: SYSTEM_URL
-          value: identifier-location
-        valueReference:
-          expressionType: reference
-          valueOf: datatypes/HD/Location
-          specs: XON.8
+              expressionType: HL7Spec
+              valueOf: XON.4
+        extension_3-assigningAuthority:
+          condition: $xon6 NOT_NULL
+          generateList: true
+          expressionType: resource
+          valueOf: datatypes/HD/ExtensionAssigningAuthority
+          specs: XON.6
+        extension_4-location:
+          condition: $xon8 NOT_NULL
+          generateList: true
+          expressionType: nested
+          vars:
+            xon8: String, XON.8
+          expressionsMap:
+            url:
+              type: SYSTEM_URL
+              value: identifier-location
+            valueReference:
+              expressionType: reference
+              valueOf: datatypes/HD/Location
+              specs: XON.8
 
 address:
   condition: $XADAddress NOT_NULL

diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/IN1/Coverage.yml b/prime-router/metadata/HL7/catchall/hl7/segments/IN1/Coverage.yml
@@ -38,6 +38,7 @@ policyHolder:
   specs: IN1.11
   vars:
     in111: STRING_ALL, IN1.11
+    CXIdentifier: IN1.10
 
 relationship:
   expressionType: resource

diff --git a/prime-router/metadata/HL7/catchall/hl7/segments/IN1/IN1Extension.yml b/prime-router/metadata/HL7/catchall/hl7/segments/IN1/IN1Extension.yml
@@ -147,19 +147,6 @@ extension:
       specs: IN1.14
       constants:
         auiExtensionName: IN1.14
-    - expressionType: nested
-      specs: IN1.15
-      condition: $in115 NOT_NULL
-      generateList: true
-      vars:
-        in115: STRING_ALL, IN1.15
-      expressionsMap:
-        url:
-          type: STRING
-          value: IN1.15
-        valueCodeableConcept:
-          valueOf: datatypes/CWE/CodeableConcept
-          expressionType: resource
     - expressionType: nested
       specs: IN1.16 *
       condition: $in116 NOT_NULL

diff --git a/prime-router/src/main/resources/metadata/hl7_mapping/resources/Coverage/IN1Extension.yml b/prime-router/src/main/resources/metadata/hl7_mapping/resources/Coverage/IN1Extension.yml
@@ -74,12 +74,6 @@ elements:
     constants:
       auiField: '%{hl7IN1Field}-14'
 
-  - name: IN1.15
-    resource: '%resource.extension.where(url = "IN1.15").value'
-    schema: classpath:/metadata/hl7_mapping/datatypes/codeableConcept/CWE.yml
-    constants:
-      cweField: '%{hl7IN1Field}-15'
-
   - name: IN1.16
     resource: '%resource.extension.where(url = "IN1.16").value'
     schema: classpath:/metadata/hl7_mapping/datatypes/HumanName/XPN.yml