From 2faaea3f617d8db5d3149e16eaf466781894738d Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Dec 2024 06:46:42 +0100 Subject: [PATCH] Add FSH improvements for lean fishing --- Resources/fsh-generated/fsh-index.json | 32 ++++----------- Resources/fsh-generated/fsh-index.txt | 12 +++--- .../ChargeItem-ChargeItem-GET-Completed.json | 4 +- .../ChargeItem-ChargeItem-POST-Binary.json | 12 +----- ...-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json | 4 +- ...-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json | 40 ------------------- ...-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json | 4 +- ...-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json | 40 ------------------- ...-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json | 2 +- ...HRG-PR-Communication-ChargChangeReply.json | 2 +- Resources/input/fsh/aliases.fsh | 1 + .../input/fsh/examples/Example_ChargeItem.fsh | 11 ++--- ...Example_Communication_ChargChangeReply.fsh | 23 ++--------- ...ample_Communication_ChargChangeRequest.fsh | 24 ++--------- .../input/fsh/examples/Example_Consent.fsh | 10 ++--- ...CHRG_PR_Communication_ChargChangeReply.fsh | 1 - .../input/fsh/rulesets/Identifier_RS.fsh | 7 ++++ .../Versioning_RS.fsh} | 0 18 files changed, 45 insertions(+), 184 deletions(-) delete mode 100644 Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json delete mode 100644 Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json create mode 100644 Resources/input/fsh/rulesets/Identifier_RS.fsh rename Resources/input/fsh/{rulesets.fsh => rulesets/Versioning_RS.fsh} (100%) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 220fe0e..e07eadf 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -13,7 +13,7 @@ "fshType": "Instance", "fshFile": "examples/Example_ChargeItem.fsh", "startLine": 22, - "endLine": 40 + "endLine": 37 }, { "outputFile": "CodeSystem-GEM-ERPCHRG-CS-ConsentType.json", @@ -25,43 +25,27 @@ }, { "outputFile": "Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json", - "fshName": "Communication_ChargChangeReply_Gkv", + "fshName": "Communication_ChargChangeReply", "fshType": "Instance", "fshFile": "examples/Example_Communication_ChargChangeReply.fsh", "startLine": 1, - "endLine": 14 - }, - { - "outputFile": "Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json", - "fshName": "Communication_ChargChangeReply_Pkv", - "fshType": "Instance", - "fshFile": "examples/Example_Communication_ChargChangeReply.fsh", - "startLine": 16, - "endLine": 29 + "endLine": 12 }, { "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json", - "fshName": "Communication_ChargChangeRequest_Gkv", + "fshName": "Communication_ChargChangeRequest", "fshType": "Instance", "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh", "startLine": 1, - "endLine": 14 - }, - { - "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json", - "fshName": "Communication_ChargChangeRequest_Pkv", - "fshType": "Instance", - "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh", - "startLine": 17, - "endLine": 30 + "endLine": 12 }, { "outputFile": "Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json", "fshName": "ChargeItemConsent-Response", "fshType": "Instance", "fshFile": "examples/Example_Consent.fsh", - "startLine": 16, - "endLine": 29 + "startLine": 15, + "endLine": 27 }, { "outputFile": "StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json", @@ -85,7 +69,7 @@ "fshType": "Profile", "fshFile": "profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh", "startLine": 1, - "endLine": 24 + "endLine": 23 }, { "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index ef3419e..639b4f3 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -1,15 +1,13 @@ Output File Name Type FSH File Lines ChargeItem-ChargeItem-GET-Completed.json ChargeItem-GET-Completed Instance examples/Example_ChargeItem.fsh 1 - 20 -ChargeItem-ChargeItem-POST-Binary.json ChargeItem-POST-Binary Instance examples/Example_ChargeItem.fsh 22 - 40 +ChargeItem-ChargeItem-POST-Binary.json ChargeItem-POST-Binary Instance examples/Example_ChargeItem.fsh 22 - 37 CodeSystem-GEM-ERPCHRG-CS-ConsentType.json GEM_ERPCHRG_CS_ConsentType CodeSystem codesystem/GEM_ERPCHRG_CS_ConsentType.fsh 1 - 7 -Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json Communication_ChargChangeReply_Gkv Instance examples/Example_Communication_ChargChangeReply.fsh 1 - 14 -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-Response Instance examples/Example_Consent.fsh 16 - 29 +Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json Communication_ChargChangeReply Instance examples/Example_Communication_ChargChangeReply.fsh 1 - 12 +Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json Communication_ChargChangeRequest Instance examples/Example_Communication_ChargChangeRequest.fsh 1 - 12 +Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json ChargeItemConsent-Response Instance examples/Example_Consent.fsh 15 - 27 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 +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 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/ChargeItem-ChargeItem-GET-Completed.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json index 5133aef..36e2cbc 100644 --- a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json +++ b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json @@ -20,7 +20,7 @@ "subject": { "identifier": { "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" + "value": "P987654321" } }, "extension": [ @@ -45,7 +45,7 @@ "enterer": { "identifier": { "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-15.2.1456789123.191" + "value": "3-2-APO-XanthippeVeilchenblau01" } }, "supportingInformation": [ diff --git a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json index b47c34a..998e12d 100644 --- a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json +++ b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json @@ -19,22 +19,14 @@ ], "subject": { "identifier": { - "type": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/identifier-type-de-basis", - "code": "PKV" - } - ] - }, "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" + "value": "P987654321" } }, "enterer": { "identifier": { "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-15.2.1456789123.191" + "value": "3-2-APO-XanthippeVeilchenblau01" } }, "supportingInformation": [ 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 54dee48..84bf7cc 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 @@ -16,14 +16,14 @@ { "identifier": { "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" + "value": "P987654321" } } ], "sender": { "identifier": { "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" + "value": "3-2-APO-XanthippeVeilchenblau01" } }, "basedOn": [ 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 deleted file mode 100644 index 5382743..0000000 --- a/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "resourceType": "Communication", - "id": "7bbc2209-9c23-4553-986e-a5c9f69a39fp", - "meta": { - "profile": [ - "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Communication_ChargChangeReply|1.1" - ], - "tag": [ - { - "display": "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message" - } - ] - }, - "status": "unknown", - "recipient": [ - { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" - } - } - ], - "sender": { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" - } - }, - "basedOn": [ - { - "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90ap" - } - ], - "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 0565baf..087c520 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 @@ -16,14 +16,14 @@ { "identifier": { "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" + "value": "3-2-APO-XanthippeVeilchenblau01" } } ], "sender": { "identifier": { "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" + "value": "P987654321" } }, "basedOn": [ 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 deleted file mode 100644 index 9d56b97..0000000 --- a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "resourceType": "Communication", - "id": "b4cf7f71-3ade-40ab-97a9-929f95af29fp", - "meta": { - "profile": [ - "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Communication_ChargChangeReq|1.1" - ], - "tag": [ - { - "display": "Communication message sent by patient to pharmacy to request the change of an existing ChargeItem by providing the AccessCode" - } - ] - }, - "status": "unknown", - "recipient": [ - { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" - } - } - ], - "sender": { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" - } - }, - "basedOn": [ - { - "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" - } - ], - "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 96cc3dc..1378ba5 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 @@ -16,7 +16,7 @@ "value": "168140950" } }, - "value": "X234567890" + "value": "P987654321" } }, "scope": { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json index fb87368..433573f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json @@ -11,7 +11,7 @@ "description": "Ressource used for the communication to reply to a change request on a ChargeItem", "fhirVersion": "4.0.1", "kind": "resource", - "abstract": true, + "abstract": false, "type": "Communication", "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Communication", "derivation": "constraint", diff --git a/Resources/input/fsh/aliases.fsh b/Resources/input/fsh/aliases.fsh index 728d995..62efffd 100644 --- a/Resources/input/fsh/aliases.fsh +++ b/Resources/input/fsh/aliases.fsh @@ -1,5 +1,6 @@ Alias: $identifier-telematik-id = https://gematik.de/fhir/sid/telematik-id Alias: $identifier-kvid-10 = http://fhir.de/sid/gkv/kvid-10 +Alias: $identifier-iknr = http://fhir.de/sid/arge-ik/iknr Alias: $DAV-PKV-PR-ERP-AbgabedatenBundle = http://fhir.abda.de/eRezeptAbgabedaten/StructureDefinition/DAV-PKV-PR-ERP-AbgabedatenBundle diff --git a/Resources/input/fsh/examples/Example_ChargeItem.fsh b/Resources/input/fsh/examples/Example_ChargeItem.fsh index 4e8b030..f7f9c19 100644 --- a/Resources/input/fsh/examples/Example_ChargeItem.fsh +++ b/Resources/input/fsh/examples/Example_ChargeItem.fsh @@ -9,8 +9,8 @@ Usage: #example * identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #billable * code = http://terminology.hl7.org/CodeSystem/data-absent-reason#not-applicable -* subject.identifier.value = "X234567890" -* enterer.identifier.value = "3-15.2.1456789123.191" +* insert PKV_Identifier(subject.identifier) +* insert ApoTelematikID(enterer.identifier) * insert DateTimeStamp(enteredDate) * supportingInformation[dispenseItemBundle] = Reference(Bundle/72bd741c-7ad8-41d8-97c3-9aabbdd0f5b4) * supportingInformation[dispenseItemBundle].display = $DAV-PKV-PR-ERP-AbgabedatenBundle @@ -30,11 +30,8 @@ Usage: #example * identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #billable * code = http://terminology.hl7.org/CodeSystem/data-absent-reason#not-applicable -* subject.identifier.system = $identifier-kvid-10 -* subject.identifier.value = "X234567890" -* 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" +* insert PKV_Identifier(subject.identifier) +* insert ApoTelematikID(enterer.identifier) * 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 534fe76..f9a483d 100644 --- a/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh +++ b/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh @@ -1,4 +1,4 @@ -Instance: Communication_ChargChangeReply_Gkv +Instance: Communication_ChargChangeReply InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReply Title: "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message" Usage: #example @@ -6,24 +6,7 @@ Usage: #example * meta.tag.display = "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message" * basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8" * status = #unknown -* sender.identifier.system = $identifier-telematik-id -* sender.identifier.value = "3-SMC-B-Testkarte-883110000123465" -* recipient[+].identifier.system = "http://fhir.de/sid/gkv/kvid-10" -* recipient[=].identifier.value = "X234567890" +* insert PKV_Identifier(recipient.identifier) +* insert ApoTelematikID(sender.identifier) * insert DateTimeStamp(sent) * payload.contentString = "Erledigt." - -Instance: Communication_ChargChangeReply_Pkv -InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReply -Title: "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message" -Usage: #example -* id = "7bbc2209-9c23-4553-986e-a5c9f69a39fp" -* meta.tag.display = "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message" -* basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90ap" -* status = #unknown -* sender.identifier.system = $identifier-telematik-id -* sender.identifier.value = "3-SMC-B-Testkarte-883110000123465" -* recipient[+].identifier.system = $identifier-kvid-10 -* recipient[=].identifier.value = "X234567890" -* 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 de310af..0012045 100644 --- a/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh +++ b/Resources/input/fsh/examples/Example_Communication_ChargChangeRequest.fsh @@ -1,4 +1,4 @@ -Instance: Communication_ChargChangeRequest_Gkv +Instance: Communication_ChargChangeRequest InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReq Title: "Communication message sent by patient to pharmacy to request the change of an existing ChargeItem by providing the AccessCode" Usage: #example @@ -6,25 +6,7 @@ Usage: #example * meta.tag.display = "Communication message sent by patient to pharmacy to request the change of an existing ChargeItem by providing the AccessCode" * basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #unknown -* recipient[+].identifier.system = $identifier-telematik-id -* recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465" -* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10" -* sender.identifier.value = "X234567890" -* insert DateTimeStamp(sent) -* payload.contentString = "Bitte meinen Namen in Günther ändern, Waltraud ist falsch." - - -Instance: Communication_ChargChangeRequest_Pkv -InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReq -Title: "Communication message sent by patient to pharmacy to request the change of an existing ChargeItem by providing the AccessCode" -Usage: #example -* id = "b4cf7f71-3ade-40ab-97a9-929f95af29fp" -* meta.tag.display = "Communication message sent by patient to pharmacy to request the change of an existing ChargeItem by providing the AccessCode" -* basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" -* status = #unknown -* recipient[+].identifier.system = $identifier-telematik-id -* recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465" -* sender.identifier.system = $identifier-kvid-10 -* sender.identifier.value = "X234567890" +* insert PKV_Identifier(sender.identifier) +* insert ApoTelematikID(recipient.identifier) * 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 c67da3f..80d3550 100644 --- a/Resources/input/fsh/examples/Example_Consent.fsh +++ b/Resources/input/fsh/examples/Example_Consent.fsh @@ -6,9 +6,8 @@ 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" +* insert PKV_Identifier(patient.identifier) +* patient.identifier.assigner.identifier.system = $identifier-iknr * patient.identifier.assigner.identifier.value = "168140950" * policyRule = http://terminology.hl7.org/CodeSystem/v3-ActCode#OPTIN */ @@ -21,9 +20,8 @@ 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" +* insert PKV_Identifier(patient.identifier) +* patient.identifier.assigner.identifier.system = $identifier-iknr * patient.identifier.assigner.identifier.value = "168140950" * insert DateTimeStamp(dateTime) * policyRule = http://terminology.hl7.org/CodeSystem/v3-ActCode#OPTIN \ No newline at end of file diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh index ac600b4..467ee95 100644 --- a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh +++ b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh @@ -4,7 +4,6 @@ Id: GEM-ERPCHRG-PR-Communication-ChargChangeReply Title: "Reply on change Request on ChargeItem from pharmacy to Patient" Description: "Ressource used for the communication to reply to a change request on a ChargeItem" * insert Meta(GEM_ERPCHRG_PR_Communication_ChargChangeReply) -* ^abstract = true * insert MetaProfile(GEM_ERPCHRG_PR_Communication_ChargChangeReply) * basedOn 1..1 * basedOn only Reference(GEM_ERPCHRG_PR_ChargeItem) diff --git a/Resources/input/fsh/rulesets/Identifier_RS.fsh b/Resources/input/fsh/rulesets/Identifier_RS.fsh new file mode 100644 index 0000000..5a592bc --- /dev/null +++ b/Resources/input/fsh/rulesets/Identifier_RS.fsh @@ -0,0 +1,7 @@ +RuleSet: PKV_Identifier(field) +* {field}.value = "P987654321" +* {field}.system = $identifier-kvid-10 + +RuleSet: ApoTelematikID(field) +* {field}.system = $identifier-telematik-id +* {field}.value = "3-2-APO-XanthippeVeilchenblau01" \ No newline at end of file diff --git a/Resources/input/fsh/rulesets.fsh b/Resources/input/fsh/rulesets/Versioning_RS.fsh similarity index 100% rename from Resources/input/fsh/rulesets.fsh rename to Resources/input/fsh/rulesets/Versioning_RS.fsh