Skip to content

Commit

Permalink
Add FSH improvements for lean fishing
Browse files Browse the repository at this point in the history
  • Loading branch information
florianschoffke committed Dec 3, 2024
1 parent f60e67a commit 2faaea3
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 184 deletions.
32 changes: 8 additions & 24 deletions Resources/fsh-generated/fsh-index.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"fshType": "Instance",
"fshFile": "examples/Example_ChargeItem.fsh",
"startLine": 22,
"endLine": 40
"endLine": 37
},
{
"outputFile": "CodeSystem-GEM-ERPCHRG-CS-ConsentType.json",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
12 changes: 5 additions & 7 deletions Resources/fsh-generated/fsh-index.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"subject": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
"value": "P987654321"
}
},
"extension": [
Expand All @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"value": "168140950"
}
},
"value": "X234567890"
"value": "P987654321"
}
},
"scope": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions Resources/input/fsh/aliases.fsh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
11 changes: 4 additions & 7 deletions Resources/input/fsh/examples/Example_ChargeItem.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
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
* id = "3bbc2209-9c23-4553-986e-a5c9f69a39fb"
* 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."
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
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
* id = "b4cf7f71-3ade-40ab-97a9-929f95af29f2"
* 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."
10 changes: 4 additions & 6 deletions Resources/input/fsh/examples/Example_Consent.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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
Loading

0 comments on commit 2faaea3

Please sign in to comment.