From 9c02ba292aa4b9ccb0cc78733b02d4d75bbcc012 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 25 Mar 2024 15:45:12 +0100 Subject: [PATCH 1/5] Remove Consent.datetime 1.. constraint Date is set by the server and therefore does not need to be sent by a client. --- .../StructureDefinition-GEM-ERPCHRG-PR-Consent.json | 5 ----- Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh | 1 - 2 files changed, 6 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json index 2eaffc1..9dd6518 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json @@ -112,11 +112,6 @@ } ] }, - { - "id": "Consent.dateTime", - "path": "Consent.dateTime", - "min": 1 - }, { "id": "Consent.policyRule", "path": "Consent.policyRule", diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh index db8079f..7d3c5a7 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh @@ -13,7 +13,6 @@ Id: GEM-ERPCHRG-PR-Consent * patient.identifier 1..1 * patient.identifier only $identifier-pkv or $identifier-kvid-10 * patient.identifier.assigner.display 0..1 -* dateTime 1.. * policyRule MS * policyRule from http://terminology.hl7.org/ValueSet/v3-ActCode From 7ee274589e46d20eecf0cae16fb8feec66ed7227 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 25 Mar 2024 15:46:17 +0100 Subject: [PATCH 2/5] Open the supportingInformation of ChargeItem When getting a list of ChargeItems no references are need to be sent. Therefore the constraint does not need to be 1.. --- .../StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json | 1 - Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json index 303d60a..1d0d5d2 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json @@ -210,7 +210,6 @@ "rules": "closed" }, "definition": "holds references to the 3 relevant documents [prescription, receipt, dispensationInformation]", - "min": 1, "max": "4", "mustSupport": true }, diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh index 06fce2a..bd9776f 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh @@ -41,7 +41,7 @@ Id: GEM-ERPCHRG-PR-ChargeItem * enterer.identifier 1.. * enterer.identifier only $identifier-telematik-id -* supportingInformation 1..4 MS +* supportingInformation 0..4 MS * supportingInformation ^slicing.discriminator.type = #value * supportingInformation ^slicing.discriminator.path = "display" * supportingInformation ^slicing.rules = #closed From 236adb5ab8169fc9a989058c2409165318140747 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 26 Mar 2024 09:00:06 +0100 Subject: [PATCH 3/5] Add comment for dateTime --- Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh index 7d3c5a7..ea39393 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh @@ -15,7 +15,7 @@ Id: GEM-ERPCHRG-PR-Consent * patient.identifier.assigner.display 0..1 * policyRule MS * policyRule from http://terminology.hl7.org/ValueSet/v3-ActCode - +// Die Kardinalität von dateTime soll auf 0..1 offen bleiben, da der E-Rezept-Fachdienst den Zeitpunkt der Zustimmung beim Hochladen erfasst. Instance: ChargeItemConsent From cfe4382f466bbee363c344a484c9dc4eb9a78ae3 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 26 Mar 2024 09:02:52 +0100 Subject: [PATCH 4/5] comment am dateTime angesetzt --- .../StructureDefinition-GEM-ERPCHRG-PR-Consent.json | 5 +++++ Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json index 9dd6518..3714b90 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json @@ -112,6 +112,11 @@ } ] }, + { + "id": "Consent.dateTime", + "path": "Consent.dateTime", + "comment": "dateTime wird vom E-Rezept-Fachdienst zu dem Zeitpunkt gesetzt, an dem die Consent Ressource hochgeladen wird." + }, { "id": "Consent.policyRule", "path": "Consent.policyRule", diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh index ea39393..f078344 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh @@ -15,7 +15,7 @@ Id: GEM-ERPCHRG-PR-Consent * patient.identifier.assigner.display 0..1 * policyRule MS * policyRule from http://terminology.hl7.org/ValueSet/v3-ActCode -// Die Kardinalität von dateTime soll auf 0..1 offen bleiben, da der E-Rezept-Fachdienst den Zeitpunkt der Zustimmung beim Hochladen erfasst. +* dateTime ^comment = "dateTime wird vom E-Rezept-Fachdienst zu dem Zeitpunkt gesetzt, an dem die Consent Ressource hochgeladen wird." Instance: ChargeItemConsent From c70f24864bd89e3d2c69d5a9e54c28d2b637efad Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 19 Dec 2024 08:23:10 +0100 Subject: [PATCH 5/5] add comment for datetime --- Resources/fsh-generated/fsh-index.json | 2 +- Resources/fsh-generated/fsh-index.txt | 2 +- .../resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json | 1 + Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index e07eadf..4349039 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -85,7 +85,7 @@ "fshType": "Profile", "fshFile": "profiles/GEM_ERPCHRG_PR_Consent.fsh", "startLine": 1, - "endLine": 24 + "endLine": 26 }, { "outputFile": "ValueSet-GEM-ERPCHRG-VS-ConsentType.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 639b4f3..66c6079 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -9,5 +9,5 @@ StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json GEM_ERPC StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json GEM_ERPCHRG_PR_ChargeItem Profile profiles/GEM_ERPCHRG_PR_ChargeItem.fsh 1 - 71 StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json GEM_ERPCHRG_PR_Communication_ChargChangeReply Profile profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh 1 - 23 StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json GEM_ERPCHRG_PR_Communication_ChargChangeReq Profile profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReq.fsh 1 - 22 -StructureDefinition-GEM-ERPCHRG-PR-Consent.json GEM_ERPCHRG_PR_Consent Profile profiles/GEM_ERPCHRG_PR_Consent.fsh 1 - 24 +StructureDefinition-GEM-ERPCHRG-PR-Consent.json GEM_ERPCHRG_PR_Consent Profile profiles/GEM_ERPCHRG_PR_Consent.fsh 1 - 26 ValueSet-GEM-ERPCHRG-VS-ConsentType.json GEM_ERPCHRG_VS_ConsentType ValueSet valuesets/GEM_ERPCHRG_VS_ConsentType.fsh 1 - 6 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json index 0b9b16a..1e1443d 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json @@ -120,6 +120,7 @@ { "id": "Consent.dateTime", "path": "Consent.dateTime", + "comment": "dateTime wird vom E-Rezept-Fachdienst zu dem Zeitpunkt gesetzt, an dem die Consent Ressource hochgeladen wird.", "mustSupport": true }, { diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh index 9a675ee..547604a 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Consent.fsh @@ -19,6 +19,8 @@ Id: GEM-ERPCHRG-PR-Consent * assigner.identifier MS * assigner.identifier only IdentifierIknr * dateTime MS + * ^comment = "dateTime wird vom E-Rezept-Fachdienst zu dem Zeitpunkt gesetzt, an dem die Consent Ressource hochgeladen wird." + * policyRule MS * policyRule from v3-ActCode \ No newline at end of file