Merge pull request #61 from gematik/backport-extension-Schedule

enhancement: backport extension r5
gematik · Feb 14, 2023 · 5a1256e · 5a1256e
2 parents 926d4a9 + 470bdd0
commit 5a1256e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 15 deletions.
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json
@@ -49,16 +49,47 @@
         "mustSupport": true
       },
       {
-        "id": "Schedule.extension:Name",
+        "id": "Schedule.extension.extension",
+        "path": "Schedule.extension.extension",
+        "max": "0"
+      },
+      {
+        "id": "Schedule.extension.value[x]",
+        "path": "Schedule.extension.value[x]",
+        "slicing": {
+          "discriminator": [
+            {
+              "type": "type",
+              "path": "$this"
+            }
+          ],
+          "ordered": false,
+          "rules": "open"
+        },
+        "min": 1
+      },
+      {
+        "id": "Schedule.extension.valueString",
+        "path": "Schedule.extension.valueString",
+        "min": 1,
+        "max": "1",
+        "type": [
+          {
+            "code": "string"
+          }
+        ]
+      },
+      {
+        "id": "Schedule.extension:KalenderName",
         "path": "Schedule.extension",
-        "sliceName": "Name",
+        "sliceName": "KalenderName",
         "min": 0,
         "max": "1",
         "type": [
           {
             "code": "Extension",
             "profile": [
-              "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension"
+              "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
             ]
           }
         ],

diff --git a/...Definition-ISiKKalenderNameExtension.json → ...ces/StructureDefinition-ScheduleName.json b/...Definition-ISiKKalenderNameExtension.json → ...ces/StructureDefinition-ScheduleName.json
@@ -1,9 +1,9 @@
 {
   "resourceType": "StructureDefinition",
-  "id": "ISiKKalenderNameExtension",
-  "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension",
+  "id": "ScheduleName",
+  "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name",
   "version": "2.0.2",
-  "name": "ISiKKalenderNameExtension",
+  "name": "ScheduleName",
   "status": "active",
   "fhirVersion": "4.0.1",
   "mapping": [
@@ -34,7 +34,7 @@
       {
         "id": "Extension.url",
         "path": "Extension.url",
-        "fixedUri": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension"
+        "fixedUri": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
       },
       {
         "id": "Extension.value[x]",
@@ -49,7 +49,6 @@
           "ordered": false,
           "rules": "open"
         },
-        "min": 1,
         "type": [
           {
             "code": "string"
@@ -59,9 +58,8 @@
       {
         "id": "Extension.valueString",
         "path": "Extension.valueString",
-        "min": 1,
-        "max": "1",
-        "mustSupport": true
+        "min": 0,
+        "max": "1"
       }
     ]
   }

diff --git a/Resources/input/fsh/ISiKKalender.fsh b/Resources/input/fsh/ISiKKalender.fsh
@@ -20,12 +20,16 @@ Id: ISiKKalender
 * actor[Akteur] only Reference(Practitioner or HealthcareService)
 * actor[Akteur].reference 1..1 MS
 * extension MS
-* extension contains ISiKKalenderNameExtension named Name 0..1 MS
+* extension contains http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name named KalenderName 0..1 MS
+  * valueString 1..1
 
-Extension: ISiKKalenderNameExtension
-Id: ISiKKalenderNameExtension
+// This extension can be safely removed as soon as a package for R5 backport extensions is published and referenced by this project
+//WIP
+Extension: ScheduleName
+Id: ScheduleName
+* ^url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
 * value[x] only string
-* valueString 1..1 MS
+* valueString 0..1
 
 Instance: ISiKKalenderExample
 InstanceOf: ISiKKalender