Merge pull request #52 from medcomdk/v.2.1.1-rc

V.3.0.0 rc

input/fsh/MedComCareCommunicationAttachmentID.fsh

@@ -1,25 +1,25 @@
-Extension: MedComCareCommunicationAttachmentExtension
-Id: medcom-carecommunication-attachment-identifier-extension
-Title: "AttachmentIdentifierExtension"
-Description: "An extension holding an attachment identifier"
+/* Extension: MedComIdentifierExtension
+Id: medcom-identifier-extension
+Title: "IdentifierExtension"
+Description: "An extension holding identifier"
 * valueIdentifier 1.. MS
-* valueIdentifier only MedComCareCommunicationAttachmentIdentifier
+* valueIdentifier only MedComMessageSegmentIdentifier
 
 
-Profile: MedComCareCommunicationAttachmentIdentifier
+Profile: MedComMessageSegmentIdentifier
 Parent: Identifier
-Id: medcom-carecommunication-attachment-identifier
-Title: "An identifier for an attachment."
-Description: "An unique identifier for an attachment used in a CareCommunication message"
+Id: medcom-message-segment-identifier
+Title: "An identifier for a message segment."
+Description: "An unique identifier for a message segment used in a CareCommunication message"
 * value 1..
-* value ^short = "The value is a UUID identifier, which shall be applied when an attachment is included. If the attachment is edited and reattached, a new UUID shall be applied."
+* value ^short = "The value is a UUID identifier version 4."
 * value obeys medcom-uuidv4
 * assigner 1..
-* assigner ^short = "A reference to the organization that initially attached the attachment."
+* assigner ^short = "A reference to the organization that initially added the message segment."
 * assigner only Reference(MedComCoreOrganization)
 * assigner and value MS
 
 Invariant: medcom-uuidv4
 Description: "The value shall correspond to the structure of an UUID version 4"
 Severity: #error
-Expression: "value.matches('urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')"
+Expression: "value.matches('urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')" */

input/fsh/MedComCareCommunicationHeader.fsh

@@ -3,6 +3,8 @@ Parent: MedComMessagingMessageHeader
 Id: medcom-careCommunication-messageHeader
 Description: "Message header for care communication message"
 * eventCoding = $MessageEvents#care-communication-message
+* destination[cc] 0..0
+* destination[primary] 1..1
 * focus 1..2 MS
 * focus only Reference(MedComCareCommunication)
 * focus ^type.aggregation = #bundled

input/fsh/MedComCareCommunicationMessage.fsh

@@ -14,7 +14,7 @@ Description: "The CareCommunication is used to ensure secure electronic communic
 Invariant: medcom-careCommunication-1
 Description: "The MessageHeader shall conform to medcom-careCommunication-messageHeader profile"
 Severity: #error
-Expression: "entry.ofType(MessageHeader).all(resource.conformsTo('http://medcomfhir.dk/ig/carecommunication/StructureDefinition/medcom-careCommunication-messageHeader'))"
+Expression: "entry[0].resource.conformsTo('http://medcomfhir.dk/ig/carecommunication/StructureDefinition/medcom-careCommunication-messageHeader')"
 
 Invariant: medcom-careCommunication-2
 Description: "Entry shall contain exactly one Patient resource"
@@ -24,7 +24,7 @@ Expression: "entry.where(resource.is(Patient)).count() = 1"
 Invariant: medcom-careCommunication-3
 Description: "All Provenance resources shall contain activities from medcom-careCommunication-messagingActivities valueset"
 Severity: #error
-Expression: "entry.ofType(Provenance).all(resource.activity.memberOf('http://medcomfhir.dk/ig/terminology/ValueSet/medcom-careCommunication-messagingActivities'))"
+Expression: "entry.resource.ofType(Provenance).all(activity.memberOf('http://medcomfhir.dk/ig/terminology/ValueSet/medcom-careCommunication-messagingActivities'))"
 
 
 Invariant: medcom-careCommunication-4

input/fsh/MedComCareCommunicationPayloadAuthorContactExtension.fsh

@@ -1,7 +1,9 @@
-Extension: MedComCareCommunicationPayloadAuthorContactExtension
+/* Extension: MedComCareCommunicationPayloadAuthorContactExtension
 Id: medcom-carecommunication-author-contact-extension
 Title: "PayloadAuthorContactExtension"
 Description: "Extension to contain the contact information tha author of the payload"
+// * ^context.type = #element
+// * ^context.expression = "Communication.payload"
 * valueContactPoint 1..
 * valueContactPoint.value 1.. MS
 * valueContactPoint.value obeys medcom-carecommunication-authorcontact
@@ -13,4 +15,4 @@ Description: "Extension to contain the contact information tha author of the pay
 Invariant: medcom-carecommunication-authorcontact
 Description: "The telephone number may include + and numbers from 0-9"
 Severity: #error
-Expression: "matches('[+]?[-0-9]')" 
+Expression: "matches('[+]?[-0-9]')"  */

input/fsh/MedComCareCommunicationPayloadAuthorExtension.fsh

@@ -1,7 +1,8 @@
-Extension: MedComCareCommunicationPayloadAuthorExtension
+/* Extension: MedComCareCommunicationPayloadAuthorExtension
 Id: medcom-carecommunication-author-extension
 Title: "PayloadAuthorExtension"
 Description: "Reference to author of this payload"
 * value[x] 1..1
 * value[x] only Reference(MedComCorePractitionerRole)
 * value[x] ^type.aggregation = #bundled
+ */

input/fsh/MedComCareCommunicationPayloadDateTimeExtension.fsh

@@ -1,6 +1,7 @@
-Extension: MedComCareCommunicationPayloadDateTimeExtension
+/* Extension: MedComCareCommunicationPayloadDateTimeExtension
 Id: medcom-carecommunication-datetime-extension
 Title: "PayloadDateTimeExtension"
 Description: "Date and time of this payload"
 * value[x] 1..1
 * value[x] only dateTime
+ */

input/fsh/MedComCareCommunicationSenderExtension.fsh

@@ -1,8 +1,9 @@
-Extension: MedComCareCommunicationSenderExtension
+/* Extension: MedComCareCommunicationSenderExtension
 Id: medcom-carecommunication-sender-extension
 Title: "SenderExtension"
 Description: "Reference to a more specfic sender of a CareCommunication message."
 * value[x] 0..1
 * value[x] only Reference(MedComCorePractitionerRole or MedComCoreCareTeam)
 * value[x] ^type.aggregation = #bundled
 * value[x] ^short = "This element is used to describe a more specific sender than the MessageHeader.sender. It may be a careteam a homecare group in the municipality or a named general practitioner."
+ */

input/ignoreWarnings.txt

@@ -3,4 +3,3 @@
 # Allowed MimeTypes are checked manually 
 Unable to check if http://medcomfhir.dk/ig/core/1.0/ValueSet/medcom-carecommunication-attachmentMimeTypes is a proper subset of http://hl7.org/fhir/ValueSet/mimetypes|4.0.1 - base value set is too large to check
 
-