From 6082a3584f1ef5f0c5099fbffe5b08f27bf8a5e7 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 18 Dec 2023 16:10:51 +0100 Subject: [PATCH] Test commit removing kbv packages --- ...-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json | 4 +- ...-8ca3c379-ac86-470f-bc12-178c9008f5c9.json | 8 -- ...-a218a36e-f2fd-4603-ba67-c827acfef01b.json | 8 -- ...-64d5081e-8d65-11ec-b909-0242ac120002.json | 6 - ...ctureDefinition-GEM-ERP-PR-AuditEvent.json | 12 +- ...tion-GEM-ERP-PR-Communication-DispReq.json | 9 -- ...tion-GEM-ERP-PR-Communication-InfoReq.json | 11 +- ...nition-GEM-ERP-PR-Communication-Reply.json | 23 +--- ...M-ERP-PR-Communication-Representative.json | 18 --- ...tureDefinition-GEM-ERP-PR-Composition.json | 103 +----------------- ...inition-GEM-ERP-PR-MedicationDispense.json | 11 +- .../StructureDefinition-GEM-ERP-PR-Task.json | 25 ----- Resources/sushi-config.yaml | 4 +- fhirpkg.lock.json | 5 +- package.json | 2 - 15 files changed, 11 insertions(+), 238 deletions(-) diff --git a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json index 94dd874a..e800de69 100644 --- a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json +++ b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json @@ -28,8 +28,6 @@ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Composition|1.2" ] }, - "status": "final", - "title": "Quittung", "extension": [ { "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_Beneficiary", @@ -39,6 +37,7 @@ } } ], + "status": "final", "type": { "coding": [ { @@ -54,6 +53,7 @@ "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" } ], + "title": "Quittung", "event": [ { "period": { diff --git a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json index 1e2f3086..c484ea1f 100644 --- a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json +++ b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json @@ -12,14 +12,6 @@ ] }, "status": "unknown", - "recipient": [ - { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" - } - } - ], "contained": [ { "resourceType": "Medication", diff --git a/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json b/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json index e4e818d9..2ed25509 100644 --- a/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json +++ b/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json @@ -12,14 +12,6 @@ ] }, "status": "unknown", - "recipient": [ - { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" - } - } - ], "basedOn": [ { "reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" diff --git a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json index 431aa703..79673269 100644 --- a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json +++ b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json @@ -27,12 +27,6 @@ } ] }, - "onBehalfOf": { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "1-HBA-Testkarte-883110000123465" - } - }, "who": { "reference": "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Device/1" } diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json index 2159b435..0a6a66d8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json @@ -104,17 +104,7 @@ { "id": "AuditEvent.agent.who.identifier", "path": "AuditEvent.agent.who.identifier", - "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-telematik-id", - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ] + "min": 1 }, { "id": "AuditEvent.agent.name", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json index c1d4be1f..c1f4150b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json @@ -118,15 +118,6 @@ "id": "Communication.sender.identifier", "path": "Communication.sender.identifier", "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ], "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json index 4477309d..3d66250c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json @@ -134,16 +134,7 @@ { "id": "Communication.sender.identifier", "path": "Communication.sender.identifier", - "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ] + "min": 1 }, { "id": "Communication.payload", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json index 6782c728..4087059e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json @@ -94,16 +94,7 @@ { "id": "Communication.recipient.identifier", "path": "Communication.recipient.identifier", - "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ] + "min": 1 }, { "id": "Communication.sender", @@ -114,17 +105,7 @@ { "id": "Communication.sender.identifier", "path": "Communication.sender.identifier", - "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10", - "http://fhir.de/StructureDefinition/identifier-telematik-id" - ] - } - ] + "min": 1 }, { "id": "Communication.payload", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json index 9940f7a5..3cc7f0dd 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json @@ -98,15 +98,6 @@ "id": "Communication.recipient.identifier", "path": "Communication.recipient.identifier", "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ], "mustSupport": true }, { @@ -119,15 +110,6 @@ "id": "Communication.sender.identifier", "path": "Communication.sender.identifier", "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ], "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json index 1f8131fc..53eb07ff 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json @@ -88,107 +88,8 @@ ] } ] - }, - { - "id": "Composition.status", - "path": "Composition.status", - "short": "Status = \"final\"", - "fixedCode": "final", - "mustSupport": true - }, - { - "id": "Composition.type", - "path": "Composition.type", - "short": "Document Type = \"Receipt\"", - "mustSupport": true - }, - { - "id": "Composition.type.coding", - "path": "Composition.type.coding", - "min": 1, - "max": "1", - "binding": { - "strength": "required", - "valueSet": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_VS_DocumentType" - } - }, - { - "id": "Composition.type.coding.code", - "path": "Composition.type.coding.code", - "fixedCode": "3" - }, - { - "id": "Composition.type.coding.display", - "path": "Composition.type.coding.display", - "fixedString": "Receipt" - }, - { - "id": "Composition.date", - "path": "Composition.date", - "mustSupport": true - }, - { - "id": "Composition.author", - "path": "Composition.author", - "short": "Reference to verifying service (Device)", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Device" - ], - "aggregation": [ - "referenced", - "bundled" - ] - } - ], - "mustSupport": true - }, - { - "id": "Composition.title", - "path": "Composition.title", - "short": "Document title = \"Quittung\"", - "fixedString": "Quittung", - "mustSupport": true - }, - { - "id": "Composition.event", - "path": "Composition.event", - "min": 1, - "max": "1" - }, - { - "id": "Composition.event.period", - "path": "Composition.event.period", - "min": 1, - "mustSupport": true - }, - { - "id": "Composition.event.period.start", - "path": "Composition.event.period.start", - "short": "Starting time of dispensation", - "definition": "Time the prescription was submitted to the dispensing organization", - "min": 1, - "mustSupport": true - }, - { - "id": "Composition.event.period.end", - "path": "Composition.event.period.end", - "definition": "The end of the period. Time when the dispensation finished, i.e. when server creates the receipt.", - "min": 1 - }, - { - "id": "Composition.event.detail", - "path": "Composition.event.detail", - "mustSupport": true - }, - { - "id": "Composition.event.detail.reference", - "path": "Composition.event.detail.reference", - "min": 1, - "mustSupport": true } ] - } + }, + "inProgress": true } diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json index 2e438b92..0d9a3d77 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json @@ -105,16 +105,7 @@ "id": "MedicationDispense.subject.identifier", "path": "MedicationDispense.subject.identifier", "short": "The patients KVNR", - "min": 1, - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ] + "min": 1 }, { "id": "MedicationDispense.performer", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json index 25630d9c..6d8d8740 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json @@ -190,19 +190,6 @@ "path": "Task.for", "short": "Identifier of Patient (KVID or PKV-Identifier)" }, - { - "id": "Task.for.identifier", - "path": "Task.for.identifier", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10", - "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10" - ] - } - ] - }, { "id": "Task.performerType.coding", "path": "Task.performerType.coding", @@ -298,18 +285,6 @@ "min": 1, "fixedCode": "2" }, - { - "id": "Task.input:patientReceipt.value[x]", - "path": "Task.input.value[x]", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "https://fhir.kbv.de/StructureDefinition/KBV_PR_ERP_Bundle" - ] - } - ] - }, { "id": "Task.output", "path": "Task.output", diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 9abe5471..6dbc314a 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -14,6 +14,4 @@ publisher: email: info@gematik.de dependencies: de.basisprofil.r4: 1.3.2 - hl7.fhir.r4.core: 4.0.1 - kbv.ita.for: 1.1.0 - kbv.ita.erp: 1.1.x \ No newline at end of file + hl7.fhir.r4.core: 4.0.1 \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 170a44c2..884743bf 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,11 +1,8 @@ { "updated": "2023-11-28T08:57:44.285755+01:00", "dependencies": { - "kbv.ita.erp": "1.1.2", - "KBV.Basis": "1.3.0", "de.basisprofil.r4": "1.3.2", - "hl7.fhir.r4.core": "4.0.1", - "kbv.ita.for": "1.1.0" + "hl7.fhir.r4.core": "4.0.1" }, "missing": {} } diff --git a/package.json b/package.json index 55cb0fb9..14bf41a8 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,6 @@ "description": "ePrescription workflow specification.\r\nRessources for ePrescription workflow major update 01.07.2023", "author": "gematik", "dependencies": { - "kbv.ita.erp": "1.1.x", - "kbv.ita.for": "1.1.0", "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1" }