From 6df0024b89b952f463686da73bbc3abc57c5ae16 Mon Sep 17 00:00:00 2001 From: Harmke Koning Date: Tue, 2 Jun 2026 14:44:30 +0200 Subject: [PATCH 1/2] set cardinalities and invariant for CR --- input/fsh/CommunicationRequest.fsh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/input/fsh/CommunicationRequest.fsh b/input/fsh/CommunicationRequest.fsh index 2113c5c..4a81c5a 100644 --- a/input/fsh/CommunicationRequest.fsh +++ b/input/fsh/CommunicationRequest.fsh @@ -7,13 +7,17 @@ Description: "A CommunicationRequest representing the advice or instruction give * category 1..* * category = $snomed#223449006 * category ^comment = "The `category.text` element may be used to provide additional context for human readers next to the pattern category coding, for example: 'Request for patient to inform relatives about treatment agreements'." +* subject 1..1 * subject only Reference(ACPPatient) * encounter only Reference(ACPEncounter) +* requester 1..1 * requester only Reference(ACPHealthProfessionalPractitionerRole or ACPHealthProfessionalPractitioner) +* sender 1..1 * sender only Reference(ACPPatient) * recipient only Reference(ACPContactPerson) * reasonCode 1..* * reasonCode = $snomed#713603004 // "advance care planning" +* obeys cr-date-required * insert ObligationRules(category) // already 1..1 so may not be needed place under obligation but added for consistency * insert ObligationRules(subject) @@ -25,6 +29,12 @@ Description: "A CommunicationRequest representing the advice or instruction give * insert ObligationRules(reasonCode) // already 1..1 so may not be needed place under obligation but added for consistency +Invariant: cr-date-required +Description: "We want to have the date of the CommunicationRequest either in the resource itself or in the Encounter in which the CommunicationRequest originated." +Severity: #error +Expression: "authoredOn.exists() or encounter.exists()" + + Mapping: MapACPInformRelativesRequest Id: pall-izppz-zib2020v2026-02-24 Title: "ACP dataset" From 763f20e36e1a6891322d573fca827be116f1377d Mon Sep 17 00:00:00 2001 From: MariekeMassa Date: Tue, 2 Jun 2026 15:06:34 +0200 Subject: [PATCH 2/2] Change description of cr-date invariant --- input/fsh/CommunicationRequest.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/fsh/CommunicationRequest.fsh b/input/fsh/CommunicationRequest.fsh index 4a81c5a..4db93e9 100644 --- a/input/fsh/CommunicationRequest.fsh +++ b/input/fsh/CommunicationRequest.fsh @@ -30,7 +30,7 @@ Description: "A CommunicationRequest representing the advice or instruction give Invariant: cr-date-required -Description: "We want to have the date of the CommunicationRequest either in the resource itself or in the Encounter in which the CommunicationRequest originated." +Description: "The date of the CommunicationRequest is expected to be captured either in the resource itself or in the Encounter in which the CommunicationRequest originated." Severity: #error Expression: "authoredOn.exists() or encounter.exists()"