Merge branch 'TC_4.0.1' of https://github.com/gematik/spec-ISiK-Basis…

…modul into TC_4.0.1
gematik · Oct 11, 2024 · b2c88a3 · b2c88a3
2 parents 03599b0 + be26c34
commit b2c88a3
Show file tree

Hide file tree

Showing 75 changed files with 159 additions and 258 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/PR_Template_Contributor.md b/.github/PULL_REQUEST_TEMPLATE/PR_Template_Contributor.md
@@ -61,4 +61,8 @@
 
 ### automated review steps:
 - [ ] no formal review needed
-- [ ] check IG-pages for broken links (possibly using plug-in)
+- [ ] check IG-pages for broken links (possibly using plug-in)
+- [ ] 
+
+### For reviewers
+You migh use this: https://conventionalcomments.org/
diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md
@@ -3,7 +3,7 @@
 ----
 Version: 4.0.1
 
-Datum: 27.09.2024
+Datum: 09.10.2024
 
 Status: Active
 

diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md
@@ -4,6 +4,13 @@ Im Rahmen der ISiK-Veröffentlichungen wird das [Semantic Versioning](https://se
 
 Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von Releases. Die dritte Ziffer Y (Release x.0.y) bezeichnet eine technische Korrektur und versioniert kleinere Änderungen (Packages) während eines Jahres, z. B. 1.0.1.
 
+Version: 4.0.1
+* Fixed CapabilityStatement *near* SearchParameter type & ResourceType Organization spelling, removed custom backport Extension - switched to the official backport mechanism, fixed Bindings to CodeSystems    https://github.com/gematik/spec-ISiK-Basismodul/commit/ ae706142832e2059046ce978c4b0dc472c2375e6
+
+Datum: tbd
+
+----
+
 Version: 4.0.0
 
 Datum: 30.8.2024

diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -61,7 +61,7 @@
     "fshType": "Instance",
     "fshFile": "IsiKPatientMerge.fsh",
     "startLine": 100,
-    "endLine": 109
+    "endLine": 113
   },
   {
     "outputFile": "CapabilityStatement-ISiKCapabilityStatementBasisServer.json",
@@ -188,8 +188,8 @@
     "fshName": "Fachabteilungskontakt",
     "fshType": "Instance",
     "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 169,
-    "endLine": 207
+    "startLine": 155,
+    "endLine": 193
   },
   {
     "outputFile": "Encounter-FachabteilungskontaktMinimal.json",
@@ -332,24 +332,24 @@
     "fshName": "Encounter-date-start",
     "fshType": "Instance",
     "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 250,
-    "endLine": 268
+    "startLine": 236,
+    "endLine": 254
   },
   {
     "outputFile": "SearchParameter-Encounter-end-date.json",
     "fshName": "Encounter-end-date",
     "fshType": "Instance",
     "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 270,
-    "endLine": 288
+    "startLine": 256,
+    "endLine": 274
   },
   {
     "outputFile": "StructureDefinition-ExtensionISiKRehaEntlassung.json",
     "fshName": "ExtensionISiKRehaEntlassung",
     "fshType": "Extension",
     "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 146,
-    "endLine": 167
+    "startLine": 132,
+    "endLine": 153
   },
   {
     "outputFile": "StructureDefinition-ISiKASKCoding.json",
@@ -615,22 +615,6 @@
     "startLine": 1,
     "endLine": 16
   },
-  {
-    "outputFile": "StructureDefinition-PlannedEndDate.json",
-    "fshName": "PlannedEndDate",
-    "fshType": "Extension",
-    "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 140,
-    "endLine": 144
-  },
-  {
-    "outputFile": "StructureDefinition-PlannedStartDate.json",
-    "fshName": "PlannedStartDate",
-    "fshType": "Extension",
-    "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh",
-    "startLine": 133,
-    "endLine": 137
-  },
   {
     "outputFile": "StructureDefinition-patient-merge-subscription.json",
     "fshName": "PatientMergeSubscription",

diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -6,7 +6,7 @@ Binary-Binary-JPEG-Example.json                                          Binary-
 Binary-Binary-PDF-Example-short.json                                     Binary-PDF-Example-short                                Instance    ISiKBinary.fsh                                23 - 28
 Binary-Binary-PDF-Example.json                                           Binary-PDF-Example                                      Instance    ISiKBinary.fsh                                36 - 41
 Bundle-ISiKBundle-Example.json                                           ISiKBundle-Example                                      Instance    ISiKBerichtBundle.fsh                         24 - 38
-Bundle-SubscriptionNotificationBundleExample.json                        SubscriptionNotificationBundleExample                   Instance    IsiKPatientMerge.fsh                          100 - 109
+Bundle-SubscriptionNotificationBundleExample.json                        SubscriptionNotificationBundleExample                   Instance    IsiKPatientMerge.fsh                          100 - 113
 CapabilityStatement-ISiKCapabilityStatementBasisServer.json              ISiKCapabilityStatementBasisServer                      Instance    ISiKCapabilityStatementBasisServer.fsh        1 - 1456
 CodeSystem-CodeSystemExample.json                                        CodeSystemExample                                       Instance    ISiKCodeSystem.fsh                            16 - 26
 CodeSystem-ISiKBehandlungsergebnisRehaCS.json                            ISiKBehandlungsergebnisReha                             CodeSystem  CodeSystems.fsh                               11 - 18
@@ -22,7 +22,7 @@ Condition-Example-condition-kreuz-stern-sekundaer.json                   Example
 Condition-MittelgradigeIntelligenzminderung.json                         MittelgradigeIntelligenzminderung                       Instance    ISiKDiagnose.fsh                              122 - 131
 Coverage-CoverageGesetzlich.json                                         CoverageGesetzlich                                      Instance    ISiKVersicherungsverhaeltnisGesetzlich.fsh    45 - 54
 Coverage-CoveragePrivat.json                                             CoveragePrivat                                          Instance    ISiKVersicherungsverhaeltnisSelbstzahler.fsh  18 - 24
-Encounter-Fachabteilungskontakt.json                                     Fachabteilungskontakt                                   Instance    ISiKKontaktGesundheitseinrichtung.fsh         169 - 207
+Encounter-Fachabteilungskontakt.json                                     Fachabteilungskontakt                                   Instance    ISiKKontaktGesundheitseinrichtung.fsh         155 - 193
 Encounter-FachabteilungskontaktMinimal.json                              FachabteilungskontaktMinimal                            Instance    ISiKBerichtBundle.fsh                         55 - 68
 Location-BettenstellplatzStandortBeispiel.json                           BettenstellplatzStandortBeispiel                        Instance    ISiKStandort.fsh                              61 - 65
 Location-RaumStandortBeispiel.json                                       RaumStandortBeispiel                                    Instance    ISiKStandort.fsh                              55 - 59
@@ -40,9 +40,9 @@ Patient-PatientinMusterfrauMinimal.json                                  Patient
 Practitioner-PractitionerWalterArzt.json                                 PractitionerWalterArzt                                  Instance    ISiKPersonImGesundheitsberuf.fsh              92 - 127
 Procedure-Appendektomie.json                                             Appendektomie                                           Instance    ISiKProzedur.fsh                              47 - 60
 RelatedPerson-ISiKAngehoerigerMustermann.json                            ISiKAngehoerigerMustermann                              Instance    ISiKAngehoeriger.fsh                          49 - 60
-SearchParameter-Encounter-date-start.json                                Encounter-date-start                                    Instance    ISiKKontaktGesundheitseinrichtung.fsh         250 - 268
-SearchParameter-Encounter-end-date.json                                  Encounter-end-date                                      Instance    ISiKKontaktGesundheitseinrichtung.fsh         270 - 288
-StructureDefinition-ExtensionISiKRehaEntlassung.json                     ExtensionISiKRehaEntlassung                             Extension   ISiKKontaktGesundheitseinrichtung.fsh         146 - 167
+SearchParameter-Encounter-date-start.json                                Encounter-date-start                                    Instance    ISiKKontaktGesundheitseinrichtung.fsh         236 - 254
+SearchParameter-Encounter-end-date.json                                  Encounter-end-date                                      Instance    ISiKKontaktGesundheitseinrichtung.fsh         256 - 274
+StructureDefinition-ExtensionISiKRehaEntlassung.json                     ExtensionISiKRehaEntlassung                             Extension   ISiKKontaktGesundheitseinrichtung.fsh         132 - 153
 StructureDefinition-ISiKASKCoding.json                                   ISiKASKCoding                                           Profile     ISiKDataTypeProfiles.fsh                      44 - 52
 StructureDefinition-ISiKATCCoding.json                                   ISiKATCCoding                                           Profile     ISiKDataTypeProfiles.fsh                      54 - 62
 StructureDefinition-ISiKAbrechnungsfall.json                             ISiKAbrechnungsfall                                     Profile     ISiKAbrechnungsfall.fsh                       1 - 32
@@ -76,8 +76,6 @@ StructureDefinition-ISiKStillstatus.json                                 ISiKSti
 StructureDefinition-ISiKValueSet.json                                    ISiKValueSet                                            Profile     ISiKValueSet.fsh                              1 - 21
 StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json          ISiKVersicherungsverhaeltnisGesetzlich                  Profile     ISiKVersicherungsverhaeltnisGesetzlich.fsh    1 - 43
 StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json        ISiKVersicherungsverhaeltnisSelbstzahler                Profile     ISiKVersicherungsverhaeltnisSelbstzahler.fsh  1 - 16
-StructureDefinition-PlannedEndDate.json                                  PlannedEndDate                                          Extension   ISiKKontaktGesundheitseinrichtung.fsh         140 - 144
-StructureDefinition-PlannedStartDate.json                                PlannedStartDate                                        Extension   ISiKKontaktGesundheitseinrichtung.fsh         133 - 137
 StructureDefinition-patient-merge-subscription.json                      PatientMergeSubscription                                Profile     IsiKPatientMerge.fsh                          2 - 18
 Subscription-PatientMergeSubscriptionExample.json                        PatientMergeSubscriptionExample                         Instance    IsiKPatientMerge.fsh                          20 - 31
 ValueSet-DiagnosesSCT.json                                               DiagnosesSCT                                            ValueSet    valueSets.fsh                                 1 - 10

diff --git a/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json b/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json
@@ -45,7 +45,7 @@
               },
               {
                 "name": "timestamp",
-                "valueDate": "2024-02-22"
+                "valueInstant": "2024-02-22T18:30:05+01:00"
               },
               {
                 "name": "focus",
@@ -56,10 +56,17 @@
             ]
           }
         ]
+      },
+      "request": {
+        "method": "GET",
+        "url": "https://gematik.de/fhir/isik/SubscriptionTopic/patient-merge/$status"
+      },
+      "response": {
+        "status": "200"
       }
     },
     {
-      "fullUrl": "http://example.com/fhir/Patient/DorisQuelle/_history/2",
+      "fullUrl": "http://example.org/fhir/Patient/DorisQuelle",
       "resource": {
         "resourceType": "Patient",
         "id": "DorisQuelle",
@@ -109,7 +116,10 @@
       },
       "request": {
         "method": "PUT",
-        "url": "Patient/DorisQuelle"
+        "url": "Patient"
+      },
+      "response": {
+        "status": "201"
       }
     }
   ]

diff --git a/...urces/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/...urces/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json
@@ -6,7 +6,7 @@
   "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "implementationGuide": [
     "https://gematik.de/fhir/isik/ImplementationGuide/ISiK-Basismodul"
   ],
@@ -2537,13 +2537,13 @@
               ],
               "name": "near",
               "definition": "http://hl7.org/fhir/SearchParameter/Location-near",
-              "type": "token",
+              "type": "special",
               "documentation": "**Beispiel zur Suche nach Standort nahe (100m) Koordinaten:**    \n        `GET [base]/Location?contains=52.525851|13.37774|100|m`    \n        **Anwendungshinweis:**   \n        Weitere Details siehe [FHIR-Kernspezifikation](https://hl7.org/fhir/R4/search.html#special).  "
             }
           ]
         },
         {
-          "type": "Organisation",
+          "type": "Organization",
           "extension": [
             {
               "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -2919,9 +2919,12 @@
         },
         {
           "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
+              "valueCode": "MAY"
+            },
             {
               "url": "http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/capabilitystatement-subscriptiontopic-canonical",
-              "valueCode": "MAY",
               "valueCanonical": "https://gematik.de/fhir/isik/SubscriptionTopic/patient-merge"
             }
           ],

diff --git a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json
@@ -10,7 +10,7 @@
   "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "url": "http://example.org/fhir/CodeSystem/TestKatalog",
   "name": "TestKatalog",
   "content": "complete",

diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json
@@ -5,6 +5,7 @@
   "name": "ISiKBehandlungsergebnisReha",
   "id": "ISiKBehandlungsergebnisRehaCS",
   "description": "Behandlungsergebnis Reha gemäß §301(4 UND 4A) SGB V. Diagnosenbezogene Bewertung des Behandlungsergebnisses für einen Versicherten/Berechtigten bei Entlassung aus der Reha-Maßnahme bzw. Stellung eines Antrags auf Verlängerung. Vgl. Schlüsseltabelle 2.71 Diagnose - Behandlungsergebnis.",
+  "version": "4.0.1",
   "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKBehandlungsergebnisRehaCS",
   "concept": [
     {
@@ -24,9 +25,8 @@
       "display": "verschlechtert"
     }
   ],
-  "version": "4.0.1",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "count": 4
 }
diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json
@@ -5,6 +5,7 @@
   "name": "ISiKBesondereBehandlungsformReha",
   "id": "ISiKBesondereBehandlungsformRehaCS",
   "description": "Besondere Behandlungsform der Reha gemäß §301(4 UND 4A) SGB V. Vgl. Schlüsseltabelle 2.51 Besondere Behandlungsformen.",
+  "version": "4.0.1",
   "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKBesondereBehandlungsformRehaCS",
   "concept": [
     {
@@ -31,9 +32,8 @@
       "display": "sonstige"
     }
   ],
-  "version": "4.0.1",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "count": 5
 }
diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json
@@ -5,6 +5,7 @@
   "name": "ISiKEntlassformReha",
   "id": "ISiKEntlassformRehaCS",
   "description": "ISiK Entlassform Reha. Beschreibt Form und ggf. Weiterbehandlung der Entlassung eines Versicherten/Berechtigten aus verwaltungs- und medizinischer Sicht. Vgl. Schlüsseltabelle 2.107 Entlassungsform.",
+  "version": "4.0.1",
   "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKEntlassformRehaCS",
   "concept": [
     {
@@ -76,9 +77,8 @@
       "display": "Entlassung vor Wiederaufnahme (für CIFolgetherapie)"
     }
   ],
-  "version": "4.0.1",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "count": 17
 }
diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json
@@ -5,6 +5,7 @@
   "name": "ISiKUnterbrechnungReha",
   "id": "ISiKUnterbrechnungRehaCS",
   "description": "ISiK Unterbrechung Reha. Dokumentiert die relevanten Gründe einer Unterbrechung einer Rehabilitationsmaßnahme im Einzelfall. Vgl. Schlüsseltabelle 2.111 Erläuterung zur Unterbrechung.",
+  "version": "4.0.1",
   "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKUnterbrechnungRehaCS",
   "concept": [
     {
@@ -36,9 +37,8 @@
       "display": "Sonstiger Grund, der zur Unterbrechung der Pflegekosten führt"
     }
   ],
-  "version": "4.0.1",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "count": 7
 }
diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json
@@ -7,7 +7,7 @@
   "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "name": "date-start",
   "code": "date-start",
   "base": [

diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json
@@ -7,7 +7,7 @@
   "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "name": "end-date",
   "code": "end-date",
   "base": [

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKRehaEntlassung.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKRehaEntlassung.json
@@ -6,7 +6,7 @@
   "name": "ExtensionISiKRehaEntlassung",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "publisher": "gematik GmbH",
   "description": "Extension zur Dokumentation von Informationen nach §301 (4 und 4a) SGB V, entsprechend dem ärztliche Reha-Entlassungsbericht",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKASKCoding.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKASKCoding.json
@@ -7,7 +7,7 @@
   "title": "ISiKASKCoding",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "publisher": "gematik GmbH",
   "description": "Data Type profile for ASK Codings in ISiK",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKATCCoding.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKATCCoding.json
@@ -7,7 +7,7 @@
   "title": "ISiKATCCoding",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "publisher": "gematik GmbH",
   "description": "Data Type profile for ATC Codings in ISiK",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json
@@ -6,7 +6,7 @@
   "name": "ISiKAbrechnungsfall",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json
@@ -7,7 +7,7 @@
   "title": "ISiK Alkohol Abusus",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-27",
+  "date": "2024-10-02",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",
@@ -24,7 +24,7 @@
           "coding": [
             {
               "code": "social-history",
-              "system": "http://hl7.org/fhir/secondary-finding"
+              "system": "http://terminology.hl7.org/CodeSystem/observation-category"
             }
           ]
         }