changes to adapt to fd

gematik · Nov 5, 2024 · 0d42dd6 · 0d42dd6
1 parent 58fec1f
commit 0d42dd6
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 32 deletions.
diff --git a/API-Examples/FSH-Files/input/fsh/aliases.fsh b/API-Examples/FSH-Files/input/fsh/aliases.fsh
@@ -20,7 +20,10 @@ Alias: $v3-ActCode = http://terminology.hl7.org/CodeSystem/v3-ActCode
 Alias: $service-type = http://terminology.hl7.org/CodeSystem/service-type
 Alias: $v3-RoleCode = http://terminology.hl7.org/CodeSystem/v3-RoleCode
 Alias: $Flowtype = https://gematik.de/fhir/CodeSystem/Flowtype
+
+// Schlüsseltabellen
 Alias: $KBV_CS_SFHIR_KBV_STATUSKENNZEICHEN = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_STATUSKENNZEICHEN
+Alias: $KBV_CS_SFHIR_KBV_PKV_TARIFF = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_PKV_TARIFF
 Alias: $KBV_CS_SFHIR_KBV_FORMULAR_ART = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_FORMULAR_ART
 Alias: $KBV_CS_ERP_Section_Type = https://fhir.kbv.de/CodeSystem/KBV_CS_ERP_Section_Type
 Alias: $KBV_CS_ERP_StatusCoPayment = https://fhir.kbv.de/StructureDefinition/KBV_EX_ERP_StatusCoPayment
@@ -32,6 +35,7 @@ Alias: $KBV_CS_SFHIR_KBV_PERSONENGRUPPE = https://fhir.kbv.de/CodeSystem/KBV_CS_
 Alias: $KBV_CS_SFHIR_KBV_DMP = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_DMP
 Alias: $KBV_CS_SFHIR_ITA_WOP = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_ITA_WOP
 Alias: $KBV_CS_SFHIR_KBV_VERSICHERTENSTATUS = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_VERSICHERTENSTATUS
+
 Alias: $versicherungsart-de-basis = http://fhir.de/CodeSystem/versicherungsart-de-basis
 Alias: $KBV_CS_FOR_Qualification_Type = https://fhir.kbv.de/CodeSystem/KBV_CS_FOR_Qualification_Type
 Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203

diff --git a/API-Examples/FSH-Files/input/fsh/examples/!Misc/PKV_Verordnungsdatensatz.fsh b/API-Examples/FSH-Files/input/fsh/examples/!Misc/PKV_Verordnungsdatensatz.fsh
@@ -16,8 +16,6 @@ RuleSet: PKV_Verordnungsdatensatz
 * entry[RezeptierdatenWirkstoffverordnung].resource = e3a4efa7-84fc-465b-b14c-720195097PKV
 * entry[Patient].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Patient/9774f67f-a238-4daf-b4e6-Pat-PKV"
 * entry[Patient].resource = 9774f67f-a238-4daf-b4e6-Pat-PKV
-* entry[AusstellendeVerschreibendeVerantwortlichePerson][+].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Practitioner/20597e0e-cb2a-45b3-95f0-dc3dbdb61PKV"
-* entry[AusstellendeVerschreibendeVerantwortlichePerson][=].resource = 20597e0e-cb2a-45b3-95f0-dc3dbdb61PKV
 * entry[AusstellendeVerschreibendeVerantwortlichePerson][+].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Practitioner/d8463daf-258e-4cad-a86a-6fd42fac1PKV"
 * entry[AusstellendeVerschreibendeVerantwortlichePerson][=].resource = d8463daf-258e-4cad-a86a-6fd42fac1PKV
 * entry[Einrichtung].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Organization/cf042e44-086a-4d51-9c77-172f9a972PKV"
@@ -29,12 +27,11 @@ Instance: b0e22b86-e7e9-46c1-80fe-e6e24442dPKV
 InstanceOf: KBV_PR_ERP_Composition
 Usage: #inline
 * extension[Rechtsgrundlage].valueCoding = $KBV_CS_SFHIR_KBV_STATUSKENNZEICHEN#00
+* extension[PKV-Tarif].valueCoding = $KBV_CS_SFHIR_KBV_PKV_TARIFF#03
 * subject = Reference(9774f67f-a238-4daf-b4e6-Pat-PKV)
 * date = "2023-07-03T11:30:02Z"
 * author[Arzt] = Reference(d8463daf-258e-4cad-a86a-6fd42fac1PKV)
 * author[Pruefnummer].identifier.value = "Y/400/1910/36/346"
-* attester.mode = #legal
-* attester.party = Reference(20597e0e-cb2a-45b3-95f0-dc3dbdb61PKV)
 * custodian = Reference(cf042e44-086a-4d51-9c77-172f9a972PKV)
 * section[Verordnung_Arzneimittel].entry = Reference(f58f4403-7a3a-4a12-bb15-b2fa25b02PKV)
 * section[Krankenversicherungsverhaeltnis].entry = Reference(1b1ffb6e-eb05-43d7-87eb-Cov-PKV)
@@ -79,20 +76,6 @@ Usage: #inline
   * strength.numerator.unit = "mg"
   * strength.denominator.value = 1
 
-Instance: 20597e0e-cb2a-45b3-95f0-dc3dbdb61PKV
-InstanceOf: KBV_PR_FOR_Practitioner
-Usage: #inline
-* identifier[ANR].value = "838382202"
-* name[name]
-  * use = #official
-  * family.extension[nachname].valueString = "Topp-Glücklich"
-  * family = "Topp-Glücklich"
-  * given = "Hans"
-  * prefix = "Dr. med."
-  * prefix.extension[prefix-qualifier].valueCode = #AC
-* qualification[Typ].code = $KBV_CS_FOR_Qualification_Type#00
-* qualification[Berufsbezeichnung].code.text = "FA Biochemie"
-
 Instance: d8463daf-258e-4cad-a86a-6fd42fac1PKV
 InstanceOf: KBV_PR_FOR_Practitioner
 Usage: #inline

diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/01_response_taskAccept.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/01_response_taskAccept.fsh
@@ -3,6 +3,9 @@ InstanceOf: Bundle
 Usage: #example
 * insert DateTimeStamp(timestamp)
 * type = #collection
+* link[+]
+  * relation = "self"
+  * url = "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Task/160.000.000.000.000.01/$accept/"
 * entry[0].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.000.000.000.01"
 * entry[=].resource = Inline-Instance-for-dffbfd6a-5712-4798-bdc8-07201eb77ab8-1
 * entry[+].fullUrl = "urn:uuid:281a985c-f25b-4aae-91a6-41ad744080b0"

diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/09_response_taskClose.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/09_response_taskClose.fsh
@@ -22,7 +22,7 @@ Usage: #inline
 * type[AuthorsSignature].system = "urn:iso-astm:E1762-95:2013"
 * type[AuthorsSignature].code = #1.2.840.10065.1.12.1.1
 * insert DateTimeStamp(when)
-* who = Reference(Device/1)
+* who = Reference(https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1)
 * sigFormat = urn:ietf:bcp:13#application/pkcs7-mime
 * data = "RGllcyBpc3QgZWluIEJlaXNwaWVs"
 
@@ -51,4 +51,5 @@ Usage: #inline
 Instance: 073ef818-3d18-4cf0-a5b7-9321ec838f94
 InstanceOf: GEM_ERP_PR_Digest
 Usage: #inline
+* meta.versionId = "1"
 * data = "tJg8c5ZtdhzEEhJ0ZpAsUVFx5dKuYgQFs5oKgthi17M="
diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/10_response_taskGet.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_abrufen/10_response_taskGet.fsh
@@ -1,8 +1,11 @@
 Instance: erp-abrufen-10-response-taskGet
 InstanceOf: Bundle
 Usage: #example
-* insert DateTimeStamp(meta.lastUpdated)
+* insert DateTimeStamp(timestamp)
 * type = #collection
+* link[+]
+  * relation = "self"
+  * url = "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Task/160.000.000.000.000.01"
 * entry[0].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.000.000.000.01-1"
 * entry[=].resource = 160.000.000.000.000.01-1
 * entry[+].fullUrl = "urn:uuid:a562d322-8b4f-449c-a88f-57ed2a8b96f7"
@@ -13,8 +16,9 @@ InstanceOf: GEM_ERP_PR_Task
 Usage: #inline
 * insert GKV_Task(completed)
 * insert TaskSecret
-* insert TaskInputQES(281a985c-f25b-4aae-91a6-41ad744080b0)
-* insert TaskOutputReceipt(a562d322-8b4f-449c-a88f-57ed2a8b96f7)
+* insert ApoTelematikID(owner.identifier)
+* input[patientReceipt].type = $GEM_ERP_CS_DocumentType#2
+* input[patientReceipt].valueReference.reference = "a562d322-8b4f-449c-a88f-57ed2a8b96f7" //TODO: Fix FD
 * insert DateTimeStampPlus1hr(extension[lastMedicationDispense].valueInstant)
 
 Instance: a562d322-8b4f-449c-a88f-57ed2a8b96f7

diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_bereitstellen/05_response_taskActivate.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_bereitstellen/05_response_taskActivate.fsh
@@ -5,5 +5,5 @@ Usage: #example
 * meta.id = "Task-erp-bereitstellen-05-response-taskActivate"
 * insert GKV_Task(ready)
 * insert TaskIdentifierAccessCode
-* insert TaskInputQES(281a985c-f25b-4aae-91a6-41ad744080b0)
-* insert TaskInputReceipt(f8c2298f-7c00-4a68-af29-8a2862d55d43)
+* insert TaskInputQES(45d3987a-deb3-4dd0-a560-89e0aba760e4) //TODO: check if FD replace with Binary/
+* insert TaskInputReceipt(f8c2298f-7c00-4a68-af29-8a2862d55d43) // TODO: check if FD replace with Bundle/
diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_chargeItem/08_GET_ChargeItems_response.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_chargeItem/08_GET_ChargeItems_response.fsh
@@ -14,7 +14,9 @@ InstanceOf: GEM_ERPCHRG_PR_ChargeItem
 Usage: #inline
 * insert ChargeItemWithAccessCode
 * insert ChargeItemExtension
-* supportingInformation[receiptBundle].display = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Bundle"
+* supportingInformation[prescriptionItemBundle] = Reference(urn:uuid:d9a98ce4-9585-4031-ba85-3719bf0fc14a)
+* supportingInformation[dispenseItemBundle] = Reference(urn:uuid:f1909de6-7d21-443b-a2ae-230b9cb62f70-1)
+* supportingInformation[receiptBundle] = Reference(urn:uuid:d45fa5b0-7b01-457f-a41f-b1ea28982963)
 
 Instance: der124bc-bc30-45f8-b109-4h474wer2h89
 InstanceOf: GEM_ERPCHRG_PR_ChargeItem
@@ -23,4 +25,6 @@ Usage: #inline
 * insert ChargeItemExtension
 * identifier[PrescriptionID].value = "200.000.000.000.000.01"
 * identifier[AccessCode].value = "888bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
-* supportingInformation[receiptBundle].display = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Bundle"
+* supportingInformation[prescriptionItemBundle] = Reference(urn:uuid:d4bbd88a-4ce3-43bd-81d5-33fb4e4bf450)
+* supportingInformation[dispenseItemBundle] = Reference(urn:uuid:f75de6f7-4505-4395-870f-3ca8176d7622)
+* supportingInformation[receiptBundle] = Reference(urn:uuid:9d9bdee8-b36a-490d-9289-2b7022e330b9)
diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_chargeItem/09_GET_ChargeItem_Response.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_chargeItem/09_GET_ChargeItem_Response.fsh
@@ -7,16 +7,28 @@ Usage: #example
 * entry[=].resource = 200.000.000.000.000.01-7
 * entry[+].fullUrl = "urn:uuid:f1909de6-7d21-443b-a2ae-230b9cb62f70-1"
 * entry[=].resource = f1909de6-7d21-443b-a2ae-230b9cb62f70-1
-* entry[+].fullUrl = "urn:uuid:d9a98ce4-9585-4031-ba85-3719bf0fc14a"
-* entry[=].resource = d9a98ce4-9585-4031-ba85-3719bf0fc14a
-* entry[+].fullUrl = "urn:uuid:d45fa5b0-7b01-457f-a41f-b1ea28982963"
-* entry[=].resource = d45fa5b0-7b01-457f-a41f-b1ea28982963
+* entry[+].fullUrl = "urn:uuid:42a8260d-579f-4cde-a288-4de0bfb6e6d9"
+* entry[=].resource = 42a8260d-579f-4cde-a288-4de0bfb6e6d9
+* entry[+].fullUrl = "urn:uuid:42772ecc-3d67-4351-a719-2d728426a06b"
+* entry[=].resource = 42772ecc-3d67-4351-a719-2d728426a06b
 
 Instance: 200.000.000.000.000.01-7
 InstanceOf: GEM_ERPCHRG_PR_ChargeItem
 Usage: #inline
 * insert ChargeItemWithAccessCode
 //* identifier[AccessCode].value = "555bjf73jr8d9si2ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
-* supportingInformation[prescriptionItemBundle] = Reference(urn:uuid:d9a98ce4-9585-4031-ba85-3719bf0fc14a)
+* supportingInformation[prescriptionItemBundle] = Reference(urn:uuid:42a8260d-579f-4cde-a288-4de0bfb6e6d9)
 * supportingInformation[dispenseItemBundle] = Reference(urn:uuid:f1909de6-7d21-443b-a2ae-230b9cb62f70-1)
-* supportingInformation[receiptBundle] = Reference(urn:uuid:d45fa5b0-7b01-457f-a41f-b1ea28982963)
+* supportingInformation[receiptBundle] = Reference(urn:uuid:42772ecc-3d67-4351-a719-2d728426a06b)
+
+Instance: 42772ecc-3d67-4351-a719-2d728426a06b
+InstanceOf: DAV_PKV_PR_ERP_AbgabedatenBundle
+Usage: #inline
+* insert PKV_Abgabedatensatz
+* signature = GEM-ERP-PR-Signature
+
+Instance: 42a8260d-579f-4cde-a288-4de0bfb6e6d9
+InstanceOf: KBV_PR_ERP_Bundle
+Usage: #inline
+* insert PKV_Verordnungsdatensatz
+* signature = GEM-ERP-PR-Signature