amts progress and bpnm

now RenderAllDiagrams includes camunda bpmn
gematik · Mar 12, 2024 · 4c1b6f7 · 4c1b6f7
1 parent 8081aeb
commit 4c1b6f7
Show file tree

Hide file tree

Showing 10 changed files with 1,076 additions and 538 deletions.
diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml
@@ -38,15 +38,16 @@ jobs:
         run: |
           wget -O plantuml.jar "https://github.com/plantuml/plantuml/releases/latest/download/plantuml.jar" 
                                 
-       # Clean Folder
+       # Ensure Folder exsists, otherwise, create it
       - name: Ensure and clean folder
         run: |
           img_dir=Material/images/diagrams
           mkdir -p $img_dir
-          rm -rf Material/images/diagrams/*.svg
+      # do not clean
+      # rm -rf Material/images/diagrams/*.svg
 
       # Generate the SVGs from PUML
-      - name: Render PUML to SVG and Move files
+      - name: Render PUML to SVG files
         run: |
           FileNamePaths=$(find . -path "*/images/src/*/*.puml" -exec dirname {} \; | sort -u)
           for dir in $FileNamePaths
@@ -70,7 +71,34 @@ jobs:
           format: svg
           action-mode: all
 
+      # Install note.js and bpmn-to-image
+      - name: Install Notejs and pbmn-to-image
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - run: npm install -g bpmn-to-image
+
+      # Generate the SVGs from BPMN
+      - name: Render BPMN to SVG files
+        run: |
+          FileNamePaths=$(find . -path "*/images/src/*/*.bpmn" -exec dirname {} \; | sort -u)
+          for dir in $FileNamePaths
+          do
+            # Render SVGs from BPMN
+            echo $dir
+            FileBaseNames=$(find $dir -name "*.bpmn" -exec basename "{}" ".bpmn" \; | sort -u)
+            #FileBaseNames=$(find $dir -name "*.bpmn" | xargs -L1 -I{} basename "{}")
+            
+            for base in $FileBaseNames
+            do
+              echo $base
+              bpmn-to-image "$dir/$base.bpmn":"$dir/$base.svg";
+            done
+            
+          done  
+
       # copies the created SVG files to the images/diagrams folder and deletes the drawio files
+      # mv for copy and delete, here
       - name: Move SVGs to target image folder
         run: |
           img_dir=Material/images/diagrams
@@ -79,7 +107,8 @@ jobs:
           for dir in $FileNamePaths
           do
             # Move SVGs to out directory
-            find $dir -name "*.svg" -exec mv {} $img_dir \;
+            # find $dir -name "*.svg" -exec rm -rf {} $img_dir \;
+            find $dir -name "*.svg" -exec mv -f {} $img_dir \;
           done
       
       ## add and commit the new generated files
@@ -99,4 +128,8 @@ jobs:
         with:
           commit_user_name: GitHub Actions Bot
           commit_user_email: [email protected]
-          commit_message: auto-generated diagrams by GitHub Action after source code change
+          commit_message: auto-generated diagrams by GitHub Action after source code change
+
+      - name: "Run if no changes have been detected"
+        if: steps.auto-commit-action.outputs.changes_detected == 'false'
+        run: echo "No Changes!"
diff --git a/ImplementationGuide/markdown/UebergreifendeUseCases/AMTS/AMTS_Apx_AuszugAK.md b/ImplementationGuide/markdown/UebergreifendeUseCases/AMTS/AMTS_Apx_AuszugAK.md
diff --git a/ImplementationGuide/markdown/UebergreifendeUseCases/AMTS/AMTS_Diagramme.md b/ImplementationGuide/markdown/UebergreifendeUseCases/AMTS/AMTS_Diagramme.md
@@ -15,6 +15,16 @@ Da es sich um eine Zusammenfassung handelt, werden nur folgende Use Case und daf
 <img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/rc/main-stufe-4/Material/images/diagrams/AMTS_usecases.svg" alt="AMTS Use Cases" width="90%"/>
 **Anwendungsfälle AMTS**
 
+
+### Interkationen In der Versorgung
+
+Im Folgenden ist ein beispielhafter Versorgungsprozess aus dem [Auszug des IOP-Arbeitskreises](https://simplifier.net/guide/isik-medikation-v4/ImplementationGuide-markdown-UebergreifendeUseCases-AMTS#Anhang-I-Auszug) dargestellt, welcher der Erarbeitung diese Implemetierungsleitfadens zugrunde lag. Weitere Prozesse und Details finden sich im [Anhang](https://simplifier.net/guide/isik-medikation-v4/ImplementationGuide-markdown-UebergreifendeUseCases-AMTS#Anhang-I-Auszug).
+
+<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/rc/main-stufe-4/Material/images/AMTS_AuszugAK/Versorgungsprozess2.jpg" alt="Sturz mit stationärer Behandlung und hausärztlicher Weiterbehandlung" width="90%"/>
+
+**Beispielprozess: Sturz mit stationärer Behandlung und hausärztlicher Weiterbehandlung**
+
+
 ### Ressourcen Diagramm AMTS
 
 Im Folgenden wird ein grafischer Überblick über alle für diesen Übergreifenden Use Case (AMTS) profilierten Ressourcen gegeben.
@@ -34,9 +44,17 @@ Da es sich um eine Zusammenfassung handelt, werden nur folgende Profile und Feld
 <img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Basismodul/rc/main-stufe-4/Material/images/diagrams/amts_infomodell.svg" alt="Vereinfachtes AMTS Infomodell" width="90%"/>
 **Vereinfachtes Infomodell AMTS**
 
-### Interkationen In der Versorgung
 
-Im Folgenden ist ein beispielhafter Versorgungsprozess aus dem [Auszug des IOP-Arbeitskreises](https://simplifier.net/guide/isik-medikation-v4/ImplementationGuide-markdown-UebergreifendeUseCases-AMTS#Anhang-I-Auszug) dargestellt, welcher der Erarbeitung diese Implemetierungsleitfadens zugrunde lag. Weitere Prozesse und Details finden sich im [Anhang](https://simplifier.net/guide/isik-medikation-v4/ImplementationGuide-markdown-UebergreifendeUseCases-AMTS#Anhang-I-Auszug).
 
-<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/rc/main-stufe-4/Material/images/AMTS_AuszugAK/Versorgungsprozess2.jpg" alt="Sturz mit stationärer Behandlung und hausärztlicher Weiterbehandlung" width="90%"/>
-**Beispielprozess: Sturz mit stationärer Behandlung und hausärztlicher Weiterbehandlung**
+### Interaktionen im Rahmen AMTS
+
+Im Folgenden sind exemplarisch die Interaktionen für einen AMTS Pull und -Push im Sinne eines Businessprozesses modelliert.
+
+<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/rc/main-stufe-4/Material/images/bpnm/AMTS_pull.svg" class="center" alt="AMTS Pull" width="90%"/>
+
+**AMTS Pull**
+
+
+<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/rc/main-stufe-4/Material/images/bpnm/AMTS_push.svg" class="center" alt="AMTS Push" width="90%"/>
+
+**AMTS Push**
diff --git a/Material/images/diagrams/AMTS_pull.png b/Material/images/diagrams/AMTS_pull.png
diff --git a/Material/images/diagrams/AMTS_pull.svg b/Material/images/diagrams/AMTS_pull.svg
diff --git a/Material/images/diagrams/AMTS_push.svg b/Material/images/diagrams/AMTS_push.svg
diff --git a/Material/images/diagrams/amts_infomodell.svg b/Material/images/diagrams/amts_infomodell.svg
diff --git a/Material/images/src/bpmn/AMTS_pull.bpmn b/Material/images/src/bpmn/AMTS_pull.bpmn
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0bryh6e" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.20.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.20.0">
+  <bpmn:collaboration id="Collaboration_0c1jfzz">
+    <bpmn:participant id="Participant_0sp6c6m" name="Patientenführendes System" processRef="Process_03gpin0" />
+    <bpmn:participant id="Participant_1hk53bl" name="AMTS System" processRef="Process_1auc2jb" />
+    <bpmn:participant id="Participant_14ch1u6" name="LIS" processRef="Process_0qkrm6u" />
+    <bpmn:participant id="Participant_0x9zlvh" name="Med. Mgmt" processRef="Process_10uf7g8" />
+    <bpmn:messageFlow id="Flow_0zeouqo" name="PID" sourceRef="Event_0is5bbd" targetRef="Event_1vvsvg6" />
+    <bpmn:messageFlow id="Flow_0zmm5uw" sourceRef="Activity_19p8u3d" targetRef="Participant_14ch1u6" />
+    <bpmn:messageFlow id="Flow_12h284p" sourceRef="Participant_14ch1u6" targetRef="Activity_19p8u3d" />
+    <bpmn:messageFlow id="Flow_1k2v1rp" sourceRef="Activity_19p8u3d" targetRef="Participant_0x9zlvh" />
+    <bpmn:messageFlow id="Flow_0lwrza6" sourceRef="Participant_0x9zlvh" targetRef="Activity_19p8u3d" />
+    <bpmn:messageFlow id="Flow_15b47tb" sourceRef="Event_03nu3i1" targetRef="Event_10d65p3" />
+    <bpmn:messageFlow id="Flow_0olasuq" sourceRef="Activity_19p8u3d" targetRef="Participant_0sp6c6m" />
+    <bpmn:messageFlow id="Flow_0g3lx6l" sourceRef="Participant_0sp6c6m" targetRef="Activity_19p8u3d" />
+  </bpmn:collaboration>
+  <bpmn:process id="Process_03gpin0" isExecutable="true" camunda:historyTimeToLive="180">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_1etb5j3</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:userTask id="Activity_1oc2cx4" name="Start der AMTS Überprüfung">
+      <bpmn:incoming>Flow_1etb5j3</bpmn:incoming>
+      <bpmn:outgoing>Flow_01a0khr</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:intermediateThrowEvent id="Event_0is5bbd">
+      <bpmn:incoming>Flow_01a0khr</bpmn:incoming>
+      <bpmn:outgoing>Flow_0o3gkzp</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_18e4mjf" />
+    </bpmn:intermediateThrowEvent>
+    <bpmn:sequenceFlow id="Flow_1etb5j3" sourceRef="StartEvent_1" targetRef="Activity_1oc2cx4" />
+    <bpmn:sequenceFlow id="Flow_01a0khr" sourceRef="Activity_1oc2cx4" targetRef="Event_0is5bbd" />
+    <bpmn:sequenceFlow id="Flow_0o3gkzp" sourceRef="Event_0is5bbd" targetRef="Event_10d65p3" />
+    <bpmn:sequenceFlow id="Flow_10ialbe" sourceRef="Event_10d65p3" targetRef="Activity_13fl80t" />
+    <bpmn:sequenceFlow id="Flow_0mc1koa" sourceRef="Activity_13fl80t" targetRef="Event_0vmxtz5" />
+    <bpmn:intermediateCatchEvent id="Event_10d65p3">
+      <bpmn:incoming>Flow_0o3gkzp</bpmn:incoming>
+      <bpmn:outgoing>Flow_10ialbe</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_0amjbhd" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:task id="Activity_13fl80t" name="Darstellung des Ergebnis">
+      <bpmn:incoming>Flow_10ialbe</bpmn:incoming>
+      <bpmn:outgoing>Flow_0mc1koa</bpmn:outgoing>
+    </bpmn:task>
+    <bpmn:endEvent id="Event_0vmxtz5">
+      <bpmn:incoming>Flow_0mc1koa</bpmn:incoming>
+    </bpmn:endEvent>
+  </bpmn:process>
+  <bpmn:process id="Process_1auc2jb" isExecutable="false">
+    <bpmn:startEvent id="Event_1vvsvg6">
+      <bpmn:outgoing>Flow_0yv7cnt</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_1ir7jpd" />
+    </bpmn:startEvent>
+    <bpmn:subProcess id="Activity_19p8u3d" name="Abfrage benötigter Informationen">
+      <bpmn:incoming>Flow_0yv7cnt</bpmn:incoming>
+      <bpmn:outgoing>Flow_1mnj0io</bpmn:outgoing>
+    </bpmn:subProcess>
+    <bpmn:sequenceFlow id="Flow_0yv7cnt" sourceRef="Event_1vvsvg6" targetRef="Activity_19p8u3d" />
+    <bpmn:sequenceFlow id="Flow_1mnj0io" sourceRef="Activity_19p8u3d" targetRef="Activity_0kjryzq" />
+    <bpmn:endEvent id="Event_03nu3i1">
+      <bpmn:incoming>Flow_1vjmt1e</bpmn:incoming>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_1g25qb0" />
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Activity_0kjryzq" name="AMTS Überprüfung">
+      <bpmn:incoming>Flow_1mnj0io</bpmn:incoming>
+      <bpmn:outgoing>Flow_1vjmt1e</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="Flow_1vjmt1e" sourceRef="Activity_0kjryzq" targetRef="Event_03nu3i1" />
+  </bpmn:process>
+  <bpmn:process id="Process_0qkrm6u" isExecutable="false" />
+  <bpmn:process id="Process_10uf7g8" isExecutable="false" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0c1jfzz">
+      <bpmndi:BPMNShape id="Participant_0sp6c6m_di" bpmnElement="Participant_0sp6c6m" isHorizontal="true">
+        <dc:Bounds x="129" y="80" width="911" height="140" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="132" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1pys6n2_di" bpmnElement="Activity_1oc2cx4">
+        <dc:Bounds x="270" y="110" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0tuws9f_di" bpmnElement="Event_0is5bbd">
+        <dc:Bounds x="402" y="132" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0f225ri_di" bpmnElement="Event_10d65p3">
+        <dc:Bounds x="752" y="132" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_13fl80t_di" bpmnElement="Activity_13fl80t">
+        <dc:Bounds x="830" y="110" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0vmxtz5_di" bpmnElement="Event_0vmxtz5">
+        <dc:Bounds x="972" y="132" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1etb5j3_di" bpmnElement="Flow_1etb5j3">
+        <di:waypoint x="215" y="150" />
+        <di:waypoint x="270" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_01a0khr_di" bpmnElement="Flow_01a0khr">
+        <di:waypoint x="370" y="150" />
+        <di:waypoint x="402" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0o3gkzp_di" bpmnElement="Flow_0o3gkzp">
+        <di:waypoint x="438" y="150" />
+        <di:waypoint x="752" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_10ialbe_di" bpmnElement="Flow_10ialbe">
+        <di:waypoint x="788" y="150" />
+        <di:waypoint x="830" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0mc1koa_di" bpmnElement="Flow_0mc1koa">
+        <di:waypoint x="930" y="150" />
+        <di:waypoint x="972" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Participant_1hk53bl_di" bpmnElement="Participant_1hk53bl" isHorizontal="true">
+        <dc:Bounds x="129" y="240" width="911" height="130" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0n9j1ry_di" bpmnElement="Event_1vvsvg6">
+        <dc:Bounds x="402" y="282" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1qt5zy7_di" bpmnElement="Event_03nu3i1">
+        <dc:Bounds x="752" y="282" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_01vcbra_di" bpmnElement="Activity_0kjryzq">
+        <dc:Bounds x="620" y="260" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0dsa5ke_di" bpmnElement="Activity_19p8u3d">
+        <dc:Bounds x="490" y="260" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0yv7cnt_di" bpmnElement="Flow_0yv7cnt">
+        <di:waypoint x="438" y="300" />
+        <di:waypoint x="490" y="300" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1mnj0io_di" bpmnElement="Flow_1mnj0io">
+        <di:waypoint x="590" y="300" />
+        <di:waypoint x="620" y="300" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1vjmt1e_di" bpmnElement="Flow_1vjmt1e">
+        <di:waypoint x="720" y="300" />
+        <di:waypoint x="752" y="300" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Participant_14ch1u6_di" bpmnElement="Participant_14ch1u6" isHorizontal="true">
+        <dc:Bounds x="129" y="390" width="911" height="60" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_11uz06l" bpmnElement="Participant_0x9zlvh" isHorizontal="true">
+        <dc:Bounds x="129" y="470" width="911" height="60" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0zeouqo_di" bpmnElement="Flow_0zeouqo">
+        <di:waypoint x="420" y="168" />
+        <di:waypoint x="420" y="282" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="430" y="174" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0zmm5uw_di" bpmnElement="Flow_0zmm5uw">
+        <di:waypoint x="530" y="340" />
+        <di:waypoint x="530" y="390" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_12h284p_di" bpmnElement="Flow_12h284p">
+        <di:waypoint x="550" y="390" />
+        <di:waypoint x="550" y="340" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1k2v1rp_di" bpmnElement="Flow_1k2v1rp">
+        <di:waypoint x="510" y="340" />
+        <di:waypoint x="510" y="470" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0lwrza6_di" bpmnElement="Flow_0lwrza6">
+        <di:waypoint x="570" y="470" />
+        <di:waypoint x="570" y="340" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_15b47tb_di" bpmnElement="Flow_15b47tb">
+        <di:waypoint x="770" y="282" />
+        <di:waypoint x="770" y="168" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0olasuq_di" bpmnElement="Flow_0olasuq">
+        <di:waypoint x="530" y="260" />
+        <di:waypoint x="530" y="220" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0g3lx6l_di" bpmnElement="Flow_0g3lx6l">
+        <di:waypoint x="550" y="220" />
+        <di:waypoint x="550" y="260" />
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1y1jdj4">
+    <bpmndi:BPMNPlane id="BPMNPlane_0x0swud" bpmnElement="Activity_19p8u3d" />
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>