Merge pull request #29 from medcomdk/2.1.0-rc1-master

2.1.0 rc1 master

_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 $*

_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

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
+Alias: $ActivityCodesValueset = http://medcomfhir.dk/ig/terminology/ValueSet/medcom-messaging-activityCodes
+Alias: $ProducenID = http://medcomfhir.dk/ig/terminology/CodeSystem/MedComProducentID  

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 represent the producer of the observations."
+* identifier 3.. 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"

input/fsh/MedComRequesterOrganization.fsh

@@ -0,0 +1,40 @@
+Profile: MedComRequesterOrganization
+Parent: MedComMessagingOrganization
+Id: medcom-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
+
+
+// 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
+// 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."

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 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

input/pagecontent/StructureDefinition-medcom-requesterorganization-intro.md

@@ -0,0 +1,10 @@
+>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 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. 

package-list.json

@@ -32,6 +32,16 @@
       "sequence": "Release",
       "fhirversion": "4.0.1",
       "current": true
+    },
+    {
+      "version": "2.1.0",
+      "date": "2023-10-31",
+      "desc": "MedCom Messaging",
+      "path": "http://medcomfhir.dk/ig/messaging/2.1.0",
+      "status": "release",
+      "sequence": "Release",
+      "fhirversion": "4.0.1",
+      "current": true
     }
   ]
 }

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"
+}

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.

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: current
+  medcom.fhir.dk.core: 2.3.0
 
 menu:
   Table of Contents: toc.html