From a06339ad00256bbd18edb279a862470af7e4b73c Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:18:29 +0100
Subject: [PATCH 1/8] Two profiles added

---
 _genonce.sh                                   |  2 ++
 input/fsh/MedComProducerOrganization.fsh      | 27 +++++++++++++++++
 input/fsh/MedComRequesterOrganization.fsh     | 30 +++++++++++++++++++
 ...ition-medcom-producerorganization-intro.md |  7 +++++
 ...tion-medcom-requesterorganization-intro.md |  8 +++++
 sushi-config.yaml                             |  2 +-
 6 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 input/fsh/MedComProducerOrganization.fsh
 create mode 100644 input/fsh/MedComRequesterOrganization.fsh
 create mode 100644 input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
 create mode 100644 input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md

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/input/fsh/MedComProducerOrganization.fsh b/input/fsh/MedComProducerOrganization.fsh
new file mode 100644
index 0000000..971b5d0
--- /dev/null
+++ b/input/fsh/MedComProducerOrganization.fsh
@@ -0,0 +1,27 @@
+Profile: MedComProducerOrganization
+Parent: MedComMessagingOrganization
+Id: medcom-producer-organization
+Title: "MedComCoreProducerOrganization"
+Description: "This profile is intended to be used to represend the producer of the observations results."
+* identifier 2.. MS
+  * ^slicing.discriminator.type = #value
+  * ^slicing.discriminator.path = "system"
+  * ^slicing.rules = #open
+* identifier contains
+    ProducentID 1..1 
+* identifier[ProducentID].system 1..1 MS
+* identifier[ProducentID].system = $ProducenID  
+* identifier[ProducentID].value 1..1 MS
+* identifier[ProducentID] ^short = "Offical MedCom code describing the producer of the observation."
+
+
+// Sender instance - new message
+Instance: ef5cb9a6-835f-4d18-a34e-179c578b9a2a
+InstanceOf: MedComProducerOrganization 
+Title: "Example of a sender organization with a SOR, an EAN identifier, and ProdcentID"
+Description: "Example of an organization with a SOR and an EAN identifier."
+* identifier[SOR-ID].value = "1144561000016002" 
+* identifier[EAN-ID].value = "5790000123117" 
+* identifier[ProducentID].system = $ProducenID
+* identifier[ProducentID].value = "KAF"
+* name = "Pleje og Rehabilitering"
\ No newline at end of file
diff --git a/input/fsh/MedComRequesterOrganization.fsh b/input/fsh/MedComRequesterOrganization.fsh
new file mode 100644
index 0000000..0705650
--- /dev/null
+++ b/input/fsh/MedComRequesterOrganization.fsh
@@ -0,0 +1,30 @@
+Profile: MedComMessagingRequesterOrganization
+Parent: MedComMessagingOrganization
+Id: medcom-messaging-requesterorganization
+Title: "MedComMessagingRequesterOrganization"
+Description: "This profile is intended to be used to represent the requester organization of the observations."
+* identifier 3.. MS
+* identifier[Ydernummer] 1.. 
+* identifier[Ydernummer] MS 
+* contact 1..1 MS
+* contact.name 0..1 MS
+* contact.name.given 1..1 MS
+* contact.name.given ^short = "Initials of the practitioner that request the observation."
+// * extension contains MedComMessagingRequesterInit named RequesterInitials 0..1
+* contact.extension contains data-absent-reason named InitialsNotKnown 0..1
+* contact obeys medcom-homecareObservation-4
+
+Invariant: medcom-homecareObservation-4
+Description: "There shall either be a RequesterInitials or a InitialsNotKnown."
+Expression: "name.exists() or extension('http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()"
+Severity: #error
+
+
+
+// Extension: MedComMessagingRequesterInit
+// Id: MedComMessagingRequesterInit
+// Title: "MedComMessagingRequesterInit"
+// Description: "Initials of the practitioner that request observations"
+// * valueHumanName 0..1 MS
+// * valueHumanName.given 1..1 MS
+// * valueHumanName.given ^short = "Initials of the practitioner that request the observation."
diff --git a/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md b/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
new file mode 100644
index 0000000..24b6107
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
@@ -0,0 +1,7 @@
+>Note: This profile is developed to be part of a production trial of the communication between the general practitioner and municipal acute care team.
+
+
+#### Scope and usage
+This profile is a MedCom Core profile for the producer of the observation and is intended to represent the producer organization of the observation for a variety cases including:
+* laboratory observations
+* homeCareObservations
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
new file mode 100644
index 0000000..a328adf
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
@@ -0,0 +1,8 @@
+### Scope and usage
+This profile is intended to be used to represent the requester organization of the observations. 
+
+
+#### Contact informations
+It is required to specify contact person at the organization that reqests observations. The contact infomration shall contain either initials of the general practitioner or status "unknown" from the [data-absent-reason ValueSet](http://hl7.org/fhir/R4/valueset-data-absent-reason.html) shall be sent. In  MedComMessagingRequesterOrganization the contact.name.given shall be used to express the initials of the general practitioner. The standard follows HL7 rulse to expres initals. [Click here to read the rules](http://hl7.org/fhir/R4/datatypes.html#HumanName)
+
+Furthermore identifiers such as SOR-, EAN and Ydernummer-identifier needs to be specified. 
\ No newline at end of file
diff --git a/sushi-config.yaml b/sushi-config.yaml
index b3beaa8..85bd128 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -14,7 +14,7 @@ publisher:
 jurisdiction: urn:iso:std:iso:3166#DK "Denmark"
 dependencies:
   hl7.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.core: current
+  medcom.fhir.dk.core: dev
   
 menu:
   Table of Contents: toc.html

From b4ae89fdd0a0c3dbf29821ad1e907d7de4e10e5a Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:12:52 +0100
Subject: [PATCH 2/8] alias added

---
 _updatePublisher.sh   | 3 +++
 input/fsh/Aliases.fsh | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/_updatePublisher.sh b/_updatePublisher.sh
index f127f66..0f9ecbe 100644
--- a/_updatePublisher.sh
+++ b/_updatePublisher.sh
@@ -117,13 +117,16 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
 
   curl -L $gencont_sh_url -o /tmp/_gencontinuous.new
   cp /tmp/_gencontinuous.new _gencontinuous.sh
+  chmod +x _gencontinuous.sh
   rm /tmp/_gencontinuous.new
 
   curl -L $gen_sh_url -o /tmp/_genonce.new
   cp /tmp/_genonce.new _genonce.sh
+  chmod +x _genonce.sh
   rm  /tmp/_genonce.new
 
   curl -L $update_sh_url -o /tmp/_updatePublisher.new
   cp /tmp/_updatePublisher.new _updatePublisher.sh
+  chmod +x _updatePublisher.sh
   rm /tmp/_updatePublisher.new
 fi
diff --git a/input/fsh/Aliases.fsh b/input/fsh/Aliases.fsh
index 8611799..eb44087 100644
--- a/input/fsh/Aliases.fsh
+++ b/input/fsh/Aliases.fsh
@@ -12,4 +12,5 @@ Alias: $SORCode = urn:oid:1.2.208.176.1.1
 Alias: $EANCode = urn:oid:1.3.88
 Alias: $activityCodes = http://medcomfhir.dk/ig/terminology/CodeSystem/medcom-messaging-activityCodes
 Alias: $MessageTypes = http://medcomfhir.dk/ig/terminology/ValueSet/medcom-messaging-messageTypes
-Alias: $ActivityCodesValueset = http://medcomfhir.dk/ig/terminology/ValueSet/medcom-messaging-activityCodes
\ No newline at end of file
+Alias: $ActivityCodesValueset = http://medcomfhir.dk/ig/terminology/ValueSet/medcom-messaging-activityCodes
+Alias: $ProducenID = http://medcomfhir.dk/ig/terminology/CodeSystem/MedComProducentID  
\ No newline at end of file

From c9340b17b1ffb8160e8ddc3f4a36da1c15e344d8 Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:24:29 +0100
Subject: [PATCH 3/8] Releasnote updated

---
 ...ureDefinition-medcom-requesterorganization-intro.md |  2 ++
 package-list.json                                      | 10 ++++++++++
 release-notes.md                                       |  1 +
 3 files changed, 13 insertions(+)
 create mode 100644 release-notes.md

diff --git a/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
index a328adf..2e193c4 100644
--- a/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
@@ -1,3 +1,5 @@
+>Note: This profile is developed to be part of a production trial of the communication between the general practitioner and municipal acute care team.
+
 ### Scope and usage
 This profile is intended to be used to represent the requester organization of the observations. 
 
diff --git a/package-list.json b/package-list.json
index 5085e65..471934b 100644
--- a/package-list.json
+++ b/package-list.json
@@ -33,5 +33,15 @@
       "fhirversion": "4.0.1",
       "current": true
     }
+    {
+      "version": "2.1.0",
+      "date": "2023-10-30",
+      "desc": "MedCom Messaging",
+      "path": "http://medcomfhir.dk/ig/messaging/2.1.0",
+      "status": "release",
+      "sequence": "Release",
+      "fhirversion": "4.0.1",
+      "current": true
+    }
   ]
 }
\ No newline at end of file
diff --git a/release-notes.md b/release-notes.md
new file mode 100644
index 0000000..38f7252
--- /dev/null
+++ b/release-notes.md
@@ -0,0 +1 @@
+* MedComProducerOrganization and MedComREquesterOrganization added. Both profiles are developed and intended to be part of a production trial of the communication between the general practitioner and municipal acute care team.
\ No newline at end of file

From 2f8783ca1a3fe9790ad4ccf64569540deaf30616 Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:41:01 +0100
Subject: [PATCH 4/8] corrections added

---
 input/fsh/MedComProducerOrganization.fsh                        | 2 +-
 .../StructureDefinition-medcom-producerorganization-intro.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/input/fsh/MedComProducerOrganization.fsh b/input/fsh/MedComProducerOrganization.fsh
index 971b5d0..d4bfbb0 100644
--- a/input/fsh/MedComProducerOrganization.fsh
+++ b/input/fsh/MedComProducerOrganization.fsh
@@ -2,7 +2,7 @@ Profile: MedComProducerOrganization
 Parent: MedComMessagingOrganization
 Id: medcom-producer-organization
 Title: "MedComCoreProducerOrganization"
-Description: "This profile is intended to be used to represend the producer of the observations results."
+Description: "This profile is intended to be used to represent the producer of the observations."
 * identifier 2.. MS
   * ^slicing.discriminator.type = #value
   * ^slicing.discriminator.path = "system"
diff --git a/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md b/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
index 24b6107..09b676b 100644
--- a/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-producerorganization-intro.md
@@ -2,6 +2,6 @@
 
 
 #### Scope and usage
-This profile is a MedCom Core profile for the producer of the observation and is intended to represent the producer organization of the observation for a variety cases including:
+This profile is a MedCom messaging profile for the producer of the observation and is intended to represent the producer organization of the observation for a variety cases including:
 * laboratory observations
 * homeCareObservations
\ No newline at end of file

From 90c8a17481be2d8e8769883ff7a37ab359f54bc1 Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:44:37 +0100
Subject: [PATCH 5/8] version corrected

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

diff --git a/sushi-config.yaml b/sushi-config.yaml
index 85bd128..b6acd52 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -4,7 +4,7 @@ name: MedComMessaging
 title: "DK MedCom Messaging"
 description: The DK MedCom Messaging IG
 status: active
-version: "2.0.0"
+version: "2.1.0"
 fhirVersion: 4.0.1
 copyrightYear: 2021+
 releaseLabel: release
@@ -14,7 +14,7 @@ publisher:
 jurisdiction: urn:iso:std:iso:3166#DK "Denmark"
 dependencies:
   hl7.fhir.dk.core: 2.0.0
-  medcom.fhir.dk.core: dev
+  medcom.fhir.dk.core: 2.3.0
   
 menu:
   Table of Contents: toc.html

From 87a9e3419792f24d7df371d27404ee2212193c4d Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:48:43 +0100
Subject: [PATCH 6/8] requesterorganization corrected

---
 input/fsh/MedComRequesterOrganization.fsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/input/fsh/MedComRequesterOrganization.fsh b/input/fsh/MedComRequesterOrganization.fsh
index 0705650..79686f0 100644
--- a/input/fsh/MedComRequesterOrganization.fsh
+++ b/input/fsh/MedComRequesterOrganization.fsh
@@ -1,6 +1,6 @@
-Profile: MedComMessagingRequesterOrganization
+Profile: MedComRequesterOrganization
 Parent: MedComMessagingOrganization
-Id: medcom-messaging-requesterorganization
+Id: medcom-requesterorganization
 Title: "MedComMessagingRequesterOrganization"
 Description: "This profile is intended to be used to represent the requester organization of the observations."
 * identifier 3.. MS

From bb7a0dd80f0e89cd8306d24dab33770a15a6eb7f Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:24:57 +0100
Subject: [PATCH 7/8] correction added

---
 input/fsh/MedComProducerOrganization.fsh               |  2 +-
 input/fsh/MedComRequesterOrganization.fsh              | 10 ++++++++++
 ...ureDefinition-medcom-requesterorganization-intro.md |  4 ++--
 release-notes.md                                       |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/input/fsh/MedComProducerOrganization.fsh b/input/fsh/MedComProducerOrganization.fsh
index d4bfbb0..5f67763 100644
--- a/input/fsh/MedComProducerOrganization.fsh
+++ b/input/fsh/MedComProducerOrganization.fsh
@@ -3,7 +3,7 @@ Parent: MedComMessagingOrganization
 Id: medcom-producer-organization
 Title: "MedComCoreProducerOrganization"
 Description: "This profile is intended to be used to represent the producer of the observations."
-* identifier 2.. MS
+* identifier 3.. MS
   * ^slicing.discriminator.type = #value
   * ^slicing.discriminator.path = "system"
   * ^slicing.rules = #open
diff --git a/input/fsh/MedComRequesterOrganization.fsh b/input/fsh/MedComRequesterOrganization.fsh
index 79686f0..a48a3f7 100644
--- a/input/fsh/MedComRequesterOrganization.fsh
+++ b/input/fsh/MedComRequesterOrganization.fsh
@@ -20,6 +20,16 @@ Expression: "name.exists() or extension('http://hl7.org/fhir/StructureDefinition
 Severity: #error
 
 
+// Reciever instance - new message
+Instance: 42541447-b58c-4a1a-9514-02b80494bbd3
+InstanceOf: MedComRequesterOrganization 
+Title: "Example of a reciever organization with a SOR, an EAN  and Ydrenummer identifier."
+Description: "Example of an organization with a SOR and an EAN and Ydrenummer identifier."
+* identifier[SOR-ID].value = "52581000016005" 
+* identifier[EAN-ID].value = "5790000127092"
+* identifier[Ydernummer].value = "061654"
+* contact.name.given = "OKM"
+* name = "Skødstrup Lægepraksis"
 
 // Extension: MedComMessagingRequesterInit
 // Id: MedComMessagingRequesterInit
diff --git a/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
index 2e193c4..69de381 100644
--- a/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
+++ b/input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md
@@ -1,10 +1,10 @@
->Note: This profile is developed to be part of a production trial of the communication between the general practitioner and municipal acute care team.
+>Note: This profile is intended to represent the requester organization of the observations. The requester can be the a general practitioner, who orders a number of homecare or laboratory observation.
 
 ### Scope and usage
 This profile is intended to be used to represent the requester organization of the observations. 
 
 
 #### Contact informations
-It is required to specify contact person at the organization that reqests observations. The contact infomration shall contain either initials of the general practitioner or status "unknown" from the [data-absent-reason ValueSet](http://hl7.org/fhir/R4/valueset-data-absent-reason.html) shall be sent. In  MedComMessagingRequesterOrganization the contact.name.given shall be used to express the initials of the general practitioner. The standard follows HL7 rulse to expres initals. [Click here to read the rules](http://hl7.org/fhir/R4/datatypes.html#HumanName)
+It is required to specify contact person at the organization that reqests observations. The contact information shall contain either initials of the general practitioner or status "unknown" from the [data-absent-reason ValueSet](http://hl7.org/fhir/R4/valueset-data-absent-reason.html) shall be sent. In  MedComMessagingRequesterOrganization the contact.name.given shall be used to express the initials of the general practitioner. The standard follows HL7 rulse to expres initals. [Click here to read the rules](http://hl7.org/fhir/R4/datatypes.html#HumanName)
 
 Furthermore identifiers such as SOR-, EAN and Ydernummer-identifier needs to be specified. 
\ No newline at end of file
diff --git a/release-notes.md b/release-notes.md
index 38f7252..3feb34d 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1 +1 @@
-* MedComProducerOrganization and MedComREquesterOrganization added. Both profiles are developed and intended to be part of a production trial of the communication between the general practitioner and municipal acute care team.
\ No newline at end of file
+* MedComProducerOrganization and MedComRequesterOrganization added. Both profiles are developed and intended to be part of a production trial of the communication between the general practitioner and municipal acute care team.
\ No newline at end of file

From 36b732350c19490e15e2a840d0c823cfa111dd6f Mon Sep 17 00:00:00 2001
From: mbumedcom <107400768+mbumedcom@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:30:45 +0100
Subject: [PATCH 8/8] corrections added

---
 package-list.json        |  4 ++--
 publication-request.json | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 publication-request.json

diff --git a/package-list.json b/package-list.json
index 471934b..f6cde51 100644
--- a/package-list.json
+++ b/package-list.json
@@ -32,10 +32,10 @@
       "sequence": "Release",
       "fhirversion": "4.0.1",
       "current": true
-    }
+    },
     {
       "version": "2.1.0",
-      "date": "2023-10-30",
+      "date": "2023-10-31",
       "desc": "MedCom Messaging",
       "path": "http://medcomfhir.dk/ig/messaging/2.1.0",
       "status": "release",
diff --git a/publication-request.json b/publication-request.json
new file mode 100644
index 0000000..88259c3
--- /dev/null
+++ b/publication-request.json
@@ -0,0 +1,12 @@
+{
+    "package-id": "medcom.fhir.dk.messaging",
+    "version": "1.0.0",
+    "path": "http://medcomfhir.dk/ig/messaging/2.1.0",
+    "status": "release",
+    "sequence": "Release",
+    "milestone" : true,
+    "title": "The DK MedCom Messaging",
+    "category": "MedCom Messaging",
+    "introduction": "The MedCom MedCom Messaging Implementation Guide includes profiles developed to be part of a MedCom messages.",
+    "descmd": "@release-notes.md"
+}
\ No newline at end of file