Added composition mapping layer and default status

model/action/org.openehr/medication.v1.yml

@@ -30,120 +30,13 @@ preprocessor:
           - "timing.event" # If the route value differs per dosage slice, create a new event
 
 mappings:
-  - name: "healthcareFacility"
-    with:
-      fhir: "$resource.request.requester"
-      openehr: "$archetype/context/health_care_facility"
 
-  - name: "context"
-    with:
-      fhir: "$resource.effective.as(Period)"
-      openehr: "$composition/context"
-      type: "NONE"
-    followedBy:
-      mappings:
-        - name: "contextStart"
-          with:
-            fhir: "start"
-            openehr: "start_time"
-
-        - name: "contextEnd"
-          with:
-            fhir: "end"
-            openehr: "end_time"
-
-  - name: "composer"
-    with:
-      fhir: "$resource.request.requester" # take identifier
-      openehr: "$composition/composer"
 
   - name: "provider"
     with:
       fhir: "$resource.actor.performer"
       openehr: "$archetype/provider"
 
-  - name: "category"
-    with:
-      fhir: "$resource.category.coding"
-      openehr: "$composition/context/setting"
-    manual:
-      - name: "outpatient"
-        fhir:
-          - path: "code"
-            value: "outpatient"
-          - path: "system"
-            value: "http://terminology.hl7.org/CodeSystem/medication-admin-category"
-          - path: "display"
-            value: "Outpatient"
-        openehrCondition:
-          targetRoot: "$openehrRoot"
-          targetAttribute: "defining_code/code_string"
-          operator: "one of"
-          criteria: "228"
-        openehr:
-          - path: "defining_code/terminology_id"
-            value: "openehr"
-          - path: "defining_code/code_string"
-            value: "228"
-          - path: "value"
-            value: "primary medical care"
-        fhirCondition:
-          targetRoot: "$resource"
-          targetAttribute: "category.coding.code"
-          operator: "one of"
-          criteria: "outpatient"
-
-      - name: "inpatient"
-        fhir:
-          - path: "code"
-            value: "inpatient"
-          - path: "system"
-            value: "http://terminology.hl7.org/CodeSystem/medication-admin-category"
-          - path: "display"
-            value: "Inpatient"
-        openehrCondition:
-          targetRoot: "$openehrRoot"
-          targetAttribute: "defining_code/code_string"
-          operator: "one of"
-          criteria: "232"
-        openehr:
-          - path: "defining_code/terminology_id"
-            value: "openehr"
-          - path: "defining_code/code_string"
-            value: "232"
-          - path: "value"
-            value: "secondary medical care"
-        fhirCondition:
-          targetRoot: "$resource"
-          targetAttribute: "category.coding.code"
-          operator: "one of"
-          criteria: "inpatient"
-
-      - name: "community"
-        fhir:
-          - path: "code"
-            value: "community"
-          - path: "system"
-            value: "http://terminology.hl7.org/CodeSystem/medication-admin-category"
-          - path: "display"
-            value: "Community"
-        openehrCondition:
-          targetRoot: "$openehrRoot"
-          targetAttribute: "defining_code/code_string"
-          operator: "one of"
-          criteria: "238"
-        openehr:
-          - path: "defining_code/terminology_id"
-            value: "openehr"
-          - path: "defining_code/code_string"
-            value: "238"
-          - path: "value"
-            value: "Community"
-        fhirCondition:
-          targetRoot: "$resource"
-          targetAttribute: "category.coding.code"
-          operator: "one of"
-          criteria: "community"
 
   - name: "note"
     with:

model/action/org.openehr/procedure.v1.yml

@@ -22,26 +22,53 @@ preprocessor:
         create: "resource"
 
 mappings:
-  - name: "participations"
+  - name: "actionPerformed"
     with:
-      fhir: "$resource.performer.actor"
-      openehr: "$composition/context/participations"  # reference to part
+      fhir: "$resource"
+      openehr: "$archetype"
       type: "NONE"
     followedBy:
       mappings:
-         - name : "participationFunction"
-           with:
-             fhir: "$fhirRoot"
-             openehr: "$openEHRRoot"
-           manual:
-             - name: "function"
-               openehr:
-                 - path: "function"
-                   value: "asserter"
-         - name: "performer"
-           with:
-             fhir: "$fhirRoot"
-             openehr: "$openEHRRoot" # reference to party_identified NOT SUPPORTED since 1..1 whole mapping is commented out
+        - name: "performed"
+          with:
+            fhir: "performed.as(Period)"
+            openehr: "$reference"
+          followedBy:
+            mappings:
+              - name: "performedEnd"
+                with:
+                  fhir: "end"
+                  openehr: "time"
+
+        - name: "performedDateTime"
+          with:
+            fhir: "performed.as(DateTimeType)"
+            openehr: "time"
+
+  - name: "actionPerformedEmtpy"
+    with:
+      fhir: "$resource"
+      openehr: "$archetype"
+      type: "NONE"
+    unidirectional: "fhir->openehr"
+    fhirCondition:
+      targetRoot: "$resource"
+      targetAttribute: "performed"
+      operator: "empty"
+    followedBy:
+      mappings:
+        - name: "performedStart"
+          with:
+            openehr: "time"
+          manual:
+            - name: "no information"
+              openehr:
+                - path: "null_flavour/value"
+                  value: "no information"
+                - path: "null_flavour/defining_code/terminology_id"
+                  value: "openehr"
+                - path: "null_flavour/defining_code/code_string"
+                  value: "271"
 
   - name: "other_participations"
     with:
@@ -67,40 +94,7 @@ mappings:
   - name: "provider"
     with:
       fhir: "$resource.performer.actor"
-      openehr: "$composition/provider"  # reference to party_identified NOT SUPPORTED since 1..1 whole mapping is commented out
-
-  - name: "contextStartTime"
-    with:
-      fhir: "$resource.performed.as(DateTimeType)"
-      openehr: "$composition/context/start_time"
-
-  - name: "performed"
-    with:
-      fhir: "$resource.performed.as(Period)"
-      openehr: "$composition/context"
-      type: "NONE"
-    followedBy:
-      mappings:
-        - name: "contextStart"
-          with:
-            fhir: "start"
-            openehr: "start_time"
-
-        - name: "contextEnd"
-          with:
-            fhir: "end"
-            openehr: "$composition/context/end_time"
-
-  - name: "actionPerformed"
-    with:
-      fhir: "$resource.performed.as(DateTimeType)"
-      openehr: "$archetype/time" # this field is more fiting then start_time thats why it overwrites the initial performed in fhir.
-
- #  reference to party_identified NOT SUPPORTED since 1..1 whole mapping is commented out
-  - name: "composer"
-    with:
-      fhir: "$resource.recorder"
-      openehr: "$composition/composer"
+      openehr: "$archetype/provider"  # reference to party_identified NOT SUPPORTED since 1..1 whole mapping is commented out
 
   - name: "ISMTransition"
     with:

model/admin_entry/org.highmed/episode_institution_local.v0.yml

@@ -14,32 +14,6 @@ spec:
 
 mappings:
 
-  - name: "healthcareFacility"
-    with:
-      fhir: "$resource.serviceProvider"
-      openehr: "$composition/context/health_care_facility"
-
-  - name: "contextPeriod"
-    with:
-      fhir: "$resource.period"
-      openehr: "$composition/context"
-      type: "NONE"
-    followedBy:
-      mappings:
-        - name: "contextStart"
-          with:
-            fhir: "start"
-            openehr: "start_time"
-        - name: "contextEnd"
-          with:
-            fhir: "end"
-            openehr: "end_time"
-
-  - name: "composer"
-    with:
-      fhir: "$resource.serviceProvider"
-      openehr: "$composition/composer"
-
   - name: "entryProvider"
     with:
       fhir: "$resource.serviceProvider"

model/cluster/org.openehr/laboratory_test_analyte.v1.yml

@@ -11,9 +11,25 @@ spec:
     revision: 1.1.8
   fhirConfig:
     structureDefinition: http://hl7.org/fhir/StructureDefinition/BackboneElement
-#    multiple: true
 
 mappings:
+  - name: "statusEmtpy"
+    with:
+      fhir: "$resource.status"
+      openehr: "$archetype/items[at0005]"
+    unidirectional: "openehr->fhir"
+    manual:
+      - name: "dataAbsent"
+        fhir:
+          - path: "extension.url"
+            value: "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
+          - path: "extension.code"
+            value: "unsupported"
+    openehrCondition:
+      targetRoot: "$archetype"
+      targetAttribute: "items[at0005]"
+      operator: "empty"
+
   - name: "status"
     with:
       fhir: "$resource"

model/composition/org.highmed/fall.v1.Encounter.yml

@@ -0,0 +1,83 @@
+grammar: FHIRConnect/v1.0.0
+type: model
+metadata:
+  name: COMPOSITION.fall.v1.encounter
+  version: 0.0.1-alpha
+spec:
+  system: FHIR
+  version: R4
+  openEhrConfig:
+    archetype: openEHR-EHR-COMPOSITION.fall.v1
+    revision: 1.0.1
+  fhirConfig:
+    structureDefinition: http://hl7.org/fhir/StructureDefinition/Encounter
+
+mappings:
+  - name: "healthcareFacility"
+    with:
+      fhir: "$resource.serviceProvider"
+      openehr: "$composition/context/health_care_facility"
+
+  - name: "contextPeriod"
+    with:
+      fhir: "$resource.period"
+      openehr: "$composition/context"
+      type: "NONE"
+    followedBy:
+      mappings:
+        - name: "contextStart"
+          with:
+            fhir: "start"
+            openehr: "start_time"
+        - name: "contextEnd"
+          with:
+            fhir: "end"
+            openehr: "end_time"
+
+  - name: "contextStartTimeEmpty"
+    with:
+      fhir: "$resource"
+      openehr: "$composition/context"
+      type: "NONE"
+    unidirectional: "fhir->openehr"
+    fhirCondition:
+      targetRoot: "$resource"
+      targetAttribute: "period"
+      operator: "empty"
+    followedBy:
+      mappings:
+        - name: "effectiveStart"
+          with:
+            openehr: "start_time"
+          manual:
+            - name: "no information"
+              openehr:
+                - path: "null_flavour/value"
+                  value: "no information"
+                - path: "null_flavour/defining_code/terminology_id"
+                  value: "openehr"
+                - path: "null_flavour/defining_code/code_string"
+                  value: "271"
+
+  - name: "composer"
+    with:
+      fhir: "$resource.serviceProvider"
+      openehr: "$composition/composer"
+
+  - name: "composerEmpty"
+    with:
+      fhir: "$resource.serviceProvider"
+      openehr: "$composition/composer"
+    fhirCondition:
+      targetRoot: "$resource"
+      targetAttribute: "serviceProvider"
+      operator: "empty"
+    manual:
+      - name: "no information"
+        openehr:
+          - path: "null_flavour/value"
+            value: "no information"
+          - path: "null_flavour/defining_code/terminology_id"
+            value: "openehr"
+          - path: "null_flavour/defining_code/code_string"
+            value: "271"