diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 4966499..220fe0e 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -57,11 +57,11 @@ }, { "outputFile": "Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json", - "fshName": "ChargeItemConsent", + "fshName": "ChargeItemConsent-Response", "fshType": "Instance", "fshFile": "examples/Example_Consent.fsh", - "startLine": 1, - "endLine": 14 + "startLine": 16, + "endLine": 29 }, { "outputFile": "StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 1b1a098..ef3419e 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -6,7 +6,7 @@ Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json Communic Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json Communication_ChargChangeReply_Pkv Instance examples/Example_Communication_ChargChangeReply.fsh 16 - 29 Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json Communication_ChargChangeRequest_Gkv Instance examples/Example_Communication_ChargChangeRequest.fsh 1 - 14 Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json Communication_ChargChangeRequest_Pkv Instance examples/Example_Communication_ChargChangeRequest.fsh 17 - 30 -Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json ChargeItemConsent Instance examples/Example_Consent.fsh 1 - 14 +Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json ChargeItemConsent-Response Instance examples/Example_Consent.fsh 16 - 29 StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json GEM_ERPCHRG_EX_MarkingFlag Extension extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh 1 - 37 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 - 24 diff --git a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json index 4255940..5133aef 100644 --- a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json +++ b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json @@ -70,5 +70,5 @@ } ] }, - "enteredDate": "2022-12-16T06:13:00+05:00" + "enteredDate": "2025-10-01T15:29:00.434+00:00" } diff --git a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json index 41b3a02..b47c34a 100644 --- a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json +++ b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json @@ -59,5 +59,5 @@ } ] }, - "enteredDate": "2022-12-16T07:13:00+05:00" + "enteredDate": "2025-10-01T15:29:00.434+00:00" } diff --git a/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json b/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json index 4688608..54dee48 100644 --- a/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json +++ b/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json @@ -31,7 +31,7 @@ "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8" } ], - "sent": "2022-04-29T13:46:30.128+02:00", + "sent": "2025-10-01T15:29:00.434+00:00", "payload": [ { "contentString": "Erledigt." diff --git a/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json b/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json index 12e9f50..5382743 100644 --- a/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json +++ b/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json @@ -31,7 +31,7 @@ "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90ap" } ], - "sent": "2022-07-04T13:46:30.128+02:00", + "sent": "2025-10-01T15:29:00.434+00:00", "payload": [ { "contentString": "Erledigt." diff --git a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json index bad470a..0565baf 100644 --- a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json +++ b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json @@ -31,7 +31,7 @@ "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" } ], - "sent": "2020-04-29T13:43:30.128+02:00", + "sent": "2025-10-01T15:29:00.434+00:00", "payload": [ { "contentString": "Bitte meinen Namen in Günther ändern, Waltraud ist falsch." diff --git a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json index e8f7df1..9d56b97 100644 --- a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json +++ b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json @@ -31,7 +31,7 @@ "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" } ], - "sent": "2020-07-04T13:43:30.128+02:00", + "sent": "2025-10-01T15:29:00.434+00:00", "payload": [ { "contentString": "Bitte meinen Namen in Günther ändern, Waltraud ist falsch." diff --git a/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json b/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json index 1e1018f..96cc3dc 100644 --- a/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json +++ b/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json @@ -39,7 +39,7 @@ ] } ], - "dateTime": "2022-06-01T07:13:00+05:00", + "dateTime": "2025-10-01T15:29:00.434+00:00", "policyRule": { "coding": [ { diff --git a/Resources/input/fsh/examples/Example_ChargeItem.fsh b/Resources/input/fsh/examples/Example_ChargeItem.fsh index cc3aff6..4e8b030 100644 --- a/Resources/input/fsh/examples/Example_ChargeItem.fsh +++ b/Resources/input/fsh/examples/Example_ChargeItem.fsh @@ -11,7 +11,7 @@ Usage: #example * code = http://terminology.hl7.org/CodeSystem/data-absent-reason#not-applicable * subject.identifier.value = "X234567890" * enterer.identifier.value = "3-15.2.1456789123.191" -* enteredDate = "2022-12-16T06:13:00+05:00" +* insert DateTimeStamp(enteredDate) * supportingInformation[dispenseItemBundle] = Reference(Bundle/72bd741c-7ad8-41d8-97c3-9aabbdd0f5b4) * supportingInformation[dispenseItemBundle].display = $DAV-PKV-PR-ERP-AbgabedatenBundle * supportingInformation[receiptBundle] = Reference(Bundle/200.000.000.000.000.01) @@ -35,6 +35,6 @@ Usage: #example * subject.identifier.type.coding = http://fhir.de/CodeSystem/identifier-type-de-basis#PKV * enterer.identifier.system = $identifier-telematik-id * enterer.identifier.value = "3-15.2.1456789123.191" -* enteredDate = "2022-12-16T07:13:00+05:00" +* insert DateTimeStamp(enteredDate) * supportingInformation[dispenseItemBinary].reference = "#c8720f99-6641-432d-94be-d49eaa164755" * supportingInformation[dispenseItemBinary].display = "Binary" diff --git a/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh b/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh index b908d94..534fe76 100644 --- a/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh +++ b/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh @@ -10,7 +10,7 @@ Usage: #example * sender.identifier.value = "3-SMC-B-Testkarte-883110000123465" * recipient[+].identifier.system = "http://fhir.de/sid/gkv/kvid-10" * recipient[=].identifier.value = "X234567890" -* sent = "2022-04-29T13:46:30.128+02:00" +* insert DateTimeStamp(sent) * payload.contentString = "Erledigt." Instance: Communication_ChargChangeReply_Pkv @@ -25,5 +25,5 @@ Usage: #example * sender.identifier.value = "3-SMC-B-Testkarte-883110000123465" * recipient[+].identifier.system = $identifier-kvid-10 * recipient[=].identifier.value = "X234567890" -* sent = "2022-07-04T13:46:30.128+02:00" +* insert DateTimeStamp(sent) * payload.contentString = "Erledigt." \ No newline at end of file diff --git a/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh b/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh index 4e2b7ad..de310af 100644 --- a/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh +++ b/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh @@ -10,7 +10,7 @@ Usage: #example * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465" * sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10" * sender.identifier.value = "X234567890" -* sent = "2020-04-29T13:43:30.128+02:00" +* insert DateTimeStamp(sent) * payload.contentString = "Bitte meinen Namen in Günther ändern, Waltraud ist falsch." @@ -26,5 +26,5 @@ Usage: #example * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465" * sender.identifier.system = $identifier-kvid-10 * sender.identifier.value = "X234567890" -* sent = "2020-07-04T13:43:30.128+02:00" +* insert DateTimeStamp(sent) * payload.contentString = "Bitte meinen Namen in Günther ändern, Waltraud ist falsch." \ No newline at end of file diff --git a/Resources/input/fsh/examples/Example_Consent.fsh b/Resources/input/fsh/examples/Example_Consent.fsh index 595efd2..c67da3f 100644 --- a/Resources/input/fsh/examples/Example_Consent.fsh +++ b/Resources/input/fsh/examples/Example_Consent.fsh @@ -1,4 +1,19 @@ -Instance: ChargeItemConsent +/* TODO: Merge approved datetime branch into this branch and build +Instance: ChargeItemConsent-Request +InstanceOf: GEM_ERPCHRG_PR_Consent +Title: "Consent to store digital ChargeItem" +Usage: #example +* status = #active +* scope = http://terminology.hl7.org/CodeSystem/consentscope#patient-privacy "Privacy Consent" +* category = GEM_ERPCHRG_CS_ConsentType#CHARGCONS "Consent for saving electronic charge item" +* patient.identifier.system = $identifier-kvid-10 +* patient.identifier.value = "X234567890" +* patient.identifier.assigner.identifier.system = "http://fhir.de/sid/arge-ik/iknr" +* patient.identifier.assigner.identifier.value = "168140950" +* policyRule = http://terminology.hl7.org/CodeSystem/v3-ActCode#OPTIN +*/ + +Instance: ChargeItemConsent-Response InstanceOf: GEM_ERPCHRG_PR_Consent Title: "Consent to store digital ChargeItem" Usage: #example @@ -10,5 +25,5 @@ Usage: #example * patient.identifier.value = "X234567890" * patient.identifier.assigner.identifier.system = "http://fhir.de/sid/arge-ik/iknr" * patient.identifier.assigner.identifier.value = "168140950" -* dateTime = "2022-06-01T07:13:00+05:00" +* insert DateTimeStamp(dateTime) * policyRule = http://terminology.hl7.org/CodeSystem/v3-ActCode#OPTIN \ No newline at end of file diff --git a/Resources/input/fsh/rulesets.fsh b/Resources/input/fsh/rulesets.fsh index ad97d0a..8b61dd7 100644 --- a/Resources/input/fsh/rulesets.fsh +++ b/Resources/input/fsh/rulesets.fsh @@ -36,4 +36,14 @@ RuleSet: ValueSet(name) * insert Versioning * ^publisher = "gematik GmbH" * ^contact.telecom.system = #url -* ^contact.telecom.value = "http://www.gematik.de" \ No newline at end of file +* ^contact.telecom.value = "http://www.gematik.de" + +// Dates for Examples (Date of actual release) +RuleSet: Date(field) +* {field} = "2025-10-01" + +RuleSet: DateTime(field) +* {field} = "2025-10-01T15:29:00+00:00" + +RuleSet: DateTimeStamp(field) +* {field} = "2025-10-01T15:29:00.434+00:00" \ No newline at end of file