diff --git a/.github/APACHE_LICENSE.md b/.github/APACHE_LICENSE.md
new file mode 100644
index 00000000..0984e3fd
--- /dev/null
+++ b/.github/APACHE_LICENSE.md
@@ -0,0 +1,194 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_
+_<>_
+
+# TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+## 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+## 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+## 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+## 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+## 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+## 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+## 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+## 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+## 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+# APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..1835dbda
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,50 @@
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Calls for violence, vilification and advertising
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at OSPO@gematik.de. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
\ No newline at end of file
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 00000000..9e1731f4
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,6 @@
+# Security Policy
+
+Since this software is not a productive version, please submit an issue or pull request for any bugs or vulnerabilities you find.
+
+In case of a responsible disclosure, please follow instructions
+on https://www.gematik.de/datensicherheit#c1227.
diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml
index ee949a78..e01d80ed 100644
--- a/.github/workflows/RenderAllDiagrams.yml
+++ b/.github/workflows/RenderAllDiagrams.yml
@@ -23,15 +23,15 @@ jobs:
# Installs Java distribution for running the plantUML jar
- name: Install Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'temurin'
- java-version: '17'
+ java-version: '21'
check-latest: true
# Install graphviz for plantuml
- name: Setup Graphviz
- uses: ts-graphviz/setup-graphviz@v1
+ uses: ts-graphviz/setup-graphviz@v2
# Download plantUML jar
- name: Download plantuml file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ceae92b3..8158ed58 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
# Java and .NET are already installed on ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
- name: Add & Commit
- uses: EndBug/add-and-commit@v7
+ uses: EndBug/add-and-commit@v9
with:
committer_name: GitHub Actions Bot
committer_email: ActionBot@github.com
diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/Implementierungsleitfaden_ISiKBasismodul.json
similarity index 92%
rename from ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json
rename to ImplementationGuide/Implementierungsleitfaden_ISiKBasismodul.json
index d8cb7f49..ed231eb1 100644
--- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json
+++ b/ImplementationGuide/Implementierungsleitfaden_ISiKBasismodul.json
@@ -1,13 +1,13 @@
{
"resourceType": "ImplementationGuide",
- "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul",
+ "url": "https://gematik.de/fhir/isik/v4/Basismodul/ImplementationGuide/ISiK-Basismodul",
"version": "4.0.0-rc",
- "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 3",
+ "name": "Implementierungsleitfaden ISiK-Basismodul",
"status": "draft",
"fhirVersion": [
"4.0.1"
],
- "packageId": "de.gematik.isik-basismodul-stufe3",
+ "packageId": "de.gematik.isik-basismodul",
"definition": {
"resource": [
{
@@ -21,15 +21,44 @@
"title": "Einführung",
"generation": "markdown",
"page": [
- {
- "nameUrl": "ImplementationGuide/markdown/ReleaseNotes.md",
- "title": "Release Notes",
- "generation": "markdown"
- },
{
"nameUrl": "ImplementationGuide/markdown/Motivation.md",
"title": "Motivation",
- "generation": "markdown"
+ "generation": "markdown",
+ "page": [
+ {
+ "nameUrl": "ImplementationGuide/markdown/ReleaseNotes.md",
+ "title": "ReleaseNotes",
+ "generation": "markdown"
+ },
+ {
+ "nameUrl": "ImplementationGuide/markdown/DecisionLog.md",
+ "title": "Decision Log",
+ "generation": "markdown"
+ }
+ ]
+ },
+ {
+ "nameUrl": "ImplementationGuide/markdown/Zusammenfassung.md",
+ "title": "Zusammenfassung",
+ "generation": "markdown",
+ "page": [
+ {
+ "nameUrl": "ImplementationGuide/markdown/Zusammenfassung/UseCases.md",
+ "title": "Anwendungsfälle (Use Cases)",
+ "generation": "markdown"
+ },
+ {
+ "nameUrl": "ImplementationGuide/markdown/Zusammenfassung/Informationsmodell.md",
+ "title": "Informationsmodell",
+ "generation": "markdown"
+ },
+ {
+ "nameUrl": "ImplementationGuide/markdown/Zusammenfassung/InteraktionenUndSearchTypes.md",
+ "title": "Interaktionen Und SearchTypes",
+ "generation": "markdown"
+ }
+ ]
},
{
"nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen.md",
diff --git a/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md b/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md
index 6b5151e0..34fa9056 100644
--- a/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md
+++ b/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md
@@ -2,4 +2,4 @@
In den folgenden Unterkapiteln werden die ISiK-Datenobjekte, die in dem vereinfachten Informationsmodell dargestellt sind, und ihre FHIR-Spezifikation beschrieben.
-
+
diff --git a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md
index 1d1888aa..25b3ad89 100644
--- a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md
+++ b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md
@@ -21,11 +21,11 @@ Der stationäre Aufenthalt oder der ambulante Kontakt eines Patienten in einer G
* **Abrechnungsfall (Account):**
Der Fall, im Sinne einer Gruppierung von medizinischen Leistungen, die in einem gemeinsamen Kontext abgerechnet werden, sind in FHIR durch die Ressource Account repräsentiert. Ein Abrechnungsfall kann mehrere Encounter umfassen (z.B. vorstationärer Besuch, stationärer Aufenthalt und nachstationäre Besuche)
-{{render:Material/Images/Encounter-Modell-Abrechnung.png}}
+{{render:Material/Images/Encounter/Encounter-Modell-Abrechnung.png}}
* **Medizinischer Fall (EpisodeOfCare):**
Der medizinische Fall gruppiert Informationen, die im Kontext einer gemeinsamen (Dauer-)Diagnose stehen und wird in FHIR durch die EpisodeOfCare dargestellt.
-{{render:Material/Images/Encounter-Modell-Medizinisch.png}}
+{{render:Material/Images/Encounter/Encounter-Modell-Medizinisch.png}}
---
@@ -43,7 +43,7 @@ Als Kontakt des Patienten mit konkreten Servicestellen, wie z.B. Radiologie oder
Zur Unterscheidung der verschiedenen Kontaktebenen wird in der MI-I eine Codierung in `Encounter.type` verwendet. Die Hierarchie der Encounter wird über die `Encounter.partOf`-Relation hergestellt. Ambulante Besuche werden in dem Modell derzeit noch nicht berücksichtigt.
-{{render:Material/Images/Encounter-Modell-MII.png}}
+{{render:Material/Images/Encounter/Encounter-Modell-MII.png}}
---
@@ -51,7 +51,7 @@ Zur Unterscheidung der verschiedenen Kontaktebenen wird in der MI-I eine Codieru
Für die Ausbaustufe 2 und 3 des ISiK Basismoduls werden alle zuvor genannten Sichtweise und Modelle berücksichtigt:
-{{render:Material/Images/Encounter-Modelle.png}}
+{{render:Material/Images/Encounter/Encounter-Modelle.png}}
Verpflichtend umzusetzen ist für die bestätigungsrelevanten Systeme der Account, im Sinne der Gruppierung einzelner Besuche, zu einem gemeinsamen (Abrechnungs-)Fall sowie der Encounter der Ebene "Abteilungskontakt" im Sinne des Modells der Medizininformatikinitiative.
@@ -61,7 +61,7 @@ Wichtig sind dabei jedoch folgende Punkte zu beachten:
* Encounter im ISiK-Kontext sind stets als "Abteilungskontakte, im Sinne der MI-I mit dem entsprechenden `Encounter.type`-Code, zu kennzeichnen.
* jegliche im ISiK-Basis-Modul, als auch in anderen ISiK-Modulen definierte Ressourcen, die über einen Encounter-Kontext verfügen, müssen auf einen ISiK-Encounter (Abteilungskontakt) referenzieren.
-{{render:Material/Images/Encounter-Modell-ISiK.png}}
+{{render:Material/Images/Encounter/Encounter-Modell-ISiK.png}}
---
@@ -80,6 +80,6 @@ Um insbesondere Subsysteme von der Pflicht zu entbinden, die Account-Ressource z
|---------|---------------------|
| {{render:Material/Images/IG_Warning}} | Die Abbildung der Fallnummer als Identifier des Accounts ist abweichend von der im Basismodul Stufe 1 festgelegten Abbildung der Fallnummer als Identifier des Encounters. Diese Änderung ist erforderlich, da die Fallnummer nicht geeignet ist, einen Encounter eindeutig zu identifizieren. Der Encounter kann weiterhin einen von der Abrechnungsfallnummer unabhänigen Identifier enthalten (z.B. "Aufnahmenummer", Bewegungsnummer). Dieser identifiziert eineindeutig den jeweiligen Kontakt.|
-{{render:Material/Images/Encounter-Modell-Fallnummer.png}}
+{{render:Material/Images/Encounter/Encounter-Modell-Fallnummer.png}}
---
diff --git a/ImplementationGuide/markdown/Zusammenfassung.md b/ImplementationGuide/markdown/Zusammenfassung.md
new file mode 100644
index 00000000..ada6e671
--- /dev/null
+++ b/ImplementationGuide/markdown/Zusammenfassung.md
@@ -0,0 +1,11 @@
+# Motivation
+
+Die Landschaft informationstechnischer Systeme in Krankenhäusern ist enorm heterogen. Für die Patientenverwaltung und -abrechnung, die medizinische Dokumentation, die Laborverwaltung, die Blutbank bis hin zum Dokumentenarchiv werden verschiedene, auf das jeweilige Fachgebiet spezialisierte Systeme verwendet. Es besteht daher der Bedarf, diese Systeme über ihren Primärzweck hinaus sinnvoll zu integrieren. Ein Szenario ist beispielsweise die Abrechnung der im Krankenhaus erbrachten Leistungen. Aus den ursprünglich in verschiedenen Spezialsystemen erfassten Informationen werden die für die Abrechnung relevanten Informationen an ein Abrechnungssystem gesendet und dort zur Rechnungslegung weiterverarbeitet.
+
+Herausforderungen stellen dabei die Vielzahl der Schnittstellen von informationstechnischen Systemen im Krankenhaus sowie zusätzliche Anforderungen für die Nutzung in mobilen Anwendungen dar. Durch die Festlegung und Verwendung von offenen und standardisierten Schnittstellen können diese Herausforderungen effizienter angenommen werden.
+
+Im Folgenden leiten wir - die gematik GmbH - her, warum die bestehenden Integrationsansätze im Krankenhaus noch unzureichend sind und durch die im Bestätigungsverfahren „Interoperabler Datenaustausch durch Informationssysteme im Krankenhaus“ (ISiK) spezifizierten Ansätze ergänzt werden, um die Vielzahl sinnvoller Integrationsszenarien effizient abzudecken.
+
+# Grafische Zusammenfassung des Implementations Guides
+
+{{index:current}}
\ No newline at end of file
diff --git a/ImplementationGuide/markdown/Zusammenfassung/Informationsmodell.md b/ImplementationGuide/markdown/Zusammenfassung/Informationsmodell.md
new file mode 100644
index 00000000..a833a2ca
--- /dev/null
+++ b/ImplementationGuide/markdown/Zusammenfassung/Informationsmodell.md
@@ -0,0 +1,23 @@
+# Übersicht
+Im Folgenden wird ein grafischer Überblick über alle in diesem Modul profilierten Ressourcen gegeben.
+Da es sich um eine Zusammenfassung handelt, werden nur folgende Profile und Felder dargestellt:
+* Profile und Extenstion, die im Basismodul enstanden sind.
+* Profile und Extenstion, die im Basismodul zwingend benötigt werden. In vereinfachter Form, mit Verweis auf den Ursprung.
+* Felder, die unterstüzt werden MÜSSEN (Must Support).
+* * Datentypen, die im ISiK-Kontext enstanden, festgelegt oder eingeschränkt wurden, sind als **Fett** gekennzeichnet.
+* Die Elemente (Unterfelder) haben, die unterstüzt werden MÜSSEN (Must Support).
+* Nur Unter-Elemente (MS) bis zu zweiten oder dritten Tiefe, abhängig von Umfang und Systematik. D.h. Keine bedingten Wiederholungen (repeat) oder Rekursionen (part-of).
+
+
+
+## Ressourcen Diagramm
+
+
+
+## Vereinfachtes Informationsmodell Diagramm
+
+
+
+## Informationsmodell Diagramm
+
+
\ No newline at end of file
diff --git a/ImplementationGuide/markdown/Zusammenfassung/InteraktionenUndSearchTypes.md b/ImplementationGuide/markdown/Zusammenfassung/InteraktionenUndSearchTypes.md
new file mode 100644
index 00000000..7fd48d1e
--- /dev/null
+++ b/ImplementationGuide/markdown/Zusammenfassung/InteraktionenUndSearchTypes.md
@@ -0,0 +1,18 @@
+# Interaktionen und Search Types
+
+## Dokumentenserver
+Das bestätigungsrelevante System nimmt die Rolle des Dokumentenservers ein. Ein Dokumentenserver nimmt Dokumente von Clients zur Speicherung/Archivierung/Verwaltung entgegen und erlaubt Clients die Suche nach und den Abruf von Dokumenten.
+
+## (Webbasierter/Mobiler) Client
+Clients können Dokumente von einem Dokumentenserver abfragen, um sie z.B. einem Anwender anzuzeigen. Dabei können sie die für die Server verpflichtend festgelegten Suchkriterien beliebig kombinieren.
+Clients sind nicht verpflichtet, alle von den Servern geforderten Suchkriterien zu unterstützen.
+
+# Search Includes and Reverse Includes
+
+Damit diese Akteure sinnvoll miteinander kommunizieren, wird im Folgenden ein grafischer Überblick über die in diesem Modul zu inlduierenden Suchparameter und Operationen gegeben.
+Da es sich um eine Zusammenfassung handelt, gelten Bedingungen für die gezeigten Inhalte:
+* Alle Must-Support Elemente einer Componente müssen von den entsprechenden Systemen suchbar sein. Diese sind hier nicht erneut aufgezählt.
+* Ein Doppelpunkt meint den Zugriff auf ein Element des beinhaltenden Profils.
+* Das Elemente hinter einem Doppelpunkt besitzt wiederum die Sucharameter (alle Must-Support Elemente!), die hier in die Suchsyntax zu inkludieren sind.
+
+
\ No newline at end of file
diff --git a/ImplementationGuide/markdown/Zusammenfassung/UseCases.md b/ImplementationGuide/markdown/Zusammenfassung/UseCases.md
new file mode 100644
index 00000000..424aa40f
--- /dev/null
+++ b/ImplementationGuide/markdown/Zusammenfassung/UseCases.md
@@ -0,0 +1,13 @@
+# Übersicht
+Im Folgenden wird ein grafischer Überblick über möglichst in diesem Modul abgedeckten Anwednungsfälle gegeben.
+Da es sich um eine Zusammenfassung handelt, werden nur folgende Use Case und dafür hinreichende Funktionen dargestellt:
+* Allgemeine und intuitiv verständliche Use Cases.
+* * Kombinationen und weitere Details sind möglich.
+* * Übergreifende Use Cases und und ihre Sub Use Cases können in einem separaten Diagram auf den entsprechenden Seiten gefunden werden.
+* Allgemeine und intuitiv Adverse Use Cases. Diese gilt es zu vermeiden.
+* In den Funktionen werde triviale Suchen einer Ressoruce anhand ihrer eigenen Properties nicht dargestelt, z.B. Suche einer Ressoruce anhand der ID, Name, Code usw.
+
+
+## Use Case Diagramm
+
+
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 00000000..bbe15e0f
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,13 @@
+## License
+
+Copyright 2024 gematik GmbH
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+
+See the [APACHE_LICENSE.md](.github/APACHE_LICENSE.md) for the specific language governing permissions and limitations under the License.
+
+Unless required by applicable law the software is provided "as is" without warranty of any kind, either express or implied, including, but not limited to, the warranties of fitness for a particular purpose, merchantability, and/or non-infringement. The authors or copyright holders shall not be liable in any manner whatsoever for any damages or other claims arising from, out of or in connection with the software or the use or other dealings with the software, whether in an action of contract, tort, or otherwise.
+
+The software is the result of research and development activities, therefore not necessarily quality assured and without the character of a liable product. For this reason, gematik does not provide any support or other user assistance (unless otherwise stated in individual cases and without justification of a legal obligation). Furthermore, there is no claim to further development and adaptation of the results to a more current state of the art.
+
+Gematik may remove published results temporarily or permanently from the place of publication at any time without prior notice or justification.
\ No newline at end of file
diff --git a/Material/images/Composition-Bundle.png b/Material/images/Composition-Bundle.png
deleted file mode 100644
index aa0c6fd1..00000000
Binary files a/Material/images/Composition-Bundle.png and /dev/null differ
diff --git a/Material/images/Encounter-Modell-Abrechnung.png b/Material/images/Encounter/Encounter-Modell-Abrechnung.png
similarity index 100%
rename from Material/images/Encounter-Modell-Abrechnung.png
rename to Material/images/Encounter/Encounter-Modell-Abrechnung.png
diff --git a/Material/images/Encounter-Modell-Fallnummer.png b/Material/images/Encounter/Encounter-Modell-Fallnummer.png
similarity index 100%
rename from Material/images/Encounter-Modell-Fallnummer.png
rename to Material/images/Encounter/Encounter-Modell-Fallnummer.png
diff --git a/Material/images/Encounter-Modell-ISiK.png b/Material/images/Encounter/Encounter-Modell-ISiK.png
similarity index 100%
rename from Material/images/Encounter-Modell-ISiK.png
rename to Material/images/Encounter/Encounter-Modell-ISiK.png
diff --git a/Material/images/Encounter-Modell-MII.png b/Material/images/Encounter/Encounter-Modell-MII.png
similarity index 100%
rename from Material/images/Encounter-Modell-MII.png
rename to Material/images/Encounter/Encounter-Modell-MII.png
diff --git a/Material/images/Encounter-Modell-Medizinisch.png b/Material/images/Encounter/Encounter-Modell-Medizinisch.png
similarity index 100%
rename from Material/images/Encounter-Modell-Medizinisch.png
rename to Material/images/Encounter/Encounter-Modell-Medizinisch.png
diff --git a/Material/images/Encounter-Modelle.png b/Material/images/Encounter/Encounter-Modelle.png
similarity index 100%
rename from Material/images/Encounter-Modelle.png
rename to Material/images/Encounter/Encounter-Modelle.png
diff --git a/Material/images/diagrams/dummy.svg b/Material/images/diagrams/dummy.svg
new file mode 100644
index 00000000..768a604c
--- /dev/null
+++ b/Material/images/diagrams/dummy.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Material/images/diagrams/infomodell.svg b/Material/images/diagrams/infomodell.svg
new file mode 100644
index 00000000..bee59e6b
--- /dev/null
+++ b/Material/images/diagrams/infomodell.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Material/images/diagrams/resourcediagram.svg b/Material/images/diagrams/resourcediagram.svg
new file mode 100644
index 00000000..4ffe2886
--- /dev/null
+++ b/Material/images/diagrams/resourcediagram.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Material/images/diagrams/searchtypes_interaction.svg b/Material/images/diagrams/searchtypes_interaction.svg
new file mode 100644
index 00000000..4d496159
--- /dev/null
+++ b/Material/images/diagrams/searchtypes_interaction.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Material/images/diagrams/usecases.svg b/Material/images/diagrams/usecases.svg
new file mode 100644
index 00000000..5b3fe28b
--- /dev/null
+++ b/Material/images/diagrams/usecases.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Material/images/src/plantuml/infomodell.puml b/Material/images/src/plantuml/infomodell.puml
new file mode 100644
index 00000000..f8489c2f
--- /dev/null
+++ b/Material/images/src/plantuml/infomodell.puml
@@ -0,0 +1,144 @@
+@startuml dummy
+' package Dummy{
+' entity Entität01 {
+' optionales Attribut
+' **optionales fettes Attribut**
+' * **vorgeschriebens fettes Attribut**
+' }
+'
+' entity Entität01 {
+' optionales Attribut : text
+' **optionales fettes Attribut** nummer <>
+' * **vorgeschriebens fettes Attribut**
+' }
+' Entität01 }|..|| Entität02
+' Entität03 }o..o| Entität04
+' Entität05 ||--o{ Entität06
+' Entität07 |o--|| Entität08
+' }
+@enduml
+
+
+' TODO:
+' Vervollständigen im Sinne von: https://github.com/gematik/spec-ISiK-Medikation/blob/rc/main-stufe-4/Material/docs/Medikation%20Abgleich%20bestehende%20Spezifikationen.xlsx
+
+@startuml infomodell
+'verhindere Probleme mit gewinkelten Krähenfüßen
+'skinparam linetype ortho
+
+'ISiK_Medikation.ISiKMedikationsListe::subject --> ISiK_Basis.ISiKPatient
+'ISiK_Medikation.ISiKMedikationTransaction --> R4_Core.Bundle
+'ISiK_Medikation.ISiKMedikationTransactionResponse --|> R4_Core.Bundle
+
+'together ISiK_DokumentenAustausch {
+ class ISiKDokumentenMetadaten <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-dokumentenaustausch-v3/isikdokumentenmetadaten ISiK Dokumenten Metadaten]]
+ }
+
+ class ISiKDokumentenSuchergebnisse <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-dokumentenaustausch-v3/isikdokumentensuchergebnisse ISiK Dokumenten Suchergebnisse]]
+ }
+
+ class ISiKConfidentialityCodes <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-dokumentenaustausch-v3/ISiKConfidentialityCodes/ ISiK Confidentiality Codes]]
+ }
+'}
+
+'together DE_Basisprofile_R4 {
+ class IHEXDShealthcareFacilityTypeCode <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656621 IHEXDS Healthcare Facility Type Code]]
+ }
+ class IHEXDSpracticeSettingCode <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656622 IHEXDS Practice Setting Code]]
+ }
+ class IHEXDStypeCode <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656623 IHEXDS Type Code]]
+ }
+ class IHEXDSclassCode <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656617 IHEXDS Class Code]]
+ }
+ class IHEXDSeventCodeList <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656619 IHEXDS Event Code List]]
+ }
+ class IHEXDSformatCodeDE <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656620 IHEXDS Format Code]]
+ }
+'}
+
+
+class vsKDL as "valueset-kdl-2022" <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/dvmd.kdl.r4.2022/2022.1.2/files/773899 Valueset KDL 2022]]
+}
+
+'together ISiK_Basis {
+ class ISiKPatient <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikpatient ISiK Patient]]
+ }
+ class ISiKKontaktGesundheitseinrichtung <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikkontaktgesundheitseinrichtung ISiK Kontakt Gesundheitseinrichtung]]
+ }
+ class ISiKPractitioner <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikpersonimgesundheitsberuf ISiK Person im Gesundheitsberuf]]
+ }
+ class ISiKAngehoeriger <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikangehoeriger ISiK Angehoeriger]]
+ }
+'}
+
+'Realtions
+
+'diamonds
+together {
+<> MultiRef_PracPatRel
+MultiRef_PracPatRel -- ISiKPractitioner
+MultiRef_PracPatRel -- ISiKPatient
+MultiRef_PracPatRel -- ISiKAngehoeriger
+<> MultiRef_KDLXDS
+MultiRef_KDLXDS -- vsKDL
+MultiRef_KDLXDS -- IHEXDStypeCode
+}
+
+'Relations
+ISiKDokumentenSuchergebnisse::DocumentReference -down- " 1..1 " ISiKDokumentenMetadaten
+
+
+ISiKDokumentenMetadaten::type -- " 1..1 " MultiRef_KDLXDS
+ISiKDokumentenMetadaten::category -- " 0..1 " IHEXDSclassCode
+
+ISiKDokumentenMetadaten::subject --> " 1..1 " ISiKPatient
+ISiKDokumentenMetadaten::author <--> " 0..1 " MultiRef_PracPatRel
+ISiKDokumentenMetadaten::securityLabel -up- " 1..* "ISiKConfidentialityCodes
+ISiKDokumentenMetadaten::content -- " 1..1 " IHEXDSformatCodeDE
+ISiKDokumentenMetadaten::encounter -- " 0..1 " ISiKKontaktGesundheitseinrichtung
+ISiKDokumentenMetadaten::context -- " 1..1 " IHEXDSeventCodeList
+ISiKDokumentenMetadaten::context -- " 1..1 " IHEXDShealthcareFacilityTypeCode
+ISiKDokumentenMetadaten::context -- " 1..1 " IHEXDSpracticeSettingCode
+
+
+' namespace dummy {
+' class Foo {
+' + field1
+' + field2
+' }
+' class Bar {
+' + field3
+' + field4
+' }
+' Foo::field1 --> Bar::field3 : foo
+' Foo::field2 --> Bar::field4 : bar
+' }
+@enduml
\ No newline at end of file
diff --git a/Material/images/src/plantuml/resourcediagram.puml b/Material/images/src/plantuml/resourcediagram.puml
new file mode 100644
index 00000000..c21673d3
--- /dev/null
+++ b/Material/images/src/plantuml/resourcediagram.puml
@@ -0,0 +1,191 @@
+@startuml dummy
+' package Dummy{
+' entity Entität01 {
+' optionales Attribut
+' **optionales fettes Attribut**
+' * **vorgeschriebens fettes Attribut**
+' }
+'
+' entity Entität01 {
+' optionales Attribut : text
+' **optionales fettes Attribut** nummer <>
+' * **vorgeschriebens fettes Attribut**
+' }
+' Entität01 }|..|| Entität02
+' Entität03 }o..o| Entität04
+' Entität05 ||--o{ Entität06
+' Entität07 |o--|| Entität08
+' }
+@enduml
+
+
+' TODO:
+' Vervollständigen im Sinne von: https://github.com/gematik/spec-ISiK-Medikation/blob/rc/main-stufe-4/Material/docs/Medikation%20Abgleich%20bestehende%20Spezifikationen.xlsx
+
+@startuml resourcediagram
+'verhindere Probleme mit gewinkelten Krähenfüßen
+'skinparam linetype ortho
+
+'Namespace enhancement
+set separator none
+
+'ISiK_Medikation.ISiKMedikationsListe::subject --> ISiK_Basis.ISiKPatient
+'ISiK_Medikation.ISiKMedikationTransaction --> R4_Core.Bundle
+'ISiK_Medikation.ISiKMedikationTransactionResponse --|> R4_Core.Bundle
+
+namespace ISiK_Basis {
+ class identifierAbrechnungsnummer <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/identifierabrechnungsnummer Identifier-Profil]] für die "Fallnummer"
+ }
+ 'ISiKMedikation::itemReference --> ISiKMedikation
+
+ class ISiKAbrechnungsfall <<(P,#8DA5C4)>>{
+ id
+ extension : **ExtensionAbrechnungsDiagnoseProzedur**
+ |_ AbrechnungsDiagnoseProzedur
+ identifier
+ |_ Abrechnungsnummer : **identifierAbrechnungsnummer**
+ |_ type : **ISiKAccountIdentifierType**
+ |_ system
+ |_ value
+ status : AccountStatus
+ type : **ISiKAccountType**
+ subject : Reference ( **Patient**)
+ coverage
+ |_ extension : **ExtensionAbrechnungsart**
+ |_ Abrechnungsart
+ |_ coverage
+ }
+
+ class ISiKAngehoeriger <<(P,#8DA5C4)>>{
+ patient : Reference ( **Patient**)
+ name : HumanName // deutsches Basisprofil
+ address : Address
+ |_ Strassenanschrift : Adresse // deutsches BasisprofilPattern
+ |_ extension
+ |_ Stadtteil
+ |_ type : AddressType.both
+ |_ line
+ |_ extension
+ |_ Strasse
+ |_ Hausnummer
+ |_ Adresszusatz
+ |_ Postfach
+ |_ city
+ |_ postalCode
+ |_ country
+ |_ Postfach : Adresse // deutsches BasisprofilPattern
+ |_ type : AddressType.postal
+ |_ line
+ |_ extension
+ |_ Strasse
+ |_ Hausnummer
+ |_ Adresszusatz
+ |_ Postfach
+ |_ city
+ |_ postalCode
+ |_ country
+ }
+
+ namespace ValueSets {
+ class ISiKAccountIdentifierType <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikaccountidentifiertype ISiK Account Identifier Type]]
+ Includes codes from the code System
+ [[https://simplifier.net/packages/hl7.fhir.r4.core/4.0.1/files/80925 v2.0203]]
+ --
+ **AN** displays-as **Account Number**
+ }
+ class ISiKAccountType <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikaccounttype ISiK Account Type]]
+ Includes codes from the code System
+ [[https://simplifier.net/packages/hl7.fhir.r4.core/4.0.1/files/80998 v3.ActCode]]
+ --
+ **AMB** displays-as **ambulatory**
+ **IMP** displays-as **inpatient encounter**
+ }
+ }
+}
+
+
+namespace DE_Basisprofile_R4 {
+ class Basisprofile_Modul <<(M,#FFAAAA)>>{
+ Dokumentation auf HL7 Org
+ [[https://simplifier.net/basisprofil-de-r4 Basisprofil DE (RE4)]]
+ }
+
+ class ExtensionAbrechnungsDiagnoseProzedur <<(E,#7A8495)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656773 Fallbezogene Abrechnungsrelevanz \nvon Diagnosen und Prozeduren]]
+ }
+
+ class ExtensionAbrechnungsart <<(E,#7A8495)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656772 Abrechnungsart]]
+ }
+
+ class gender-amtlich-de <<(E,#7A8495)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.4.0/files/656672 Administratives Geschlecht 'other']]
+ }
+
+ class humanname-de-basis <<(E,#7A8495)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.5.0-alpha6/files/2338720 HumanName, deutsches Basisprofil]]
+ }
+
+ class address-de-basis <<(E,#7A8495)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/de.basisprofil.r4/1.5.0-alpha6/files/2338610 Adresse, deutsches Basisprofil]]
+ }
+
+}
+
+namespace HL7_FHIR_R4_Core {
+ class Foundation_Modul <<(M,#FFAAAA)>>{
+ Dokumentation auf HL7 Org
+ [[https://hl7.org/fhir/R4/ HL7 FHIR R4 Core Foundation]]
+ }
+ class AccountStatus <<(V,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/packages/hl7.fhir.r4.core/4.0.1/files/82308 Account Status]]
+ Includes all codes from the underlying code System
+ [[https://simplifier.net/packages/hl7.fhir.r4.core/4.0.1/files/81890 Account Status]]
+ }
+}
+
+namespace ISiK_Basis {
+ class Basismodul_Stufe_4 <<(M,#FFDC36)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/~introduction ISiK Basis Stufe 3]]
+ }
+ class ISiKPatient <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikpatient ISiK Patient]]
+ }
+ class ISiKKontaktGesundheitseinrichtung <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikkontaktgesundheitseinrichtung ISiK Kontakt Gesundheitseinrichtung]]
+ }
+ class ISiKPractitioner <<(P,#8DA5C4)>>{
+ Dokumentation auf Simplifier
+ [[https://simplifier.net/isik-basis-v3/isikpersonimgesundheitsberuf ISiK Person im Gesundheitsberuf]]
+ }
+}
+
+
+'namespace dummy {
+' class Foo {
+' + field1
+' + field2
+' }
+' class Bar {
+' + field3
+' + field4
+' }
+' Foo::field1 --> Bar::field3 : foo
+' Foo::field2 --> Bar::field4 : bar
+'}
+@enduml
\ No newline at end of file
diff --git a/Material/images/src/plantuml/search_includes.puml b/Material/images/src/plantuml/search_includes.puml
new file mode 100644
index 00000000..89d87547
--- /dev/null
+++ b/Material/images/src/plantuml/search_includes.puml
@@ -0,0 +1,93 @@
+
+@startuml searchtypes_interaction
+left to right direction
+'skinparam packageStyle cloud
+skinparam linetype ortho
+
+
+folder CSt_MedInfo as "Systeme mit dem Charakter der \n Medikationsinformation" {
+ component _MedInfo [
+ **ISiK MedikationsInformation**
+ ====
+ Suche anhand von
+ * ** :** medication
+ * ** :** patient
+ * ** :** context
+ ]
+
+ component CStAll_MedikationsListe [
+ **ISiK MedikationsListe**
+ ====
+ Suche anhand von
+ * ** :** medication
+ * ** :** patient
+ * ** :** context
+ ]
+ 'component "ISiK MedikationsListe"
+ component "ISiK Medikament"
+ component "ISiK Patient"
+ component "ISiK Kontakt Gesundheitseinrichtung"
+ component "ISiK Person im Gesundheitsberuf"
+
+}
+
+folder CSt_MedAll as "Alle Systeme mit MedikationsCharakter" {
+ component CStAll_Medikament [
+ **ISiK Medikament**
+ ====
+ Suche anhand von
+ * ** :** ingredient
+ ]
+ component CStAll_Patient [
+ **ISiK Patient**
+ ====
+ Finde alle zugehörigen
+ * Encounter ** via ** :patient
+ * Encounter ** via ** subject
+ ]
+ component CStAll_KontaktGesundheitseinrichtung [
+ **ISiK Kontakt Gesundheitseinrichtung**
+ ====
+ Suche anhand von
+ * ** :** patient
+ * ** :** subject
+ * ** :** part-of
+ Finde alle zugehörigen
+ * Encounter ** via ** part-of
+ ]
+ component "ISiK Person im Gesundheitsberuf"
+}
+'CSt_MedInfo --> CStAll_MedikationsListe
+folder CSt_MedVerab as "Systeme mit dem Charakter der \n Medikationsverabreichung" {
+ component _MedVerab [
+ **ISiK MedikationsVerabreichung**
+ ====
+ Suche anhand von
+ * ** :** medication
+ * ** :** patient
+ * ** :** context
+ * ** :** performer
+ ]
+ component "ISiK Medikament "
+ component "ISiK Patient "
+ component "ISiK Kontakt Gesundheitseinrichtung "
+ component "ISiK Person im Gesundheitsberuf "
+}
+
+folder CSt_MedVerord as "Systeme mit dem Charakter der \n Medikationsverordnung" {
+ component _MedVerord [
+ **ISiK MedikationsVerordnung**
+ ====
+ Suche anhand von
+ * ** :** medication
+ * ** :** patient
+ * ** :** encounter
+ * ** :** requester
+ ]
+ component "ISiK Medikament "
+ component "ISiK Patient "
+ component "ISiK Kontakt Gesundheitseinrichtung "
+ component "ISiK Person im Gesundheitsberuf "
+}
+
+@enduml
\ No newline at end of file
diff --git a/Material/images/src/plantuml/usecases.puml b/Material/images/src/plantuml/usecases.puml
new file mode 100644
index 00000000..06de4bfa
--- /dev/null
+++ b/Material/images/src/plantuml/usecases.puml
@@ -0,0 +1,81 @@
+'@startuml usecases
+'usecase Medikation as "
+' = Medikation
+'
+' ___
+' Some text
+' === Neu-Verordnung
+' Other text
+' === Anpassung
+' Information
+' === Abgabe
+'"
+'@enduml
+
+@startuml usecases
+left to right direction
+'skinparam packageStyle cloud
+'skinparam linetype ortho
+
+'actor :FHIR Repository: as DB << Application >>
+actor :Heilberufler:
+actor :Versicherter:
+:FHIR Repository: as FhirRepo << Technical User >>
+:Client: as Client << Technical User >>
+
+storage gnrlUC as "Allgemein" {
+ (Versorgung)
+ (Administration)
+ (Digitalisierung)
+ (Dokumentation)
+ (Abrechnung)
+ (Strukturierung)
+ (Organisationsstruktur)
+ (Archivierung)
+ (Delegation)
+ (Konsultation)
+ (Transparenz)
+ storage patientUC as "Patienten-Management"{
+ (Aufnahme)
+ (Behandlungs-Journey)
+ (Entlassung)
+ (Überleitung)
+ (Information)
+ (Einbeziehung \nAngehöriger)
+ (Einsichtnahme)
+ }
+}
+
+storage adverseUC as "Adverse Use Cases" {
+ storage (Verwechslung){
+ (Patient)
+ (Fall)
+ (Diagnose)
+ (Ort-Zeit)
+ }
+ (Merhfachdokumentation)
+ (Dokumentationslücken)
+ (Nicht-Verfügbarkeit)
+ (Verlust)
+}
+
+storage techUC as "Technical Use Case" {
+ (Synchronisation)
+ (Performance & \nDatensparsamkeit)
+ (Wechsel führendes System)
+ (Kommunikation)
+ (Eindeutigkeit)
+ (Grundlagen-Ressourcen)
+}
+
+
+
+Heilberufler --> gnrlUC
+Versicherter --> patientUC
+
+FhirRepo --> techUC
+Client --> techUC
+
+'fncts --> adverseUC : mitigates
+'fncts --> gnrlUC : enables
+@enduml
\ No newline at end of file
diff --git a/README.md b/README.md
index aa9ac368..4379fea8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,45 @@
-Dies ist ein Branch rund um das Thema Patientendatenzusammenführung (Patient merge).
+
-Ein Konzept zur genaueren Definition des Problems (WIP) wird unter [Patient merge](ImplementationGuide/markdown/UebergreifendeFestlegungen/Patient_merge.md) veröffentlicht und weiterentwickelt.
+# ISiK-Basis
+
+ Table of Contents
+
+