From 42d59bd2a7e3e7f855e98e23ca122815090fc9da Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Mon, 12 Dec 2022 15:59:47 +0100
Subject: [PATCH 01/10] Added timestamp for periode of leave

index.md: updated description
Encounter-intro.md: added a description of timestamps
MedComHospitalNotificationLeavePeriodExtension.fsh: created the file and added content
MedComHospitalNotificationEncounter.fsh: added a reference to the MedComHospitalNotificationLeavePeriodExtension, the rule medcom-hospitalNotification-6 and udpated examples
---
 _genonce.sh                                   |  2 ++
 ig.ini                                        |  2 +-
 .../MedComHospitalNotificationEncounter.fsh   | 12 ++++++++
 ...spitalNotificationLeavePeriodExtension.fsh |  9 ++++++
 ...om-hospitalNotification-encounter-intro.md | 26 +++++++++++++++++
 input/pagecontent/index.md                    | 29 ++++++-------------
 sushi-config.yaml                             |  2 +-
 7 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 input/fsh/MedComHospitalNotificationLeavePeriodExtension.fsh

diff --git a/_genonce.sh b/_genonce.sh
index 38efcb4..4f981f0 100755
--- a/_genonce.sh
+++ b/_genonce.sh
@@ -14,6 +14,8 @@ fi
 
 echo "$txoption"
 
+export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8"
+
 publisher=$input_cache_path/$publisher_jar
 if test -f "$publisher"; then
 	java -jar $publisher -ig . $txoption $*
diff --git a/ig.ini b/ig.ini
index bb6fb57..ed934d5 100644
--- a/ig.ini
+++ b/ig.ini
@@ -1,3 +1,3 @@
 [IG]
 ig = fsh-generated/resources/ImplementationGuide-medcom.fhir.dk.hospitalnotification.json
-template = medcom.fhir.template#dev
\ No newline at end of file
+template = https://github.com/medcomdk/medcom-ig-template
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationEncounter.fsh b/input/fsh/MedComHospitalNotificationEncounter.fsh
index 92999dc..642d104 100644
--- a/input/fsh/MedComHospitalNotificationEncounter.fsh
+++ b/input/fsh/MedComHospitalNotificationEncounter.fsh
@@ -24,6 +24,7 @@ Description: "Encounter derivation that handles hospital notification when a pat
 * period 1.. MS
 * period ^definition = "The start and end time of the encounter. For notification of hospitalization an start interval is always known as the notification of adminssion is trigged by the arrival of a patient. There a period will always exist as the notification of admission always starts the communication flow. Please that the encounter.period values always referes to the encounter start and end. The period of the leave of absence is not part of the notification of hospitalization FHIR resource ."
 * period.start 1.. MS
+* period.end MS
 * period.start ^definition = "Encounter Starting time.  \r\nFor the notificationOfHospitalization a starting time is the timestamp that is registered by the hospital at patient physical arrival at the ward or emergency department."
 * length ..0
 * reasonCode ..0
@@ -34,6 +35,14 @@ Description: "Encounter derivation that handles hospital notification when a pat
 * location ..0
 * serviceProvider 1.. MS
 * partOf ..0
+* extension contains medcom-hospitalnotifiation-leave-period-extension named leavePeriod 0..1 MS SU
+* obeys medcom-hospitalNotification-6
+
+Invariant: medcom-hospitalNotification-6
+Description: "When the status = 'onleave', the timestamp for beginning of a leave (extension.valuePeriod.start) shall be present."
+Severity: #error
+Expression: "where(status = 'onleave').extension.value.start.exists() or status != 'onleave'"
+
 
 // All use cases associated with inpatient hospitalization
 Instance: a790f964-88d3-4652-bbc8-81d2f3d035f8
@@ -79,6 +88,7 @@ Description: "Example of HospitalNoticication inpatient Encounter on leave with
 * subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
 * period.start = 2022-09-01T12:00:05Z
+* extension[leavePeriod].valuePeriod.start = 2022-09-04T14:00:30Z
 * serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 Instance: e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b
@@ -90,6 +100,8 @@ Description: "Example of HospitalNoticication inpatient Encounter End leave with
 * subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
 * period.start = 2022-09-01T12:00:05Z
+* extension[leavePeriod].valuePeriod.start = 2022-09-04T14:00:30Z
+* extension[leavePeriod].valuePeriod.end = 2022-09-05T15:00:10Z
 * serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 Instance: f405ba2d-467a-4e92-9acc-9dc2a629760f
diff --git a/input/fsh/MedComHospitalNotificationLeavePeriodExtension.fsh b/input/fsh/MedComHospitalNotificationLeavePeriodExtension.fsh
new file mode 100644
index 0000000..8f48953
--- /dev/null
+++ b/input/fsh/MedComHospitalNotificationLeavePeriodExtension.fsh
@@ -0,0 +1,9 @@
+Extension: MedComHospitalNotificationLeavePeriodExtension
+Id: medcom-hospitalnotifiation-leave-period-extension
+Title: "MedComHospitalNotificationLeavePeriodExtension"
+Description: "Includes timestamps for start and end of leave of a hospitalization."
+* valuePeriod MS
+* valuePeriod.start 1.. MS
+* valuePeriod.start ^short = "Describes the beginning of a period of leave."
+* valuePeriod.end MS
+* valuePeriod.end ^short = "Describes the end of a period of leave."
diff --git a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
index 3b641fe..31dae91 100644
--- a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
@@ -19,3 +19,29 @@ The sender of a HospitalNotification (MessageHeader.sender) and the serviceProvi
 
 [An example of different serviceProvider and sender organisation can be found here](http://medcomfhir.dk/ig/hospitalnotification/Bundle-m908i967-9ie3-9023-b9ec-98108695f01d.html). Other examples will have the same organisation as serviceProvider and sender.
 
+### Timestamps 
+
+The Encounter profile contains four timestamps each representing a different time during a hospitalisation. Common for the four timestamps is that they represent the time of the event, e.g. the patient's physical attendance at the hospital (Encounter.period.start) or the patient leaves the hospital for to go on leave (Encounter.extension:leavePeriod.start).  
+
+|FHIR-element|Description|Event|See example [MISSING LINKS]|
+|-----|------|------| ------| 
+|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|HospitalNotification Encounter - STIN|
+|Encounter.period.end|End hospital stay, i.e. the actual end of the meeting between the health care professional and patient|Patient leaves the hospital after discharge or when a patient dies (on arrival or during hospital stay)| HospitalNotification Encounter - SLHJ and HospitalNotification Encounter - MORS|
+|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital for to go on leave.|HospitalNotification Encounter - STOR|
+|Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period, when the patient returns to the hospital|Patient is physical attendant at the hospital after a period of leave|HospitalNotification Encounter - SLOR|
+
+#### Start and end of hospital stay
+As described above, the timestamp of start and end of hospital stay are included in the element Encounter.period.start and Encounter.period.end, respectively. 
+Encounter.period.start shall always be present, despite it is not a start hospital stay HospitalNotification being sent. 
+
+In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall be given a new Encounter.period.start representing the time of the cahnge in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
+
+#### Leave
+To express the timestamps for a period of leave, the MedComHospitalNotificationLeavePeriodExtension shall be used. 
+
+When a patient goes on leave the Encounter.extension:leavePeriod.start shall be used, and when the patient returns from leave both Encounter.extension:leavePeriod.start and Encounter.extension:leavePeriod.end shall be present. 
+
+The cardinality of MedComHospitalNotificationLeavePeriodExtension is 0..1 meaning that only one period of leave can be included in a HospitalNotification to avoid confusion about which period of leave is the current. In case a patient goes on leave several times during the same hospitalisation, the period shall be described in separate HospitalNotifications, that are being sent when each period of leave occurs. 
+
+#### Death
+When a patient dies either on arrival or during hospital stay, the timestamp Encounter.period.end represents the time the encounter ended i.e the time of death. The Encounter.period.start shall also be populated. If a patient dies either on arrival Encounter.period.start shall be equal to Encounter.period.end and if the dies during hospital stay Encounter.period.start shall represent the acutal beginning of the hospital stay. A HospitalNotification can only be interpreted as describing a deceased patient when the element Patient.deaceased = 'true'.  
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index f01476b..1494aa6 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -47,26 +47,15 @@ The [MedComMessagingOrganization](http://medcomfhir.dk/ig/messaging/StructureDef
 
 #### Timestamps 
 
-The HospitalNotification message contains five timestamps that representes at different times during the patient's hospital stay and message delivery:
-
-* Encounter.period.start
-* Encounter.period.end
-* Bundle.timestamp
-* Provenance.occuredDateTime[x]
-* Provenance.recorded.
- 
-**Admitting a patient**: 
-When the patient arrives at a hospital, the hospital staff admits the patient and the first timestamp, **Encounter.period.start**,  is registered. Please notice that the Encounter.period.start does not change during the citizen's hospital stay.
-Immediately after the hospital staff admits the patient to the hospital, the HospitalNotification for admission is generated and **Bundle.timestamp** is registered. When the HospitalNotification is sent to the municipality the **Provenance.occuredDateTime[x]** and **Provenance.recorded** timestamps are registered. Note that the Provenance.occuredDateTime[x] is a human redable, where Provenance.recorded is a system readable timestamp. 
-The most precise timestamp for the admission is **Encounter.period.start**.
-
-**Discharge a patient**:
-When the patient is ready to be discharged from the hospital, the hospital staff completes the discharge form and the **Encounter.period.end** is registered. Immediately after the hospital staff completed the discharge form, a HospitalNotification for discharge is generated and the **Bundle.timestamp** is registered. When the discharge HospitalNotification is sent the municipality the **Provenance.occuredDateTime[x]** and **Provenance.recorded** timestamps are registered. 
-The most precise timestamp for the discharge will be **Encounter.period.end**.
-
-**Periods of leave**:
-When a patient is onleave or ends onleave a HospitalNotification message is sent, but no timestamp will be registered in the Encounter resource. Immediately after onleave or ends onleave is registered by the hospital staff, a HospitalNotification message is generated and the **Bundle.timestamp** is registered. When the onleave or end onleave HospitalNotification message is sent to the municipality the **Provenance.occuredDateTime[x]** and **Provenance.recorded** timestamps are registered. 
-The most precise timestamp for onleave or end onleave is **Provenance.occuredDateTime[x]**. This timestamp has the same data structure as in the timestamp for admitting and discharging a patient, why it is recommended over the Bundle.timestamp and Provenance.recorded.
+HospitalNotification messages are generated and sent based on real-time registration in the EPR/PAS system. So, in case the EPR allows future registrations of planned contacts or a period of leave, the HospitalNotifications shall only be triggered when the event occurs, i.e. at the patient's physical attendance, as described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application). 
+
+The HospitalNotification message contains several timestamps. These timestamps are present in the profiles MedComHospitalNotificationEncounter, MedComHospitalNotificationMessage and MedComMessagingProvenance and have different purposes: 
+
+* Encounter-timestamps represent the time of an event. [The usage of these timestamps are more thoroughly described here.](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-encounter.html)
+* Bundle.timestamp represents the time bundle is generated.
+* Provenance.occuredDateTime[x] represents the time the HospitalNotification is sent, in a human-readable time
+* Provenance.recorded represents the time the HospitalNotification is sent, in a machine-readable time
+
 
 #### IDs
 
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 6936bc9..0750950 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -3,7 +3,7 @@ canonical: http://medcomfhir.dk/ig/hospitalnotification
 name: MedComHospitalNotification
 title: "DK MedCom HospitalNotification"
 description: The DK MedCom HospitalNotification IG
-status: active
+status: draft
 version: "2.0.0"
 fhirVersion: 4.0.1
 copyrightYear: 2021+

From b9b422dfc3e7758ce28e489dc2a9119cdcb856c2 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:09:18 +0100
Subject: [PATCH 02/10] Update sushi-config.yaml

---
 sushi-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sushi-config.yaml b/sushi-config.yaml
index 0750950..6266c6f 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -14,8 +14,8 @@ publisher:
 jurisdiction: urn:iso:std:iso:3166#DK "Denmark"
 dependencies:
   hl7.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.messaging: 2.0.0
+  medcom.fhir.dk.core: current #2.0.0
+  medcom.fhir.dk.messaging: current #2.0.0
 
 menu:
   Table of Contents: toc.html

From 5dd8f063859ec0e711f40ab69f351875761a40ee Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:13:18 +0100
Subject: [PATCH 03/10] Update ig.ini

---
 ig.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ig.ini b/ig.ini
index ed934d5..bfc8496 100644
--- a/ig.ini
+++ b/ig.ini
@@ -1,3 +1,3 @@
 [IG]
 ig = fsh-generated/resources/ImplementationGuide-medcom.fhir.dk.hospitalnotification.json
-template = https://github.com/medcomdk/medcom-ig-template
\ No newline at end of file
+template = fhir.base.template #https://github.com/medcomdk/medcom-ig-template
\ No newline at end of file

From 8963968df77bd2ddec1400757d32be39d5be6755 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:16:30 +0100
Subject: [PATCH 04/10] Update ig.ini

---
 ig.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ig.ini b/ig.ini
index bfc8496..b652232 100644
--- a/ig.ini
+++ b/ig.ini
@@ -1,3 +1,3 @@
 [IG]
 ig = fsh-generated/resources/ImplementationGuide-medcom.fhir.dk.hospitalnotification.json
-template = fhir.base.template #https://github.com/medcomdk/medcom-ig-template
\ No newline at end of file
+template = fhir.base.template#current
\ No newline at end of file

From 3dcdedc43e300b9ab05c924fce4448c06cdc5d72 Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Tue, 13 Dec 2022 08:24:00 +0100
Subject: [PATCH 05/10] ' added

---
 input/pagecontent/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index 1494aa6..a94124b 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -57,7 +57,7 @@ The HospitalNotification message contains several timestamps. These timestamps a
 * Provenance.recorded represents the time the HospitalNotification is sent, in a machine-readable time
 
 
-#### IDs
+#### ID's
 
 All profiles shall have a global unique id by using an UUID. [Read more about the use of ids here](https://medcomdk.github.io/MedCom-FHIR-Communication/assets/documents/052.2_MessageHeader_Identifiers_Timestamps.html).
 

From 00df31c51538257861fcb855eb8fe89d5ba0e6aa Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Tue, 13 Dec 2022 14:37:25 +0100
Subject: [PATCH 06/10] Update index.md

Added description after internal review
---
 input/pagecontent/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index a94124b..d34ca3e 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -51,7 +51,7 @@ HospitalNotification messages are generated and sent based on real-time registra
 
 The HospitalNotification message contains several timestamps. These timestamps are present in the profiles MedComHospitalNotificationEncounter, MedComHospitalNotificationMessage and MedComMessagingProvenance and have different purposes: 
 
-* Encounter-timestamps represent the time of an event. [The usage of these timestamps are more thoroughly described here.](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-encounter.html)
+* Encounter-timestamps represent the time of an event. For receiving systems, this is the timestamps that must be displayed for the end user in the HospitalNotification as ‘date and time of start/end for the event’. [The usage of these timestamps is more thoroughly described here.](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-encounter.html)
 * Bundle.timestamp represents the time bundle is generated.
 * Provenance.occuredDateTime[x] represents the time the HospitalNotification is sent, in a human-readable time
 * Provenance.recorded represents the time the HospitalNotification is sent, in a machine-readable time

From 62e23cf905419d3984482267e988f697d6efefd2 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Tue, 13 Dec 2022 14:44:08 +0100
Subject: [PATCH 07/10] Update
 StructureDefinition-medcom-hospitalNotification-encounter-intro.md

Updated after internal review
---
 ...tion-medcom-hospitalNotification-encounter-intro.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
index 31dae91..12c3e52 100644
--- a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
@@ -21,20 +21,20 @@ The sender of a HospitalNotification (MessageHeader.sender) and the serviceProvi
 
 ### Timestamps 
 
-The Encounter profile contains four timestamps each representing a different time during a hospitalisation. Common for the four timestamps is that they represent the time of the event, e.g. the patient's physical attendance at the hospital (Encounter.period.start) or the patient leaves the hospital for to go on leave (Encounter.extension:leavePeriod.start).  
+The Encounter profile contains four timestamps each representing a different time during a hospitalisation. Common for the four timestamps is that they represent the time of the event, e.g. the patient's physical attendance at the hospital (Encounter.period.start) or a patient going on leave from the hospital  (Encounter.extension:leavePeriod.start).  
 
 |FHIR-element|Description|Event|See example [MISSING LINKS]|
 |-----|------|------| ------| 
-|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|HospitalNotification Encounter - STIN|
+|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|HospitalNotification Encounter - STIN and HospitalNotification Encounter - STAA|
 |Encounter.period.end|End hospital stay, i.e. the actual end of the meeting between the health care professional and patient|Patient leaves the hospital after discharge or when a patient dies (on arrival or during hospital stay)| HospitalNotification Encounter - SLHJ and HospitalNotification Encounter - MORS|
-|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital for to go on leave.|HospitalNotification Encounter - STOR|
+|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital to go on leave.|HospitalNotification Encounter - STOR|
 |Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period, when the patient returns to the hospital|Patient is physical attendant at the hospital after a period of leave|HospitalNotification Encounter - SLOR|
 
 #### Start and end of hospital stay
 As described above, the timestamp of start and end of hospital stay are included in the element Encounter.period.start and Encounter.period.end, respectively. 
 Encounter.period.start shall always be present, despite it is not a start hospital stay HospitalNotification being sent. 
 
-In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall be given a new Encounter.period.start representing the time of the cahnge in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
+In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall result in a new instance of the Encounter profile and be given a new Encounter.period.start representing the time of the change in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
 
 #### Leave
 To express the timestamps for a period of leave, the MedComHospitalNotificationLeavePeriodExtension shall be used. 
@@ -44,4 +44,4 @@ When a patient goes on leave the Encounter.extension:leavePeriod.start shall be
 The cardinality of MedComHospitalNotificationLeavePeriodExtension is 0..1 meaning that only one period of leave can be included in a HospitalNotification to avoid confusion about which period of leave is the current. In case a patient goes on leave several times during the same hospitalisation, the period shall be described in separate HospitalNotifications, that are being sent when each period of leave occurs. 
 
 #### Death
-When a patient dies either on arrival or during hospital stay, the timestamp Encounter.period.end represents the time the encounter ended i.e the time of death. The Encounter.period.start shall also be populated. If a patient dies either on arrival Encounter.period.start shall be equal to Encounter.period.end and if the dies during hospital stay Encounter.period.start shall represent the acutal beginning of the hospital stay. A HospitalNotification can only be interpreted as describing a deceased patient when the element Patient.deaceased = 'true'.  
+When a patient dies either on arrival or during hospital stay, the timestamp Encounter.period.end represents the time the encounter ended i.e the time of death. The Encounter.period.start shall also be populated. If a patient dies either on arrival Encounter.period.start shall be equal to Encounter.period.end and if the patient dies during hospital stay Encounter.period.start shall represent the actual beginning of the hospital stay. A HospitalNotification can only be interpreted as describing a deceased patient when the element Patient.deaceased = 'true'.  

From 0d120a9254e532672ad1b10be406e8d7ed97ca59 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Thu, 22 Dec 2022 13:47:53 +0100
Subject: [PATCH 08/10] Examples are updated, added simplified examples and
 made few linguistic changes

---
 input/fsh/GeneralInstances.fsh                | 356 +++++++++++++++--
 ...ospitalNotificationProvenanceInstances.fsh | 143 ++++---
 .../MedComHospitalNotificationEncounter.fsh   | 120 +++---
 .../fsh/MedComHospitalNotificationMessage.fsh | 213 ++++-------
 ...edComHospitalNotificationMessageHeader.fsh | 105 ++---
 .../HNAdmitEnteredInError.svg                 |  18 +-
 .../hospitalnotification/HNAdmitInPat.svg     | 254 ++----------
 .../HNcancelEnteredInError.svg                | 234 +++++++++++
 .../hospitalnotification/HNdeceasedInPat.svg  | 236 ++++++++++++
 .../hospitalnotification/HNdischargeInPat.svg | 234 +++++++++++
 .../hospitalnotification/HNendOnleave.svg     | 272 +++++++++++++
 .../hospitalnotification/HNstartOnleave.svg   | 240 ++++++++++++
 ...om-hospitalNotification-encounter-intro.md |  14 +-
 input/pagecontent/index.md                    |  50 ++-
 puml/HospitalNotificationAdmit.puml           |  95 +++++
 ...spitalNotificationAdmitEnteredInError.puml | 148 ++-----
 puml/HospitalNotificationAdmitFinish.puml     | 177 ---------
 ...italNotificationAdmitOnleaveEndFinish.puml | 362 ------------------
 puml/HospitalNotificationDischarge.puml       | 106 +++++
 puml/HospitalNotificationEndOnleave.puml      | 124 ++++++
 puml/HospitalNotificationMors.puml            | 107 ++++++
 puml/HospitalNotificationStartOnleave.puml    | 109 ++++++
 sushi-config.yaml                             |   5 +-
 23 files changed, 2464 insertions(+), 1258 deletions(-)
 create mode 100644 input/images/hospitalnotification/HNcancelEnteredInError.svg
 create mode 100644 input/images/hospitalnotification/HNdeceasedInPat.svg
 create mode 100644 input/images/hospitalnotification/HNdischargeInPat.svg
 create mode 100644 input/images/hospitalnotification/HNendOnleave.svg
 create mode 100644 input/images/hospitalnotification/HNstartOnleave.svg
 create mode 100644 puml/HospitalNotificationAdmit.puml
 delete mode 100644 puml/HospitalNotificationAdmitFinish.puml
 delete mode 100644 puml/HospitalNotificationAdmitOnleaveEndFinish.puml
 create mode 100644 puml/HospitalNotificationDischarge.puml
 create mode 100644 puml/HospitalNotificationEndOnleave.puml
 create mode 100644 puml/HospitalNotificationMors.puml
 create mode 100644 puml/HospitalNotificationStartOnleave.puml

diff --git a/input/fsh/GeneralInstances.fsh b/input/fsh/GeneralInstances.fsh
index 03a2ba2..09b71e0 100644
--- a/input/fsh/GeneralInstances.fsh
+++ b/input/fsh/GeneralInstances.fsh
@@ -1,45 +1,355 @@
-// MedComCorePatient instance
+// MedComCorePatient instance - STIN
 Instance: t33cef33-3626-422b-955d-d506aaa65fe1
 InstanceOf: MedComCorePatient
-Title: "Bruno Test Elmer"
-Description: "Patient described with minimal information. Valid only if used in a Bundle."
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
 * identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
 * identifier[cpr].value = "2509479989"
 * name[official].use = #official
 * name[official].family = "Elmer"
 
-Instance: t82fb8a3-6725-41e2-a615-2b1cfcfe9931
+
+// Reciever instance
+Instance: o4cdf292-abf3-4f5f-80ea-60a48013ff6d
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital"
+
+
+// MedComCorePatient instance - RE-STIN
+Instance: 48393486-81c6-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: 8858e7e6-81c6-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: abb09e14-81c6-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital"
+
+
+// MedComCorePatient instance - AN-STIN
+Instance: d6eeaca6-81c6-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: eefc2dfa-81c6-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 05266a00-81c7-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital"
+
+// MedComCorePatient instance - STOR
+Instance: 97404d10-81c8-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: a39d4a04-81c8-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: b79a7914-81c8-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - SLOR  
+Instance: 519d5170-81ca-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: 55ba5884-81ca-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 5961ade8-81ca-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - SLHJ (inpatient)  
+Instance: 6841b54e-81cd-11ed-a1eb-0242ac120002
 InstanceOf: MedComCorePatient
-Title: "Bruno Test Elmer"
-Description: "Deceased patient described with minimal information. Valid only if used in a Bundle."
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: 7e692262-81cd-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 8d813af0-81cd-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - MORS
+Instance: t82fb8a3-6725-41e2-a615-2b1cfcfe9931 // MORS
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer (deceased)"
+Description: "Example of a MedComCorePatient who is deceased and with minimal information. Only valid if used in a Bundle."
+Usage: #definition
 * identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
 * identifier[cpr].value = "2509479989"
 * name[official].use = #official
 * name[official].family = "Elmer"
 * deceasedBoolean = true
 
-// Service provider instance
-Instance: of839e87-4e44-4977-b38e-92b5a6f187b5
-InstanceOf: MedComCoreOrganization
-Title: "Example of a service provider organization with a SOR."
-Description: "Example of an organization with a SOR."
-* identifier[SOR-ID].value = "399841000016000"
-* name = "Service provider Organization"
+// Reciever instance
+Instance: 753bdcba-81ce-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 840b4046-81ce-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - STAA
+Instance: fdc1fc66-81d0-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
 
 // Reciever instance
-Instance: o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-InstanceOf: MedComMessagingOrganization // Odense Kommune, Beskæftigelses- og Socialforvaltningen
-Title: "Example of a reciever organization with a SOR and an EAN identifier."
-Description: "Example of an organization with a SOR and an EAN identifier."
+Instance: 103fbebe-81d1-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
 * identifier[SOR-ID].value = "953741000016009" 
 * identifier[EAN-ID].value = "5790001348120" 
-* name = "Receiver Organization"
+* name = "Plejecenter Herlev"
 
 // Sender instance
-Instance: o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-InstanceOf: MedComMessagingOrganization // Region Syddanmark, OUH FS Operationsafsnit
-Title: "Example of a sender organization with a SOR and an EAN identifier."
-Description: "Example of an organization with a SOR and an EAN identifier."
+Instance: 1f5882b4-81d1-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
 * identifier[SOR-ID].value = "265161000016000" 
 * identifier[EAN-ID].value = "5790000209354" 
-* name = "Sender Organization"
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - SLHJ (Acute ambulant)
+Instance: 6c16f41e-81d1-11ed-a1eb-0242ac120002
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: e5682f5e-81d1-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 0465ec66-81d2-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - MORS (Acute ambulant)
+Instance: 384b4a58-81d2-11ed-a1eb-0242ac120002 // MORS
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Example of a MedComCorePatient who is deceased and with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+* deceasedBoolean = true
+
+// Reciever instance
+Instance: 55eb90b8-81d2-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: 66c12a92-81d2-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+// MedComCorePatient instance - STIN - different serviceprovider
+Instance: b00ea1c0-81d2-11ed-a1eb-0242ac120002 // MORS
+InstanceOf: MedComCorePatient
+Title: "Patient - Bruno Test Elmer"
+Description: "Deceased Example of a MedComCorePatient with minimal information. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[cpr].system = "urn:oid:1.2.208.176.1.2"
+* identifier[cpr].value = "2509479989"
+* name[official].use = #official
+* name[official].family = "Elmer"
+
+// Reciever instance
+Instance: bea5b49e-81d2-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Receiver organization - Plejecenter Herlev."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "953741000016009" 
+* identifier[EAN-ID].value = "5790001348120" 
+* name = "Plejecenter Herlev"
+
+// Sender instance
+Instance: cd72967c-81d2-11ed-a1eb-0242ac120002
+InstanceOf: MedComMessagingOrganization  
+Title: "Sender organization - Hjerteafdelingen på Herlev og Gentofte hospital."
+Description: "Example of a MedComMessagingOrganization with SOR and EAN identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "265161000016000" 
+* identifier[EAN-ID].value = "5790000209354" 
+* name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+
+
+// Service provider instance
+Instance: of839e87-4e44-4977-b38e-92b5a6f187b5
+InstanceOf: MedComCoreOrganization
+Title: "ServiceProvider organization - Hjertemedicinsk sengeafs. S103"
+Description: "Example of a MedComCoreOrganization with SOR identifier. Only valid if used in a Bundle."
+Usage: #definition
+* identifier[SOR-ID].value = "399841000016000"
+* name = "Hjertemedicinsk sengeafs. S103"
\ No newline at end of file
diff --git a/input/fsh/HospitalNotificationProvenanceInstances.fsh b/input/fsh/HospitalNotificationProvenanceInstances.fsh
index 63fb618..4da6a18 100644
--- a/input/fsh/HospitalNotificationProvenanceInstances.fsh
+++ b/input/fsh/HospitalNotificationProvenanceInstances.fsh
@@ -2,87 +2,94 @@
 // Admit instance
 Instance: a7cf3888-6f42-4e4d-929c-d2475d24fba0
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - STIN"
-Description: "HospitalNotification Provenance - STIN. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - STIN"
+Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-09-01T12:00:30Z
-* recorded = 2022-09-01T12:00:30Z
+* occurredDateTime = 2022-12-07T12:00:02Z
+* recorded = 2022-12-07T12:00:02Z
 * activity.coding = $ActivityCode#admit-inpatient
 * agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 // Revise admit instance
 Instance: b5f7de8c-957a-11ec-b909-0242ac120002
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - RE_STIN"
-Description: "HospitalNotification Provenance. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - RE_STIN"
+Description: "Example of MedComMessagingProvenance used in 'Revise Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(cc47c1e2-78e6-4291-b071-f423a4f7fbfe) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-09-01T14:00:30Z
-* recorded = 2022-09-01T14:00:30Z
+* occurredDateTime = 2022-12-07T14:00:02Z
+* recorded = 2022-12-07T14:00:02Z
 * activity.coding = $ActivityCode#revise-admit-inpatient 
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(abb09e14-81c6-11ed-a1eb-0242ac120002)
 * entity.role = #revision
 * entity.what = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404)
 
 // Cancel admit instance
 Instance: c67ecb1c-957a-11ec-b909-0242ac120002
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - AN_STIN"
-Description: "HospitalNotification Provenance. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - AN_STIN"
+Description: "Example of MedComMessagingProvenance used in 'Cancellation Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(d8749b54-1aeb-4089-8941-8d876bdffc51) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-09-01T15:00:30Z
-* recorded = 2022-09-01T15:00:30Z
+* occurredDateTime = 2022-12-07T15:00:02Z
+* recorded = 2022-12-07T15:00:02Z
 * activity.coding = $ActivityCode#cancel-admit-inpatient
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(05266a00-81c7-11ed-a1eb-0242ac120002)
 * entity.role = #removal
 * entity.what = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404)
 
 //start leave
 Instance: dc421d0a-cded-470f-9a53-2ddba7583baa
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - STOR"
-Description: "HospitalNotification Provenance - STOR. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - STOR"
+Description: "Example of MedComMessagingProvenance used in 'Start leave'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(e563a2b2-bf92-4b13-bbd2-0a021a95bded)
-* occurredDateTime = 2022-09-04T14:00:30Z
-* recorded = 2022-09-04T14:00:30Z
+* occurredDateTime = 2022-12-13T14:00:12Z
+* recorded = 2022-12-13T14:00:12Z
 * activity.coding = $ActivityCode#start-leave-inpatient
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(b79a7914-81c8-11ed-a1eb-0242ac120002)
 * entity.role = #revision
 * entity.what = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404)
 
 // End leave example
 Instance: e4db4939-7c60-4ac6-aefc-523f809ccba6
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - SLOR"
-Description: "HospitalNotification Provenance - SLOR. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - SLOR"
+Description: "Example of MedComMessagingProvenance used in 'End leave'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(f47254da-f170-46f0-b624-4778a9c92b1f)
-* occurredDateTime = 2022-09-05T15:00:30Z
-* recorded = 2022-09-05T15:00:30Z
+* occurredDateTime = 2022-12-14T15:30:02Z
+* recorded = 2022-12-14T15:30:02Z
 * activity.coding = $ActivityCode#end-leave-inpatient
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(5961ade8-81ca-11ed-a1eb-0242ac120002)
 * entity.role = #revision
 * entity.what = Reference(e563a2b2-bf92-4b13-bbd2-0a021a95bded)
 
 // discharge inpatient
 Instance: f710698c-83eb-4c3e-81c8-fe8e40baf524
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - SLHJ (inpatient)"
-Description: "HospitalNotification Provenance  - SLHJ (inpatient). The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - SLHJ (inpatient)"
+Description: "Example of MedComMessagingProvenance used in 'End hospital stay - patient completed to home/primary sector' (inpatient). Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(g1affa53-c157-4080-abb0-8e681524f969)
-* occurredDateTime = 2022-09-30T09:00:53Z
-* recorded = 2022-09-30T09:00:53Z
+* occurredDateTime = 2022-12-18T09:45:32Z
+* recorded = 2022-12-18T09:45:32Z
 * activity.coding = $ActivityCode#discharge-inpatient-home
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(8d813af0-81cd-11ed-a1eb-0242ac120002)
 * entity.role = #revision
-* entity.what = Reference(e563a2b2-bf92-4b13-bbd2-0a021a95bded)
+* entity.what = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404)
 
  // patient is deceased
 Instance: g9942adb-197a-4e30-bec8-566e3a113efe
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - MORS (inpatient)"
-Description: "HospitalNotification Provenance - MORS (inpatient). The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - MORS (inpatient)"
+Description: "Example of MedComMessagingProvenance used in 'Deceased' (inpatient). Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(hefc6d95-6161-4493-99c9-f359488dedb8)
-* occurredDateTime = 2022-09-30T09:00:53Z
-* recorded = 2022-09-30T09:00:53Z
+* occurredDateTime = 2022-12-09T09:45:32Z
+* recorded = 2022-12-09T09:45:32Z
 * activity.coding = $ActivityCode#admit-inpatient
 * agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d) 
 * entity.role = #revision
@@ -93,73 +100,53 @@ Description: "HospitalNotification Provenance - MORS (inpatient). The Provenance
 // Admit instance
 Instance: h60bd482-9c47-43c5-9b77-1134eaa2d5f0
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - STAA"
-Description: "HospitalNotification Provenance - STAA. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - STAA"
+Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - acute ambulant'. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-10-01T10:00:30Z
-* recorded = 2022-10-01T10:00:30Z
+* occurredDateTime = 2022-12-01T10:00:06Z
+* recorded = 2022-12-01T10:00:06Z
 * activity.coding = $ActivityCode#admit-emergency
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 
-// Revise admit instance
-Instance: if89e89e-f8a3-4a88-b605-765008d1cb44
-InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - RE_STAA"
-Description: "HospitalNotification Provenance. The Provenance instance is only valid if used in a Bundle (message)."
-* target = Reference(k06f2487-7aab-4e35-9a80-70431060a7e8) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-10-01T12:00:30Z
-* recorded = 2022-10-01T12:00:30Z
-* activity.coding = $ActivityCode#revise-admit-emergency 
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-* entity.role = #revision
-* entity.what = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029)
 
-// Cancel admit acute ambulant
-Instance: j762d089-2298-4774-ae0b-f83f65bf5640
-InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - AN_STAA"
-Description: "HospitalNotification Provenance. The Provenance instance is only valid if used in a Bundle (message)."
-* target = Reference(l3398a98-37ed-4bff-8e19-cc78ccb5b5f2) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-10-01T13:00:30Z
-* recorded = 2022-10-01T13:00:30Z
-* activity.coding = $ActivityCode#cancel-admit-emergency
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-* entity.role = #removal
-* entity.what = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029)
 
 // discharge acute ambulant
 Instance: ka776a3e-3eca-407b-9f81-b8c16f089874
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - SLHJ (acute ambulant)"
-Description: "HospitalNotification Provenance  - SLHJ (acute ambulant). The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - SLHJ (acute ambulant)"
+Description: "Example of MedComMessagingProvenance used in 'End hospital stay - patient completed to home/primary sector' (acute ambulant). Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(m9bea09c-e662-4d59-b84f-9af570b57f42)
-* occurredDateTime = 2022-10-02T22:00:30Z
-* recorded = 2022-10-02T22:00:30Z
+* occurredDateTime = 2022-12-02T22:00:11Z
+* recorded = 2022-12-02T22:00:11Z
 * activity.coding = $ActivityCode#discharge-emergency-home
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(0465ec66-81d2-11ed-a1eb-0242ac120002)
 * entity.role = #revision
 * entity.what = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029)
 
  // patient is deceased
 Instance: l17de5f5-abb0-4701-93aa-6b0d7b4127bc
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - MORS (acute ambulant)"
-Description: "HospitalNotification Provenance - MORS (acute ambulant). The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - MORS (acute ambulant)"
+Description: "Example of MedComMessagingProvenance used in 'Deceased' (acute ambulant). Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(nabb68aa-c97b-4905-a60c-71ff3209fd51)
-* occurredDateTime = 2022-10-02T22:00:30Z
-* recorded = 2022-10-02T22:00:30Z
+* occurredDateTime = 2022-12-02T07:00:02Z
+* recorded = 2022-12-02T07:00:02Z
 * activity.coding = $ActivityCode#admit-emergency
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* agent.who = Reference(66c12a92-81d2-11ed-a1eb-0242ac120002)
 * entity.role = #revision
 * entity.what = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029)
 
 // Admit instance - different serviceprovider
 Instance: m7cf3888-6f52-5e4d-939c-d2575d24fba0
 InstanceOf: MedComMessagingProvenance
-Title: "HospitalNotification Provenance - STIN. With serviceprovider organisation as agent.who."
-Description: "HospitalNotification Provenance - STIN. The Provenance instance is only valid if used in a Bundle (message)."
+Title: "MedComMessagingProvenance - STIN."
+Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - admitted'. With different serviceProvider and sender Organization. Only valid if used in a Bundle (message)."
+Usage: #definition
 * target = Reference(o9b4818e-12de-5cc4-c418-d30cbc7b5404) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-09-01T12:00:30Z
-* recorded = 2022-09-01T12:00:30Z
+* occurredDateTime = 2022-12-09T12:00:02Z
+* recorded = 2022-12-09T12:00:02Z
 * activity.coding = $ActivityCode#admit-inpatient
-* agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
\ No newline at end of file
+* agent.who = Reference(cd72967c-81d2-11ed-a1eb-0242ac120002)
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationEncounter.fsh b/input/fsh/MedComHospitalNotificationEncounter.fsh
index 642d104..5104935 100644
--- a/input/fsh/MedComHospitalNotificationEncounter.fsh
+++ b/input/fsh/MedComHospitalNotificationEncounter.fsh
@@ -25,7 +25,7 @@ Description: "Encounter derivation that handles hospital notification when a pat
 * period ^definition = "The start and end time of the encounter. For notification of hospitalization an start interval is always known as the notification of adminssion is trigged by the arrival of a patient. There a period will always exist as the notification of admission always starts the communication flow. Please that the encounter.period values always referes to the encounter start and end. The period of the leave of absence is not part of the notification of hospitalization FHIR resource ."
 * period.start 1.. MS
 * period.end MS
-* period.start ^definition = "Encounter Starting time.  \r\nFor the notificationOfHospitalization a starting time is the timestamp that is registered by the hospital at patient physical arrival at the ward or emergency department."
+* period.start ^definition = "Encounter Starting time. \r\nFor the notificationOfHospitalization a starting time is the timestamp that is registered by the hospital at patient physical arrival at the ward or emergency department."
 * length ..0
 * reasonCode ..0
 * reasonReference ..0
@@ -48,154 +48,132 @@ Expression: "where(status = 'onleave').extension.value.start.exists() or status
 Instance: a790f964-88d3-4652-bbc8-81d2f3d035f8
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - STIN"
-Description: "Example of HospitalNoticication inpatient Encounter in progress with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#IMP 
 * subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-09-01T12:00:05Z
+* period.start = 2022-12-07T12:00:00Z
 * serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 
 Instance: b9846c24-0335-11ed-b939-0242ac120002
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - RE_STIN"
-Description: "Example of HospitalNoticication updating an inpatient Encounter in progress with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'Revise Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(48393486-81c6-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-09-01T12:00:05Z //updated here
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T13:00:00Z //updated here
+* serviceProvider = Reference(abb09e14-81c6-11ed-a1eb-0242ac120002)
 
 Instance: c9782061-ce63-41b5-8be6-655812d23332
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - AN_STIN"
-Description: "Example of HospitalNoticication canceling an inpatient Encounter with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'Cancellation Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * status = #entered-in-error
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(d6eeaca6-81c6-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-09-01T12:00:05Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T12:00:00Z
+* serviceProvider = Reference(05266a00-81c7-11ed-a1eb-0242ac120002)
 
 Instance: d56e9c54-23d2-43a4-816e-951d2a6e3281
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - STOR"
-Description: "Example of HospitalNoticication inpatient Encounter on leave with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'Start leave'. Only Valid if used in a Bundle."
 * status = #onleave
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(97404d10-81c8-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
-* period.start = 2022-09-01T12:00:05Z
-* extension[leavePeriod].valuePeriod.start = 2022-09-04T14:00:30Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T12:00:00Z
+* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10Z
+* serviceProvider = Reference(b79a7914-81c8-11ed-a1eb-0242ac120002)
 
 Instance: e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - SLOR"
-Description: "Example of HospitalNoticication inpatient Encounter End leave with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'End leave'. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(519d5170-81ca-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
-* period.start = 2022-09-01T12:00:05Z
-* extension[leavePeriod].valuePeriod.start = 2022-09-04T14:00:30Z
-* extension[leavePeriod].valuePeriod.end = 2022-09-05T15:00:10Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T12:00:00Z
+* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10Z
+* extension[leavePeriod].valuePeriod.end = 2022-12-14T15:30:00Z
+* serviceProvider = Reference(5961ade8-81ca-11ed-a1eb-0242ac120002)
 
 Instance: f405ba2d-467a-4e92-9acc-9dc2a629760f
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - SLHJ (inpatient)"
-Description: "Example of HospitalNoticication inpatient Encounter finished with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'End hospital stay - patient completed to home/primary sector' (inpatient). Only Valid if used in a Bundle."
 * status = #finished
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(6841b54e-81cd-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:b0172334-fa5e-5dfe-acb8-2a5b7aee3143" 
-* period.start = 2022-09-01T12:00:05Z
-* period.end = 2022-09-30T09:22:28Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T12:00:00Z
+* period.end = 2022-12-18T09:45:30Z
+* serviceProvider = Reference(8d813af0-81cd-11ed-a1eb-0242ac120002)
 
 //Embedded Encounter with admitted patient deceased
 Instance: gcab7218-9584-11ec-b909-0242ac120002
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - MORS (inpatient)"
-Description: "Example of HospitalNoticication inpatient Encounter finished, patient deceased"
+Description: "Example of MedComHospitalNotificationEncounter 'Deceased' (inpatient). Only Valid if used in a Bundle."
 * status = #finished
 * class = $ActCodes#IMP
 * subject = Reference(t82fb8a3-6725-41e2-a615-2b1cfcfe9931)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:150d589a-d7e0-50cd-9651-fd9cad93be68"
-* period.start = 2022-09-01T12:00:05Z
-* period.end = 2022-09-30T09:22:28Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-07T12:00:00Z
+* period.end = 2022-12-09T09:45:30Z
+* serviceProvider = Reference(840b4046-81ce-11ed-a1eb-0242ac120002)
 
 
 // All use cases associated with acute ambulant hospitalization
 Instance: h2cb16ce-af8c-46f3-be9e-89406ef3e7b5
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - STAA"
-Description: "Example of HospitalNoticication acute ambulant Encounter in progress with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'Start hospital stay - acute ambulant'. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#EMER 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(fdc1fc66-81d0-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-10-01T10:00:05Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-
-Instance: i458ddc8-fea4-41c3-992b-ff73cb6f657b
-InstanceOf: MedComHospitalNotificationEncounter
-Title: "HospitalNotification Encounter - RE_STAA"
-Description: "Example of HospitalNoticication updating an acute ambulant Encounter in progress with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
-* status = #in-progress
-* class = $ActCodes#EMER 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
-* episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-10-01T10:00:05Z //updated here
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-
-Instance: j245dcc2-8668-4fcf-ae5f-d49a50bfc2d4
-InstanceOf: MedComHospitalNotificationEncounter
-Title: "HospitalNotification Encounter - AN_STAA"
-Description: "Example of HospitalNoticication canceling an acute ambulant Encounter with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
-* status = #entered-in-error
-* class = $ActCodes#EMER 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
-* episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-10-01T10:00:05Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-01T10:00:04Z
+* serviceProvider = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 
 Instance: kbbad98c-3310-404a-af0c-7e3739d7b49f
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - SLHJ (acute ambulant)"
-Description: "Example of HospitalNoticication acute ambulant Encounter finished with o7056980-a8b2-42aa-8a0e-c1fc85d1f40d as serviceProvider"
+Description: "Example of MedComHospitalNotificationEncounter 'End hospital stay - patient completed to home/primary sector' (acute ambulant). Only Valid if used in a Bundle."
 * status = #finished
 * class = $ActCodes#EMER 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(6c16f41e-81d1-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:b0172334-fa5e-5dfe-acb8-2a5b7aee3143" 
-* period.start = 2022-10-01T10:00:05Z
-* period.end = 2022-10-02T22:00:05Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-01T10:00:04Z
+* period.end = 2022-12-02T22:00:09Z
+* serviceProvider = Reference(0465ec66-81d2-11ed-a1eb-0242ac120002)
 
 //Embedded Encounter with admitted patient deceased
 Instance: l001c640-6b5d-414c-b6bd-e00ec6d4ceee
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - MORS (acute ambulant)"
-Description: "Example of HospitalNoticication acute ambulant Encounter finished, patient deceased"
+Description: "Example of MedComHospitalNotificationEncounter 'Deceased' (acute ambulant). Only Valid if used in a Bundle."
 * status = #finished
 * class = $ActCodes#EMER
-* subject = Reference(t82fb8a3-6725-41e2-a615-2b1cfcfe9931)
+* subject = Reference(384b4a58-81d2-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:150d589a-d7e0-50cd-9651-fd9cad93be68"
-* period.start = 2022-10-01T10:00:05Z
-* period.end = 2022-10-02T22:00:05Z
-* serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* period.start = 2022-12-01T10:00:04Z
+* period.end = 2022-12-02T07:00:00Z
+* serviceProvider = Reference(66c12a92-81d2-11ed-a1eb-0242ac120002)
 
 Instance: m790f964-98d3-4852-bac8-83d2f3d035f8
 InstanceOf: MedComHospitalNotificationEncounter
-Title: "HospitalNotification Encounter - STIN, with different serviceProvider and sender organisation in the Bundle"
-Description: "Example of HospitalNoticication inpatient Encounter in progress with of839e87-4e44-4977-b38e-92b5a6f187b5 as serviceProvider"
+Title: "HospitalNotification Encounter - STIN"
+Description: "Example of MedComHospitalNotificationEncounter 'Start hospital stay - admitted'. With different serviceProvider and sender organisation in the Bundle. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#IMP 
-* subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
+* subject = Reference(b00ea1c0-81d2-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-09-01T12:00:05Z
+* period.start = 2022-12-07T12:00:00Z
 * serviceProvider = Reference(of839e87-4e44-4977-b38e-92b5a6f187b5)
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationMessage.fsh b/input/fsh/MedComHospitalNotificationMessage.fsh
index 9e35750..408a9bb 100644
--- a/input/fsh/MedComHospitalNotificationMessage.fsh
+++ b/input/fsh/MedComHospitalNotificationMessage.fsh
@@ -40,9 +40,9 @@ Expression: "Bundle.entry.resource.ofType(MessageHeader).destination.extension.v
 Instance: a5e5b880-c087-4055-b9ec-99108695f81d
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STIN"
-Description: "Example of MedCom HospitalNotification  - STIN. Admit inpatient."
+Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-09-01T12:00:10Z
+* timestamp = 2022-12-07T12:00:01Z
 * entry[+].fullUrl = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
 * entry[=].resource = b9b4818e-02de-4cc4-b418-d20cbc7b5404
 * entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
@@ -60,19 +60,19 @@ Description: "Example of MedCom HospitalNotification  - STIN. Admit inpatient."
 Instance: bfab3e80-9584-11ec-b909-0242ac120002
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - RE_STIN"
-Description: "Example of MedCom HospitalNotification RE_STIN. Revise Admission"
+Description: "Example of MedComHospitalNotificationMessage 'Update Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-09-01T14:00:10Z
+* timestamp = 2022-12-07T14:00:01Z
 * entry[+].fullUrl = "MessageHeader/cc47c1e2-78e6-4291-b071-f423a4f7fbfe"
 * entry[=].resource = cc47c1e2-78e6-4291-b071-f423a4f7fbfe
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/48393486-81c6-11ed-a1eb-0242ac120002"
+* entry[=].resource = 48393486-81c6-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/b9846c24-0335-11ed-b939-0242ac120002"
 * entry[=].resource = b9846c24-0335-11ed-b939-0242ac120002
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
+* entry[+].fullUrl = "Organization/abb09e14-81c6-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = abb09e14-81c6-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/8858e7e6-81c6-11ed-a1eb-0242ac120002"
+* entry[=].resource = 8858e7e6-81c6-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/b5f7de8c-957a-11ec-b909-0242ac120002"
 * entry[=].resource = b5f7de8c-957a-11ec-b909-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0"
@@ -82,19 +82,19 @@ Description: "Example of MedCom HospitalNotification RE_STIN. Revise Admission"
 Instance: c83671a4-9584-11ec-b909-0242ac120002
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - AN_STIN"
-Description: "Example of MedCom HospitalNotification - AN_STIN. Cancel Admission"
+Description: "Example of MedComHospitalNotificationMessage 'Cancellation Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-09-01T15:00:10Z
+* timestamp = 2022-12-07T15:00:01Z
 * entry[+].fullUrl = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
 * entry[=].resource = d8749b54-1aeb-4089-8941-8d876bdffc51
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
+* entry[=].resource = d6eeaca6-81c6-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
 * entry[=].resource = c9782061-ce63-41b5-8be6-655812d23332
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
+* entry[+].fullUrl = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 05266a00-81c7-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+* entry[=].resource = eefc2dfa-81c6-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/c67ecb1c-957a-11ec-b909-0242ac120002"
 * entry[=].resource = c67ecb1c-957a-11ec-b909-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0"
@@ -103,19 +103,19 @@ Description: "Example of MedCom HospitalNotification - AN_STIN. Cancel Admission
 Instance: d3128d9b-cede-4c7f-8904-809eab322d7d
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STOR"
-Description: "Example of MedCom HospitalNotification - STOR. Start Leave"
+Description: "Example of MedComHospitalNotificationMessage 'Start leave'"
 * type = $BundleType#message
-* timestamp = 2022-09-04T14:00:10Z
+* timestamp = 2022-12-13T14:00:11Z
 * entry[+].fullUrl = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
 * entry[=].resource = e563a2b2-bf92-4b13-bbd2-0a021a95bded
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
+* entry[=].resource = 97404d10-81c8-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"
 * entry[=].resource = d56e9c54-23d2-43a4-816e-951d2a6e3281
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"
+* entry[=].resource = a39d4a04-81c8-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = b79a7914-81c8-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0" //admit prov
 * entry[=].resource = a7cf3888-6f42-4e4d-929c-d2475d24fba0
 * entry[+].fullUrl = "Provenance/dc421d0a-cded-470f-9a53-2ddba7583baa" //start leave prov
@@ -124,19 +124,19 @@ Description: "Example of MedCom HospitalNotification - STOR. Start Leave"
 Instance: e94de8ee-bd94-475e-b454-b8fbbef8a685
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLOR"
-Description: "Example of MedCom HospitalNotification - SLOR End Leave"
+Description: "Example of MedComHospitalNotificationMessage 'End leave'"
 * type = $BundleType#message
-* timestamp = 2022-09-05T15:00:10Z
+* timestamp = 2022-12-14T15:30:01Z
 * entry[+].fullUrl = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
 * entry[=].resource = f47254da-f170-46f0-b624-4778a9c92b1f
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
+* entry[=].resource = 519d5170-81ca-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
 * entry[=].resource = e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"
+* entry[=].resource = 55ba5884-81ca-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 5961ade8-81ca-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0" //admit
 * entry[=].resource = a7cf3888-6f42-4e4d-929c-d2475d24fba0
 * entry[+].fullUrl = "Provenance/dc421d0a-cded-470f-9a53-2ddba7583baa" //start leave
@@ -147,47 +147,43 @@ Description: "Example of MedCom HospitalNotification - SLOR End Leave"
 Instance: f4aa42a4-86db-4e68-9b38-9dda0dfd5774
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLHJ (inpatient)"
-Description: "Example of MedCom HospitalNotification - SLHJ Discharge inpatient"
+Description: "Example of MedComHospitalNotificationMessage 'End hospital stay - patient completed to home/primary sector' (inpatient)"
 * type = $BundleType#message
-* timestamp = 2022-09-30T09:22:33Z
+* timestamp = 2022-12-18T09:45:31Z
 * entry[+].fullUrl = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
 * entry[=].resource = g1affa53-c157-4080-abb0-8e681524f969
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
+* entry[=].resource = 6841b54e-81cd-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
 * entry[=].resource = f405ba2d-467a-4e92-9acc-9dc2a629760f
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
+* entry[+].fullUrl = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 8d813af0-81cd-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"
+* entry[=].resource = 7e692262-81cd-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0" //admit
 * entry[=].resource = a7cf3888-6f42-4e4d-929c-d2475d24fba0
-* entry[+].fullUrl = "Provenance/dc421d0a-cded-470f-9a53-2ddba7583baa" //start leave
-* entry[=].resource = dc421d0a-cded-470f-9a53-2ddba7583baa
-* entry[+].fullUrl = "Provenance/e4db4939-7c60-4ac6-aefc-523f809ccba6" //end leave
-* entry[=].resource = e4db4939-7c60-4ac6-aefc-523f809ccba6
 * entry[+].fullUrl = "Provenance/f710698c-83eb-4c3e-81c8-fe8e40baf524" //discharge
 * entry[=].resource = f710698c-83eb-4c3e-81c8-fe8e40baf524
 
 
 
-//Example of patient deceased message
+//Example of MedComHospitalNotificationMessage patient deceased message
 Instance: g099bbf3-3fca-4722-a248-bfe1aa956410
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - MORS (inpatient)"
-Description: "Example of MedCom HospitalNotification - MORS. Discharge when patient is deceased"
+Description: "Example of MedComHospitalNotificationMessage 'Deceased' (inpatient)"
 * type = $BundleType#message
-* timestamp = 2022-09-30T09:22:33Z
+* timestamp = 2022-12-09T09:45:31Z
 * entry[+].fullUrl = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
 * entry[=].resource = hefc6d95-6161-4493-99c9-f359488dedb8
 * entry[+].fullUrl = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
 * entry[=].resource = t82fb8a3-6725-41e2-a615-2b1cfcfe9931
 * entry[+].fullUrl = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"
 * entry[=].resource = gcab7218-9584-11ec-b909-0242ac120002
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"
+* entry[=].resource = 753bdcba-81ce-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 840b4046-81ce-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/a7cf3888-6f42-4e4d-929c-d2475d24fba0" //admit
 * entry[=].resource = a7cf3888-6f42-4e4d-929c-d2475d24fba0
 * entry[+].fullUrl = "Provenance/g9942adb-197a-4e30-bec8-566e3a113efe"
@@ -200,82 +196,39 @@ Description: "Example of MedCom HospitalNotification - MORS. Discharge when pati
 Instance: h1c8e4a8-6b45-4669-94ad-2a99ad96bf03
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STAA"
-Description: "Example of MedCom HospitalNotification - STAA. Admit acute ambulate patient."
+Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - acute ambulant'"
 * type = $BundleType#message
-* timestamp = 2022-10-01T10:00:05Z
+* timestamp = 2022-12-01T10:00:05Z
 * entry[+].fullUrl = "MessageHeader/i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029"
 * entry[=].resource = i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/fdc1fc66-81d0-11ed-a1eb-0242ac120002"
+* entry[=].resource = fdc1fc66-81d0-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/h2cb16ce-af8c-46f3-be9e-89406ef3e7b5"
 * entry[=].resource = h2cb16ce-af8c-46f3-be9e-89406ef3e7b5
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/103fbebe-81d1-11ed-a1eb-0242ac120002"
+* entry[=].resource = 103fbebe-81d1-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/1f5882b4-81d1-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 1f5882b4-81d1-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/h60bd482-9c47-43c5-9b77-1134eaa2d5f0"
 * entry[=].resource = h60bd482-9c47-43c5-9b77-1134eaa2d5f0
 
 
-Instance: i3c2c3c0-ee07-41fd-b1a2-359eb0ccabe4
-InstanceOf: MedComHospitalNotificationMessage
-Title: "HospitalNotification Message - RE_STAA"
-Description: "Example of MedCom HospitalNotification RE_STAA. Revise Admission"
-* type = $BundleType#message
-* timestamp = 2022-10-01T12:00:10Z
-* entry[+].fullUrl = "MessageHeader/k06f2487-7aab-4e35-9a80-70431060a7e8"
-* entry[=].resource = k06f2487-7aab-4e35-9a80-70431060a7e8
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
-* entry[+].fullUrl = "Encounter/i458ddc8-fea4-41c3-992b-ff73cb6f657b"
-* entry[=].resource = i458ddc8-fea4-41c3-992b-ff73cb6f657b
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d" 
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-* entry[+].fullUrl = "Provenance/h60bd482-9c47-43c5-9b77-1134eaa2d5f0"
-* entry[=].resource = h60bd482-9c47-43c5-9b77-1134eaa2d5f0
-* entry[+].fullUrl = "Provenance/if89e89e-f8a3-4a88-b605-765008d1cb44"
-* entry[=].resource = if89e89e-f8a3-4a88-b605-765008d1cb44
-
-
-Instance: j1f8b295-821f-4d2f-9ec4-71f228ed65fe
-InstanceOf: MedComHospitalNotificationMessage
-Title: "HospitalNotification Message - AN_STAA"
-Description: "Example of MedCom HospitalNotification - AN_STAA. Cancel Admission"
-* type = $BundleType#message
-* timestamp = 2022-10-01T13:00:10Z
-* entry[+].fullUrl = "MessageHeader/l3398a98-37ed-4bff-8e19-cc78ccb5b5f2"
-* entry[=].resource = l3398a98-37ed-4bff-8e19-cc78ccb5b5f2
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
-* entry[+].fullUrl = "Encounter/j245dcc2-8668-4fcf-ae5f-d49a50bfc2d4"
-* entry[=].resource = j245dcc2-8668-4fcf-ae5f-d49a50bfc2d4
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
-* entry[+].fullUrl = "Provenance/h60bd482-9c47-43c5-9b77-1134eaa2d5f0"
-* entry[=].resource = h60bd482-9c47-43c5-9b77-1134eaa2d5f0
-* entry[+].fullUrl = "Provenance/j762d089-2298-4774-ae0b-f83f65bf5640"
-* entry[=].resource = j762d089-2298-4774-ae0b-f83f65bf5640
-
 Instance: kcab461b-f44e-4d97-a041-ef7e64800587
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLHJ (acute ambulant)"
-Description: "Example of MedCom HospitalNotification - SLHJ Discharge inpatient"
+Description: "Example of MedComHospitalNotificationMessage 'End hospital stay - patient completed to home/primary sector' (acute ambulant)"
 * type = $BundleType#message
-* timestamp = 2022-10-02T22:00:10Z
+* timestamp = 2022-12-02T22:00:10Z
 * entry[+].fullUrl = "MessageHeader/m9bea09c-e662-4d59-b84f-9af570b57f42"
 * entry[=].resource = m9bea09c-e662-4d59-b84f-9af570b57f42
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/6c16f41e-81d1-11ed-a1eb-0242ac120002"
+* entry[=].resource = 6c16f41e-81d1-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/kbbad98c-3310-404a-af0c-7e3739d7b49f"
 * entry[=].resource = kbbad98c-3310-404a-af0c-7e3739d7b49f
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/e5682f5e-81d1-11ed-a1eb-0242ac120002"
+* entry[=].resource = e5682f5e-81d1-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/0465ec66-81d2-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 0465ec66-81d2-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/h60bd482-9c47-43c5-9b77-1134eaa2d5f0"
 * entry[=].resource = h60bd482-9c47-43c5-9b77-1134eaa2d5f0
 * entry[+].fullUrl = "Provenance/ka776a3e-3eca-407b-9f81-b8c16f089874" //discharge
@@ -283,23 +236,23 @@ Description: "Example of MedCom HospitalNotification - SLHJ Discharge inpatient"
 
 
 
-//Example of patient deceased message
+//Example of MedComHospitalNotificationMessage patient deceased message
 Instance: ld31e08a-b91f-49c3-841a-ce80e6380517
 InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - MORS (acute ambulant)"
-Description: "Example of MedCom HospitalNotification - MORS. Discharge when patient is deceased"
+Description: "Example of MedComHospitalNotificationMessage 'Deceased' (acute ambulant)"
 * type = $BundleType#message
-* timestamp = 2022-10-02T22:00:10Z
+* timestamp = 2022-12-02T07:00:01Z
 * entry[+].fullUrl = "MessageHeader/nabb68aa-c97b-4905-a60c-71ff3209fd51"
 * entry[=].resource = nabb68aa-c97b-4905-a60c-71ff3209fd51
-* entry[+].fullUrl = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
-* entry[=].resource = t82fb8a3-6725-41e2-a615-2b1cfcfe9931
+* entry[+].fullUrl = "Patient/384b4a58-81d2-11ed-a1eb-0242ac120002"
+* entry[=].resource = 384b4a58-81d2-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Encounter/l001c640-6b5d-414c-b6bd-e00ec6d4ceee"
 * entry[=].resource = l001c640-6b5d-414c-b6bd-e00ec6d4ceee
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" //service provider Org
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/55eb90b8-81d2-11ed-a1eb-0242ac120002"
+* entry[=].resource = 55eb90b8-81d2-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/66c12a92-81d2-11ed-a1eb-0242ac120002" //service provider Org
+* entry[=].resource = 66c12a92-81d2-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/h60bd482-9c47-43c5-9b77-1134eaa2d5f0"
 * entry[=].resource = h60bd482-9c47-43c5-9b77-1134eaa2d5f0
 * entry[+].fullUrl = "Provenance/l17de5f5-abb0-4701-93aa-6b0d7b4127bc"
@@ -309,21 +262,21 @@ Description: "Example of MedCom HospitalNotification - MORS. Discharge when pati
 // use cases associated with inpatient hospitalization
 Instance: m908i967-9ie3-9023-b9ec-98108695f01d
 InstanceOf: MedComHospitalNotificationMessage
-Title: "HospitalNotification Message - STIN, with different serviceProvider and sender Organization."
-Description: "Example of MedCom HospitalNotification  - STIN. Admit inpatient, with different serviceProvider and sender Organization."
+Title: "HospitalNotification Message - STIN"
+Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - admitted'. With different serviceProvider and sender Organization."
 * type = $BundleType#message
-* timestamp = 2022-09-01T12:00:10Z
+* timestamp = 2022-12-07T12:00:01Z
 * entry[+].fullUrl = "MessageHeader/o9b4818e-12de-5cc4-c418-d30cbc7b5404"
 * entry[=].resource = o9b4818e-12de-5cc4-c418-d30cbc7b5404
-* entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-* entry[=].resource = t33cef33-3626-422b-955d-d506aaa65fe1
+* entry[+].fullUrl = "Patient/b00ea1c0-81d2-11ed-a1eb-0242ac120002"
+* entry[=].resource = b00ea1c0-81d2-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Organization/of839e87-4e44-4977-b38e-92b5a6f187b5" // service provider org
 * entry[=].resource = of839e87-4e44-4977-b38e-92b5a6f187b5
 * entry[+].fullUrl = "Encounter/m790f964-98d3-4852-bac8-83d2f3d035f8"
 * entry[=].resource = m790f964-98d3-4852-bac8-83d2f3d035f8
-* entry[+].fullUrl = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-* entry[=].resource = o4cdf292-abf3-4f5f-80ea-60a48013ff6d
-* entry[+].fullUrl = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d" 
-* entry[=].resource = o7056980-a8b2-42aa-8a0e-c1fc85d1f40d
+* entry[+].fullUrl = "Organization/bea5b49e-81d2-11ed-a1eb-0242ac120002"
+* entry[=].resource = bea5b49e-81d2-11ed-a1eb-0242ac120002
+* entry[+].fullUrl = "Organization/cd72967c-81d2-11ed-a1eb-0242ac120002" 
+* entry[=].resource = cd72967c-81d2-11ed-a1eb-0242ac120002
 * entry[+].fullUrl = "Provenance/m7cf3888-6f52-5e4d-939c-d2575d24fba0"
 * entry[=].resource = m7cf3888-6f52-5e4d-939c-d2575d24fba0
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationMessageHeader.fsh b/input/fsh/MedComHospitalNotificationMessageHeader.fsh
index 5622ae9..500f8c7 100644
--- a/input/fsh/MedComHospitalNotificationMessageHeader.fsh
+++ b/input/fsh/MedComHospitalNotificationMessageHeader.fsh
@@ -24,8 +24,8 @@ Usage: #inline
 
 Instance: a1b27813-8aa8-4fa1-846b-aeabf5afb7d4
 InstanceOf: MedComHospitalNotificationMessageHeader
-Title: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag = true"
-Description: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag sat to true. Valid only if used in a bundle (message)."
+Title: "HospitalNotification MessageHeader - STIN"
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start hospital stay - admitted'. Without request for a reportOfAdmission. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
@@ -33,14 +33,12 @@ Description: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag s
 * sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(a790f964-88d3-4652-bbc8-81d2f3d035f8)
-* extension[reportOfAdmissionFlag].valueBoolean = true
-* extension[reportOfAdmissionRecipient].valueReference = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 // admit message 
 Instance: b9b4818e-02de-4cc4-b418-d20cbc7b5404
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - STIN."
-Description: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag sat to false. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start hospital stay - admitted'. reportOfAdmissionFlag is 'true'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
@@ -48,17 +46,19 @@ Description: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag s
 * sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(a790f964-88d3-4652-bbc8-81d2f3d035f8)
+* extension[reportOfAdmissionFlag].valueBoolean = true
+* extension[reportOfAdmissionRecipient].valueReference = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 // admit message 
 Instance: cc47c1e2-78e6-4291-b071-f423a4f7fbfe
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - RE_STIN."
-Description: "HospitalNotification MessageHeader - RE_STIN. reportOfAdmissionFlag sat to false. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Revise Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(8858e7e6-81c6-11ed-a1eb-0242ac120002)
+* sender = Reference(abb09e14-81c6-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(b9846c24-0335-11ed-b939-0242ac120002)
 
@@ -66,48 +66,48 @@ Description: "HospitalNotification MessageHeader - RE_STIN. reportOfAdmissionFla
 Instance: d8749b54-1aeb-4089-8941-8d876bdffc51
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - AN_STIN."
-Description: "HospitalNotification MessageHeader - AN_STIN. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Cancellation Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(eefc2dfa-81c6-11ed-a1eb-0242ac120002)
+* sender = Reference(05266a00-81c7-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(c9782061-ce63-41b5-8be6-655812d23332)
 
 Instance: e563a2b2-bf92-4b13-bbd2-0a021a95bded
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - STOR."
-Description: "HospitalNotification MessageHeader - STOR. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start leave'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(a39d4a04-81c8-11ed-a1eb-0242ac120002)
+* sender = Reference(b79a7914-81c8-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(d56e9c54-23d2-43a4-816e-951d2a6e3281)
 
 Instance: f47254da-f170-46f0-b624-4778a9c92b1f
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - SLOR."
-Description: "HospitalNotification MessageHeader - SLOR. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'End leave'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(55ba5884-81ca-11ed-a1eb-0242ac120002)
+* sender = Reference(5961ade8-81ca-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b)
 
 Instance: g1affa53-c157-4080-abb0-8e681524f969
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - SLHJ (inpatient)."
-Description: "HospitalNotification MessageHeader - SLHJ (inpatient). Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'End hospital stay - patient completed to home/primary sector' (inpatient). Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(7e692262-81cd-11ed-a1eb-0242ac120002)
+* sender = Reference(8d813af0-81cd-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(f405ba2d-467a-4e92-9acc-9dc2a629760f)
 
@@ -115,12 +115,12 @@ Description: "HospitalNotification MessageHeader - SLHJ (inpatient). Valid only
 Instance: hefc6d95-6161-4493-99c9-f359488dedb8
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - MORS (inpatient)."
-Description: "HospitalNotification MessageHeader - MORS (inpatient). Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Deceased' (inpatient). Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(753bdcba-81ce-11ed-a1eb-0242ac120002)
+* sender = Reference(840b4046-81ce-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(gcab7218-9584-11ec-b909-0242ac120002)
 
@@ -129,66 +129,41 @@ Description: "HospitalNotification MessageHeader - MORS (inpatient). Valid only
 
 Instance: i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029
 InstanceOf: MedComHospitalNotificationMessageHeader
-Title: "HospitalNotification MessageHeader - STAA. reportOfAdmissionFlag = true"
-Description: "HospitalNotification MessageHeader - STAA. reportOfAdmissionFlag sat to true. Valid only if used in a bundle (message)."
+Title: "HospitalNotification MessageHeader - STAA."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start hospital stay - acute ambulant'. reportOfAdmissionFlag is 'true'. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(103fbebe-81d1-11ed-a1eb-0242ac120002)
+* sender = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(h2cb16ce-af8c-46f3-be9e-89406ef3e7b5)
 * extension[reportOfAdmissionFlag].valueBoolean = true
-* extension[reportOfAdmissionRecipient].valueReference = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* extension[reportOfAdmissionRecipient].valueReference = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 
 // admit message 
 Instance: j3675c4a-33db-40f1-b578-ff16e3e9134c
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - STAA."
-Description: "HospitalNotification MessageHeader - STAA. reportOfAdmissionFlag sat to false. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start hospital stay - acute ambulant'. Without request for a reportOfAdmission. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(103fbebe-81d1-11ed-a1eb-0242ac120002)
+* sender = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(h2cb16ce-af8c-46f3-be9e-89406ef3e7b5)
 
-// admit message 
-Instance: k06f2487-7aab-4e35-9a80-70431060a7e8
-InstanceOf: MedComHospitalNotificationMessageHeader
-Title: "HospitalNotification MessageHeader - RE_STAA."
-Description: "HospitalNotification MessageHeader - RE_STAA. reportOfAdmissionFlag sat to false. Valid only if used in a bundle (message)."
-* destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
-* eventCoding = $MessageEvents#hospital-notification-message
-* destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-* source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-* focus = Reference(i458ddc8-fea4-41c3-992b-ff73cb6f657b)
-
-// admit message 
-Instance: l3398a98-37ed-4bff-8e19-cc78ccb5b5f2
-InstanceOf: MedComHospitalNotificationMessageHeader
-Title: "HospitalNotification MessageHeader - AN_STAA."
-Description: "HospitalNotification MessageHeader - AN_STAA. Valid only if used in a bundle (message)."
-* destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
-* eventCoding = $MessageEvents#hospital-notification-message
-* destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
-* source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-* focus = Reference(j245dcc2-8668-4fcf-ae5f-d49a50bfc2d4)
 
 Instance: m9bea09c-e662-4d59-b84f-9af570b57f42
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - SLHJ (acute ambulant)."
-Description: "HospitalNotification MessageHeader - SLHJ (acute ambulant). Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'End hospital stay - patient completed to home/primary sector' (acute ambulant). Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(e5682f5e-81d1-11ed-a1eb-0242ac120002)
+* sender = Reference(0465ec66-81d2-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(kbbad98c-3310-404a-af0c-7e3739d7b49f)
 
@@ -196,12 +171,12 @@ Description: "HospitalNotification MessageHeader - SLHJ (acute ambulant). Valid
 Instance: nabb68aa-c97b-4905-a60c-71ff3209fd51
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - MORS (acute ambulant)."
-Description: "HospitalNotification MessageHeader - MORS (acute ambulant). Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Deceased' (acute ambulant). Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(55eb90b8-81d2-11ed-a1eb-0242ac120002)
+* sender = Reference(66c12a92-81d2-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(l001c640-6b5d-414c-b6bd-e00ec6d4ceee)
 
@@ -209,11 +184,11 @@ Description: "HospitalNotification MessageHeader - MORS (acute ambulant). Valid
 Instance: o9b4818e-12de-5cc4-c418-d30cbc7b5404
 InstanceOf: MedComHospitalNotificationMessageHeader
 Title: "HospitalNotification MessageHeader - STIN."
-Description: "HospitalNotification MessageHeader - STIN. reportOfAdmissionFlag sat to false. Valid only if used in a bundle (message)."
+Description: "Example of MedComHospitalNotificationMessageHeader 'Start hospital stay - admitted'. With different serviceProvider and sender organisation. Only Valid if used in a Bundle."
 * destination[primary].extension[use] = b4e7e16b-9658-4172-acd7-5e7193f2cc5f
 * eventCoding = $MessageEvents#hospital-notification-message
 * destination[primary].endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-* destination[primary].receiver = Reference(o4cdf292-abf3-4f5f-80ea-60a48013ff6d)
-* sender = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
+* destination[primary].receiver = Reference(bea5b49e-81d2-11ed-a1eb-0242ac120002)
+* sender = Reference(cd72967c-81d2-11ed-a1eb-0242ac120002)
 * source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
 * focus = Reference(m790f964-98d3-4852-bac8-83d2f3d035f8)
diff --git a/input/images/hospitalnotification/HNAdmitEnteredInError.svg b/input/images/hospitalnotification/HNAdmitEnteredInError.svg
index 5a91773..6c202eb 100644
--- a/input/images/hospitalnotification/HNAdmitEnteredInError.svg
+++ b/input/images/hospitalnotification/HNAdmitEnteredInError.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1520px" preserveAspectRatio="none" style="width:1529px;height:1520px;background:#FFFFFF;" version="1.1" viewBox="0 0 1529 1520" width="1529px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="434" x="540.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="424" x="545.5" y="24.5332">Simplified example: Admit and cancel admission for inpatient</text><!--MD5=[e3ce9a70b36f22ff1736cff4b5094119]
 cluster admit--><g id="cluster_admit"><rect fill="none" height="1225" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M206,45.6094 L206,56.2188 L196,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="189" x="10" y="61.1426">Message 1: Admit Inpatient</text></g><!--MD5=[77d9f3ba0333437ce7407f559fb23290]
 cluster error--><g id="cluster_error"><rect fill="none" height="1469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="777" y="45.6094"/><path d="M1079,45.6094 L1079,56.2188 L1069,66.2188 L777,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="292" x="780" y="61.1426">Message 2: Cancel Admission of Inpatient</text></g><!--MD5=[8b0fb6bcdbcce853e3af8ebdd7dc8030]
-class admitB--><g id="elem_admitB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-09-01T12:00:10"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
+class admitB--><g id="elem_admitB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-07T12:00:01"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
 class admitMH--><g id="elem_admitMH"><rect codeLine="24" fill="#FFFFFF" height="246.9219" id="admitMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="225.752">id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="550" x="29" y="331.4082">destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="29" y="349.0176">sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196" x="29" y="384.2363">reportOfAdmissionFlag = "true"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="549" x="29" y="401.8457">reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="419.4551">focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"</text></g><!--MD5=[e036c46784c1ca676a3972d4e1c0dddd]
 class admitPT--><g id="elem_admitPT"><rect codeLine="38" fill="#FFFFFF" height="158.875" id="admitPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="436.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="456.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="464.2188" y2="464.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="482.752">id = "t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="500.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="517.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="535.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="553.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="570.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="588.4082">name.given[1] = "Test"</text></g><!--MD5=[221b3f3a43b02d938eddc6ab5661f5a7]
 class admitENC--><g id="elem_admitENC"><rect codeLine="47" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="605.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="625.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="633.2188" y2="633.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="651.752">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="669.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="686.9707">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="704.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="722.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="739.7988">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="757.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="775.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="792.627">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="810.2363">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
 class admitROrg--><g id="elem_admitROrg"><rect codeLine="59" fill="#FFFFFF" height="123.6563" id="admitROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="202.5" y="847.1426">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="288" x="29" y="873.752">id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="944.1895">identifier[1].value = "953741000016009"</text></g><!--MD5=[89083fc17cd646efcc5774baa7271f78]
 class admitSOrg--><g id="elem_admitSOrg"><rect codeLine="66" fill="#FFFFFF" height="123.6563" id="admitSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="961.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="219" y="981.1426">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="989.2188" y2="989.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="1007.752">id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1025.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1042.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1060.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1078.1895">identifier[1].value = "265161000016000"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1115.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1141.752">id = "a7128eb7-8df1-4479-b56f-9c66970159f6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1247.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[eeb0debb5fca22f0d75064ed3b775ab3]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1115.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1141.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1247.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[eeb0debb5fca22f0d75064ed3b775ab3]
 class errorB--><g id="elem_errorB"><rect codeLine="93" fill="#FFFFFF" height="88.4375" id="errorB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="1003" y="101.1426">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="799" y="127.752">id = "c83671a4-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="799" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="799" y="162.9707">timestamp = "2022-09-01T14:00:05"</text></g><!--MD5=[beb118c84b97787df19f260a30b51ecd]
 class errorMH--><g id="elem_errorMH"><rect codeLine="98" fill="#FFFFFF" height="211.7031" id="errorMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="197.1094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="950.5" y="216.6426">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="224.7188" y2="224.7188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="799" y="243.252">id = "d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="799" y="260.8613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="799" y="278.4707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="799" y="296.0801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="799" y="313.6895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="799" y="331.2988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="567" x="799" y="348.9082">destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="799" y="366.5176">sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="799" y="384.127">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="403" x="799" y="401.7363">focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"</text></g><!--MD5=[e245cb8a2d08a530ae37cebee9106e69]
 class errorPT--><g id="elem_errorPT"><rect codeLine="110" fill="#FFFFFF" height="158.875" id="errorPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="436.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="1053.5" y="456.1426">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="464.2188" y2="464.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="799" y="482.752">id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="799" y="500.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="799" y="517.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="799" y="535.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="799" y="553.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="799" y="570.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="799" y="588.4082">name.given[1] = "Test"</text></g><!--MD5=[a9c075c36a1e45039083e1f044853e75]
 class errorENC--><g id="elem_errorENC"><rect codeLine="119" fill="#FFFFFF" height="211.7031" id="errorENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="605.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="988.5" y="625.1426">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="633.2188" y2="633.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="799" y="651.752">id = "c9782061-ce63-41b5-8be6-655812d23332"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="799" y="669.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="799" y="686.9707">status.code = "entered-in-error"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="799" y="704.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="799" y="722.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="386" x="799" y="739.7988">subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="799" y="757.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="799" y="775.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="799" y="792.627">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="799" y="810.2363">serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[6c9a41914b460d3a5f1dd0d448b31429]
 class errorROrg--><g id="elem_errorROrg"><rect codeLine="131" fill="#FFFFFF" height="123.6563" id="errorROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="972.5" y="847.1426">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="799" y="873.752">id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="944.1895">identifier[1].value = "953741000016009"</text></g><!--MD5=[4afeb56674f7fa49ccf35764061b8d1d]
 class errorSOrg--><g id="elem_errorSOrg"><rect codeLine="138" fill="#FFFFFF" height="123.6563" id="errorSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="961.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="989" y="981.1426">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="989.2188" y2="989.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="799" y="1007.752">id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="1025.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="1042.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="1060.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="1078.1895">identifier[1].value = "265161000016000"</text></g><!--MD5=[fa176c8b8f7b9fe18e0376420c9c7cc6]
-class admiterrorPRO--><g id="elem_admiterrorPRO"><rect codeLine="145" fill="#FFFFFF" height="158.875" id="admiterrorPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1115.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="799" y="1141.752">id = "a7128eb7-8df1-4479-b56f-9c66970159f6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="799" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="799" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1247.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[17da20a5a516157a8c1fce446ca93f65]
+class admiterrorPRO--><g id="elem_admiterrorPRO"><rect codeLine="145" fill="#FFFFFF" height="158.875" id="admiterrorPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1115.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="799" y="1141.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="799" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="799" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1247.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[17da20a5a516157a8c1fce446ca93f65]
 class errorPRO--><g id="elem_errorPRO"><rect codeLine="154" fill="#FFFFFF" height="211.7031" id="errorPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1286.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1306.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1314.2188" y2="1314.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="799" y="1332.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="437" x="799" y="1350.3613">target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1367.9707">occuredDateTime = "2022-09-01T14:00:25+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1385.5801">recorded = "2022-09-01T14:00:25"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1403.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="243" x="799" y="1420.7988">activity.code = "cancel-admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1438.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="799" y="1456.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="799" y="1473.627">entity.role.value = "removal"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="799" y="1491.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
 link admitB to admitMH--><!--MD5=[2f36b81be7e2fd37c8dd70abd0e29703]
 link admitMH to admitPT--><!--MD5=[859e67acec9d8ffbc65cb4a1350759d6]
@@ -51,7 +51,7 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-09-01T12:00:10"
+        timestamp = "2022-12-07T12:00:01"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -103,7 +103,7 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         identifier[1].value = "265161000016000"
     }
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
         occuredDateTime = "2022-09-01T12:00:30+02:00"
         recorded = "2022-09-01T12:00:30"
@@ -175,7 +175,7 @@ class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
         identifier[1].value = "265161000016000"
     }
     class "Provenance (MedComMessagingProvenance)" as admiterrorPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
         occuredDateTime = "2022-09-01T12:00:30+02:00"
         recorded = "2022-09-01T12:00:30"
@@ -230,7 +230,7 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-09-01T12:00:10"
+        timestamp = "2022-12-07T12:00:01"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -282,7 +282,7 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         identifier[1].value = "265161000016000"
     }
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
         occuredDateTime = "2022-09-01T12:00:30+02:00"
         recorded = "2022-09-01T12:00:30"
@@ -353,7 +353,7 @@ class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
         identifier[1].value = "265161000016000"
     }
     class "Provenance (MedComMessagingProvenance)" as admiterrorPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
         occuredDateTime = "2022-09-01T12:00:30+02:00"
         recorded = "2022-09-01T12:00:30"
diff --git a/input/images/hospitalnotification/HNAdmitInPat.svg b/input/images/hospitalnotification/HNAdmitInPat.svg
index 32377da..cd1271f 100644
--- a/input/images/hospitalnotification/HNAdmitInPat.svg
+++ b/input/images/hospitalnotification/HNAdmitInPat.svg
@@ -1,34 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1499px" preserveAspectRatio="none" style="width:1529px;height:1499px;background:#FFFFFF;" version="1.1" viewBox="0 0 1529 1499" width="1529px" zoomAndPan="magnify"><defs/><g><!--MD5=[e3ce9a70b36f22ff1736cff4b5094119]
-cluster admit--><g id="cluster_admit"><rect fill="none" height="1242" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M206,7 L206,17.6094 L196,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="189" x="10" y="22.5332">Message 1: Admit Inpatient</text></g><!--MD5=[9756565d0a87a182f1ee8f471f451df3]
-cluster finished--><g id="cluster_finished"><rect fill="none" height="1486" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="777" y="7"/><path d="M1070,7 L1070,17.6094 L1060,27.6094 L777,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="283" x="780" y="22.5332">Message 2: Discharge Inpatient to Home</text></g><!--MD5=[8b0fb6bcdbcce853e3af8ebdd7dc8030]
-class admitB--><g id="elem_admitB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="62.5332">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="89.1426">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-09-01T12:00:10"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
-class admitMH--><g id="elem_admitMH"><rect codeLine="20" fill="#FFFFFF" height="246.9219" id="admitMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="160.5332">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="187.1426">id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="550" x="29" y="292.7988">destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="29" y="310.4082">sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196" x="29" y="345.627">reportOfAdmissionFlag = "true"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="549" x="29" y="363.2363">reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="380.8457">focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"</text></g><!--MD5=[e036c46784c1ca676a3972d4e1c0dddd]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1272px" preserveAspectRatio="none" style="width:759px;height:1272px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1272" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[e3ce9a70b36f22ff1736cff4b5094119]
+cluster admit--><g id="cluster_admit"><rect fill="none" height="1259" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M216,7 L216,17.6094 L206,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="199" x="10" y="22.5332">Start hospital stay - admitted</text></g><!--MD5=[8b0fb6bcdbcce853e3af8ebdd7dc8030]
+class admitB--><g id="elem_admitB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="62.5332">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="89.1426">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-07T12:00:01"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
+class admitMH--><g id="elem_admitMH"><rect codeLine="20" fill="#FFFFFF" height="246.9219" id="admitMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="160.5332">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="187.1426">id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="550" x="29" y="292.7988">destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="29" y="310.4082">sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="260" x="29" y="345.627">extension:reportOfAdmissionFlag = "true"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="613" x="29" y="363.2363">extension:reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="380.8457">focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"</text></g><!--MD5=[e036c46784c1ca676a3972d4e1c0dddd]
 class admitPT--><g id="elem_admitPT"><rect codeLine="34" fill="#FFFFFF" height="158.875" id="admitPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="398"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="417.5332">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="425.6094" y2="425.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="444.1426">id = "t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="461.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="479.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="496.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="514.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="532.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="549.7988">name.given[1] = "Test"</text></g><!--MD5=[221b3f3a43b02d938eddc6ab5661f5a7]
-class admitENC--><g id="elem_admitENC"><rect codeLine="43" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="575.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="595.0332">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="603.1094" y2="603.1094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="621.6426">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="639.252">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="656.8613">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="674.4707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="692.0801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="709.6895">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="727.2988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="744.9082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="762.5176">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="780.127">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
-class admitROrg--><g id="elem_admitROrg"><rect codeLine="55" fill="#FFFFFF" height="123.6563" id="admitROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="806"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="202.5" y="825.5332">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="833.6094" y2="833.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="288" x="29" y="852.1426">id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="869.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="887.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="904.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="922.5801">identifier[1].value = "953741000016009"</text></g><!--MD5=[89083fc17cd646efcc5774baa7271f78]
-class admitSOrg--><g id="elem_admitSOrg"><rect codeLine="62" fill="#FFFFFF" height="123.6563" id="admitSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="940"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="219" y="959.5332">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="967.6094" y2="967.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="986.1426">id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1003.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1021.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1038.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1056.5801">identifier[1].value = "265161000016000"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="69" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1074"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1093.5332">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1101.6094" y2="1101.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1120.1426">id = "a7128eb7-8df1-4479-b56f-9c66970159f6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1137.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1155.3613">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1172.9707">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1190.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1208.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1225.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[8643caa4df69b0da87a1502fd43a3ee1]
-class finishedB--><g id="elem_finishedB"><rect codeLine="88" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="1003" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="799" y="89.1426">id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="799" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="799" y="124.3613">timestamp = "2022-09-30T09:22:33"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
-class finishedMH--><g id="elem_finishedMH"><rect codeLine="93" fill="#FFFFFF" height="211.7031" id="finishedMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="158.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="950.5" y="178.0332">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="186.1094" y2="186.1094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="799" y="204.6426">id = "g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="799" y="222.252">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="799" y="239.8613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="799" y="257.4707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="799" y="275.0801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="799" y="292.6895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="567" x="799" y="310.2988">destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="799" y="327.9082">sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="799" y="345.5176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="394" x="799" y="363.127">focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"</text></g><!--MD5=[69159a19e1c17c8c59fb310b141e20fe]
-class finishedPT--><g id="elem_finishedPT"><rect codeLine="105" fill="#FFFFFF" height="158.875" id="finishedPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="398"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="1053.5" y="417.5332">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="425.6094" y2="425.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="799" y="444.1426">id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="799" y="461.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="799" y="479.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="799" y="496.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="799" y="514.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="799" y="532.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="799" y="549.7988">name.given[1] = "Test"</text></g><!--MD5=[f65897f4a4ff1f4ef21384fb85edbe70]
-class finishedENC--><g id="elem_finishedENC"><rect codeLine="114" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="567"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="988.5" y="586.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="594.6094" y2="594.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="799" y="613.1426">id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="799" y="630.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="799" y="648.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="799" y="665.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="799" y="683.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="386" x="799" y="701.1895">subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="799" y="718.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="799" y="736.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="799" y="754.0176">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="285" x="799" y="771.627">periode.end = "2022-09-30T09:22:28+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="799" y="789.2363">serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
-class finishedROrg--><g id="elem_finishedROrg"><rect codeLine="127" fill="#FFFFFF" height="123.6563" id="finishedROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="806"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="972.5" y="825.5332">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="833.6094" y2="833.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="799" y="852.1426">id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="869.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="887.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="904.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="922.5801">identifier[1].value = "953741000016009"</text></g><!--MD5=[45851fe3f072b6e685002dddf1e38ddc]
-class finishedSOrg--><g id="elem_finishedSOrg"><rect codeLine="134" fill="#FFFFFF" height="123.6563" id="finishedSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="940"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="989" y="959.5332">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="967.6094" y2="967.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="799" y="986.1426">id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="1003.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="1021.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="1038.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="1056.5801">identifier[1].value = "265161000016000"</text></g><!--MD5=[75f6ba0f813ec2cc7f51b4f6df93deb7]
-class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="141" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1074"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1093.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1101.6094" y2="1101.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="799" y="1120.1426">id = "a7128eb7-8df1-4479-b56f-9c66970159f6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="799" y="1137.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1155.3613">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1172.9707">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1190.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="799" y="1208.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1225.7988">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
-class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="150" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1265"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1284.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1292.6094" y2="1292.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="799" y="1311.1426">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="433" x="799" y="1328.752">target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1346.3613">occuredDateTime = "2022-09-30T09:22:53+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1363.9707">recorded = "2022-09-30T09:22:53"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1381.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="265" x="799" y="1399.1895">activity.code = "discharge-inpatient-home"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1416.7988">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="799" y="1434.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="799" y="1452.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="799" y="1469.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
+class admitENC--><g id="elem_admitENC"><rect codeLine="43" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="567"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="586.5332">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="594.6094" y2="594.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="613.1426">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="630.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="648.3613">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="665.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="683.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="701.1895">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="718.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="736.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="754.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="771.627">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
+class admitROrg--><g id="elem_admitROrg"><rect codeLine="55" fill="#FFFFFF" height="141.2656" id="admitROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="789"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="808.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="816.6094" y2="816.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="288" x="29" y="835.1426">id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="852.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="870.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="887.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="905.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="923.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[89083fc17cd646efcc5774baa7271f78]
+class admitSOrg--><g id="elem_admitSOrg"><rect codeLine="63" fill="#FFFFFF" height="141.2656" id="admitSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="940"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="959.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="967.6094" y2="967.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="986.1426">id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1003.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1021.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1038.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1056.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1074.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1091"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1110.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1118.6094" y2="1118.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1137.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1154.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1172.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1189.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1207.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1225.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1242.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
 link admitB to admitMH--><!--MD5=[2f36b81be7e2fd37c8dd70abd0e29703]
 link admitMH to admitPT--><!--MD5=[859e67acec9d8ffbc65cb4a1350759d6]
 link admitPT to admitENC--><!--MD5=[f69bb7d73991288835a957c5e30a0ded]
 link admitENC to admitROrg--><!--MD5=[f8460bd4b2c2a4369224dcea9f47c36b]
 link admitROrg to admitSOrg--><!--MD5=[f3a8aefdba3953f5b249616a0861bf2e]
-link admitSOrg to admitPRO--><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
-link finishedB to finishedMH--><!--MD5=[01398e4eee645f6817e085231ec28f01]
-link finishedMH to finishedPT--><!--MD5=[5639e68ccfddceafd0b94761b3bd9542]
-link finishedPT to finishedENC--><!--MD5=[8899a0f3539f940b0d000e1b06fb8e9b]
-link finishedENC to finishedROrg--><!--MD5=[70f1cb6cd4d544ed603bf13294a71ace]
-link finishedROrg to finishedSOrg--><!--MD5=[d8a2a7125f85b778798b2e3e86e46577]
-link finishedSOrg to admitfinishedPRO--><!--MD5=[774b752288196a1a08a451fcc2747d3a]
-link admitfinishedPRO to finishedPRO--><!--MD5=[274562e8df2dcffe90dc8a7daa6aed13]
+link admitSOrg to admitPRO--><!--MD5=[29d31f360974a503c6a1a7ba67f12d0e]
 @startuml HNAdmitInPat
 
 'layout
@@ -43,11 +27,11 @@ skinparam SameClassWidth true
 skinparam Ranksep 10
 
 'Message 1: Admit inpatient
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
+package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-09-01T12:00:10"
+        timestamp = "2022-12-07T12:00:01"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -59,8 +43,8 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
         sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+        extension:reportOfAdmissionFlag = "true"
+        extension:reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
     }
     class "Patient (MedComCorePatient)" as admitPT{
@@ -81,28 +65,30 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
+        period.start = "2022-12-07T12:00:00"
         serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
     }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
+    class "Receiver (MedComMessagingOrganization)" as admitROrg{
         id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790001348120"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
     }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
+    class "Sender (MedComMessagingOrganization)" as admitSOrg{
         id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790000209354"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
     }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -116,90 +102,6 @@ admitROrg-[hidden]-admitSOrg
 admitSOrg-[hidden]-admitPRO
 }
 
-package "Message 2: Discharge Inpatient to Home" as finished <<Frame>>{
-    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
-        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
-        type = "message"
-        timestamp = "2022-09-30T09:22:33"
-    }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
-        id = "g1affa53-c157-4080-abb0-8e681524f969"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
-    }
-    class "Patient  (MedComCorePatient)" as finishedPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
-        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "finished"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        periode.end = "2022-09-30T09:22:28+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    } 
-    class "Receiver: Municipality (MedComMessagingOrganization)" as finishedROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as finishedSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    } 
-    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }
-    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
-        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-09-30T09:22:53+02:00"
-        recorded = "2022-09-30T09:22:53"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "discharge-inpatient-home"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
-        entity.role.value = "revision"
-        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-    }
-finishedB-[hidden]-finishedMH
-finishedMH-[hidden]-finishedPT
-finishedPT-[hidden]-finishedENC
-finishedENC-[hidden]-finishedROrg
-finishedROrg-[hidden]-finishedSOrg
-finishedSOrg-[hidden]-admitfinishedPRO
-admitfinishedPRO-[hidden]-finishedPRO
-
-}
 ' pile mellem de to beskeder
 ' admit - -> finished
 
@@ -218,11 +120,11 @@ hide empty members
 skinparam SameClassWidth true
 skinparam Ranksep 10
 
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
+package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-09-01T12:00:10"
+        timestamp = "2022-12-07T12:00:01"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -234,8 +136,8 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
         sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+        extension:reportOfAdmissionFlag = "true"
+        extension:reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
     }
     class "Patient (MedComCorePatient)" as admitPT{
@@ -256,28 +158,30 @@ package "Message 1: Admit Inpatient" as admit <<Frame>>{
         subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
+        period.start = "2022-12-07T12:00:00"
         serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
     }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
+    class "Receiver (MedComMessagingOrganization)" as admitROrg{
         id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790001348120"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
     }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
+    class "Sender (MedComMessagingOrganization)" as admitSOrg{
         id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790000209354"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
     }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -291,98 +195,14 @@ admitROrg-[hidden]-admitSOrg
 admitSOrg-[hidden]-admitPRO
 }
 
-package "Message 2: Discharge Inpatient to Home" as finished <<Frame>>{
-    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
-        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
-        type = "message"
-        timestamp = "2022-09-30T09:22:33"
-    }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
-        id = "g1affa53-c157-4080-abb0-8e681524f969"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
-    }
-    class "Patient  (MedComCorePatient)" as finishedPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
-        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "finished"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        periode.end = "2022-09-30T09:22:28+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    } 
-    class "Receiver: Municipality (MedComMessagingOrganization)" as finishedROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as finishedSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    } 
-    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }
-    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
-        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-09-30T09:22:53+02:00"
-        recorded = "2022-09-30T09:22:53"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "discharge-inpatient-home"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
-        entity.role.value = "revision"
-        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-    }
-finishedB-[hidden]-finishedMH
-finishedMH-[hidden]-finishedPT
-finishedPT-[hidden]-finishedENC
-finishedENC-[hidden]-finishedROrg
-finishedROrg-[hidden]-finishedSOrg
-finishedSOrg-[hidden]-admitfinishedPRO
-admitfinishedPRO-[hidden]-finishedPRO
-
-}
 
 
 @enduml
 
 PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
 (GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
 Default Encoding: Cp1252
 Language: da
 Country: DK
diff --git a/input/images/hospitalnotification/HNcancelEnteredInError.svg b/input/images/hospitalnotification/HNcancelEnteredInError.svg
new file mode 100644
index 0000000..ed6f98c
--- /dev/null
+++ b/input/images/hospitalnotification/HNcancelEnteredInError.svg
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1497px" preserveAspectRatio="none" style="width:759px;height:1497px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1497" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="440" x="152.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="430" x="157.5" y="24.5332">Simplified example: Cancellation Start hospital stay - admitted</text><!--MD5=[89aab9ccae0ad4c10abfd3158e14a105]
+cluster cancel--><g id="cluster_cancel"><rect fill="none" height="1446" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M307,45.6094 L307,56.2188 L297,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="290" x="10" y="61.1426">Cancellation Start hospital stay - admitted</text></g><!--MD5=[9c4c787fc80e9639e4969afb5347adbd]
+class cancelB--><g id="elem_cancelB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="cancelB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="127.752">id = "c83671a4-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-07T15:00:01"</text></g><!--MD5=[3295c9b529d258ca96e57881573292eb]
+class cancelMH--><g id="elem_cancelMH"><rect codeLine="24" fill="#FFFFFF" height="211.7031" id="cancelMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="29" y="225.752">id = "d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="564" x="29" y="331.4082">destination.receiver.reference = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="403" x="29" y="384.2363">focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"</text></g><!--MD5=[58c019352c2432c238b4217051ba5a54]
+class cancelPT--><g id="elem_cancelPT"><rect codeLine="36" fill="#FFFFFF" height="158.875" id="cancelPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="447.752">id = "d6eeaca6-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[04112e82ba0d964cdd1fd0b591869556]
+class cancelENC--><g id="elem_cancelENC"><rect codeLine="45" fill="#FFFFFF" height="211.7031" id="cancelENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="616.752">id = "c9782061-ce63-41b5-8be6-655812d23332"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="29" y="651.9707">status.code = "entered-in-error"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="704.7988">subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="775.2363">serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text></g><!--MD5=[c1ee5d1e60cd54b4e03dd4caa59d84dc]
+class cancelROrg--><g id="elem_cancelROrg"><rect codeLine="57" fill="#FFFFFF" height="141.2656" id="cancelROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="792.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="812.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="820.2188" y2="820.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="29" y="838.752">id = "eefc2dfa-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="856.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="873.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="891.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="909.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="926.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[276b8b0c80623393b47be3359e980ff4]
+class cancelSOrg--><g id="elem_cancelSOrg"><rect codeLine="65" fill="#FFFFFF" height="141.2656" id="cancelSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="943.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="963.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="971.2188" y2="971.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="989.752">id = "05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1007.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1024.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1042.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1060.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1077.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1094.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1114.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1122.2188" y2="1122.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1140.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1158.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1175.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1193.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1211.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1228.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1246.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[6a63071bbd1240e3093ba5b0567ecdd8]
+class cancelPRO--><g id="elem_cancelPRO"><rect codeLine="82" fill="#FFFFFF" height="211.7031" id="cancelPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1263.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1283.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1291.2188" y2="1291.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1309.752">id = "c67ecb1c-957a-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="437" x="29" y="1327.3613">target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1344.9707">occuredDateTime = "2022-12-07T15:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1362.5801">recorded = "2022-12-07T15:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1380.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="243" x="29" y="1397.7988">activity.code = "cancel-admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1415.4082">agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1433.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="1450.627">entity.role.value = "removal"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1468.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[7485026127ad8884a11178a40f83945d]
+link cancelB to cancelMH--><!--MD5=[0afe9d959afe5b5653546b11e1ac6476]
+link cancelMH to cancelPT--><!--MD5=[d3f0a871e483079c7f6f778ccd8d41e5]
+link cancelPT to cancelENC--><!--MD5=[51b26afd67893d8015d1259fa7a81b87]
+link cancelENC to cancelROrg--><!--MD5=[a4dacbf51e43cdf542a0fe6ac1ce230d]
+link cancelROrg to cancelSOrg--><!--MD5=[9e969d95e7d481be6fdb2c695f5c1461]
+link cancelSOrg to admitPRO--><!--MD5=[8f079a6438a84102f2758350a88cc8fe]
+link admitPRO to cancelPRO--><!--MD5=[453bc7d73c50b9e013f6abb00a2fb06a]
+@startuml HNcancelEnteredInError
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+'title
+title Simplified example: Cancellation Start hospital stay - admitted
+
+'Message 1: Admit inpatient
+package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
+    class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
+        id = "c83671a4-9584-11ec-b909-0242ac120002"
+        type = "message"
+        timestamp = "2022-12-07T15:00:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
+        id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
+    }
+    class "Patient (MedComCorePatient)" as cancelPT{
+        id = "d6eeaca6-81c6-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as cancelENC{
+        id = "c9782061-ce63-41b5-8be6-655812d23332"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "entered-in-error"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as cancelROrg{
+        id = "eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as cancelSOrg{
+        id = "05266a00-81c7-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    }
+    class "Provenance (MedComMessagingProvenance)" as cancelPRO{
+        id = "c67ecb1c-957a-11ec-b909-0242ac120002"
+        target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
+        occuredDateTime = "2022-12-07T15:00:02"
+        recorded = "2022-12-07T15:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "cancel-admit-inpatient"
+        agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "removal"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+
+cancelB -[hidden]- cancelMH
+cancelMH-[hidden]-cancelPT
+cancelPT-[hidden]-cancelENC
+cancelENC-[hidden]-cancelROrg
+cancelROrg-[hidden]-cancelSOrg
+cancelSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-cancelPRO
+}
+
+@enduml
+
+@startuml HNcancelEnteredInError
+
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+title Simplified example: Cancellation Start hospital stay - admitted
+
+package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
+    class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
+        id = "c83671a4-9584-11ec-b909-0242ac120002"
+        type = "message"
+        timestamp = "2022-12-07T15:00:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
+        id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
+    }
+    class "Patient (MedComCorePatient)" as cancelPT{
+        id = "d6eeaca6-81c6-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as cancelENC{
+        id = "c9782061-ce63-41b5-8be6-655812d23332"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "entered-in-error"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as cancelROrg{
+        id = "eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as cancelSOrg{
+        id = "05266a00-81c7-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    }
+    class "Provenance (MedComMessagingProvenance)" as cancelPRO{
+        id = "c67ecb1c-957a-11ec-b909-0242ac120002"
+        target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
+        occuredDateTime = "2022-12-07T15:00:02"
+        recorded = "2022-12-07T15:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "cancel-admit-inpatient"
+        agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "removal"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+
+cancelB -[hidden]- cancelMH
+cancelMH-[hidden]-cancelPT
+cancelPT-[hidden]-cancelENC
+cancelENC-[hidden]-cancelROrg
+cancelROrg-[hidden]-cancelSOrg
+cancelSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-cancelPRO
+}
+
+@enduml
+
+PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: Cp1252
+Language: da
+Country: DK
+--></g></svg>
\ No newline at end of file
diff --git a/input/images/hospitalnotification/HNdeceasedInPat.svg b/input/images/hospitalnotification/HNdeceasedInPat.svg
new file mode 100644
index 0000000..df7abbe
--- /dev/null
+++ b/input/images/hospitalnotification/HNdeceasedInPat.svg
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1493px" preserveAspectRatio="none" style="width:759px;height:1493px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1493" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[9756565d0a87a182f1ee8f471f451df3]
+cluster finished--><g id="cluster_finished"><rect fill="none" height="1480" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M87,7 L87,17.6094 L77,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="70" x="10" y="22.5332">Deceased</text></g><!--MD5=[8643caa4df69b0da87a1502fd43a3ee1]
+class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="89.1426">id = "g099bbf3-3fca-4722-a248-bfe1aa956410"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-09T09:45:31"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
+class finishedMH--><g id="elem_finishedMH"><rect codeLine="20" fill="#FFFFFF" height="211.7031" id="finishedMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="180.5" y="160.5332">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="187.1426">id = "hefc6d95-6161-4493-99c9-f359488dedb8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="572" x="29" y="292.7988">destination.receiver.reference = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="310.4082">sender.reference = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="402" x="29" y="345.627">focus = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"</text></g><!--MD5=[69159a19e1c17c8c59fb310b141e20fe]
+class finishedPT--><g id="elem_finishedPT"><rect codeLine="32" fill="#FFFFFF" height="176.4844" id="finishedPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="363"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="283.5" y="382.5332">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="390.6094" y2="390.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="295" x="29" y="409.1426">id = "t82fb8a3-6725-41e2-a615-2b1cfcfe9931"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="426.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="444.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="461.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="479.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="497.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="514.7988">name.given[1] = "Test"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="29" y="532.4082">deceased = "true"</text></g><!--MD5=[f65897f4a4ff1f4ef21384fb85edbe70]
+class finishedENC--><g id="elem_finishedENC"><rect codeLine="42" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="549"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="568.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="576.6094" y2="576.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="595.1426">id = "gcab7218-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="612.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="630.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="647.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="665.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="377" x="29" y="683.1895">subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="700.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="718.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="736.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="29" y="753.627">periode.end = "2022-12-09T09:45:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="771.2363">serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
+class finishedROrg--><g id="elem_finishedROrg"><rect codeLine="55" fill="#FFFFFF" height="141.2656" id="finishedROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="788"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="807.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="815.6094" y2="815.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="834.1426">id = "753bdcba-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="851.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="869.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="886.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="904.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="922.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[45851fe3f072b6e685002dddf1e38ddc]
+class finishedSOrg--><g id="elem_finishedSOrg"><rect codeLine="63" fill="#FFFFFF" height="141.2656" id="finishedSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="939"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="958.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="966.6094" y2="966.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="985.1426">id = "840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1002.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1020.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1037.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1055.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1073.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[75f6ba0f813ec2cc7f51b4f6df93deb7]
+class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1090"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1109.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1117.6094" y2="1117.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1136.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1153.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1171.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1188.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1206.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1224.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1241.7988">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
+class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="80" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1259"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1278.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1286.6094" y2="1286.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1305.1426">id = "g9942adb-197a-4e30-bec8-566e3a113efe"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="436" x="29" y="1322.752">target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1340.3613">occuredDateTime = "2022-12-09T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1357.9707">recorded = "2022-12-09T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1375.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1393.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1410.7988">agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1428.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1446.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1463.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
+link finishedB to finishedMH--><!--MD5=[01398e4eee645f6817e085231ec28f01]
+link finishedMH to finishedPT--><!--MD5=[5639e68ccfddceafd0b94761b3bd9542]
+link finishedPT to finishedENC--><!--MD5=[8899a0f3539f940b0d000e1b06fb8e9b]
+link finishedENC to finishedROrg--><!--MD5=[70f1cb6cd4d544ed603bf13294a71ace]
+link finishedROrg to finishedSOrg--><!--MD5=[d8a2a7125f85b778798b2e3e86e46577]
+link finishedSOrg to admitfinishedPRO--><!--MD5=[774b752288196a1a08a451fcc2747d3a]
+link admitfinishedPRO to finishedPRO--><!--MD5=[3ae51f777de2de7e8276242f4455142d]
+@startuml HNdeceasedInPat
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "Deceased" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
+        type = "message"
+        timestamp = "2022-12-09T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "hefc6d95-6161-4493-99c9-f359488dedb8"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+        deceased = "true"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "gcab7218-9584-11ec-b909-0242ac120002"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-09T09:45:30"
+        serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "753bdcba-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "840b4046-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "g9942adb-197a-4e30-bec8-566e3a113efe"
+        target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
+        occuredDateTime = "2022-12-09T09:45:32"
+        recorded = "2022-12-09T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+' pile mellem de to beskeder
+' admit - -> finished
+
+
+@enduml
+
+@startuml HNdeceasedInPat
+
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "Deceased" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
+        type = "message"
+        timestamp = "2022-12-09T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "hefc6d95-6161-4493-99c9-f359488dedb8"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+        deceased = "true"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "gcab7218-9584-11ec-b909-0242ac120002"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-09T09:45:30"
+        serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "753bdcba-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "840b4046-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "g9942adb-197a-4e30-bec8-566e3a113efe"
+        target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
+        occuredDateTime = "2022-12-09T09:45:32"
+        recorded = "2022-12-09T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+
+
+@enduml
+
+PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: Cp1252
+Language: da
+Country: DK
+--></g></svg>
\ No newline at end of file
diff --git a/input/images/hospitalnotification/HNdischargeInPat.svg b/input/images/hospitalnotification/HNdischargeInPat.svg
new file mode 100644
index 0000000..be95062
--- /dev/null
+++ b/input/images/hospitalnotification/HNdischargeInPat.svg
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1476px" preserveAspectRatio="none" style="width:759px;height:1476px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1476" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[9756565d0a87a182f1ee8f471f451df3]
+cluster finished--><g id="cluster_finished"><rect fill="none" height="1463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M442,7 L442,17.6094 L432,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="425" x="10" y="22.5332">End hospital stay - patient completed to home/primary sector</text></g><!--MD5=[8643caa4df69b0da87a1502fd43a3ee1]
+class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="89.1426">id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-18T09:45:31"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
+class finishedMH--><g id="elem_finishedMH"><rect codeLine="20" fill="#FFFFFF" height="211.7031" id="finishedMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="180.5" y="160.5332">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="187.1426">id = "g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="292.7988">destination.receiver.reference = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="489" x="29" y="310.4082">sender.reference = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="394" x="29" y="345.627">focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"</text></g><!--MD5=[69159a19e1c17c8c59fb310b141e20fe]
+class finishedPT--><g id="elem_finishedPT"><rect codeLine="32" fill="#FFFFFF" height="158.875" id="finishedPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="363"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="283.5" y="382.5332">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="390.6094" y2="390.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="409.1426">id = "6841b54e-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="426.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="444.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="461.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="479.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="497.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="514.7988">name.given[1] = "Test"</text></g><!--MD5=[f65897f4a4ff1f4ef21384fb85edbe70]
+class finishedENC--><g id="elem_finishedENC"><rect codeLine="41" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="532"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="551.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="559.6094" y2="559.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="29" y="578.1426">id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="595.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="613.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="630.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="648.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="666.1895">subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="683.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="701.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="719.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="29" y="736.627">periode.end = "2022-12-18T09:45:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="478" x="29" y="754.2363">serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
+class finishedROrg--><g id="elem_finishedROrg"><rect codeLine="54" fill="#FFFFFF" height="141.2656" id="finishedROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="771"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="790.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="798.6094" y2="798.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="817.1426">id = "7e692262-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="834.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="852.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="869.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="887.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="905.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[45851fe3f072b6e685002dddf1e38ddc]
+class finishedSOrg--><g id="elem_finishedSOrg"><rect codeLine="62" fill="#FFFFFF" height="141.2656" id="finishedSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="922"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="941.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="949.6094" y2="949.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="968.1426">id = "8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="985.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1003.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1020.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1038.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1056.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[75f6ba0f813ec2cc7f51b4f6df93deb7]
+class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="70" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1073"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1092.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1100.6094" y2="1100.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1119.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1136.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1154.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1171.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1189.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1207.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1224.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
+class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="79" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1242"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1261.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1269.6094" y2="1269.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="298" x="29" y="1288.1426">id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="433" x="29" y="1305.752">target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1323.3613">occuredDateTime = "2022-12-18T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1340.9707">recorded = "2022-12-18T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1358.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="265" x="29" y="1376.1895">activity.code = "discharge-inpatient-home"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="445" x="29" y="1393.7988">agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1411.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1429.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1446.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
+link finishedB to finishedMH--><!--MD5=[01398e4eee645f6817e085231ec28f01]
+link finishedMH to finishedPT--><!--MD5=[5639e68ccfddceafd0b94761b3bd9542]
+link finishedPT to finishedENC--><!--MD5=[8899a0f3539f940b0d000e1b06fb8e9b]
+link finishedENC to finishedROrg--><!--MD5=[70f1cb6cd4d544ed603bf13294a71ace]
+link finishedROrg to finishedSOrg--><!--MD5=[d8a2a7125f85b778798b2e3e86e46577]
+link finishedSOrg to admitfinishedPRO--><!--MD5=[774b752288196a1a08a451fcc2747d3a]
+link admitfinishedPRO to finishedPRO--><!--MD5=[0a371f7b70f93283e1398c90cbd69a8e]
+@startuml HNdischargeInPat
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "End hospital stay - patient completed to home/primary sector" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
+        type = "message"
+        timestamp = "2022-12-18T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "g1affa53-c157-4080-abb0-8e681524f969"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "6841b54e-81cd-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-18T09:45:30"
+        serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "7e692262-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "8d813af0-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
+        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
+        occuredDateTime = "2022-12-18T09:45:32"
+        recorded = "2022-12-18T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "discharge-inpatient-home"
+        agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+' pile mellem de to beskeder
+' admit - -> finished
+
+
+@enduml
+
+@startuml HNdischargeInPat
+
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "End hospital stay - patient completed to home/primary sector" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
+        type = "message"
+        timestamp = "2022-12-18T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "g1affa53-c157-4080-abb0-8e681524f969"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "6841b54e-81cd-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-18T09:45:30"
+        serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "7e692262-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "8d813af0-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
+        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
+        occuredDateTime = "2022-12-18T09:45:32"
+        recorded = "2022-12-18T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "discharge-inpatient-home"
+        agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+
+
+@enduml
+
+PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: Cp1252
+Language: da
+Country: DK
+--></g></svg>
\ No newline at end of file
diff --git a/input/images/hospitalnotification/HNendOnleave.svg b/input/images/hospitalnotification/HNendOnleave.svg
new file mode 100644
index 0000000..7a5ae80
--- /dev/null
+++ b/input/images/hospitalnotification/HNendOnleave.svg
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1754px" preserveAspectRatio="none" style="width:759px;height:1754px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1754" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="220" x="262.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="210" x="267.5" y="24.5332">Simplified example: End leave</text><!--MD5=[094a32da25a27f7ae2ae43c8b08ae265]
+cluster endOnleave--><g id="cluster_endOnleave"><rect fill="none" height="1703" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M87,45.6094 L87,56.2188 L77,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="70" x="10" y="61.1426">End leave</text></g><!--MD5=[c9a6decd0ed2d896b92172cd5252138f]
+class endOnleaveB--><g id="elem_endOnleaveB"><rect codeLine="20" fill="#FFFFFF" height="88.4375" id="endOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="127.752">id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-14T15:30:01"</text></g><!--MD5=[0480104e4d8b98f8eb6bd90b63d750a0]
+class endOnleaveMH--><g id="elem_endOnleaveMH"><rect codeLine="25" fill="#FFFFFF" height="211.7031" id="endOnleaveMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="296" x="29" y="225.752">id = "f47254da-f170-46f0-b624-4778a9c92b1f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="331.4082">destination.receiver.reference = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="397" x="29" y="384.2363">focus = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"</text></g><!--MD5=[8d49389ec55207906081a4e172135de7]
+class endOnleavePT--><g id="elem_endOnleavePT"><rect codeLine="37" fill="#FFFFFF" height="158.875" id="endOnleavePT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="447.752">id = "519d5170-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[a733ad531f2273a693f23c400487a794]
+class endOnleaveENC--><g id="elem_endOnleaveENC"><rect codeLine="46" fill="#FFFFFF" height="246.9219" id="endOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="616.752">id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="651.9707">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="336" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="332" x="29" y="792.8457">extension:leavePeriod.end = "2022-12-14T15:30:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="810.4551">serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text></g><!--MD5=[b3bf7de2daa27b6ad6a1601727077d91]
+class endOnleaveROrg--><g id="elem_endOnleaveROrg"><rect codeLine="60" fill="#FFFFFF" height="141.2656" id="endOnleaveROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="847.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="873.752">id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="944.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="961.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[cbce2390a6149b4f8830c489b42f3eb4]
+class endOnleaveSOrg--><g id="elem_endOnleaveSOrg"><rect codeLine="68" fill="#FFFFFF" height="141.2656" id="endOnleaveSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="978.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="998.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1006.2188" y2="1006.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="1024.752">id = "b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1042.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1059.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1077.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1095.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1112.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="76" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1129.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1149.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1157.2188" y2="1157.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1175.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1193.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1210.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1228.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1246.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1263.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1281.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
+class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="85" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1298.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1318.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1326.2188" y2="1326.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1344.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1362.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1379.9707">occuredDateTime = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1397.5801">recorded = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1415.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1432.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1450.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1468.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1485.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1503.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[60e317b52c6d5568a9735dc93c89f5a1]
+class endOnleavePRO--><g id="elem_endOnleavePRO"><rect codeLine="97" fill="#FFFFFF" height="211.7031" id="endOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1520.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1540.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1548.2188" y2="1548.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1566.752">id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="429" x="29" y="1584.3613">target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1601.9707">occuredDateTime = "2022-12-14T15:30:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1619.5801">recorded = "2022-12-14T15:30:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1637.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="29" y="1654.7988">activity.code = "end-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1672.4082">agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1690.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1707.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1725.2363">entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text></g><!--MD5=[be938a171a18a10c169f1add6b315420]
+link endOnleaveB to endOnleaveMH--><!--MD5=[f3cdf63d14eeabdb2e09e227a4e74c2e]
+link endOnleaveMH to endOnleavePT--><!--MD5=[20f70ef21cab2fa9c0c822c46af33e7e]
+link endOnleavePT to endOnleaveENC--><!--MD5=[244bf99aafea09cbf67fb3d6c06cc491]
+link endOnleaveENC to endOnleaveROrg--><!--MD5=[55e3c888574e1c8902daf4d074ad86e1]
+link endOnleaveROrg to endOnleaveSOrg--><!--MD5=[000ce222a695ef5be96a45a0b274f609]
+link endOnleaveSOrg to admitPRO--><!--MD5=[4e71cc400377f6d4394ffbcbeb839323]
+link admitPRO to startOnleavePRO--><!--MD5=[070ac2b0b09fc940ebf8ff4d811785a5]
+link startOnleavePRO to endOnleavePRO--><!--MD5=[a939d6fb8ba44ec7e7982a2e6f3a6c34]
+@startuml HNendOnleave
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+'title
+title Simplified example: End leave
+
+
+'Message 3: End onleave inpatient
+package "End leave" as endOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
+        id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
+        type = "message"
+        timestamp = "2022-12-14T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
+        id = "f47254da-f170-46f0-b624-4778a9c92b1f"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+    }
+    class "Patient (MedComCorePatient)" as endOnleavePT{
+        id = "519d5170-81ca-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as endOnleaveENC{
+        id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "in-progress"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+    }    
+class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as endOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
+        id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
+        target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
+        occuredDateTime = "2022-12-14T15:30:02"
+        recorded = "2022-12-14T15:30:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "end-leave-inpatient"
+        agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+    }
+endOnleaveB -[hidden]- endOnleaveMH
+endOnleaveMH-[hidden]-endOnleavePT
+endOnleavePT-[hidden]-endOnleaveENC
+endOnleaveENC-[hidden]-endOnleaveROrg
+endOnleaveROrg-[hidden]-endOnleaveSOrg
+endOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+startOnleavePRO-[hidden]-endOnleavePRO
+
+}
+
+
+
+@enduml
+
+@startuml HNendOnleave
+
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+title Simplified example: End leave
+
+
+package "End leave" as endOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
+        id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
+        type = "message"
+        timestamp = "2022-12-14T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
+        id = "f47254da-f170-46f0-b624-4778a9c92b1f"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+    }
+    class "Patient (MedComCorePatient)" as endOnleavePT{
+        id = "519d5170-81ca-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as endOnleaveENC{
+        id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "in-progress"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+    }    
+class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as endOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
+        id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
+        target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
+        occuredDateTime = "2022-12-14T15:30:02"
+        recorded = "2022-12-14T15:30:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "end-leave-inpatient"
+        agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+    }
+endOnleaveB -[hidden]- endOnleaveMH
+endOnleaveMH-[hidden]-endOnleavePT
+endOnleavePT-[hidden]-endOnleaveENC
+endOnleaveENC-[hidden]-endOnleaveROrg
+endOnleaveROrg-[hidden]-endOnleaveSOrg
+endOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+startOnleavePRO-[hidden]-endOnleavePRO
+
+}
+
+
+
+@enduml
+
+PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: Cp1252
+Language: da
+Country: DK
+--></g></svg>
\ No newline at end of file
diff --git a/input/images/hospitalnotification/HNstartOnleave.svg b/input/images/hospitalnotification/HNstartOnleave.svg
new file mode 100644
index 0000000..289930d
--- /dev/null
+++ b/input/images/hospitalnotification/HNstartOnleave.svg
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1514px" preserveAspectRatio="none" style="width:759px;height:1514px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1514" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="226" x="259.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="216" x="264.5" y="24.5332">Simplified example: Start leave</text><!--MD5=[3dd6fae0817ee960d4190cb33ff51be2]
+cluster startOnleave--><g id="cluster_startOnleave"><rect fill="none" height="1463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M93,45.6094 L93,56.2188 L83,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="76" x="10" y="61.1426">Start leave</text></g><!--MD5=[a77e0b639f638aeaf6da96b7b262a803]
+class startOnleaveB--><g id="elem_startOnleaveB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="startOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "d3128d9b-cede-4c7f-8904-809eab322d7d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-13T15:30:01"</text></g><!--MD5=[bbbcd05d53f3b51c903071076988f180]
+class startOnleaveMH--><g id="elem_startOnleaveMH"><rect codeLine="24" fill="#FFFFFF" height="211.7031" id="startOnleaveMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="225.752">id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="331.4082">destination.receiver.reference = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="404" x="29" y="384.2363">focus = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"</text></g><!--MD5=[0d9b0e5346b897197cb9eb87bcafc092]
+class startOnleavePT--><g id="elem_startOnleavePT"><rect codeLine="36" fill="#FFFFFF" height="158.875" id="startOnleavePT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="447.752">id = "97404d10-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[91c6aa77f4a24fb7aaf0d12bef428b0f]
+class startOnleaveENC--><g id="elem_startOnleaveENC"><rect codeLine="45" fill="#FFFFFF" height="229.3125" id="startOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="312" x="29" y="616.752">id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="29" y="651.9707">status.code = "onleave"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="336" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="792.8457">serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text></g><!--MD5=[70699069a73f487436219c9503fc003e]
+class startOnleaveROrg--><g id="elem_startOnleaveROrg"><rect codeLine="58" fill="#FFFFFF" height="141.2656" id="startOnleaveROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="809.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="829.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="837.2188" y2="837.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="855.752">id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="873.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="890.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="908.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="926.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="943.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[62bd944c7f10ba353d51b36c3243b7a6]
+class startOnleaveSOrg--><g id="elem_startOnleaveSOrg"><rect codeLine="66" fill="#FFFFFF" height="141.2656" id="startOnleaveSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="960.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="980.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="988.2188" y2="988.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="1006.752">id = "b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1024.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1041.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1059.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1077.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1094.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="74" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1111.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1131.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1139.2188" y2="1139.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1157.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1175.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1192.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1210.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1228.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1245.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1263.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
+class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="83" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1280.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1300.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1308.2188" y2="1308.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1326.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1344.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1361.9707">occuredDateTime = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1379.5801">recorded = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1397.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1414.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1432.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1450.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1467.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1485.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[920db40ac0ba3dad502f5efc1bf0a6dd]
+link startOnleaveB to startOnleaveMH--><!--MD5=[1a66f75dd4e2cdf34875598d9ab7735d]
+link startOnleaveMH to startOnleavePT--><!--MD5=[cd21bb8602078bb8652f188bf7dd4dec]
+link startOnleavePT to startOnleaveENC--><!--MD5=[d1f9f56b094239f2c680c0566e251619]
+link startOnleaveENC to startOnleaveROrg--><!--MD5=[5864411d63d057d16a32a545460d5e01]
+link startOnleaveROrg to startOnleaveSOrg--><!--MD5=[d050b1bc7c3106725ea83587738d04ed]
+link startOnleaveSOrg to admitPRO--><!--MD5=[4e71cc400377f6d4394ffbcbeb839323]
+link admitPRO to startOnleavePRO--><!--MD5=[4c12e2242367a48caee8013f2a2dca8c]
+@startuml HNstartOnleave
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+'title
+title Simplified example: Start leave
+
+
+'Message 3: End onleave inpatient
+package "Start leave" as startOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
+        id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
+        type = "message"
+        timestamp = "2022-12-13T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
+        id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"
+    }
+    class "Patient (MedComCorePatient)" as startOnleavePT{
+        id = "97404d10-81c8-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as startOnleaveENC{
+        id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "onleave"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as startOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+startOnleaveB -[hidden]- startOnleaveMH
+startOnleaveMH-[hidden]-startOnleavePT
+startOnleavePT-[hidden]-startOnleaveENC
+startOnleaveENC-[hidden]-startOnleaveROrg
+startOnleaveROrg-[hidden]-startOnleaveSOrg
+startOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+
+}
+
+
+
+@enduml
+
+@startuml HNstartOnleave
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+title Simplified example: Start leave
+
+
+package "Start leave" as startOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
+        id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
+        type = "message"
+        timestamp = "2022-12-13T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
+        id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"
+    }
+    class "Patient (MedComCorePatient)" as startOnleavePT{
+        id = "97404d10-81c8-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as startOnleaveENC{
+        id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "onleave"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as startOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+startOnleaveB -[hidden]- startOnleaveMH
+startOnleaveMH-[hidden]-startOnleavePT
+startOnleavePT-[hidden]-startOnleaveENC
+startOnleaveENC-[hidden]-startOnleaveROrg
+startOnleaveROrg-[hidden]-startOnleaveSOrg
+startOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+
+}
+
+
+
+@enduml
+
+PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: Cp1252
+Language: da
+Country: DK
+--></g></svg>
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
index 12c3e52..98a2853 100644
--- a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
@@ -15,7 +15,7 @@ Please refer to the tab "Snapshot Table(Must support)" below for the definition
 The element Encounter.serviceProvider describes the organization or hospital department in charge of the patient's admission. 
 The element references a MedComMessagingOrganization or MedComCoreOrganization, since MedComMessaigingOrganization inherits properties from MedComCoreOrganization.
 
-The sender of a HospitalNotification (MessageHeader.sender) and the serviceProvider (Encounter.serviceProvider) may be the same hospital department, hence be represented referencing the same instance of a Organization resource, which shall be a MedComMessagingOrganization. However, the sender organisation may be a higher-level deparment (in the SOR register)than the serviceProvider organisation, and in this case they shall be represented referencing two different instances of a Organization resource.
+The sender of a HospitalNotification (MessageHeader.sender) and the serviceProvider (Encounter.serviceProvider) may be the same hospital department, hence be represented referencing the same instance of a Organization resource, which shall be a MedComMessagingOrganization. However, the sender organisation may be a higher-level department (in the SOR register) than the serviceProvider organisation, and in this case they shall be represented referencing two different instances of a Organization resource.
 
 [An example of different serviceProvider and sender organisation can be found here](http://medcomfhir.dk/ig/hospitalnotification/Bundle-m908i967-9ie3-9023-b9ec-98108695f01d.html). Other examples will have the same organisation as serviceProvider and sender.
 
@@ -25,13 +25,13 @@ The Encounter profile contains four timestamps each representing a different tim
 
 |FHIR-element|Description|Event|See example [MISSING LINKS]|
 |-----|------|------| ------| 
-|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|HospitalNotification Encounter - STIN and HospitalNotification Encounter - STAA|
-|Encounter.period.end|End hospital stay, i.e. the actual end of the meeting between the health care professional and patient|Patient leaves the hospital after discharge or when a patient dies (on arrival or during hospital stay)| HospitalNotification Encounter - SLHJ and HospitalNotification Encounter - MORS|
-|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital to go on leave.|HospitalNotification Encounter - STOR|
-|Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period, when the patient returns to the hospital|Patient is physical attendant at the hospital after a period of leave|HospitalNotification Encounter - SLOR|
+|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|[HospitalNotification Encounter - STIN](https://medcomfhir.dk/ig/hospitalnotification/Encounter-a790f964-88d3-4652-bbc8-81d2f3d035f8.html) and [HospitalNotification Encounter - STAA](https://medcomfhir.dk/ig/hospitalnotification/Encounter-h2cb16ce-af8c-46f3-be9e-89406ef3e7b5.html)|
+|Encounter.period.end|End hospital stay, i.e. the actual end of the meeting between the health care professional and patient|Patient leaves the hospital after discharge or when a patient dies (on arrival or during hospital stay)| [HospitalNotification Encounter - SLHJ (inpatient)](https://medcomfhir.dk/ig/hospitalnotification/Encounter-f405ba2d-467a-4e92-9acc-9dc2a629760f.html) and [HospitalNotification Encounter - MORS (inpatient)](https://medcomfhir.dk/ig/hospitalnotification/Encounter-gcab7218-9584-11ec-b909-0242ac120002.html)|
+|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital to go on leave.|[HospitalNotification Encounter - STOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-d56e9c54-23d2-43a4-816e-951d2a6e3281.html)|
+|Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period, when the patient returns to the hospital|Patient is physical attendant at the hospital after a period of leave|[HospitalNotification Encounter - SLOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b.html)|
 
 #### Start and end of hospital stay
-As described above, the timestamp of start and end of hospital stay are included in the element Encounter.period.start and Encounter.period.end, respectively. 
+As described above, the timestamp of start and end of hospital stay are included in the elements Encounter.period.start and Encounter.period.end, respectively. 
 Encounter.period.start shall always be present, despite it is not a start hospital stay HospitalNotification being sent. 
 
 In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall result in a new instance of the Encounter profile and be given a new Encounter.period.start representing the time of the change in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
@@ -44,4 +44,4 @@ When a patient goes on leave the Encounter.extension:leavePeriod.start shall be
 The cardinality of MedComHospitalNotificationLeavePeriodExtension is 0..1 meaning that only one period of leave can be included in a HospitalNotification to avoid confusion about which period of leave is the current. In case a patient goes on leave several times during the same hospitalisation, the period shall be described in separate HospitalNotifications, that are being sent when each period of leave occurs. 
 
 #### Death
-When a patient dies either on arrival or during hospital stay, the timestamp Encounter.period.end represents the time the encounter ended i.e the time of death. The Encounter.period.start shall also be populated. If a patient dies either on arrival Encounter.period.start shall be equal to Encounter.period.end and if the patient dies during hospital stay Encounter.period.start shall represent the actual beginning of the hospital stay. A HospitalNotification can only be interpreted as describing a deceased patient when the element Patient.deaceased = 'true'.  
+When a patient dies either on arrival or during hospital stay, the timestamp Encounter.period.end represents the time the encounter ended i.e the time of death. The Encounter.period.start shall also be populated. If a patient dies on arrival Encounter.period.start shall be equal to Encounter.period.end, and if the patient dies during hospital stay Encounter.period.start shall represent the actual beginning of the hospital stay. A HospitalNotification can only be interpreted as describing a deceased patient when the element Patient.deaceased = 'true'.  
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index d34ca3e..a8eb726 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -47,7 +47,7 @@ The [MedComMessagingOrganization](http://medcomfhir.dk/ig/messaging/StructureDef
 
 #### Timestamps 
 
-HospitalNotification messages are generated and sent based on real-time registration in the EPR/PAS system. So, in case the EPR allows future registrations of planned contacts or a period of leave, the HospitalNotifications shall only be triggered when the event occurs, i.e. at the patient's physical attendance, as described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application). 
+HospitalNotification messages are generated and sent based on real-time registration in the EPR/PAS system. In case the EPR allows future registrations of planned contacts or a period of leave, the HospitalNotifications shall only be triggered when the event occurs, i.e. at the patient's physical attendance, as described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application). 
 
 The HospitalNotification message contains several timestamps. These timestamps are present in the profiles MedComHospitalNotificationEncounter, MedComHospitalNotificationMessage and MedComMessagingProvenance and have different purposes: 
 
@@ -63,14 +63,54 @@ All profiles shall have a global unique id by using an UUID. [Read more about th
 
 #### Simplified examples of the HospitalNotification message flow
 
-The simplified examples contain the required content of a HospitalNotification message. The messages illustrate admission and discharge of an inpatient admission, as well as an cancellation of a messages. The patient, service provider organization, sender and receiver information are identical across a message stream, since all messages are send from a hospital to a municipality.
+The simplified examples contain the required content of a HospitalNotification message. Throughout this section different activity codes and statuses are used. [To get an overview of all the codes and statuses, please go to GitHub pages for HospitalNotification](https://medcomdk.github.io/dk-medcom-hospitalnotification/#14-hospitalnotification-codes).
 
-[More examples of a HospitalNotification message can be found here](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-message-examples.html). For examples of a profile, take a look under the tab 'Examples' on the site for the given profile.
+In the sections below is a limited number HospitalNotifications examplified. [More examples of a HospitalNotification message can be found here](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-message-examples.html). For examples of a profile, take a look under the tab 'Examples' on the site for the given profile.
 
 > Please notice, that in the following examples is the Provenance resources listed as an array. This is just an example of an order, resources may be listed in any order. 
 
-* [Simplified example of a MedComHospitalNotificationMessage for admit and finished stay.](./hospitalnotification/HNAdmitInPat.svg)
-* [Simplified example of a cancelled MedComHospitalNotificationMessage message.](./hospitalnotification/HNAdmitEnteredInError.svg)
+##### STIN - Start hospital stay - admitted
+The simplified example below is an example of a 'Start hospital stay - admitted' HospitalNotification. In the MessageHeader there is a request for a reportOfAdmission (extension:reportOfAdmissionFlag). In the Encounter instance the status is 'in-progress', and the Encounter is populated with a start timestamp (period.start). In the Provenance instance is the activity code 'admit-inpatient'. The sender and serviceProvider organisation is the same. 
+
+* [1 - Simplified example of 'Start hospital stay - admitted'](./hospitalnotification/HNAdmitInPat.svg)
+
+[Click here to see the generated example of simplified example number 1.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-a5e5b880-c087-4055-b9ec-99108695f81d.html)
+
+##### STOR - Start leave
+The simplified example below is an example of a 'Start leave' HospitalNotification which is sent in continuation of simplified example number 1. The status in the Encounter is changed from 'in-progress' to 'onleave', and the Encounter is populated with a start timestamp for the period of leave (extension:leavePeriod.start). In the Provenance instance is the activity code 'start-leave-inpatient'. The sender and serviceProvider organisation is the same. 
+
+* [2 - Simplified example of 'Start leave'](./hospitalnotification/HNstartOnleave.svg)
+
+[Click here to see the generated example of simplified example number 2.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-d3128d9b-cede-4c7f-8904-809eab322d7d.html)
+
+##### SLOR - End leave
+The simplified example below is an example of a 'End leave' HospitalNotification which is sent in continuation of simplified example number 2. The status in the Encounter is changed from 'onleave' to 'in-progress', and the Encounter is populated with a end timestamp for the period of leave (extension:leavePeriod.end). In the Provenance instance is the activity code 'end-leave-inpatient'. The sender and serviceProvider organisation is the same. 
+
+* [3 - Simplified example of 'End leave'](./hospitalnotification/HNendOnleave.svg)
+
+[Click here to see the generated example of simplified example number 3.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-e94de8ee-bd94-475e-b454-b8fbbef8a685.html)
+
+##### SLHJ - End hospital stay - patient completed to home/primary sector (inpatient)
+The simplified example below is an example of a 'End hospital stay - patient completed to home/primary sector' HospitalNotification which is sent in continuation of simplified example number 1. The status in the Encounter is changed from 'in-progress' to 'finished', and the Encounter is populated with a timestamp indicating end of the encounter (period.end). In the Provenance instance is the activity code 'discharge-inpatient-home'. The sender and serviceProvider organisation is the same. 
+
+* [4 - Simplified example of 'End hospital stay - patient completed to home/primary sector'](./hospitalnotification/HNdischargeInPat.svg)
+
+[Click here to see the generated example of simplified example number 4.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-f4aa42a4-86db-4e68-9b38-9dda0dfd5774.html)
+
+##### MORS - Deceased (inpatient)
+The simplified example below is an example of a 'Deceased' HospitalNotification which is sent in continuation of simplified example number 1. The status in the Encounter is changed from 'in-progress' to 'finished', and the Encounter is populated with a timestamp indicating end of the encounter (period.end) i.e. the death of the patient. The element Patient.deceased is sat to 'true', indicating that the patient is deceased. In the Provenance instance is the activity code 'admit-inpatient', as it shall remain the current activity. The sender and serviceProvider organisation is the same. 
+
+* [5 - Simplified example of 'Deceased'](./hospitalnotification/HNdeceasedInPat.svg)
+
+[Click here to see the generated example of simplified example number 5.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-g099bbf3-3fca-4722-a248-bfe1aa956410.html)
+
+##### AN_STIN - Cancellation Start hospital stay - admitted
+The simplified example below is an example of a 'Cancellation Start hospital stay - admitted' HospitalNotification which is sent in continuation of simplified example number 1. In the Provenance instance the activity code is changed to 'cancel-admit-inpatient' and the entity.what is now 'removal' indicating that the previous message is cancelled. The sender and serviceProvider organisation is the same. 
+
+* [6 - Simplified example of 'Cancellation Start hospital stay - admitted'](./hospitalnotification/HNcancelEnteredInError.svg)
+
+[Click here to see the generated example of simplified example number 6.](https://medcomfhir.dk/ig/hospitalnotification/Bundle-c83671a4-9584-11ec-b909-0242ac120002.html)
+
 
 #### Terminology
 On [MedCom Terminology IG](http://medcomfhir.dk/ig/terminology/) all referenced CodeSystem and ValueSets developed by MedCom can be found.
diff --git a/puml/HospitalNotificationAdmit.puml b/puml/HospitalNotificationAdmit.puml
new file mode 100644
index 0000000..7dcdb9d
--- /dev/null
+++ b/puml/HospitalNotificationAdmit.puml
@@ -0,0 +1,95 @@
+@startuml HNAdmitInPat
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+'Message 1: Admit inpatient
+package "Start hospital stay - admitted" as admit <<Frame>>{
+    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
+        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
+        type = "message"
+        timestamp = "2022-12-07T12:00:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
+        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
+        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        extension:reportOfAdmissionFlag = "true"
+        extension:reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
+    }
+    class "Patient (MedComCorePatient)" as admitPT{
+        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
+        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "in-progress"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as admitROrg{
+        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as admitSOrg{
+        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+
+admitB -[hidden]- admitMH
+admitMH-[hidden]-admitPT
+admitPT-[hidden]-admitENC
+admitENC-[hidden]-admitROrg
+admitROrg-[hidden]-admitSOrg
+admitSOrg-[hidden]-admitPRO
+}
+
+' pile mellem de to beskeder
+' admit --> finished
+
+
+@enduml
+
diff --git a/puml/HospitalNotificationAdmitEnteredInError.puml b/puml/HospitalNotificationAdmitEnteredInError.puml
index 58139c9..11a9064 100644
--- a/puml/HospitalNotificationAdmitEnteredInError.puml
+++ b/puml/HospitalNotificationAdmitEnteredInError.puml
@@ -1,4 +1,4 @@
-@startuml HNAdmitEnteredInError
+@startuml HNcancelEnteredInError
 
 'layout
 skinparam class {
@@ -13,103 +13,29 @@ skinparam Ranksep 10
 
 
 'title
-title Simplified example: Admit and cancel admission for inpatient
+title Simplified example: Cancellation Start hospital stay - admitted
 
 'Message 1: Admit inpatient
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-09-01T12:00:10"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
-        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
-    }
-    class "Patient (MedComCorePatient)" as admitPT{
-        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
-        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "in-progress"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
-        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
-        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }
-
-admitB -[hidden]- admitMH
-admitMH-[hidden]-admitPT
-admitPT-[hidden]-admitENC
-admitENC-[hidden]-admitROrg
-admitROrg-[hidden]-admitSOrg
-admitSOrg-[hidden]-admitPRO
-}
-
-'Message 2: Entered in Error inpatient
-package "Message 2: Cancel Admission of Inpatient" as error <<Frame>> {
-class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
+package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
+    class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
         id = "c83671a4-9584-11ec-b909-0242ac120002"
         type = "message"
-        timestamp = "2022-09-01T14:00:05"
+        timestamp = "2022-12-07T15:00:01"
     }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as errorMH{
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
         id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
         event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
         event.code = "hospital-notification-message"
         destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
         destination.use.code = "primary"
         destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+        destination.receiver.reference = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
         source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
         focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
     }
-    class "Patient  (MedComCorePatient)" as errorPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
+    class "Patient (MedComCorePatient)" as cancelPT{
+        id = "d6eeaca6-81c6-11ed-a1eb-0242ac120002"
         identifier.system = "urn:oid:1.2.208.176.1.2"
         identifier.value = "2509479989"
         name.use = "official"
@@ -117,66 +43,64 @@ class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
         name.given[0] = "Bruno"
         name.given[1] = "Test"
     }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as errorENC{
+    class "Encounter (MedComHospitalNotificationEncounter)" as cancelENC{
         id = "c9782061-ce63-41b5-8be6-655812d23332"
         status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
         status.code = "entered-in-error"
         class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
         class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
+        subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+        period.start = "2022-12-07T12:00:00"
+        serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
     }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as errorROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
+    class "Receiver (MedComMessagingOrganization)" as cancelROrg{
+        id = "eefc2dfa-81c6-11ed-a1eb-0242ac120002"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790001348120"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
     }
-    class "Sender: Hospital (MedComMessagingOrganization)" as errorSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    class "Sender (MedComMessagingOrganization)" as cancelSOrg{
+        id = "05266a00-81c7-11ed-a1eb-0242ac120002"
         identifier[0].system = "https://www.gs1.org/gln"
         identifier[0].value = "5790000209354"
         identifier[1].system = "urn:oid:1.2.208.176.1.1"
         identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
     }
-    class "Provenance (MedComMessagingProvenance)" as admiterrorPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
+    class "Provenance (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
     }
-    class "Provenance (MedComMessagingProvenance)" as errorPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+    class "Provenance (MedComMessagingProvenance)" as cancelPRO{
+        id = "c67ecb1c-957a-11ec-b909-0242ac120002"
         target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-09-01T14:00:25+02:00"
-        recorded = "2022-09-01T14:00:25"
+        occuredDateTime = "2022-12-07T15:00:02"
+        recorded = "2022-12-07T15:00:02"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "cancel-admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+        agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
         entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
         entity.role.value = "removal"
         entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
     }
-errorB-[hidden]-errorMH
-errorMH-[hidden]-errorPT
-errorPT-[hidden]-errorENC
-errorENC-[hidden]-errorROrg
-errorROrg-[hidden]-errorSOrg
-errorSOrg-[hidden]-admiterrorPRO
-admiterrorPRO-[hidden]-errorPRO
 
+cancelB -[hidden]- cancelMH
+cancelMH-[hidden]-cancelPT
+cancelPT-[hidden]-cancelENC
+cancelENC-[hidden]-cancelROrg
+cancelROrg-[hidden]-cancelSOrg
+cancelSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-cancelPRO
 }
 
-' pile mellem de to beskeder
-' admit --> error
-
-
 @enduml
 
diff --git a/puml/HospitalNotificationAdmitFinish.puml b/puml/HospitalNotificationAdmitFinish.puml
deleted file mode 100644
index cd4a5b4..0000000
--- a/puml/HospitalNotificationAdmitFinish.puml
+++ /dev/null
@@ -1,177 +0,0 @@
-@startuml HNAdmitInPat
-
-'layout
-skinparam class {
-    BackgroundColor White
-    BorderColor Black
-    ArrowColor Black
-  }
-hide circle
-hide empty members
-skinparam SameClassWidth true
-skinparam Ranksep 10
-
-'Message 1: Admit inpatient
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-09-01T12:00:10"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
-        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
-    }
-    class "Patient (MedComCorePatient)" as admitPT{
-        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
-        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "in-progress"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
-        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
-        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }
-
-admitB -[hidden]- admitMH
-admitMH-[hidden]-admitPT
-admitPT-[hidden]-admitENC
-admitENC-[hidden]-admitROrg
-admitROrg-[hidden]-admitSOrg
-admitSOrg-[hidden]-admitPRO
-}
-
-package "Message 2: Discharge Inpatient to Home" as finished <<Frame>>{
-    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
-        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
-        type = "message"
-        timestamp = "2022-09-30T09:22:33"
-    }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
-        id = "g1affa53-c157-4080-abb0-8e681524f969"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
-    }
-    class "Patient  (MedComCorePatient)" as finishedPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
-        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "finished"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        periode.end = "2022-09-30T09:22:28+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    } 
-    class "Receiver: Municipality (MedComMessagingOrganization)" as finishedROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as finishedSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    } 
-    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }
-    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
-        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-09-30T09:22:53+02:00"
-        recorded = "2022-09-30T09:22:53"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "discharge-inpatient-home"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
-        entity.role.value = "revision"
-        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-    }
-finishedB-[hidden]-finishedMH
-finishedMH-[hidden]-finishedPT
-finishedPT-[hidden]-finishedENC
-finishedENC-[hidden]-finishedROrg
-finishedROrg-[hidden]-finishedSOrg
-finishedSOrg-[hidden]-admitfinishedPRO
-admitfinishedPRO-[hidden]-finishedPRO
-
-}
-' pile mellem de to beskeder
-' admit --> finished
-
-
-@enduml
-
diff --git a/puml/HospitalNotificationAdmitOnleaveEndFinish.puml b/puml/HospitalNotificationAdmitOnleaveEndFinish.puml
deleted file mode 100644
index a40d678..0000000
--- a/puml/HospitalNotificationAdmitOnleaveEndFinish.puml
+++ /dev/null
@@ -1,362 +0,0 @@
-@startuml HNAdmitOnleaveEndFinish
-
-'layout
-skinparam class {
-    BackgroundColor White
-    BorderColor Black
-    ArrowColor Black
-  }
-hide circle
-hide empty members
-skinparam SameClassWidth true
-skinparam Ranksep 10
-
-
-'title
-title Simplified example: Admit, Onleave, and Discharge Inpatient
-
-
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-09-01T12:00:10"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
-        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        event.system = "http://medcomfhir.dk/fhir/dk-medcom-terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/fhir/dk-medcom-terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
-    }
-    class "Patient (MedComCorePatient)" as admitPT{
-        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
-        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
-        status.system = "http://medcomfhir.dk/fhir/dk-medcom-terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "in-progress"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
-        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[0].system = "urn:oid:1.2.208.176.1.1"
-        identifier[0].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
-        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[0].system = "urn:oid:1.2.208.176.1.1"
-        identifier[0].value = "265161000016000"
-    }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7128eb7-8df1-4479-b56f-9c66970159f6"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/fhir/dk-medcom-terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }
-
-admitB -[hidden]- admitMH
-admitMH-[hidden]-admitPT
-admitPT-[hidden]-admitENC
-admitENC-[hidden]-admitROrg
-admitROrg-[hidden]-admitSOrg
-admitSOrg-[hidden]-admitPRO
-}
-
-'Message 2: Onleave inpatient
-package "Message 2: Start Onleave Inpatient" as Onleave <<Frame>> {
-    class "Bundle (MedComHospitalNotificationMessage)" as onleaveB {
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-09-01T12:00:10"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as onleaveMH{
-        id = MH2
-        event = "hospital-notification-message"
-        destination:primary = MedComMessagingOrganization/RO1
-        destination:primary.use = "primary"
-        destination:primary.endpoint = *url to receiver of HospitalNotification message*
-        sender = MedComMessagingOrganization/SO1
-        source.endpoint = *url to receiver of Acknowledgement*
-        focus = MedComHospitalNotificationEncounter/ENC1
-    }
-    class "Patient (MedComCorePatient)" as onleavePT{
-        id = PA1
-        identifier:cpr = 2509479989
-        name.family = Elmer
-        name.given[0] = Bruno
-        name.given[1] = Test
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as onleaveENC{
-        id = ENC2
-        status = "onleave"
-        class = "IMP"
-        subject = MedComCorePatient/PA1
-        episodeOfCare = *refence to the episode of care*
-        episodeOfCare.identifier = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = 2021-12-01T12:00:00Z
-        serviceProvider = MedComCoreOrganization/SPO1
-    }
-    class "Service Provider Organization (MedComCoreOrganization)" as onleaveSPOrg{
-        id = SPO1
-        sorIdentifier = 369258147
-    }
-    class "Receiver: Municipality (MedComMessagingOrganization)" as onleaveROrg{
-        id = RO1
-        eanIdentifier = 987654321
-        sorIdentifier = 741852963
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as onleaveSOrg{
-        id = SO1
-        eanIdentifier = 123456789
-        sorIdentifier = 369258147
-    }
-    class "Provenance (MedComMessagingProvenance)" as admitonleavePRO{
-        id = PROV1
-        target = MessageHeader/MH1
-        occuredDateTime = 2021-12-01T12:00:10+01:00
-        recorded = 2021-12-01T12:00:20
-        activity.code = "admit-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-    }
-    class "Provenance (MedComMessagingProvenance)" as onleavePRO{
-        id = PROV2        
-        target = MH2
-        occuredDateTime = 2021-12-01T12:00:10+01:00
-        recorded = 2021-12-01T12:00:20
-        activity = "start-leave-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH1
-
-    }
-onleaveB-[hidden]-onleaveMH
-onleaveMH-[hidden]-onleavePT
-onleavePT-[hidden]-onleaveENC
-onleaveENC-[hidden]-onleaveSPOrg
-onleaveSPOrg-[hidden]-onleaveROrg
-onleaveROrg-[hidden]-onleaveSOrg
-onleaveSOrg-[hidden]-admitonleavePRO
-admitonleavePRO-[hidden]-onleavePRO
-
-}
-
-'Message 3: End onleave inpatient
-package "Message 3: End onleave Inpatient" as endOnleave <<Frame>> {
-    class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB {
-        id = BUN3
-        type = "message"
-        timestamp = 2021-12-03T13:00:00
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
-        id = MH3
-        event = "hospital-notification-message"
-        destination:primary = MedComMessagingOrganization/RO1
-        destination:primary.use = "primary"
-        destination:primary.endpoint = *url to receiver of HospitalNotification message*
-        sender = MedComMessagingOrganization/SO1
-        source.endpoint = *url to receiver of Acknowledgement*
-        focus = MedComHospitalNotificationEncounter/ENC1
-    }
-    class "Patient (MedComCorePatient)" as endOnleavePT{
-        id = PA1
-        identifier:cpr = 2509479989
-        name.family = Elmer
-        name.given[0] = Bruno
-        name.given[1] = Test
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as endOnleaveENC{
-        id = ENC3
-        status = "in-progress"
-        class = "IMP"
-        subject = MedComCorePatient/PA1
-        episodeOfCare = *refence to the episode of care*
-        episodeOfCare.identifier = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = 2021-12-01T12:00:00Z
-        serviceProvider = MedComCoreOrganization/SPO1
-    }
-    class "ServiceProvider Organization (MedComCoreOrganization)" as endOnleaveSPOrg{
-        id = SPO1
-        sorIdentifier = 369258147
-    }
-    class "Receiver: Municipality (MedComMessagingOrganization)" as endOnleaveROrg{
-        id = RO1
-        eanIdentifier = 987654321
-        sorIdentifier = 741852963
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as endOnleaveSOrg{
-        id = SO1
-        eanIdentifier = 123456789
-        sorIdentifier = 369258147
-    }    
-    class "Provenance(MedComMessagingProvenance)" as admitendOnleavePRO{
-        id = PROV1
-        target = MessageHeader/MH1
-        occuredDateTime = 2021-12-01T12:00:10+01:00
-        recorded = 2021-12-01T12:00:20
-        activity.code = "admit-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-    }
-    class "Provenance (MedComMessagingProvenance)" as onleaveendOnleavePRO{
-        id = PROV2        
-        target = MessageHeader/MH2
-        occuredDateTime = 2021-12-02T08:00:00+01:00
-        recorded = 2021-12-02T08:00:20
-        activity = "start-leave-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH1
-    }
-    class "Provenance (MedComMessagingProvenance)" as endOnleavePRO{
-        id = PROV3        
-        target = MessageHeader/MH3
-        occuredDateTime = 2021-12-03T13:00:00+01:00
-        recorded = 2021-12-03T13:00:20
-        activity = "end-leave-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH2
-    }
-endOnleaveB-[hidden]-endOnleaveMH
-endOnleaveMH-[hidden]-endOnleavePT
-endOnleavePT-[hidden]-endOnleaveENC
-endOnleaveENC-[hidden]-endOnleaveSPOrg
-endOnleaveSPOrg-[hidden]-endOnleaveROrg
-endOnleaveROrg-[hidden]-endOnleaveSOrg
-endOnleaveSOrg-[hidden]-admitendOnleavePRO
-admitendOnleavePRO-[hidden]-onleaveendOnleavePRO
-onleaveendOnleavePRO-[hidden]-endOnleavePRO
-
-}
-
-
-'Message 2: Finished inpatient
-package "Message 4: Discharge Inpatient to Home" as finished <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as finishedB{
-        id = BUN4
-        type = "message"
-        timestamp = 2021-12-04T14:00:10+01:00
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as finishedMH{
-        id = MHID2
-        event = "hospital-notification-message"
-        destination:primary = MedComMessagingOrganization/RO2
-        destination:primary.use = "primary"
-        destination:primary.endpoint = *url to receiver of HospitalNotification message*
-        sender = MedComMessagingOrganization/SO1
-        source.endpoint = *url to receiver of Acknowledgement*
-        focus = MedComHospitalNotificationEncounter/ENC2
-    }
-    class "Patient (MedComCorePatient)" as finishedPT{
-        id = PA1
-        identifier:cpr = 2509479989
-        name.family = Elmer
-        name.given[0] = Bruno
-        name.given[1] = Test
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as finishedENC{
-        id = ENC4
-        status = "finished"
-        class = "IMP"
-        subject = MedComCorePatient/PA1
-        episodeOfCare = *refence to the episode of care*
-        episodeOfCare.identifier = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = 2021-12-01T12:00:00+01:00
-        serviceProvider = MedComCoreOrganization/SPO1
-    }
-    class "ServiceProvider Organization (MedComCoreOrganization)" as finishedSPOrg{
-        id = SPO1 
-        sorIdentifier = 369258147
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as finishedROrg{
-        id = RO1
-        eanIdentifier = 987654321
-        sorIdentifier = 741852963
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as finishedSOrg{
-        id = SO1
-        eanIdentifier = 123456789
-        sorIdentifier = 369258147
-    }    
-    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
-        id = PROV1
-        target = MessageHeader/MH1
-        occuredDateTime = 2021-12-01T12:00:10+01:00
-        recorded = 2021-12-01T12:00:20
-        activity.code = "admit-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-    }
-    class "Provenance (MedComMessagingProvenance)" as startfinishedPRO{
-        id = PROV2        
-        target = MessageHeader/MH2
-        occuredDateTime = 2021-12-02T08:00:00+01:00
-        recorded = 2021-12-02T08:00:20
-        activity = "start-leave-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH1
-    }
-    class "Provenance (MedComMessagingProvenance)" as endfinishedPRO{
-        id = PROV3        
-        target = MessageHeader/MH3
-        occuredDateTime = 2021-12-03T13:00:00+01:00
-        recorded = 2021-12-03T13:00:20
-        activity = "end-leave-inpatient"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH2
-    }
-    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
-        id = PROV4
-        target = MessageHeader/MH4
-        occuredDateTime = 2021-12-04T14:00:10+01:00
-        recorded = 2021-12-04T14:00:20
-        activity = "discharge-inpatient-home"
-        agent.who = MedComMessagingOrganization/SO1
-        entity.role = "deriviation"
-        entity.what = MessageHeader/MH3
-    }
-finishedB-[hidden]-finishedMH
-finishedMH-[hidden]-finishedPT
-finishedPT-[hidden]-finishedENC
-finishedENC-[hidden]-finishedSPOrg
-finishedSPOrg-[hidden]-finishedROrg
-finishedROrg-[hidden]-finishedSOrg
-finishedSOrg-[hidden]-admitfinishedPRO
-admitfinishedPRO-[hidden]-startfinishedPRO
-startfinishedPRO-[hidden]-endfinishedPRO
-endfinishedPRO-[hidden]-finishedPRO
-
-
-}
-
-
-
-@enduml
-
diff --git a/puml/HospitalNotificationDischarge.puml b/puml/HospitalNotificationDischarge.puml
new file mode 100644
index 0000000..d499384
--- /dev/null
+++ b/puml/HospitalNotificationDischarge.puml
@@ -0,0 +1,106 @@
+@startuml HNdischargeInPat
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "End hospital stay - patient completed to home/primary sector" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
+        type = "message"
+        timestamp = "2022-12-18T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "g1affa53-c157-4080-abb0-8e681524f969"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "6841b54e-81cd-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-18T09:45:30"
+        serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "7e692262-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "8d813af0-81cd-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
+        target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
+        occuredDateTime = "2022-12-18T09:45:32"
+        recorded = "2022-12-18T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "discharge-inpatient-home"
+        agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+' pile mellem de to beskeder
+' admit --> finished
+
+
+@enduml
+
diff --git a/puml/HospitalNotificationEndOnleave.puml b/puml/HospitalNotificationEndOnleave.puml
new file mode 100644
index 0000000..5028632
--- /dev/null
+++ b/puml/HospitalNotificationEndOnleave.puml
@@ -0,0 +1,124 @@
+@startuml HNendOnleave
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+'title
+title Simplified example: End leave
+
+
+'Message 3: End onleave inpatient
+package "End leave" as endOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
+        id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
+        type = "message"
+        timestamp = "2022-12-14T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
+        id = "f47254da-f170-46f0-b624-4778a9c92b1f"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+    }
+    class "Patient (MedComCorePatient)" as endOnleavePT{
+        id = "519d5170-81ca-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as endOnleaveENC{
+        id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "in-progress"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+    }    
+class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as endOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
+        id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
+        target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
+        occuredDateTime = "2022-12-14T15:30:02"
+        recorded = "2022-12-14T15:30:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "end-leave-inpatient"
+        agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+    }
+endOnleaveB -[hidden]- endOnleaveMH
+endOnleaveMH-[hidden]-endOnleavePT
+endOnleavePT-[hidden]-endOnleaveENC
+endOnleaveENC-[hidden]-endOnleaveROrg
+endOnleaveROrg-[hidden]-endOnleaveSOrg
+endOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+startOnleavePRO-[hidden]-endOnleavePRO
+
+}
+
+
+
+@enduml
+
diff --git a/puml/HospitalNotificationMors.puml b/puml/HospitalNotificationMors.puml
new file mode 100644
index 0000000..f8ab15e
--- /dev/null
+++ b/puml/HospitalNotificationMors.puml
@@ -0,0 +1,107 @@
+@startuml HNdeceasedInPat
+
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+package "Deceased" as finished <<Frame>>{
+    class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
+        id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
+        type = "message"
+        timestamp = "2022-12-09T09:45:31"
+    }
+    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
+        id = "hefc6d95-6161-4493-99c9-f359488dedb8"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"
+    }
+    class "Patient  (MedComCorePatient)" as finishedPT{
+        id = "t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+        deceased = "true"
+    }
+    class "Encounter  (MedComHospitalNotificationEncounter)" as finishedENC{
+        id = "gcab7218-9584-11ec-b909-0242ac120002"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "finished"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        periode.end = "2022-12-09T09:45:30"
+        serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+    } 
+    class "Receiver (MedComMessagingOrganization)" as finishedROrg{
+        id = "753bdcba-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as finishedSOrg{
+        id = "840b4046-81ce-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
+    }
+    class "Provenance (MedComMessagingProvenance)" as finishedPRO{
+        id = "g9942adb-197a-4e30-bec8-566e3a113efe"
+        target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
+        occuredDateTime = "2022-12-09T09:45:32"
+        recorded = "2022-12-09T09:45:32"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+finishedB-[hidden]-finishedMH
+finishedMH-[hidden]-finishedPT
+finishedPT-[hidden]-finishedENC
+finishedENC-[hidden]-finishedROrg
+finishedROrg-[hidden]-finishedSOrg
+finishedSOrg-[hidden]-admitfinishedPRO
+admitfinishedPRO-[hidden]-finishedPRO
+
+}
+' pile mellem de to beskeder
+' admit --> finished
+
+
+@enduml
+
diff --git a/puml/HospitalNotificationStartOnleave.puml b/puml/HospitalNotificationStartOnleave.puml
new file mode 100644
index 0000000..89bfc23
--- /dev/null
+++ b/puml/HospitalNotificationStartOnleave.puml
@@ -0,0 +1,109 @@
+@startuml HNstartOnleave
+'layout
+skinparam class {
+    BackgroundColor White
+    BorderColor Black
+    ArrowColor Black
+  }
+hide circle
+hide empty members
+skinparam SameClassWidth true
+skinparam Ranksep 10
+
+
+'title
+title Simplified example: Start leave
+
+
+'Message 3: End onleave inpatient
+package "Start leave" as startOnleave <<Frame>> {
+    class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
+        id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
+        type = "message"
+        timestamp = "2022-12-13T15:30:01"
+    }
+    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
+        id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
+        event.code = "hospital-notification-message"
+        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
+        destination.use.code = "primary"
+        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
+        destination.receiver.reference = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        sender.reference = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
+        focus = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"
+    }
+    class "Patient (MedComCorePatient)" as startOnleavePT{
+        id = "97404d10-81c8-11ed-a1eb-0242ac120002"
+        identifier.system = "urn:oid:1.2.208.176.1.2"
+        identifier.value = "2509479989"
+        name.use = "official"
+        name.family = "Elmer"
+        name.given[0] = "Bruno"
+        name.given[1] = "Test"
+    }
+    class "Encounter (MedComHospitalNotificationEncounter)" as startOnleaveENC{
+        id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"
+        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
+        status.code = "onleave"
+        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
+        class.code = "IMP"
+        subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
+        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
+        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
+        period.start = "2022-12-07T12:00:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+    }    
+    class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
+        id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790001348120"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "953741000016009"
+        name = "Plejecenter Herlev"
+    }
+    class "Sender (MedComMessagingOrganization)" as startOnleaveSOrg{
+        id = "b79a7914-81c8-11ed-a1eb-0242ac120002"
+        identifier[0].system = "https://www.gs1.org/gln"
+        identifier[0].value = "5790000209354"
+        identifier[1].system = "urn:oid:1.2.208.176.1.1"
+        identifier[1].value = "265161000016000"
+        name = "Hjerteafdelingen på Herlev og Gentofte hospital" 
+    }
+    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
+        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
+        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+        occuredDateTime = "2022-12-07T12:00:02"
+        recorded = "2022-12-07T12:00:02"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "admit-inpatient"
+        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
+    }
+    class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
+        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
+        target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
+        occuredDateTime = "2022-12-13T14:00:12"
+        recorded = "2022-12-13T14:00:12"
+        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
+        activity.code = "start-leave-inpatient"
+        agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
+        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
+        entity.role.value = "revision"
+        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
+    }
+startOnleaveB -[hidden]- startOnleaveMH
+startOnleaveMH-[hidden]-startOnleavePT
+startOnleavePT-[hidden]-startOnleaveENC
+startOnleaveENC-[hidden]-startOnleaveROrg
+startOnleaveROrg-[hidden]-startOnleaveSOrg
+startOnleaveSOrg-[hidden]-admitPRO
+admitPRO-[hidden]-startOnleavePRO
+
+}
+
+
+
+@enduml
+
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 6266c6f..c076632 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -14,8 +14,9 @@ publisher:
 jurisdiction: urn:iso:std:iso:3166#DK "Denmark"
 dependencies:
   hl7.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.core: current #2.0.0
-  medcom.fhir.dk.messaging: current #2.0.0
+  medcom.fhir.dk.core: 2.1.0
+  medcom.fhir.dk.messaging: 2.0.0
+  medcom.fhir.dk.terminology: 1.1.0
 
 menu:
   Table of Contents: toc.html

From 28b0fb7a1bc2c8c58388e2651195ba38efbe14b5 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Thu, 22 Dec 2022 13:55:43 +0100
Subject: [PATCH 09/10] Update sushi-config.yaml

---
 sushi-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sushi-config.yaml b/sushi-config.yaml
index c076632..315d226 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -14,9 +14,9 @@ publisher:
 jurisdiction: urn:iso:std:iso:3166#DK "Denmark"
 dependencies:
   hl7.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.core: 2.1.0
-  medcom.fhir.dk.messaging: 2.0.0
-  medcom.fhir.dk.terminology: 1.1.0
+  medcom.fhir.dk.core: "current"
+  medcom.fhir.dk.messaging: "current"
+  medcom.fhir.dk.terminology: "current"
 
 menu:
   Table of Contents: toc.html

From 9e94dd28da73c56a058ac98bdd589529719b4c52 Mon Sep 17 00:00:00 2001
From: tmsMedcom <88831880+tmsMedcom@users.noreply.github.com>
Date: Mon, 2 Jan 2023 10:10:39 +0100
Subject: [PATCH 10/10] Modified after review

---
 ...ospitalNotificationProvenanceInstances.fsh |  46 +-
 .../MedComHospitalNotificationEncounter.fsh   |  47 ++-
 .../fsh/MedComHospitalNotificationMessage.fsh |  22 +-
 .../HNAdmitEnteredInError.svg                 | 397 ------------------
 .../hospitalnotification/HNAdmitInPat.svg     |  24 +-
 .../HNcancelEnteredInError.svg                |  34 +-
 .../hospitalnotification/HNdeceasedInPat.svg  |  38 +-
 .../hospitalnotification/HNdischargeInPat.svg |  38 +-
 .../hospitalnotification/HNendOnleave.svg     |  52 +--
 .../hospitalnotification/HNstartOnleave.svg   |  38 +-
 ...om-hospitalNotification-encounter-intro.md |  14 +-
 input/pagecontent/index.md                    |   4 +-
 puml/HospitalNotificationAdmit.puml           |   8 +-
 ...spitalNotificationAdmitEnteredInError.puml |  12 +-
 puml/HospitalNotificationDischarge.puml       |  14 +-
 puml/HospitalNotificationEndOnleave.puml      |  20 +-
 puml/HospitalNotificationMors.puml            |  14 +-
 puml/HospitalNotificationStartOnleave.puml    |  14 +-
 18 files changed, 221 insertions(+), 615 deletions(-)
 delete mode 100644 input/images/hospitalnotification/HNAdmitEnteredInError.svg

diff --git a/input/fsh/HospitalNotificationProvenanceInstances.fsh b/input/fsh/HospitalNotificationProvenanceInstances.fsh
index 4da6a18..6d14b9a 100644
--- a/input/fsh/HospitalNotificationProvenanceInstances.fsh
+++ b/input/fsh/HospitalNotificationProvenanceInstances.fsh
@@ -6,8 +6,8 @@ Title: "MedComMessagingProvenance - STIN"
 Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(b9b4818e-02de-4cc4-b418-d20cbc7b5404) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-12-07T12:00:02Z
-* recorded = 2022-12-07T12:00:02Z
+* occurredDateTime = 2022-12-07T12:00:02+02:00
+* recorded = 2022-12-07T12:00:02+02:00
 * activity.coding = $ActivityCode#admit-inpatient
 * agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
@@ -15,11 +15,11 @@ Usage: #definition
 Instance: b5f7de8c-957a-11ec-b909-0242ac120002
 InstanceOf: MedComMessagingProvenance
 Title: "MedComMessagingProvenance - RE_STIN"
-Description: "Example of MedComMessagingProvenance used in 'Revise Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
+Description: "Example of MedComMessagingProvenance used in 'Update Start hospital stay -admitted'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(cc47c1e2-78e6-4291-b071-f423a4f7fbfe) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-12-07T14:00:02Z
-* recorded = 2022-12-07T14:00:02Z
+* occurredDateTime = 2022-12-07T14:00:02+02:00
+* recorded = 2022-12-07T14:00:02+02:00
 * activity.coding = $ActivityCode#revise-admit-inpatient 
 * agent.who = Reference(abb09e14-81c6-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -32,8 +32,8 @@ Title: "MedComMessagingProvenance - AN_STIN"
 Description: "Example of MedComMessagingProvenance used in 'Cancellation Start hospital stay - admitted'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(d8749b54-1aeb-4089-8941-8d876bdffc51) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-12-07T15:00:02Z
-* recorded = 2022-12-07T15:00:02Z
+* occurredDateTime = 2022-12-07T15:00:02+02:00
+* recorded = 2022-12-07T15:00:02+02:00
 * activity.coding = $ActivityCode#cancel-admit-inpatient
 * agent.who = Reference(05266a00-81c7-11ed-a1eb-0242ac120002)
 * entity.role = #removal
@@ -46,8 +46,8 @@ Title: "MedComMessagingProvenance - STOR"
 Description: "Example of MedComMessagingProvenance used in 'Start leave'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(e563a2b2-bf92-4b13-bbd2-0a021a95bded)
-* occurredDateTime = 2022-12-13T14:00:12Z
-* recorded = 2022-12-13T14:00:12Z
+* occurredDateTime = 2022-12-13T14:00:12+02:00
+* recorded = 2022-12-13T14:00:12+02:00
 * activity.coding = $ActivityCode#start-leave-inpatient
 * agent.who = Reference(b79a7914-81c8-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -60,8 +60,8 @@ Title: "MedComMessagingProvenance - SLOR"
 Description: "Example of MedComMessagingProvenance used in 'End leave'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(f47254da-f170-46f0-b624-4778a9c92b1f)
-* occurredDateTime = 2022-12-14T15:30:02Z
-* recorded = 2022-12-14T15:30:02Z
+* occurredDateTime = 2022-12-14T15:30:02+02:00
+* recorded = 2022-12-14T15:30:02+02:00
 * activity.coding = $ActivityCode#end-leave-inpatient
 * agent.who = Reference(5961ade8-81ca-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -74,8 +74,8 @@ Title: "MedComMessagingProvenance - SLHJ (inpatient)"
 Description: "Example of MedComMessagingProvenance used in 'End hospital stay - patient completed to home/primary sector' (inpatient). Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(g1affa53-c157-4080-abb0-8e681524f969)
-* occurredDateTime = 2022-12-18T09:45:32Z
-* recorded = 2022-12-18T09:45:32Z
+* occurredDateTime = 2022-12-18T09:45:32+02:00
+* recorded = 2022-12-18T09:45:32+02:00
 * activity.coding = $ActivityCode#discharge-inpatient-home
 * agent.who = Reference(8d813af0-81cd-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -88,8 +88,8 @@ Title: "MedComMessagingProvenance - MORS (inpatient)"
 Description: "Example of MedComMessagingProvenance used in 'Deceased' (inpatient). Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(hefc6d95-6161-4493-99c9-f359488dedb8)
-* occurredDateTime = 2022-12-09T09:45:32Z
-* recorded = 2022-12-09T09:45:32Z
+* occurredDateTime = 2022-12-09T09:45:32+02:00
+* recorded = 2022-12-09T09:45:32+02:00
 * activity.coding = $ActivityCode#admit-inpatient
 * agent.who = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d) 
 * entity.role = #revision
@@ -104,8 +104,8 @@ Title: "MedComMessagingProvenance - STAA"
 Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - acute ambulant'. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-12-01T10:00:06Z
-* recorded = 2022-12-01T10:00:06Z
+* occurredDateTime = 2022-12-01T10:00:06+02:00
+* recorded = 2022-12-01T10:00:06+02:00
 * activity.coding = $ActivityCode#admit-emergency
 * agent.who = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 
@@ -118,8 +118,8 @@ Title: "MedComMessagingProvenance - SLHJ (acute ambulant)"
 Description: "Example of MedComMessagingProvenance used in 'End hospital stay - patient completed to home/primary sector' (acute ambulant). Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(m9bea09c-e662-4d59-b84f-9af570b57f42)
-* occurredDateTime = 2022-12-02T22:00:11Z
-* recorded = 2022-12-02T22:00:11Z
+* occurredDateTime = 2022-12-02T22:00:11+02:00
+* recorded = 2022-12-02T22:00:11+02:00
 * activity.coding = $ActivityCode#discharge-emergency-home
 * agent.who = Reference(0465ec66-81d2-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -132,8 +132,8 @@ Title: "MedComMessagingProvenance - MORS (acute ambulant)"
 Description: "Example of MedComMessagingProvenance used in 'Deceased' (acute ambulant). Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(nabb68aa-c97b-4905-a60c-71ff3209fd51)
-* occurredDateTime = 2022-12-02T07:00:02Z
-* recorded = 2022-12-02T07:00:02Z
+* occurredDateTime = 2022-12-02T07:00:02+02:00
+* recorded = 2022-12-02T07:00:02+02:00
 * activity.coding = $ActivityCode#admit-emergency
 * agent.who = Reference(66c12a92-81d2-11ed-a1eb-0242ac120002)
 * entity.role = #revision
@@ -143,10 +143,10 @@ Usage: #definition
 Instance: m7cf3888-6f52-5e4d-939c-d2575d24fba0
 InstanceOf: MedComMessagingProvenance
 Title: "MedComMessagingProvenance - STIN."
-Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - admitted'. With different serviceProvider and sender Organization. Only valid if used in a Bundle (message)."
+Description: "Example of MedComMessagingProvenance used in 'Start hospital stay - admitted'. With different serviceProvider and sender Organisation. Only valid if used in a Bundle (message)."
 Usage: #definition
 * target = Reference(o9b4818e-12de-5cc4-c418-d30cbc7b5404) // should be changed to the current MessageHeader
-* occurredDateTime = 2022-12-09T12:00:02Z
+* occurredDateTime = 2022-12-09T12:00:02+02:00
 * recorded = 2022-12-09T12:00:02Z
 * activity.coding = $ActivityCode#admit-inpatient
 * agent.who = Reference(cd72967c-81d2-11ed-a1eb-0242ac120002)
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationEncounter.fsh b/input/fsh/MedComHospitalNotificationEncounter.fsh
index 5104935..a11359b 100644
--- a/input/fsh/MedComHospitalNotificationEncounter.fsh
+++ b/input/fsh/MedComHospitalNotificationEncounter.fsh
@@ -13,7 +13,7 @@ Description: "Encounter derivation that handles hospital notification when a pat
 * priority 0..0
 * episodeOfCare 1.. MS
 * episodeOfCare.identifier 1.. MS
-* episodeOfCare ^definition = "Shall contain an episode of care identifier for the entire hospitalization"
+* episodeOfCare ^definition = "Shall contain an episode of care identifier for the entire hospitalisation"
 * episodeOfCare[lpr3identifier] MS
 * episodeOfCare[lpr3identifier].identifier SU
 * episodeOfCare[lpr3identifier].reference ..0
@@ -22,10 +22,13 @@ Description: "Encounter derivation that handles hospital notification when a pat
 * participant ..0
 * appointment ..0
 * period 1.. MS
-* period ^definition = "The start and end time of the encounter. For notification of hospitalization an start interval is always known as the notification of adminssion is trigged by the arrival of a patient. There a period will always exist as the notification of admission always starts the communication flow. Please that the encounter.period values always referes to the encounter start and end. The period of the leave of absence is not part of the notification of hospitalization FHIR resource ."
+* period ^definition = "The start and end time of the encounter. For notification of hospitalisation an start interval is always known as the notification of adminssion is trigged by the arrival of a patient. There a period will always exist as the notification of admission always starts the communication flow. Please that the encounter.period values always referes to the encounter start and end. The period of the leave of absence is not part of the notification of hospitalization FHIR resource ."
 * period.start 1.. MS
 * period.end MS
-* period.start ^definition = "Encounter Starting time. \r\nFor the notificationOfHospitalization a starting time is the timestamp that is registered by the hospital at patient physical arrival at the ward or emergency department."
+* period.start ^short = "Encounter start time."
+* period.start ^definition = "In HospitalNotification a start time is the timestamp that is registered by the hospital at patient physical attendance at the hospital."
+* period.end ^short = "Encounter end time."
+* period.end ^definition = "In HospitalNotification a end time is the timestamp that is registered by the hospital when the patient leaves the hospital after discharge."
 * length ..0
 * reasonCode ..0
 * reasonReference ..0
@@ -53,19 +56,19 @@ Description: "Example of MedComHospitalNotificationEncounter 'Start hospital sta
 * class = $ActCodes#IMP 
 * subject = Reference(t33cef33-3626-422b-955d-d506aaa65fe1)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-12-07T12:00:00Z
+* period.start = 2022-12-07T12:00:00+02:00
 * serviceProvider = Reference(o7056980-a8b2-42aa-8a0e-c1fc85d1f40d)
 
 
 Instance: b9846c24-0335-11ed-b939-0242ac120002
 InstanceOf: MedComHospitalNotificationEncounter
 Title: "HospitalNotification Encounter - RE_STIN"
-Description: "Example of MedComHospitalNotificationEncounter 'Revise Start hospital stay - admitted'. Only Valid if used in a Bundle."
+Description: "Example of MedComHospitalNotificationEncounter 'Update Start hospital stay - admitted'. Only Valid if used in a Bundle."
 * status = #in-progress
 * class = $ActCodes#IMP 
 * subject = Reference(48393486-81c6-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-12-07T13:00:00Z //updated here
+* period.start = 2022-12-07T13:00:00+02:00 //updated here
 * serviceProvider = Reference(abb09e14-81c6-11ed-a1eb-0242ac120002)
 
 Instance: c9782061-ce63-41b5-8be6-655812d23332
@@ -76,7 +79,7 @@ Description: "Example of MedComHospitalNotificationEncounter 'Cancellation Start
 * class = $ActCodes#IMP 
 * subject = Reference(d6eeaca6-81c6-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-12-07T12:00:00Z
+* period.start = 2022-12-07T12:00:00+02:00
 * serviceProvider = Reference(05266a00-81c7-11ed-a1eb-0242ac120002)
 
 Instance: d56e9c54-23d2-43a4-816e-951d2a6e3281
@@ -87,8 +90,8 @@ Description: "Example of MedComHospitalNotificationEncounter 'Start leave'. Only
 * class = $ActCodes#IMP 
 * subject = Reference(97404d10-81c8-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
-* period.start = 2022-12-07T12:00:00Z
-* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10Z
+* period.start = 2022-12-07T12:00:00+02:00
+* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10+02:00
 * serviceProvider = Reference(b79a7914-81c8-11ed-a1eb-0242ac120002)
 
 Instance: e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b
@@ -99,9 +102,9 @@ Description: "Example of MedComHospitalNotificationEncounter 'End leave'. Only V
 * class = $ActCodes#IMP 
 * subject = Reference(519d5170-81ca-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:a8e9917e-4081-5f99-905c-54246ae72867" 
-* period.start = 2022-12-07T12:00:00Z
-* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10Z
-* extension[leavePeriod].valuePeriod.end = 2022-12-14T15:30:00Z
+* period.start = 2022-12-07T12:00:00+02:00
+* extension[leavePeriod].valuePeriod.start = 2022-12-13T14:00:10+02:00
+* extension[leavePeriod].valuePeriod.end = 2022-12-14T15:30:00+02:00
 * serviceProvider = Reference(5961ade8-81ca-11ed-a1eb-0242ac120002)
 
 Instance: f405ba2d-467a-4e92-9acc-9dc2a629760f
@@ -112,8 +115,8 @@ Description: "Example of MedComHospitalNotificationEncounter 'End hospital stay
 * class = $ActCodes#IMP 
 * subject = Reference(6841b54e-81cd-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:b0172334-fa5e-5dfe-acb8-2a5b7aee3143" 
-* period.start = 2022-12-07T12:00:00Z
-* period.end = 2022-12-18T09:45:30Z
+* period.start = 2022-12-07T12:00:00+02:00
+* period.end = 2022-12-18T09:45:30+02:00
 * serviceProvider = Reference(8d813af0-81cd-11ed-a1eb-0242ac120002)
 
 //Embedded Encounter with admitted patient deceased
@@ -125,8 +128,8 @@ Description: "Example of MedComHospitalNotificationEncounter 'Deceased' (inpatie
 * class = $ActCodes#IMP
 * subject = Reference(t82fb8a3-6725-41e2-a615-2b1cfcfe9931)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:150d589a-d7e0-50cd-9651-fd9cad93be68"
-* period.start = 2022-12-07T12:00:00Z
-* period.end = 2022-12-09T09:45:30Z
+* period.start = 2022-12-07T12:00:00+02:00
+* period.end = 2022-12-09T09:45:30+02:00
 * serviceProvider = Reference(840b4046-81ce-11ed-a1eb-0242ac120002)
 
 
@@ -139,7 +142,7 @@ Description: "Example of MedComHospitalNotificationEncounter 'Start hospital sta
 * class = $ActCodes#EMER 
 * subject = Reference(fdc1fc66-81d0-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-12-01T10:00:04Z
+* period.start = 2022-12-01T10:00:04+02:00
 * serviceProvider = Reference(1f5882b4-81d1-11ed-a1eb-0242ac120002)
 
 Instance: kbbad98c-3310-404a-af0c-7e3739d7b49f
@@ -150,8 +153,8 @@ Description: "Example of MedComHospitalNotificationEncounter 'End hospital stay
 * class = $ActCodes#EMER 
 * subject = Reference(6c16f41e-81d1-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:b0172334-fa5e-5dfe-acb8-2a5b7aee3143" 
-* period.start = 2022-12-01T10:00:04Z
-* period.end = 2022-12-02T22:00:09Z
+* period.start = 2022-12-01T10:00:04+02:00
+* period.end = 2022-12-02T22:00:09+02:00
 * serviceProvider = Reference(0465ec66-81d2-11ed-a1eb-0242ac120002)
 
 //Embedded Encounter with admitted patient deceased
@@ -163,8 +166,8 @@ Description: "Example of MedComHospitalNotificationEncounter 'Deceased' (acute a
 * class = $ActCodes#EMER
 * subject = Reference(384b4a58-81d2-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:150d589a-d7e0-50cd-9651-fd9cad93be68"
-* period.start = 2022-12-01T10:00:04Z
-* period.end = 2022-12-02T07:00:00Z
+* period.start = 2022-12-01T10:00:04+02:00
+* period.end = 2022-12-02T07:00:00+02:00
 * serviceProvider = Reference(66c12a92-81d2-11ed-a1eb-0242ac120002)
 
 Instance: m790f964-98d3-4852-bac8-83d2f3d035f8
@@ -175,5 +178,5 @@ Description: "Example of MedComHospitalNotificationEncounter 'Start hospital sta
 * class = $ActCodes#IMP 
 * subject = Reference(b00ea1c0-81d2-11ed-a1eb-0242ac120002)
 * episodeOfCare[lpr3identifier].identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7" 
-* period.start = 2022-12-07T12:00:00Z
+* period.start = 2022-12-07T12:00:00+02:00
 * serviceProvider = Reference(of839e87-4e44-4977-b38e-92b5a6f187b5)
\ No newline at end of file
diff --git a/input/fsh/MedComHospitalNotificationMessage.fsh b/input/fsh/MedComHospitalNotificationMessage.fsh
index 408a9bb..eb626f2 100644
--- a/input/fsh/MedComHospitalNotificationMessage.fsh
+++ b/input/fsh/MedComHospitalNotificationMessage.fsh
@@ -42,7 +42,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STIN"
 Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-12-07T12:00:01Z
+* timestamp = 2022-12-07T12:00:01+02:00
 * entry[+].fullUrl = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
 * entry[=].resource = b9b4818e-02de-4cc4-b418-d20cbc7b5404
 * entry[+].fullUrl = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
@@ -62,7 +62,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - RE_STIN"
 Description: "Example of MedComHospitalNotificationMessage 'Update Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-12-07T14:00:01Z
+* timestamp = 2022-12-07T14:00:01+02:00
 * entry[+].fullUrl = "MessageHeader/cc47c1e2-78e6-4291-b071-f423a4f7fbfe"
 * entry[=].resource = cc47c1e2-78e6-4291-b071-f423a4f7fbfe
 * entry[+].fullUrl = "Patient/48393486-81c6-11ed-a1eb-0242ac120002"
@@ -84,7 +84,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - AN_STIN"
 Description: "Example of MedComHospitalNotificationMessage 'Cancellation Start hospital stay - admitted'"
 * type = $BundleType#message
-* timestamp = 2022-12-07T15:00:01Z
+* timestamp = 2022-12-07T15:00:01+02:00
 * entry[+].fullUrl = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
 * entry[=].resource = d8749b54-1aeb-4089-8941-8d876bdffc51
 * entry[+].fullUrl = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
@@ -105,7 +105,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STOR"
 Description: "Example of MedComHospitalNotificationMessage 'Start leave'"
 * type = $BundleType#message
-* timestamp = 2022-12-13T14:00:11Z
+* timestamp = 2022-12-13T14:00:11+02:00
 * entry[+].fullUrl = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
 * entry[=].resource = e563a2b2-bf92-4b13-bbd2-0a021a95bded
 * entry[+].fullUrl = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
@@ -126,7 +126,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLOR"
 Description: "Example of MedComHospitalNotificationMessage 'End leave'"
 * type = $BundleType#message
-* timestamp = 2022-12-14T15:30:01Z
+* timestamp = 2022-12-14T15:30:01+02:00
 * entry[+].fullUrl = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
 * entry[=].resource = f47254da-f170-46f0-b624-4778a9c92b1f
 * entry[+].fullUrl = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
@@ -149,7 +149,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLHJ (inpatient)"
 Description: "Example of MedComHospitalNotificationMessage 'End hospital stay - patient completed to home/primary sector' (inpatient)"
 * type = $BundleType#message
-* timestamp = 2022-12-18T09:45:31Z
+* timestamp = 2022-12-18T09:45:31+02:00
 * entry[+].fullUrl = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
 * entry[=].resource = g1affa53-c157-4080-abb0-8e681524f969
 * entry[+].fullUrl = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
@@ -173,7 +173,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - MORS (inpatient)"
 Description: "Example of MedComHospitalNotificationMessage 'Deceased' (inpatient)"
 * type = $BundleType#message
-* timestamp = 2022-12-09T09:45:31Z
+* timestamp = 2022-12-09T09:45:31+02:00
 * entry[+].fullUrl = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
 * entry[=].resource = hefc6d95-6161-4493-99c9-f359488dedb8
 * entry[+].fullUrl = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
@@ -198,7 +198,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STAA"
 Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - acute ambulant'"
 * type = $BundleType#message
-* timestamp = 2022-12-01T10:00:05Z
+* timestamp = 2022-12-01T10:00:05+02:00
 * entry[+].fullUrl = "MessageHeader/i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029"
 * entry[=].resource = i50fc5fe-2d11-4ef3-acac-2e2e5c6c0029
 * entry[+].fullUrl = "Patient/fdc1fc66-81d0-11ed-a1eb-0242ac120002"
@@ -218,7 +218,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - SLHJ (acute ambulant)"
 Description: "Example of MedComHospitalNotificationMessage 'End hospital stay - patient completed to home/primary sector' (acute ambulant)"
 * type = $BundleType#message
-* timestamp = 2022-12-02T22:00:10Z
+* timestamp = 2022-12-02T22:00:10+02:00
 * entry[+].fullUrl = "MessageHeader/m9bea09c-e662-4d59-b84f-9af570b57f42"
 * entry[=].resource = m9bea09c-e662-4d59-b84f-9af570b57f42
 * entry[+].fullUrl = "Patient/6c16f41e-81d1-11ed-a1eb-0242ac120002"
@@ -242,7 +242,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - MORS (acute ambulant)"
 Description: "Example of MedComHospitalNotificationMessage 'Deceased' (acute ambulant)"
 * type = $BundleType#message
-* timestamp = 2022-12-02T07:00:01Z
+* timestamp = 2022-12-02T07:00:01+02:00
 * entry[+].fullUrl = "MessageHeader/nabb68aa-c97b-4905-a60c-71ff3209fd51"
 * entry[=].resource = nabb68aa-c97b-4905-a60c-71ff3209fd51
 * entry[+].fullUrl = "Patient/384b4a58-81d2-11ed-a1eb-0242ac120002"
@@ -265,7 +265,7 @@ InstanceOf: MedComHospitalNotificationMessage
 Title: "HospitalNotification Message - STIN"
 Description: "Example of MedComHospitalNotificationMessage 'Start hospital stay - admitted'. With different serviceProvider and sender Organization."
 * type = $BundleType#message
-* timestamp = 2022-12-07T12:00:01Z
+* timestamp = 2022-12-07T12:00:01+02:00
 * entry[+].fullUrl = "MessageHeader/o9b4818e-12de-5cc4-c418-d30cbc7b5404"
 * entry[=].resource = o9b4818e-12de-5cc4-c418-d30cbc7b5404
 * entry[+].fullUrl = "Patient/b00ea1c0-81d2-11ed-a1eb-0242ac120002"
diff --git a/input/images/hospitalnotification/HNAdmitEnteredInError.svg b/input/images/hospitalnotification/HNAdmitEnteredInError.svg
deleted file mode 100644
index 6c202eb..0000000
--- a/input/images/hospitalnotification/HNAdmitEnteredInError.svg
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1520px" preserveAspectRatio="none" style="width:1529px;height:1520px;background:#FFFFFF;" version="1.1" viewBox="0 0 1529 1520" width="1529px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="434" x="540.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="424" x="545.5" y="24.5332">Simplified example: Admit and cancel admission for inpatient</text><!--MD5=[e3ce9a70b36f22ff1736cff4b5094119]
-cluster admit--><g id="cluster_admit"><rect fill="none" height="1225" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M206,45.6094 L206,56.2188 L196,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="189" x="10" y="61.1426">Message 1: Admit Inpatient</text></g><!--MD5=[77d9f3ba0333437ce7407f559fb23290]
-cluster error--><g id="cluster_error"><rect fill="none" height="1469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="777" y="45.6094"/><path d="M1079,45.6094 L1079,56.2188 L1069,66.2188 L777,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="292" x="780" y="61.1426">Message 2: Cancel Admission of Inpatient</text></g><!--MD5=[8b0fb6bcdbcce853e3af8ebdd7dc8030]
-class admitB--><g id="elem_admitB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-07T12:00:01"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
-class admitMH--><g id="elem_admitMH"><rect codeLine="24" fill="#FFFFFF" height="246.9219" id="admitMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="225.752">id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="550" x="29" y="331.4082">destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="29" y="349.0176">sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196" x="29" y="384.2363">reportOfAdmissionFlag = "true"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="549" x="29" y="401.8457">reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="419.4551">focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"</text></g><!--MD5=[e036c46784c1ca676a3972d4e1c0dddd]
-class admitPT--><g id="elem_admitPT"><rect codeLine="38" fill="#FFFFFF" height="158.875" id="admitPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="436.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="456.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="464.2188" y2="464.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="482.752">id = "t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="500.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="517.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="535.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="553.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="570.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="588.4082">name.given[1] = "Test"</text></g><!--MD5=[221b3f3a43b02d938eddc6ab5661f5a7]
-class admitENC--><g id="elem_admitENC"><rect codeLine="47" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="605.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="625.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="633.2188" y2="633.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="651.752">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="669.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="686.9707">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="704.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="722.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="739.7988">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="757.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="775.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="792.627">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="810.2363">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
-class admitROrg--><g id="elem_admitROrg"><rect codeLine="59" fill="#FFFFFF" height="123.6563" id="admitROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="202.5" y="847.1426">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="288" x="29" y="873.752">id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="944.1895">identifier[1].value = "953741000016009"</text></g><!--MD5=[89083fc17cd646efcc5774baa7271f78]
-class admitSOrg--><g id="elem_admitSOrg"><rect codeLine="66" fill="#FFFFFF" height="123.6563" id="admitSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="961.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="219" y="981.1426">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="989.2188" y2="989.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="1007.752">id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1025.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1042.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1060.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1078.1895">identifier[1].value = "265161000016000"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1115.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1141.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1247.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[eeb0debb5fca22f0d75064ed3b775ab3]
-class errorB--><g id="elem_errorB"><rect codeLine="93" fill="#FFFFFF" height="88.4375" id="errorB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="1003" y="101.1426">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="799" y="127.752">id = "c83671a4-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="799" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="799" y="162.9707">timestamp = "2022-09-01T14:00:05"</text></g><!--MD5=[beb118c84b97787df19f260a30b51ecd]
-class errorMH--><g id="elem_errorMH"><rect codeLine="98" fill="#FFFFFF" height="211.7031" id="errorMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="197.1094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="950.5" y="216.6426">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="224.7188" y2="224.7188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="799" y="243.252">id = "d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="799" y="260.8613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="799" y="278.4707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="799" y="296.0801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="799" y="313.6895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="799" y="331.2988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="567" x="799" y="348.9082">destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="799" y="366.5176">sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="799" y="384.127">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="403" x="799" y="401.7363">focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"</text></g><!--MD5=[e245cb8a2d08a530ae37cebee9106e69]
-class errorPT--><g id="elem_errorPT"><rect codeLine="110" fill="#FFFFFF" height="158.875" id="errorPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="436.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="1053.5" y="456.1426">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="464.2188" y2="464.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="799" y="482.752">id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="799" y="500.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="799" y="517.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="799" y="535.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="799" y="553.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="799" y="570.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="799" y="588.4082">name.given[1] = "Test"</text></g><!--MD5=[a9c075c36a1e45039083e1f044853e75]
-class errorENC--><g id="elem_errorENC"><rect codeLine="119" fill="#FFFFFF" height="211.7031" id="errorENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="605.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="988.5" y="625.1426">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="633.2188" y2="633.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="799" y="651.752">id = "c9782061-ce63-41b5-8be6-655812d23332"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="799" y="669.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="799" y="686.9707">status.code = "entered-in-error"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="799" y="704.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="799" y="722.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="386" x="799" y="739.7988">subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="799" y="757.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="799" y="775.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="799" y="792.627">period.start = "2022-09-01T12:00:05+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="799" y="810.2363">serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[6c9a41914b460d3a5f1dd0d448b31429]
-class errorROrg--><g id="elem_errorROrg"><rect codeLine="131" fill="#FFFFFF" height="123.6563" id="errorROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="355" x="972.5" y="847.1426">Receiver: Municipality (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="799" y="873.752">id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="944.1895">identifier[1].value = "953741000016009"</text></g><!--MD5=[4afeb56674f7fa49ccf35764061b8d1d]
-class errorSOrg--><g id="elem_errorSOrg"><rect codeLine="138" fill="#FFFFFF" height="123.6563" id="errorSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="961.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="989" y="981.1426">Sender: Hospital (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="989.2188" y2="989.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="799" y="1007.752">id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="799" y="1025.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="799" y="1042.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="799" y="1060.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="799" y="1078.1895">identifier[1].value = "265161000016000"</text></g><!--MD5=[fa176c8b8f7b9fe18e0376420c9c7cc6]
-class admiterrorPRO--><g id="elem_admiterrorPRO"><rect codeLine="145" fill="#FFFFFF" height="158.875" id="admiterrorPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1095.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1115.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1123.2188" y2="1123.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="799" y="1141.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="799" y="1159.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1176.9707">occuredDateTime = "2022-09-01T12:00:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1194.5801">recorded = "2022-09-01T12:00:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1212.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="799" y="1229.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1247.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[17da20a5a516157a8c1fce446ca93f65]
-class errorPRO--><g id="elem_errorPRO"><rect codeLine="154" fill="#FFFFFF" height="211.7031" id="errorPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="793" y="1286.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1005" y="1306.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="794" x2="1506" y1="1314.2188" y2="1314.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="799" y="1332.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="437" x="799" y="1350.3613">target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="799" y="1367.9707">occuredDateTime = "2022-09-01T14:00:25+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="799" y="1385.5801">recorded = "2022-09-01T14:00:25"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="799" y="1403.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="243" x="799" y="1420.7988">activity.code = "cancel-admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="799" y="1438.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="799" y="1456.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="799" y="1473.627">entity.role.value = "removal"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="799" y="1491.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
-link admitB to admitMH--><!--MD5=[2f36b81be7e2fd37c8dd70abd0e29703]
-link admitMH to admitPT--><!--MD5=[859e67acec9d8ffbc65cb4a1350759d6]
-link admitPT to admitENC--><!--MD5=[f69bb7d73991288835a957c5e30a0ded]
-link admitENC to admitROrg--><!--MD5=[f8460bd4b2c2a4369224dcea9f47c36b]
-link admitROrg to admitSOrg--><!--MD5=[f3a8aefdba3953f5b249616a0861bf2e]
-link admitSOrg to admitPRO--><!--MD5=[6f084a8d2e872725faa44846c01687f1]
-link errorB to errorMH--><!--MD5=[f4a6f90ab8cd4587f22264651557da14]
-link errorMH to errorPT--><!--MD5=[56358e0dbe0e2cce716083e3aa2c331d]
-link errorPT to errorENC--><!--MD5=[42d17321a5a2f7fc52288d4e9bc7b981]
-link errorENC to errorROrg--><!--MD5=[f98f56d20bb755e4d5aabf6a21e38333]
-link errorROrg to errorSOrg--><!--MD5=[a305cad4a7af414a34f2e85f60e2b82e]
-link errorSOrg to admiterrorPRO--><!--MD5=[c6f79db62b0d183cfcff860ba030febb]
-link admiterrorPRO to errorPRO--><!--MD5=[083f97e46f571501c6048bbaa9727ef3]
-@startuml HNAdmitEnteredInError
-
-'layout
-skinparam class {
-    BackgroundColor White
-    BorderColor Black
-    ArrowColor Black
-  }
-hide circle
-hide empty members
-skinparam SameClassWidth true
-skinparam Ranksep 10
-
-
-'title
-title Simplified example: Admit and cancel admission for inpatient
-
-'Message 1: Admit inpatient
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-12-07T12:00:01"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
-        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
-    }
-    class "Patient (MedComCorePatient)" as admitPT{
-        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
-        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "in-progress"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
-        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
-        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }
-
-admitB -[hidden]- admitMH
-admitMH-[hidden]-admitPT
-admitPT-[hidden]-admitENC
-admitENC-[hidden]-admitROrg
-admitROrg-[hidden]-admitSOrg
-admitSOrg-[hidden]-admitPRO
-}
-
-'Message 2: Entered in Error inpatient
-package "Message 2: Cancel Admission of Inpatient" as error <<Frame>> {
-class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
-        id = "c83671a4-9584-11ec-b909-0242ac120002"
-        type = "message"
-        timestamp = "2022-09-01T14:00:05"
-    }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as errorMH{
-        id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
-    }
-    class "Patient  (MedComCorePatient)" as errorPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as errorENC{
-        id = "c9782061-ce63-41b5-8be6-655812d23332"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "entered-in-error"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as errorROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as errorSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance (MedComMessagingProvenance)" as admiterrorPRO{
-        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }
-    class "Provenance (MedComMessagingProvenance)" as errorPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
-        target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-09-01T14:00:25+02:00"
-        recorded = "2022-09-01T14:00:25"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "cancel-admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
-        entity.role.value = "removal"
-        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-    }
-errorB-[hidden]-errorMH
-errorMH-[hidden]-errorPT
-errorPT-[hidden]-errorENC
-errorENC-[hidden]-errorROrg
-errorROrg-[hidden]-errorSOrg
-errorSOrg-[hidden]-admiterrorPRO
-admiterrorPRO-[hidden]-errorPRO
-
-}
-
-' pile mellem de to beskeder
-' admit - -> error
-
-
-@enduml
-
-@startuml HNAdmitEnteredInError
-
-skinparam class {
-    BackgroundColor White
-    BorderColor Black
-    ArrowColor Black
-  }
-hide circle
-hide empty members
-skinparam SameClassWidth true
-skinparam Ranksep 10
-
-
-title Simplified example: Admit and cancel admission for inpatient
-
-package "Message 1: Admit Inpatient" as admit <<Frame>>{
-    class "Bundle (MedComHospitalNotificationMessage)" as admitB{
-        id = "a5e5b880-c087-4055-b9ec-99108695f81d"
-        type = "message"
-        timestamp = "2022-12-07T12:00:01"
-    }
-    class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
-        id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        reportOfAdmissionFlag = "true"
-        reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"
-    }
-    class "Patient (MedComCorePatient)" as admitPT{
-        id = "t33cef33-3626-422b-955d-d506aaa65fe1"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter (MedComHospitalNotificationEncounter)" as admitENC{
-        id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "in-progress"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as admitROrg{
-        id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as admitSOrg{
-        id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance  (MedComMessagingProvenance)" as admitPRO{
-        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
-    }
-
-admitB -[hidden]- admitMH
-admitMH-[hidden]-admitPT
-admitPT-[hidden]-admitENC
-admitENC-[hidden]-admitROrg
-admitROrg-[hidden]-admitSOrg
-admitSOrg-[hidden]-admitPRO
-}
-
-package "Message 2: Cancel Admission of Inpatient" as error <<Frame>> {
-class "Bundle  (MedComHospitalNotificationMessage)" as errorB{
-        id = "c83671a4-9584-11ec-b909-0242ac120002"
-        type = "message"
-        timestamp = "2022-09-01T14:00:05"
-    }
-    class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as errorMH{
-        id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
-        event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"
-        event.code = "hospital-notification-message"
-        destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"
-        destination.use.code = "primary"
-        destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"
-        destination.receiver.reference = "Organization/0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        sender.reference = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"
-        focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"
-    }
-    class "Patient  (MedComCorePatient)" as errorPT{
-        id = "b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        identifier.system = "urn:oid:1.2.208.176.1.2"
-        identifier.value = "2509479989"
-        name.use = "official"
-        name.family = "Elmer"
-        name.given[0] = "Bruno"
-        name.given[1] = "Test"
-    }
-    class "Encounter  (MedComHospitalNotificationEncounter)" as errorENC{
-        id = "c9782061-ce63-41b5-8be6-655812d23332"
-        status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"
-        status.code = "entered-in-error"
-        class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"
-        class.code = "IMP"
-        subject = "Patient/b4055f9c-56ed-472b-b51e-be53652fd0aa"
-        episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
-        episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-09-01T12:00:05+02:00"
-        serviceProvider = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }    
-    class "Receiver: Municipality (MedComMessagingOrganization)" as errorROrg{
-        id = "0cfcaed6-067d-4c66-92eb-690d26b333bc"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790001348120"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "953741000016009"
-    }
-    class "Sender: Hospital (MedComMessagingOrganization)" as errorSOrg{
-        id = "d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        identifier[0].system = "https://www.gs1.org/gln"
-        identifier[0].value = "5790000209354"
-        identifier[1].system = "urn:oid:1.2.208.176.1.1"
-        identifier[1].value = "265161000016000"
-    }
-    class "Provenance (MedComMessagingProvenance)" as admiterrorPRO{
-        id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
-        target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-09-01T12:00:30+02:00"
-        recorded = "2022-09-01T12:00:30"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-    }
-    class "Provenance (MedComMessagingProvenance)" as errorPRO{
-        id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
-        target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-09-01T14:00:25+02:00"
-        recorded = "2022-09-01T14:00:25"
-        activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
-        activity.code = "cancel-admit-inpatient"
-        agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
-        entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"
-        entity.role.value = "removal"
-        entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-    }
-errorB-[hidden]-errorMH
-errorMH-[hidden]-errorPT
-errorPT-[hidden]-errorENC
-errorENC-[hidden]-errorROrg
-errorROrg-[hidden]-errorSOrg
-errorSOrg-[hidden]-admiterrorPRO
-admiterrorPRO-[hidden]-errorPRO
-
-}
-
-
-
-@enduml
-
-PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
-(GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
-Default Encoding: Cp1252
-Language: da
-Country: DK
---></g></svg>
\ No newline at end of file
diff --git a/input/images/hospitalnotification/HNAdmitInPat.svg b/input/images/hospitalnotification/HNAdmitInPat.svg
index cd1271f..725c3a8 100644
--- a/input/images/hospitalnotification/HNAdmitInPat.svg
+++ b/input/images/hospitalnotification/HNAdmitInPat.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1272px" preserveAspectRatio="none" style="width:759px;height:1272px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1272" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[e3ce9a70b36f22ff1736cff4b5094119]
 cluster admit--><g id="cluster_admit"><rect fill="none" height="1259" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M216,7 L216,17.6094 L206,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="199" x="10" y="22.5332">Start hospital stay - admitted</text></g><!--MD5=[8b0fb6bcdbcce853e3af8ebdd7dc8030]
-class admitB--><g id="elem_admitB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="62.5332">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="89.1426">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-07T12:00:01"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
+class admitB--><g id="elem_admitB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="admitB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="62.5332">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="89.1426">id = "a5e5b880-c087-4055-b9ec-99108695f81d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="124.3613">timestamp = "2022-12-07T12:00:01+02:00"</text></g><!--MD5=[68044dbd0c0fdc3b9d6261f9ceefe69d]
 class admitMH--><g id="elem_admitMH"><rect codeLine="20" fill="#FFFFFF" height="246.9219" id="admitMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="160.5332">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="187.1426">id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="550" x="29" y="292.7988">destination.receiver.reference = "Organization/o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="485" x="29" y="310.4082">sender.reference = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="260" x="29" y="345.627">extension:reportOfAdmissionFlag = "true"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="613" x="29" y="363.2363">extension:reportofAdmissionRecipient = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="380.8457">focus = "Encounter/a790f964-88d3-4652-bbc8-81d2f3d035f8"</text></g><!--MD5=[e036c46784c1ca676a3972d4e1c0dddd]
 class admitPT--><g id="elem_admitPT"><rect codeLine="34" fill="#FFFFFF" height="158.875" id="admitPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="398"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="417.5332">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="425.6094" y2="425.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="444.1426">id = "t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="461.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="479.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="496.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="514.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="532.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="549.7988">name.given[1] = "Test"</text></g><!--MD5=[221b3f3a43b02d938eddc6ab5661f5a7]
-class admitENC--><g id="elem_admitENC"><rect codeLine="43" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="567"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="586.5332">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="594.6094" y2="594.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="613.1426">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="630.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="648.3613">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="665.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="683.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="701.1895">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="718.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="736.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="754.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="771.627">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
+class admitENC--><g id="elem_admitENC"><rect codeLine="43" fill="#FFFFFF" height="211.7031" id="admitENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="567"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="586.5332">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="594.6094" y2="594.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="613.1426">id = "a790f964-88d3-4652-bbc8-81d2f3d035f8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="630.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="648.3613">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="665.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="683.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="382" x="29" y="701.1895">subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="718.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="736.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="754.0176">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="474" x="29" y="771.627">serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[ad527777f3a6291c7554598c28fca64f]
 class admitROrg--><g id="elem_admitROrg"><rect codeLine="55" fill="#FFFFFF" height="141.2656" id="admitROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="789"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="808.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="816.6094" y2="816.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="288" x="29" y="835.1426">id = "o4cdf292-abf3-4f5f-80ea-60a48013ff6d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="852.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="870.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="887.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="905.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="923.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[89083fc17cd646efcc5774baa7271f78]
 class admitSOrg--><g id="elem_admitSOrg"><rect codeLine="63" fill="#FFFFFF" height="141.2656" id="admitSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="940"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="959.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="967.6094" y2="967.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="986.1426">id = "o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1003.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1021.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1038.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1056.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1074.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1091"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1110.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1118.6094" y2="1118.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1137.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1154.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1172.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1189.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1207.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1225.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1242.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1091"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1110.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1118.6094" y2="1118.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1137.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1154.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1172.3613">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1189.9707">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1207.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1225.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1242.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[556b98b3a4d3909b45b7fc5f1a3a2576]
 link admitB to admitMH--><!--MD5=[2f36b81be7e2fd37c8dd70abd0e29703]
 link admitMH to admitPT--><!--MD5=[859e67acec9d8ffbc65cb4a1350759d6]
 link admitPT to admitENC--><!--MD5=[f69bb7d73991288835a957c5e30a0ded]
 link admitENC to admitROrg--><!--MD5=[f8460bd4b2c2a4369224dcea9f47c36b]
 link admitROrg to admitSOrg--><!--MD5=[f3a8aefdba3953f5b249616a0861bf2e]
-link admitSOrg to admitPRO--><!--MD5=[29d31f360974a503c6a1a7ba67f12d0e]
+link admitSOrg to admitPRO--><!--MD5=[c59ba1c8cd64eb986722245765ec6b33]
 @startuml HNAdmitInPat
 
 'layout
@@ -31,7 +31,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-12-07T12:00:01"
+        timestamp = "2022-12-07T12:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -65,7 +65,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
         subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
     }    
     class "Receiver (MedComMessagingOrganization)" as admitROrg{
@@ -87,8 +87,8 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -124,7 +124,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-12-07T12:00:01"
+        timestamp = "2022-12-07T12:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -158,7 +158,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
         subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
     }    
     class "Receiver (MedComMessagingOrganization)" as admitROrg{
@@ -180,8 +180,8 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
diff --git a/input/images/hospitalnotification/HNcancelEnteredInError.svg b/input/images/hospitalnotification/HNcancelEnteredInError.svg
index ed6f98c..822a92b 100644
--- a/input/images/hospitalnotification/HNcancelEnteredInError.svg
+++ b/input/images/hospitalnotification/HNcancelEnteredInError.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1497px" preserveAspectRatio="none" style="width:759px;height:1497px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1497" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="440" x="152.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="430" x="157.5" y="24.5332">Simplified example: Cancellation Start hospital stay - admitted</text><!--MD5=[89aab9ccae0ad4c10abfd3158e14a105]
 cluster cancel--><g id="cluster_cancel"><rect fill="none" height="1446" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M307,45.6094 L307,56.2188 L297,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="290" x="10" y="61.1426">Cancellation Start hospital stay - admitted</text></g><!--MD5=[9c4c787fc80e9639e4969afb5347adbd]
-class cancelB--><g id="elem_cancelB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="cancelB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="127.752">id = "c83671a4-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-07T15:00:01"</text></g><!--MD5=[3295c9b529d258ca96e57881573292eb]
+class cancelB--><g id="elem_cancelB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="cancelB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="127.752">id = "c83671a4-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="162.9707">timestamp = "2022-12-07T15:00:01+02:00"</text></g><!--MD5=[3295c9b529d258ca96e57881573292eb]
 class cancelMH--><g id="elem_cancelMH"><rect codeLine="24" fill="#FFFFFF" height="211.7031" id="cancelMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="29" y="225.752">id = "d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="564" x="29" y="331.4082">destination.receiver.reference = "Organization/eefc2dfa-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="403" x="29" y="384.2363">focus = "Encounter/c9782061-ce63-41b5-8be6-655812d23332"</text></g><!--MD5=[58c019352c2432c238b4217051ba5a54]
 class cancelPT--><g id="elem_cancelPT"><rect codeLine="36" fill="#FFFFFF" height="158.875" id="cancelPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="447.752">id = "d6eeaca6-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[04112e82ba0d964cdd1fd0b591869556]
-class cancelENC--><g id="elem_cancelENC"><rect codeLine="45" fill="#FFFFFF" height="211.7031" id="cancelENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="616.752">id = "c9782061-ce63-41b5-8be6-655812d23332"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="29" y="651.9707">status.code = "entered-in-error"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="704.7988">subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="775.2363">serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text></g><!--MD5=[c1ee5d1e60cd54b4e03dd4caa59d84dc]
+class cancelENC--><g id="elem_cancelENC"><rect codeLine="45" fill="#FFFFFF" height="211.7031" id="cancelENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="616.752">id = "c9782061-ce63-41b5-8be6-655812d23332"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="29" y="651.9707">status.code = "entered-in-error"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="392" x="29" y="704.7988">subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="757.627">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="775.2363">serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text></g><!--MD5=[c1ee5d1e60cd54b4e03dd4caa59d84dc]
 class cancelROrg--><g id="elem_cancelROrg"><rect codeLine="57" fill="#FFFFFF" height="141.2656" id="cancelROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="792.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="812.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="820.2188" y2="820.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="29" y="838.752">id = "eefc2dfa-81c6-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="856.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="873.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="891.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="909.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="926.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[276b8b0c80623393b47be3359e980ff4]
 class cancelSOrg--><g id="elem_cancelSOrg"><rect codeLine="65" fill="#FFFFFF" height="141.2656" id="cancelSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="943.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="963.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="971.2188" y2="971.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="989.752">id = "05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1007.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1024.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1042.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1060.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1077.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1094.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1114.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1122.2188" y2="1122.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1140.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1158.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1175.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1193.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1211.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1228.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1246.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[6a63071bbd1240e3093ba5b0567ecdd8]
-class cancelPRO--><g id="elem_cancelPRO"><rect codeLine="82" fill="#FFFFFF" height="211.7031" id="cancelPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1263.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1283.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1291.2188" y2="1291.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1309.752">id = "c67ecb1c-957a-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="437" x="29" y="1327.3613">target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1344.9707">occuredDateTime = "2022-12-07T15:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1362.5801">recorded = "2022-12-07T15:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1380.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="243" x="29" y="1397.7988">activity.code = "cancel-admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1415.4082">agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1433.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="1450.627">entity.role.value = "removal"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1468.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[7485026127ad8884a11178a40f83945d]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="73" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1094.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1114.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1122.2188" y2="1122.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1140.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1158.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1175.9707">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1193.5801">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1211.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1228.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1246.4082">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[6a63071bbd1240e3093ba5b0567ecdd8]
+class cancelPRO--><g id="elem_cancelPRO"><rect codeLine="82" fill="#FFFFFF" height="211.7031" id="cancelPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1263.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1283.1426">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1291.2188" y2="1291.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1309.752">id = "c67ecb1c-957a-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="437" x="29" y="1327.3613">target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1344.9707">occuredDateTime = "2022-12-07T15:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1362.5801">recorded = "2022-12-07T15:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1380.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="243" x="29" y="1397.7988">activity.code = "cancel-admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1415.4082">agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1433.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="1450.627">entity.role.value = "removal"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1468.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[7485026127ad8884a11178a40f83945d]
 link cancelB to cancelMH--><!--MD5=[0afe9d959afe5b5653546b11e1ac6476]
 link cancelMH to cancelPT--><!--MD5=[d3f0a871e483079c7f6f778ccd8d41e5]
 link cancelPT to cancelENC--><!--MD5=[51b26afd67893d8015d1259fa7a81b87]
 link cancelENC to cancelROrg--><!--MD5=[a4dacbf51e43cdf542a0fe6ac1ce230d]
 link cancelROrg to cancelSOrg--><!--MD5=[9e969d95e7d481be6fdb2c695f5c1461]
 link cancelSOrg to admitPRO--><!--MD5=[8f079a6438a84102f2758350a88cc8fe]
-link admitPRO to cancelPRO--><!--MD5=[453bc7d73c50b9e013f6abb00a2fb06a]
+link admitPRO to cancelPRO--><!--MD5=[87deff6b6cc6800102320c6e98d956ff]
 @startuml HNcancelEnteredInError
 
 'layout
@@ -37,7 +37,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
         id = "c83671a4-9584-11ec-b909-0242ac120002"
         type = "message"
-        timestamp = "2022-12-07T15:00:01"
+        timestamp = "2022-12-07T15:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
         id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
@@ -69,7 +69,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
         subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as cancelROrg{
@@ -91,8 +91,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -100,8 +100,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as cancelPRO{
         id = "c67ecb1c-957a-11ec-b909-0242ac120002"
         target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-12-07T15:00:02"
-        recorded = "2022-12-07T15:00:02"
+        occuredDateTime = "2022-12-07T15:00:02+02:00"
+        recorded = "2022-12-07T15:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "cancel-admit-inpatient"
         agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
@@ -140,7 +140,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
         id = "c83671a4-9584-11ec-b909-0242ac120002"
         type = "message"
-        timestamp = "2022-12-07T15:00:01"
+        timestamp = "2022-12-07T15:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
         id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
@@ -172,7 +172,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
         subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as cancelROrg{
@@ -194,8 +194,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -203,8 +203,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as cancelPRO{
         id = "c67ecb1c-957a-11ec-b909-0242ac120002"
         target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-12-07T15:00:02"
-        recorded = "2022-12-07T15:00:02"
+        occuredDateTime = "2022-12-07T15:00:02+02:00"
+        recorded = "2022-12-07T15:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "cancel-admit-inpatient"
         agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
diff --git a/input/images/hospitalnotification/HNdeceasedInPat.svg b/input/images/hospitalnotification/HNdeceasedInPat.svg
index df7abbe..a936e46 100644
--- a/input/images/hospitalnotification/HNdeceasedInPat.svg
+++ b/input/images/hospitalnotification/HNdeceasedInPat.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1493px" preserveAspectRatio="none" style="width:759px;height:1493px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1493" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[9756565d0a87a182f1ee8f471f451df3]
 cluster finished--><g id="cluster_finished"><rect fill="none" height="1480" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M87,7 L87,17.6094 L77,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="70" x="10" y="22.5332">Deceased</text></g><!--MD5=[8643caa4df69b0da87a1502fd43a3ee1]
-class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="89.1426">id = "g099bbf3-3fca-4722-a248-bfe1aa956410"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-09T09:45:31"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
+class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="89.1426">id = "g099bbf3-3fca-4722-a248-bfe1aa956410"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="124.3613">timestamp = "2022-12-09T09:45:31+02:00"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
 class finishedMH--><g id="elem_finishedMH"><rect codeLine="20" fill="#FFFFFF" height="211.7031" id="finishedMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="180.5" y="160.5332">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="303" x="29" y="187.1426">id = "hefc6d95-6161-4493-99c9-f359488dedb8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="572" x="29" y="292.7988">destination.receiver.reference = "Organization/753bdcba-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="310.4082">sender.reference = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="402" x="29" y="345.627">focus = "Encounter/gcab7218-9584-11ec-b909-0242ac120002"</text></g><!--MD5=[69159a19e1c17c8c59fb310b141e20fe]
 class finishedPT--><g id="elem_finishedPT"><rect codeLine="32" fill="#FFFFFF" height="176.4844" id="finishedPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="363"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="283.5" y="382.5332">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="390.6094" y2="390.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="295" x="29" y="409.1426">id = "t82fb8a3-6725-41e2-a615-2b1cfcfe9931"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="426.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="444.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="461.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="479.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="497.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="514.7988">name.given[1] = "Test"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="29" y="532.4082">deceased = "true"</text></g><!--MD5=[f65897f4a4ff1f4ef21384fb85edbe70]
-class finishedENC--><g id="elem_finishedENC"><rect codeLine="42" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="549"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="568.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="576.6094" y2="576.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="595.1426">id = "gcab7218-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="612.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="630.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="647.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="665.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="377" x="29" y="683.1895">subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="700.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="718.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="736.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="29" y="753.627">periode.end = "2022-12-09T09:45:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="771.2363">serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
+class finishedENC--><g id="elem_finishedENC"><rect codeLine="42" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="549"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="568.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="576.6094" y2="576.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="595.1426">id = "gcab7218-9584-11ec-b909-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="612.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="630.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="647.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="665.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="377" x="29" y="683.1895">subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="700.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="718.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="736.0176">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="285" x="29" y="753.627">periode.end = "2022-12-09T09:45:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="771.2363">serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
 class finishedROrg--><g id="elem_finishedROrg"><rect codeLine="55" fill="#FFFFFF" height="141.2656" id="finishedROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="788"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="807.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="815.6094" y2="815.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="310" x="29" y="834.1426">id = "753bdcba-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="851.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="869.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="886.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="904.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="922.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[45851fe3f072b6e685002dddf1e38ddc]
 class finishedSOrg--><g id="elem_finishedSOrg"><rect codeLine="63" fill="#FFFFFF" height="141.2656" id="finishedSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="939"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="958.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="966.6094" y2="966.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="985.1426">id = "840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1002.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1020.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1037.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1055.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1073.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[75f6ba0f813ec2cc7f51b4f6df93deb7]
-class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1090"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1109.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1117.6094" y2="1117.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1136.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1153.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1171.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1188.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1206.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1224.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1241.7988">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
-class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="80" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1259"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1278.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1286.6094" y2="1286.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1305.1426">id = "g9942adb-197a-4e30-bec8-566e3a113efe"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="436" x="29" y="1322.752">target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1340.3613">occuredDateTime = "2022-12-09T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1357.9707">recorded = "2022-12-09T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1375.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1393.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1410.7988">agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1428.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1446.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1463.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
+class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="71" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1090"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1109.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1117.6094" y2="1117.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1136.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1153.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1171.3613">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1188.9707">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1206.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1224.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1241.7988">agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
+class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="80" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1259"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1278.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1286.6094" y2="1286.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="308" x="29" y="1305.1426">id = "g9942adb-197a-4e30-bec8-566e3a113efe"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="436" x="29" y="1322.752">target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1340.3613">occuredDateTime = "2022-12-09T09:45:32+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1357.9707">recorded = "2022-12-09T09:45:32+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1375.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1393.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1410.7988">agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1428.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1446.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1463.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
 link finishedB to finishedMH--><!--MD5=[01398e4eee645f6817e085231ec28f01]
 link finishedMH to finishedPT--><!--MD5=[5639e68ccfddceafd0b94761b3bd9542]
 link finishedPT to finishedENC--><!--MD5=[8899a0f3539f940b0d000e1b06fb8e9b]
 link finishedENC to finishedROrg--><!--MD5=[70f1cb6cd4d544ed603bf13294a71ace]
 link finishedROrg to finishedSOrg--><!--MD5=[d8a2a7125f85b778798b2e3e86e46577]
 link finishedSOrg to admitfinishedPRO--><!--MD5=[774b752288196a1a08a451fcc2747d3a]
-link admitfinishedPRO to finishedPRO--><!--MD5=[3ae51f777de2de7e8276242f4455142d]
+link admitfinishedPRO to finishedPRO--><!--MD5=[9559f91f1e2b6564419ef9f05960ac96]
 @startuml HNdeceasedInPat
 
 'layout
@@ -33,7 +33,7 @@ package "Deceased" as finished <<Frame>>{
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
         type = "message"
-        timestamp = "2022-12-09T09:45:31"
+        timestamp = "2022-12-09T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "hefc6d95-6161-4493-99c9-f359488dedb8"
@@ -66,8 +66,8 @@ package "Deceased" as finished <<Frame>>{
         subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-09T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-09T09:45:30+02:00"
         serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -89,8 +89,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -98,8 +98,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "g9942adb-197a-4e30-bec8-566e3a113efe"
         target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
-        occuredDateTime = "2022-12-09T09:45:32"
-        recorded = "2022-12-09T09:45:32"
+        occuredDateTime = "2022-12-09T09:45:32+02:00"
+        recorded = "2022-12-09T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
@@ -139,7 +139,7 @@ package "Deceased" as finished <<Frame>>{
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
         type = "message"
-        timestamp = "2022-12-09T09:45:31"
+        timestamp = "2022-12-09T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "hefc6d95-6161-4493-99c9-f359488dedb8"
@@ -172,8 +172,8 @@ package "Deceased" as finished <<Frame>>{
         subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-09T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-09T09:45:30+02:00"
         serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -195,8 +195,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -204,8 +204,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "g9942adb-197a-4e30-bec8-566e3a113efe"
         target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
-        occuredDateTime = "2022-12-09T09:45:32"
-        recorded = "2022-12-09T09:45:32"
+        occuredDateTime = "2022-12-09T09:45:32+02:00"
+        recorded = "2022-12-09T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
diff --git a/input/images/hospitalnotification/HNdischargeInPat.svg b/input/images/hospitalnotification/HNdischargeInPat.svg
index be95062..fcba112 100644
--- a/input/images/hospitalnotification/HNdischargeInPat.svg
+++ b/input/images/hospitalnotification/HNdischargeInPat.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1476px" preserveAspectRatio="none" style="width:759px;height:1476px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1476" width="759px" zoomAndPan="magnify"><defs/><g><!--MD5=[9756565d0a87a182f1ee8f471f451df3]
 cluster finished--><g id="cluster_finished"><rect fill="none" height="1463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="7"/><path d="M442,7 L442,17.6094 L432,27.6094 L7,27.6094 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="425" x="10" y="22.5332">End hospital stay - patient completed to home/primary sector</text></g><!--MD5=[8643caa4df69b0da87a1502fd43a3ee1]
-class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="89.1426">id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="124.3613">timestamp = "2022-12-18T09:45:31"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
+class finishedB--><g id="elem_finishedB"><rect codeLine="15" fill="#FFFFFF" height="88.4375" id="finishedB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="43"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="62.5332">Bundle  (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="70.6094" y2="70.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="89.1426">id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="106.752">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="124.3613">timestamp = "2022-12-18T09:45:31+02:00"</text></g><!--MD5=[2438405adbef9080ca323d9bd84f009f]
 class finishedMH--><g id="elem_finishedMH"><rect codeLine="20" fill="#FFFFFF" height="211.7031" id="finishedMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="141"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="399" x="180.5" y="160.5332">MessageHeader  (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="168.6094" y2="168.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="187.1426">id = "g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="204.752">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="222.3613">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="239.9707">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="257.5801">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="275.1895">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="292.7988">destination.receiver.reference = "Organization/7e692262-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="489" x="29" y="310.4082">sender.reference = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="328.0176">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="394" x="29" y="345.627">focus = "Encounter/f405ba2d-467a-4e92-9acc-9dc2a629760f"</text></g><!--MD5=[69159a19e1c17c8c59fb310b141e20fe]
 class finishedPT--><g id="elem_finishedPT"><rect codeLine="32" fill="#FFFFFF" height="158.875" id="finishedPT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="363"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="283.5" y="382.5332">Patient  (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="390.6094" y2="390.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="409.1426">id = "6841b54e-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="426.752">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="444.3613">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="461.9707">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="479.5801">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="497.1895">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="514.7988">name.given[1] = "Test"</text></g><!--MD5=[f65897f4a4ff1f4ef21384fb85edbe70]
-class finishedENC--><g id="elem_finishedENC"><rect codeLine="41" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="532"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="551.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="559.6094" y2="559.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="29" y="578.1426">id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="595.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="613.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="630.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="648.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="666.1895">subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="683.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="701.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="719.0176">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="29" y="736.627">periode.end = "2022-12-18T09:45:30"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="478" x="29" y="754.2363">serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
+class finishedENC--><g id="elem_finishedENC"><rect codeLine="41" fill="#FFFFFF" height="229.3125" id="finishedENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="532"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="218.5" y="551.5332">Encounter  (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="559.6094" y2="559.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="29" y="578.1426">id = "f405ba2d-467a-4e92-9acc-9dc2a629760f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="595.752">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="29" y="613.3613">status.code = "finished"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="630.9707">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="648.5801">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="666.1895">subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="683.7988">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="701.4082">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="719.0176">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="285" x="29" y="736.627">periode.end = "2022-12-18T09:45:30+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="478" x="29" y="754.2363">serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text></g><!--MD5=[8167ec7728550bc37cdf5ab657a3a60b]
 class finishedROrg--><g id="elem_finishedROrg"><rect codeLine="54" fill="#FFFFFF" height="141.2656" id="finishedROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="771"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="790.5332">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="798.6094" y2="798.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="817.1426">id = "7e692262-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="834.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="852.3613">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="869.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="887.5801">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="905.1895">name = "Plejecenter Herlev"</text></g><!--MD5=[45851fe3f072b6e685002dddf1e38ddc]
 class finishedSOrg--><g id="elem_finishedSOrg"><rect codeLine="62" fill="#FFFFFF" height="141.2656" id="finishedSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="922"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="941.5332">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="949.6094" y2="949.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="968.1426">id = "8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="985.752">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1003.3613">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1020.9707">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1038.5801">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1056.1895">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[75f6ba0f813ec2cc7f51b4f6df93deb7]
-class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="70" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1073"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1092.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1100.6094" y2="1100.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1119.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1136.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1154.3613">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1171.9707">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1189.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1207.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1224.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
-class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="79" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1242"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1261.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1269.6094" y2="1269.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="298" x="29" y="1288.1426">id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="433" x="29" y="1305.752">target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1323.3613">occuredDateTime = "2022-12-18T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1340.9707">recorded = "2022-12-18T09:45:32"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1358.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="265" x="29" y="1376.1895">activity.code = "discharge-inpatient-home"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="445" x="29" y="1393.7988">agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1411.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1429.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1446.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
+class admitfinishedPRO--><g id="elem_admitfinishedPRO"><rect codeLine="70" fill="#FFFFFF" height="158.875" id="admitfinishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1073"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1092.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1100.6094" y2="1100.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1119.1426">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1136.752">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1154.3613">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1171.9707">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1189.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1207.1895">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1224.7988">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[25b5a17ee15e2b3dc74e7b80e781b6e9]
+class finishedPRO--><g id="elem_finishedPRO"><rect codeLine="79" fill="#FFFFFF" height="211.7031" id="finishedPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1242"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="1261.5332">Provenance (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1269.6094" y2="1269.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="298" x="29" y="1288.1426">id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="433" x="29" y="1305.752">target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1323.3613">occuredDateTime = "2022-12-18T09:45:32+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1340.9707">recorded = "2022-12-18T09:45:32+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1358.5801">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="265" x="29" y="1376.1895">activity.code = "discharge-inpatient-home"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="445" x="29" y="1393.7988">agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1411.4082">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1429.0176">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1446.627">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[4d74d65cc9b48f686308486efe3538f9]
 link finishedB to finishedMH--><!--MD5=[01398e4eee645f6817e085231ec28f01]
 link finishedMH to finishedPT--><!--MD5=[5639e68ccfddceafd0b94761b3bd9542]
 link finishedPT to finishedENC--><!--MD5=[8899a0f3539f940b0d000e1b06fb8e9b]
 link finishedENC to finishedROrg--><!--MD5=[70f1cb6cd4d544ed603bf13294a71ace]
 link finishedROrg to finishedSOrg--><!--MD5=[d8a2a7125f85b778798b2e3e86e46577]
 link finishedSOrg to admitfinishedPRO--><!--MD5=[774b752288196a1a08a451fcc2747d3a]
-link admitfinishedPRO to finishedPRO--><!--MD5=[0a371f7b70f93283e1398c90cbd69a8e]
+link admitfinishedPRO to finishedPRO--><!--MD5=[706f06638a3e296d55f15a7bd370bf4d]
 @startuml HNdischargeInPat
 
 'layout
@@ -33,7 +33,7 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
         type = "message"
-        timestamp = "2022-12-18T09:45:31"
+        timestamp = "2022-12-18T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "g1affa53-c157-4080-abb0-8e681524f969"
@@ -65,8 +65,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
         subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-18T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-18T09:45:30+02:00"
         serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -88,8 +88,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -97,8 +97,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
         target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-12-18T09:45:32"
-        recorded = "2022-12-18T09:45:32"
+        occuredDateTime = "2022-12-18T09:45:32+02:00"
+        recorded = "2022-12-18T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "discharge-inpatient-home"
         agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
@@ -138,7 +138,7 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
         type = "message"
-        timestamp = "2022-12-18T09:45:31"
+        timestamp = "2022-12-18T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "g1affa53-c157-4080-abb0-8e681524f969"
@@ -170,8 +170,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
         subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-18T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-18T09:45:30+02:00"
         serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -193,8 +193,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -202,8 +202,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
         target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-12-18T09:45:32"
-        recorded = "2022-12-18T09:45:32"
+        occuredDateTime = "2022-12-18T09:45:32+02:00"
+        recorded = "2022-12-18T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "discharge-inpatient-home"
         agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
diff --git a/input/images/hospitalnotification/HNendOnleave.svg b/input/images/hospitalnotification/HNendOnleave.svg
index 7a5ae80..76488e8 100644
--- a/input/images/hospitalnotification/HNendOnleave.svg
+++ b/input/images/hospitalnotification/HNendOnleave.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1754px" preserveAspectRatio="none" style="width:759px;height:1754px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1754" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="220" x="262.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="210" x="267.5" y="24.5332">Simplified example: End leave</text><!--MD5=[094a32da25a27f7ae2ae43c8b08ae265]
 cluster endOnleave--><g id="cluster_endOnleave"><rect fill="none" height="1703" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M87,45.6094 L87,56.2188 L77,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="70" x="10" y="61.1426">End leave</text></g><!--MD5=[c9a6decd0ed2d896b92172cd5252138f]
-class endOnleaveB--><g id="elem_endOnleaveB"><rect codeLine="20" fill="#FFFFFF" height="88.4375" id="endOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="127.752">id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-14T15:30:01"</text></g><!--MD5=[0480104e4d8b98f8eb6bd90b63d750a0]
+class endOnleaveB--><g id="elem_endOnleaveB"><rect codeLine="20" fill="#FFFFFF" height="88.4375" id="endOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="127.752">id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="162.9707">timestamp = "2022-12-14T15:30:01+02:00"</text></g><!--MD5=[0480104e4d8b98f8eb6bd90b63d750a0]
 class endOnleaveMH--><g id="elem_endOnleaveMH"><rect codeLine="25" fill="#FFFFFF" height="211.7031" id="endOnleaveMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="296" x="29" y="225.752">id = "f47254da-f170-46f0-b624-4778a9c92b1f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="331.4082">destination.receiver.reference = "Organization/55ba5884-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="397" x="29" y="384.2363">focus = "Encounter/e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"</text></g><!--MD5=[8d49389ec55207906081a4e172135de7]
 class endOnleavePT--><g id="elem_endOnleavePT"><rect codeLine="37" fill="#FFFFFF" height="158.875" id="endOnleavePT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="447.752">id = "519d5170-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[a733ad531f2273a693f23c400487a794]
-class endOnleaveENC--><g id="elem_endOnleaveENC"><rect codeLine="46" fill="#FFFFFF" height="246.9219" id="endOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="616.752">id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="651.9707">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="336" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="332" x="29" y="792.8457">extension:leavePeriod.end = "2022-12-14T15:30:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="810.4551">serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text></g><!--MD5=[b3bf7de2daa27b6ad6a1601727077d91]
+class endOnleaveENC--><g id="elem_endOnleaveENC"><rect codeLine="46" fill="#FFFFFF" height="246.9219" id="endOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="305" x="29" y="616.752">id = "e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="29" y="651.9707">status.code = "in-progress"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="757.627">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="380" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="376" x="29" y="792.8457">extension:leavePeriod.end = "2022-12-14T15:30:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="810.4551">serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text></g><!--MD5=[b3bf7de2daa27b6ad6a1601727077d91]
 class endOnleaveROrg--><g id="elem_endOnleaveROrg"><rect codeLine="60" fill="#FFFFFF" height="141.2656" id="endOnleaveROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="827.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="847.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="855.2188" y2="855.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="873.752">id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="891.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="908.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="926.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="944.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="961.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[cbce2390a6149b4f8830c489b42f3eb4]
 class endOnleaveSOrg--><g id="elem_endOnleaveSOrg"><rect codeLine="68" fill="#FFFFFF" height="141.2656" id="endOnleaveSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="978.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="998.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1006.2188" y2="1006.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="1024.752">id = "b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1042.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1059.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1077.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1095.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1112.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="76" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1129.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1149.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1157.2188" y2="1157.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1175.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1193.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1210.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1228.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1246.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1263.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1281.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
-class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="85" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1298.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1318.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1326.2188" y2="1326.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1344.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1362.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1379.9707">occuredDateTime = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1397.5801">recorded = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1415.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1432.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1450.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1468.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1485.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1503.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[60e317b52c6d5568a9735dc93c89f5a1]
-class endOnleavePRO--><g id="elem_endOnleavePRO"><rect codeLine="97" fill="#FFFFFF" height="211.7031" id="endOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1520.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1540.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1548.2188" y2="1548.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1566.752">id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="429" x="29" y="1584.3613">target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1601.9707">occuredDateTime = "2022-12-14T15:30:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1619.5801">recorded = "2022-12-14T15:30:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1637.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="29" y="1654.7988">activity.code = "end-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1672.4082">agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1690.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1707.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1725.2363">entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text></g><!--MD5=[be938a171a18a10c169f1add6b315420]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="76" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1129.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1149.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1157.2188" y2="1157.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1175.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1193.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1210.9707">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1228.5801">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1246.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1263.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1281.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
+class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="85" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1298.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1318.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1326.2188" y2="1326.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1344.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1362.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1379.9707">occuredDateTime = "2022-12-13T14:00:12+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1397.5801">recorded = "2022-12-13T14:00:12+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1415.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1432.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1450.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1468.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1485.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1503.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[60e317b52c6d5568a9735dc93c89f5a1]
+class endOnleavePRO--><g id="elem_endOnleavePRO"><rect codeLine="97" fill="#FFFFFF" height="211.7031" id="endOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1520.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1540.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1548.2188" y2="1548.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="300" x="29" y="1566.752">id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="429" x="29" y="1584.3613">target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1601.9707">occuredDateTime = "2022-12-14T15:30:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1619.5801">recorded = "2022-12-14T15:30:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1637.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="29" y="1654.7988">activity.code = "end-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1672.4082">agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1690.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1707.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1725.2363">entity.what = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text></g><!--MD5=[be938a171a18a10c169f1add6b315420]
 link endOnleaveB to endOnleaveMH--><!--MD5=[f3cdf63d14eeabdb2e09e227a4e74c2e]
 link endOnleaveMH to endOnleavePT--><!--MD5=[20f70ef21cab2fa9c0c822c46af33e7e]
 link endOnleavePT to endOnleaveENC--><!--MD5=[244bf99aafea09cbf67fb3d6c06cc491]
@@ -16,7 +16,7 @@ link endOnleaveENC to endOnleaveROrg--><!--MD5=[55e3c888574e1c8902daf4d074ad86e1
 link endOnleaveROrg to endOnleaveSOrg--><!--MD5=[000ce222a695ef5be96a45a0b274f609]
 link endOnleaveSOrg to admitPRO--><!--MD5=[4e71cc400377f6d4394ffbcbeb839323]
 link admitPRO to startOnleavePRO--><!--MD5=[070ac2b0b09fc940ebf8ff4d811785a5]
-link startOnleavePRO to endOnleavePRO--><!--MD5=[a939d6fb8ba44ec7e7982a2e6f3a6c34]
+link startOnleavePRO to endOnleavePRO--><!--MD5=[34f454d990152c734a786966e75d8cca]
 @startuml HNendOnleave
 
 'layout
@@ -40,7 +40,7 @@ package "End leave" as endOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
         id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
         type = "message"
-        timestamp = "2022-12-14T15:30:01"
+        timestamp = "2022-12-14T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
         id = "f47254da-f170-46f0-b624-4778a9c92b1f"
@@ -72,9 +72,9 @@ package "End leave" as endOnleave <<Frame>> {
         subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
-        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
+        extension:leavePeriod.end = "2022-12-14T15:30:00+02:00"
         serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
     }    
 class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
@@ -96,8 +96,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -105,8 +105,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
@@ -117,8 +117,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
         id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
         target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
-        occuredDateTime = "2022-12-14T15:30:02"
-        recorded = "2022-12-14T15:30:02"
+        occuredDateTime = "2022-12-14T15:30:02+02:00"
+        recorded = "2022-12-14T15:30:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "end-leave-inpatient"
         agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
@@ -161,7 +161,7 @@ package "End leave" as endOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
         id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
         type = "message"
-        timestamp = "2022-12-14T15:30:01"
+        timestamp = "2022-12-14T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
         id = "f47254da-f170-46f0-b624-4778a9c92b1f"
@@ -193,9 +193,9 @@ package "End leave" as endOnleave <<Frame>> {
         subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
-        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
+        extension:leavePeriod.end = "2022-12-14T15:30:00+02:00"
         serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
     }    
 class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
@@ -217,8 +217,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -226,8 +226,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
@@ -238,8 +238,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
         id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
         target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
-        occuredDateTime = "2022-12-14T15:30:02"
-        recorded = "2022-12-14T15:30:02"
+        occuredDateTime = "2022-12-14T15:30:02+02:00"
+        recorded = "2022-12-14T15:30:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "end-leave-inpatient"
         agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
diff --git a/input/images/hospitalnotification/HNstartOnleave.svg b/input/images/hospitalnotification/HNstartOnleave.svg
index 289930d..722ee1c 100644
--- a/input/images/hospitalnotification/HNstartOnleave.svg
+++ b/input/images/hospitalnotification/HNstartOnleave.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1514px" preserveAspectRatio="none" style="width:759px;height:1514px;background:#FFFFFF;" version="1.1" viewBox="0 0 759 1514" width="759px" zoomAndPan="magnify"><defs/><g><rect fill="none" height="27.6094" id="_title" style="stroke:none;stroke-width:1.0;" width="226" x="259.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="216" x="264.5" y="24.5332">Simplified example: Start leave</text><!--MD5=[3dd6fae0817ee960d4190cb33ff51be2]
 cluster startOnleave--><g id="cluster_startOnleave"><rect fill="none" height="1463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="746" x="7" y="45.6094"/><path d="M93,45.6094 L93,56.2188 L83,66.2188 L7,66.2188 " fill="none" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="76" x="10" y="61.1426">Start leave</text></g><!--MD5=[a77e0b639f638aeaf6da96b7b262a803]
-class startOnleaveB--><g id="elem_startOnleaveB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="startOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "d3128d9b-cede-4c7f-8904-809eab322d7d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="229" x="29" y="162.9707">timestamp = "2022-12-13T15:30:01"</text></g><!--MD5=[bbbcd05d53f3b51c903071076988f180]
+class startOnleaveB--><g id="elem_startOnleaveB"><rect codeLine="19" fill="#FFFFFF" height="88.4375" id="startOnleaveB" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="81.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="235" y="101.1426">Bundle (MedComHospitalNotificationMessage)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="109.2188" y2="109.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="127.752">id = "d3128d9b-cede-4c7f-8904-809eab322d7d"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="29" y="145.3613">type = "message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="29" y="162.9707">timestamp = "2022-12-13T15:30:01+02:00"</text></g><!--MD5=[bbbcd05d53f3b51c903071076988f180]
 class startOnleaveMH--><g id="elem_startOnleaveMH"><rect codeLine="24" fill="#FFFFFF" height="211.7031" id="startOnleaveMH" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="179.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="182.5" y="199.1426">MessageHeader (MedComHospitalNotificationMessageHeader)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="207.2188" y2="207.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="309" x="29" y="225.752">id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="624" x="29" y="243.3613">event.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-eventCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="29" y="260.9707">event.code = "hospital-notification-message"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="702" x="29" y="278.5801">destination.use.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-destinationUse"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="29" y="296.1895">destination.use.code = "primary"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="460" x="29" y="313.7988">destination.endpoint = "https://sor2.sum.dsdn.dk/#id=953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="573" x="29" y="331.4082">destination.receiver.reference = "Organization/a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="493" x="29" y="349.0176">sender.reference = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="434" x="29" y="366.627">source.endpoint = "https://sor2.sum.dsdn.dk/#id=265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="404" x="29" y="384.2363">focus = "Encounter/d56e9c54-23d2-43a4-816e-951d2a6e3281"</text></g><!--MD5=[0d9b0e5346b897197cb9eb87bcafc092]
 class startOnleavePT--><g id="elem_startOnleavePT"><rect codeLine="36" fill="#FFFFFF" height="158.875" id="startOnleavePT" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="401.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="285.5" y="421.1426">Patient (MedComCorePatient)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="429.2188" y2="429.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="447.752">id = "97404d10-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="29" y="465.3613">identifier.system = "urn:oid:1.2.208.176.1.2"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198" x="29" y="482.9707">identifier.value = "2509479989"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="29" y="500.5801">name.use = "official"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="29" y="518.1895">name.family = "Elmer"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="29" y="535.7988">name.given[0] = "Bruno"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="553.4082">name.given[1] = "Test"</text></g><!--MD5=[91c6aa77f4a24fb7aaf0d12bef428b0f]
-class startOnleaveENC--><g id="elem_startOnleaveENC"><rect codeLine="45" fill="#FFFFFF" height="229.3125" id="startOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="312" x="29" y="616.752">id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="29" y="651.9707">status.code = "onleave"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="29" y="757.627">period.start = "2022-12-07T12:00:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="336" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="792.8457">serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text></g><!--MD5=[70699069a73f487436219c9503fc003e]
+class startOnleaveENC--><g id="elem_startOnleaveENC"><rect codeLine="45" fill="#FFFFFF" height="229.3125" id="startOnleaveENC" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="570.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="220.5" y="590.1426">Encounter (MedComHospitalNotificationEncounter)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="598.2188" y2="598.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="312" x="29" y="616.752">id = "d56e9c54-23d2-43a4-816e-951d2a6e3281"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="682" x="29" y="634.3613">status.system = "http://medcomfhir.dk/ig/terminology/ValueSet/medcom-hospitalNotification-encounterStatus"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="29" y="651.9707">status.code = "onleave"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="425" x="29" y="669.5801">class.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="687.1895">class.code = "IMP"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="393" x="29" y="704.7988">subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="594" x="29" y="722.4082">episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="539" x="29" y="740.0176">episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="29" y="757.627">period.start = "2022-12-07T12:00:00+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="380" x="29" y="775.2363">extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="482" x="29" y="792.8457">serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text></g><!--MD5=[70699069a73f487436219c9503fc003e]
 class startOnleaveROrg--><g id="elem_startOnleaveROrg"><rect codeLine="58" fill="#FFFFFF" height="141.2656" id="startOnleaveROrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="809.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274" x="243" y="829.1426">Receiver (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="837.2188" y2="837.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="855.752">id = "a39d4a04-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="873.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="890.9707">identifier[0].value = "5790001348120"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="908.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="926.1895">identifier[1].value = "953741000016009"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="29" y="943.7988">name = "Plejecenter Herlev"</text></g><!--MD5=[62bd944c7f10ba353d51b36c3243b7a6]
 class startOnleaveSOrg--><g id="elem_startOnleaveSOrg"><rect codeLine="66" fill="#FFFFFF" height="141.2656" id="startOnleaveSOrg" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="960.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264" x="248" y="980.1426">Sender (MedComMessagingOrganization)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="988.2188" y2="988.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="311" x="29" y="1006.752">id = "b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="29" y="1024.3613">identifier[0].system = "https://www.gs1.org/gln"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="29" y="1041.9707">identifier[0].value = "5790000209354"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="292" x="29" y="1059.5801">identifier[1].system = "urn:oid:1.2.208.176.1.1"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="254" x="29" y="1077.1895">identifier[1].value = "265161000016000"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="360" x="29" y="1094.7988">name = "Hjerteafdelingen på Herlev og Gentofte hospital"</text></g><!--MD5=[2368394ca3ef2fd76d3f052c2d010166]
-class admitPRO--><g id="elem_admitPRO"><rect codeLine="74" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1111.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1131.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1139.2188" y2="1139.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1157.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1175.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1192.9707">occuredDateTime = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1210.5801">recorded = "2022-12-07T12:00:02"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1228.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1245.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1263.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
-class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="83" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1280.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1300.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1308.2188" y2="1308.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1326.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1344.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="29" y="1361.9707">occuredDateTime = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="29" y="1379.5801">recorded = "2022-12-13T14:00:12"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1397.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1414.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1432.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1450.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1467.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1485.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[920db40ac0ba3dad502f5efc1bf0a6dd]
+class admitPRO--><g id="elem_admitPRO"><rect codeLine="74" fill="#FFFFFF" height="158.875" id="admitPRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1111.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1131.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1139.2188" y2="1139.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299" x="29" y="1157.752">id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1175.3613">target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1192.9707">occuredDateTime = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1210.5801">recorded = "2022-12-07T12:00:02+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1228.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="29" y="1245.7988">activity.code = "admit-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="441" x="29" y="1263.4082">agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"</text></g><!--MD5=[39b646228527caee05b072cb08ba83a0]
+class startOnleavePRO--><g id="elem_startOnleavePRO"><rect codeLine="83" fill="#FFFFFF" height="211.7031" id="startOnleavePRO" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:0.5;" width="714" x="23" y="1280.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="294" x="233" y="1300.1426">Provenance  (MedComMessagingProvenance)</text><line style="stroke:#000000;stroke-width:0.5;" x1="24" x2="736" y1="1308.2188" y2="1308.2188"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="307" x="29" y="1326.752">id = "dc421d0a-cded-470f-9a53-2ddba7583baa"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="442" x="29" y="1344.3613">target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="321" x="29" y="1361.9707">occuredDateTime = "2022-12-13T14:00:12+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="29" y="1379.5801">recorded = "2022-12-13T14:00:12+02:00"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="640" x="29" y="1397.1895">activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="230" x="29" y="1414.7988">activity.code = "start-leave-inpatient"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="449" x="29" y="1432.4082">agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="448" x="29" y="1450.0176">entity.role.system = "http://hl7.org/fhir/ValueSet/provenance-entity-role"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="29" y="1467.627">entity.role.value = "revision"</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="472" x="29" y="1485.2363">entity.what = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"</text></g><!--MD5=[920db40ac0ba3dad502f5efc1bf0a6dd]
 link startOnleaveB to startOnleaveMH--><!--MD5=[1a66f75dd4e2cdf34875598d9ab7735d]
 link startOnleaveMH to startOnleavePT--><!--MD5=[cd21bb8602078bb8652f188bf7dd4dec]
 link startOnleavePT to startOnleaveENC--><!--MD5=[d1f9f56b094239f2c680c0566e251619]
 link startOnleaveENC to startOnleaveROrg--><!--MD5=[5864411d63d057d16a32a545460d5e01]
 link startOnleaveROrg to startOnleaveSOrg--><!--MD5=[d050b1bc7c3106725ea83587738d04ed]
 link startOnleaveSOrg to admitPRO--><!--MD5=[4e71cc400377f6d4394ffbcbeb839323]
-link admitPRO to startOnleavePRO--><!--MD5=[4c12e2242367a48caee8013f2a2dca8c]
+link admitPRO to startOnleavePRO--><!--MD5=[2cdcb5fb5347d78b65423948e3ed005b]
 @startuml HNstartOnleave
 'layout
 skinparam class {
@@ -37,7 +37,7 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
         id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
         type = "message"
-        timestamp = "2022-12-13T15:30:01"
+        timestamp = "2022-12-13T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
         id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
@@ -69,8 +69,8 @@ package "Start leave" as startOnleave <<Frame>> {
         subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
         serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
@@ -92,8 +92,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -101,8 +101,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
@@ -143,7 +143,7 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
         id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
         type = "message"
-        timestamp = "2022-12-13T15:30:01"
+        timestamp = "2022-12-13T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
         id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
@@ -175,8 +175,8 @@ package "Start leave" as startOnleave <<Frame>> {
         subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
         serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
@@ -198,8 +198,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -207,8 +207,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
diff --git a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
index 98a2853..efd57db 100644
--- a/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-hospitalNotification-encounter-intro.md
@@ -21,20 +21,20 @@ The sender of a HospitalNotification (MessageHeader.sender) and the serviceProvi
 
 ### Timestamps 
 
-The Encounter profile contains four timestamps each representing a different time during a hospitalisation. Common for the four timestamps is that they represent the time of the event, e.g. the patient's physical attendance at the hospital (Encounter.period.start) or a patient going on leave from the hospital  (Encounter.extension:leavePeriod.start).  
+The Encounter profile contains four timestamps each representing a different time during a hospitalisation. Common for the four timestamps is that they represent the time of the event, e.g. the patient's physical attendance at the hospital (Encounter.period.start) or a patient going on leave from the hospital (Encounter.extension:leavePeriod.start).  
 
-|FHIR-element|Description|Event|See example [MISSING LINKS]|
+|FHIR-element|Description|Event|See Encounter example|
 |-----|------|------| ------| 
-|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient is physical attendant at the hospital|[HospitalNotification Encounter - STIN](https://medcomfhir.dk/ig/hospitalnotification/Encounter-a790f964-88d3-4652-bbc8-81d2f3d035f8.html) and [HospitalNotification Encounter - STAA](https://medcomfhir.dk/ig/hospitalnotification/Encounter-h2cb16ce-af8c-46f3-be9e-89406ef3e7b5.html)|
+|Encounter.period.start|Start hospital stay, i.e. the actual beginning of the meeting between the health care professional and patient|Patient's physical attendance at the hospital|[HospitalNotification Encounter - STIN](https://medcomfhir.dk/ig/hospitalnotification/Encounter-a790f964-88d3-4652-bbc8-81d2f3d035f8.html) and [HospitalNotification Encounter - STAA](https://medcomfhir.dk/ig/hospitalnotification/Encounter-h2cb16ce-af8c-46f3-be9e-89406ef3e7b5.html)|
 |Encounter.period.end|End hospital stay, i.e. the actual end of the meeting between the health care professional and patient|Patient leaves the hospital after discharge or when a patient dies (on arrival or during hospital stay)| [HospitalNotification Encounter - SLHJ (inpatient)](https://medcomfhir.dk/ig/hospitalnotification/Encounter-f405ba2d-467a-4e92-9acc-9dc2a629760f.html) and [HospitalNotification Encounter - MORS (inpatient)](https://medcomfhir.dk/ig/hospitalnotification/Encounter-gcab7218-9584-11ec-b909-0242ac120002.html)|
-|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period, when the patient leaves the hospital|Patient leaves the hospital to go on leave.|[HospitalNotification Encounter - STOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-d56e9c54-23d2-43a4-816e-951d2a6e3281.html)|
-|Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period, when the patient returns to the hospital|Patient is physical attendant at the hospital after a period of leave|[HospitalNotification Encounter - SLOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b.html)|
+|Encounter.extension:leavePeriod.start|Patient starts leave, i.e. the actual beginning of a leave-period|Patient leaves the hospital to go on leave.|[HospitalNotification Encounter - STOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-d56e9c54-23d2-43a4-816e-951d2a6e3281.html)|
+|Encounter.extension:leavePeriod.end|Patient ends leave, i.e. the actual end of a leave-period|Patient's physical attendance at the hospital after a period of leave|[HospitalNotification Encounter - SLOR](https://medcomfhir.dk/ig/hospitalnotification/Encounter-e07c4bd4-cfad-4c4d-9c4b-e4ba3424a65b.html)|
 
 #### Start and end of hospital stay
 As described above, the timestamp of start and end of hospital stay are included in the elements Encounter.period.start and Encounter.period.end, respectively. 
-Encounter.period.start shall always be present, despite it is not a start hospital stay HospitalNotification being sent. 
+Encounter.period.start shall always be present, also when sending a HospitalNotification describing a period of leave or end or hospital stay. 
 
-In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall result in a new instance of the Encounter profile and be given a new Encounter.period.start representing the time of the change in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
+In cases where a patient is transferred to a hospital in the same region or in another region, or a hospitalisation changes from 'acute ambulant' to 'inpatient', a new start hospital stay HospitalNotification shall be sent. These three cases shall result in a new instance of the Encounter profile which has a new Encounter.period.start representing the time of the change in the hospitalisation. All cases are described in the [Clinical guidelines for application](https://medcomdk.github.io/dk-medcom-hospitalnotification/#11-clinical-guidelines-for-application).
 
 #### Leave
 To express the timestamps for a period of leave, the MedComHospitalNotificationLeavePeriodExtension shall be used. 
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index a8eb726..acdfc04 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -65,9 +65,9 @@ All profiles shall have a global unique id by using an UUID. [Read more about th
 
 The simplified examples contain the required content of a HospitalNotification message. Throughout this section different activity codes and statuses are used. [To get an overview of all the codes and statuses, please go to GitHub pages for HospitalNotification](https://medcomdk.github.io/dk-medcom-hospitalnotification/#14-hospitalnotification-codes).
 
-In the sections below is a limited number HospitalNotifications examplified. [More examples of a HospitalNotification message can be found here](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-message-examples.html). For examples of a profile, take a look under the tab 'Examples' on the site for the given profile.
+In the sections below is a limited number HospitalNotifications simplified examples. [More examples of a HospitalNotification message can be found here](http://medcomfhir.dk/ig/hospitalnotification/StructureDefinition-medcom-hospitalNotification-message-examples.html). For examples of a profile, take a look under the tab 'Examples' on the site for the given profile.
 
-> Please notice, that in the following examples is the Provenance resources listed as an array. This is just an example of an order, resources may be listed in any order. 
+> Please notice, that in the following examples is the resources listed as an array. This is just an example of an order, resources may be listed in any order. 
 
 ##### STIN - Start hospital stay - admitted
 The simplified example below is an example of a 'Start hospital stay - admitted' HospitalNotification. In the MessageHeader there is a request for a reportOfAdmission (extension:reportOfAdmissionFlag). In the Encounter instance the status is 'in-progress', and the Encounter is populated with a start timestamp (period.start). In the Provenance instance is the activity code 'admit-inpatient'. The sender and serviceProvider organisation is the same. 
diff --git a/puml/HospitalNotificationAdmit.puml b/puml/HospitalNotificationAdmit.puml
index 7dcdb9d..fcfcac6 100644
--- a/puml/HospitalNotificationAdmit.puml
+++ b/puml/HospitalNotificationAdmit.puml
@@ -16,7 +16,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as admitB{
         id = "a5e5b880-c087-4055-b9ec-99108695f81d"
         type = "message"
-        timestamp = "2022-12-07T12:00:01"
+        timestamp = "2022-12-07T12:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as admitMH{
         id = "b9b4818e-02de-4cc4-b418-d20cbc7b5404"
@@ -50,7 +50,7 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
         subject = "Patient/t33cef33-3626-422b-955d-d506aaa65fe1"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
     }    
     class "Receiver (MedComMessagingOrganization)" as admitROrg{
@@ -72,8 +72,8 @@ package "Start hospital stay - admitted" as admit <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
diff --git a/puml/HospitalNotificationAdmitEnteredInError.puml b/puml/HospitalNotificationAdmitEnteredInError.puml
index 11a9064..e3cad0a 100644
--- a/puml/HospitalNotificationAdmitEnteredInError.puml
+++ b/puml/HospitalNotificationAdmitEnteredInError.puml
@@ -20,7 +20,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Bundle (MedComHospitalNotificationMessage)" as cancelB{
         id = "c83671a4-9584-11ec-b909-0242ac120002"
         type = "message"
-        timestamp = "2022-12-07T15:00:01"
+        timestamp = "2022-12-07T15:00:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as cancelMH{
         id = "d8749b54-1aeb-4089-8941-8d876bdffc51"
@@ -52,7 +52,7 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
         subject = "Patient/d6eeaca6-81c6-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
+        period.start = "2022-12-07T12:00:00+02:00"
         serviceProvider = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as cancelROrg{
@@ -74,8 +74,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -83,8 +83,8 @@ package "Cancellation Start hospital stay - admitted" as cancel <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as cancelPRO{
         id = "c67ecb1c-957a-11ec-b909-0242ac120002"
         target = "MessageHeader/d8749b54-1aeb-4089-8941-8d876bdffc51"
-        occuredDateTime = "2022-12-07T15:00:02"
-        recorded = "2022-12-07T15:00:02"
+        occuredDateTime = "2022-12-07T15:00:02+02:00"
+        recorded = "2022-12-07T15:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "cancel-admit-inpatient"
         agent.who = "Organization/05266a00-81c7-11ed-a1eb-0242ac120002"
diff --git a/puml/HospitalNotificationDischarge.puml b/puml/HospitalNotificationDischarge.puml
index d499384..406f5e9 100644
--- a/puml/HospitalNotificationDischarge.puml
+++ b/puml/HospitalNotificationDischarge.puml
@@ -16,7 +16,7 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "f4aa42a4-86db-4e68-9b38-9dda0dfd5774"
         type = "message"
-        timestamp = "2022-12-18T09:45:31"
+        timestamp = "2022-12-18T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "g1affa53-c157-4080-abb0-8e681524f969"
@@ -48,8 +48,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
         subject = "Patient/6841b54e-81cd-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-18T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-18T09:45:30+02:00"
         serviceProvider = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -71,8 +71,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -80,8 +80,8 @@ package "End hospital stay - patient completed to home/primary sector" as finish
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "f710698c-83eb-4c3e-81c8-fe8e40baf524"
         target = "MessageHeader/g1affa53-c157-4080-abb0-8e681524f969"
-        occuredDateTime = "2022-12-18T09:45:32"
-        recorded = "2022-12-18T09:45:32"
+        occuredDateTime = "2022-12-18T09:45:32+02:00"
+        recorded = "2022-12-18T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "discharge-inpatient-home"
         agent.who = "Organization/8d813af0-81cd-11ed-a1eb-0242ac120002"
diff --git a/puml/HospitalNotificationEndOnleave.puml b/puml/HospitalNotificationEndOnleave.puml
index 5028632..e00f8db 100644
--- a/puml/HospitalNotificationEndOnleave.puml
+++ b/puml/HospitalNotificationEndOnleave.puml
@@ -21,7 +21,7 @@ package "End leave" as endOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as endOnleaveB{
         id = "e94de8ee-bd94-475e-b454-b8fbbef8a685"
         type = "message"
-        timestamp = "2022-12-14T15:30:01"
+        timestamp = "2022-12-14T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as endOnleaveMH{
         id = "f47254da-f170-46f0-b624-4778a9c92b1f"
@@ -53,9 +53,9 @@ package "End leave" as endOnleave <<Frame>> {
         subject = "Patient/519d5170-81ca-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
-        extension:leavePeriod.end = "2022-12-14T15:30:00"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
+        extension:leavePeriod.end = "2022-12-14T15:30:00+02:00"
         serviceProvider = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
     }    
 class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
@@ -77,8 +77,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -86,8 +86,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
@@ -98,8 +98,8 @@ class "Receiver (MedComMessagingOrganization)" as endOnleaveROrg{
     class "Provenance  (MedComMessagingProvenance)" as endOnleavePRO{
         id = "e4db4939-7c60-4ac6-aefc-523f809ccba6"
         target = "MessageHeader/f47254da-f170-46f0-b624-4778a9c92b1f"
-        occuredDateTime = "2022-12-14T15:30:02"
-        recorded = "2022-12-14T15:30:02"
+        occuredDateTime = "2022-12-14T15:30:02+02:00"
+        recorded = "2022-12-14T15:30:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "end-leave-inpatient"
         agent.who = "Organization/5961ade8-81ca-11ed-a1eb-0242ac120002"
diff --git a/puml/HospitalNotificationMors.puml b/puml/HospitalNotificationMors.puml
index f8ab15e..7fb3ccd 100644
--- a/puml/HospitalNotificationMors.puml
+++ b/puml/HospitalNotificationMors.puml
@@ -16,7 +16,7 @@ package "Deceased" as finished <<Frame>>{
     class "Bundle  (MedComHospitalNotificationMessage)" as finishedB{
         id = "g099bbf3-3fca-4722-a248-bfe1aa956410"
         type = "message"
-        timestamp = "2022-12-09T09:45:31"
+        timestamp = "2022-12-09T09:45:31+02:00"
     }
     class "MessageHeader  (MedComHospitalNotificationMessageHeader)" as finishedMH{
         id = "hefc6d95-6161-4493-99c9-f359488dedb8"
@@ -49,8 +49,8 @@ package "Deceased" as finished <<Frame>>{
         subject = "Patient/t82fb8a3-6725-41e2-a615-2b1cfcfe9931"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        periode.end = "2022-12-09T09:45:30"
+        period.start = "2022-12-07T12:00:00+02:00"
+        periode.end = "2022-12-09T09:45:30+02:00"
         serviceProvider = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
     } 
     class "Receiver (MedComMessagingOrganization)" as finishedROrg{
@@ -72,8 +72,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as admitfinishedPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/d6ed6725-1aec-42ad-829d-f7074c3914f3"
@@ -81,8 +81,8 @@ package "Deceased" as finished <<Frame>>{
     class "Provenance (MedComMessagingProvenance)" as finishedPRO{
         id = "g9942adb-197a-4e30-bec8-566e3a113efe"
         target = "MessageHeader/hefc6d95-6161-4493-99c9-f359488dedb8"
-        occuredDateTime = "2022-12-09T09:45:32"
-        recorded = "2022-12-09T09:45:32"
+        occuredDateTime = "2022-12-09T09:45:32+02:00"
+        recorded = "2022-12-09T09:45:32+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/840b4046-81ce-11ed-a1eb-0242ac120002"
diff --git a/puml/HospitalNotificationStartOnleave.puml b/puml/HospitalNotificationStartOnleave.puml
index 89bfc23..4e822c7 100644
--- a/puml/HospitalNotificationStartOnleave.puml
+++ b/puml/HospitalNotificationStartOnleave.puml
@@ -20,7 +20,7 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Bundle (MedComHospitalNotificationMessage)" as startOnleaveB{
         id = "d3128d9b-cede-4c7f-8904-809eab322d7d"
         type = "message"
-        timestamp = "2022-12-13T15:30:01"
+        timestamp = "2022-12-13T15:30:01+02:00"
     }
     class "MessageHeader (MedComHospitalNotificationMessageHeader)" as startOnleaveMH{
         id = "e563a2b2-bf92-4b13-bbd2-0a021a95bded"
@@ -52,8 +52,8 @@ package "Start leave" as startOnleave <<Frame>> {
         subject = "Patient/97404d10-81c8-11ed-a1eb-0242ac120002"
         episodeOfCare.identifier.system = "https://www.esundhed.dk/Registre/Landspatientsregisteret"
         episodeOfCare.identifier.value = "urn:uuid:fc60e762-b13b-5773-865e-67f3907bdcc7"
-        period.start = "2022-12-07T12:00:00"
-        extension:leavePeriod.start = "2022-12-13T14:00:10"
+        period.start = "2022-12-07T12:00:00+02:00"
+        extension:leavePeriod.start = "2022-12-13T14:00:10+02:00"
         serviceProvider = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"
     }    
     class "Receiver (MedComMessagingOrganization)" as startOnleaveROrg{
@@ -75,8 +75,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as admitPRO{
         id = "a7cf3888-6f42-4e4d-929c-d2475d24fba0"
         target = "MessageHeader/b9b4818e-02de-4cc4-b418-d20cbc7b5404"
-        occuredDateTime = "2022-12-07T12:00:02"
-        recorded = "2022-12-07T12:00:02"
+        occuredDateTime = "2022-12-07T12:00:02+02:00"
+        recorded = "2022-12-07T12:00:02+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "admit-inpatient"
         agent.who = "Organization/o7056980-a8b2-42aa-8a0e-c1fc85d1f40d"
@@ -84,8 +84,8 @@ package "Start leave" as startOnleave <<Frame>> {
     class "Provenance  (MedComMessagingProvenance)" as startOnleavePRO{
         id = "dc421d0a-cded-470f-9a53-2ddba7583baa"
         target = "MessageHeader/e563a2b2-bf92-4b13-bbd2-0a021a95bded"
-        occuredDateTime = "2022-12-13T14:00:12"
-        recorded = "2022-12-13T14:00:12"
+        occuredDateTime = "2022-12-13T14:00:12+02:00"
+        recorded = "2022-12-13T14:00:12+02:00"
         activity.system = "http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes"
         activity.code = "start-leave-inpatient"
         agent.who = "Organization/b79a7914-81c8-11ed-a1eb-0242ac120002"