From eccbd78ae6c8de9d4bac5440e04279ea5ad6031a Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 3 Feb 2025 15:35:02 +0100 Subject: [PATCH 1/3] add invalids for references --- .../01_INVALID_fullUrl_and_id_missmatch.xml | 11 +++ .../02_INVALID_mixed_reference.xml | 69 +++++++++++++++++++ .../03_INVALID_fullUrl_format.xml | 14 ++++ .../04_Invalid_Example_Patient_no_id.xml | 9 +++ .../01_INVALID_fullUrl_and_id_missmatch.fsh | 29 ++++++++ .../02-INVALID-mixed-reference.fsh | 22 ++++++ .../03-INVALID-fullUrl-format.fsh | 12 ++++ .../04-Invalid-Example-Patient-no-id.fsh | 8 +++ 8 files changed, 174 insertions(+) create mode 100644 API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml create mode 100644 API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml create mode 100644 API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml create mode 100644 API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml create mode 100644 API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh create mode 100644 API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh create mode 100644 API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh create mode 100644 API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh diff --git a/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml new file mode 100644 index 00000000..bb95294d --- /dev/null +++ b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml b/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml new file mode 100644 index 00000000..ab2d66e6 --- /dev/null +++ b/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <custodian> + <reference value="Organization/94662b9e-af55-4206-b52a-7e086d0d4d82"/> + </custodian> + <section> + <code> + <coding> + <system value="https://fhir.kbv.de/CodeSystem/KBV_CS_ERP_Section_Type"/> + <code value="Prescription"/> + </coding> + </code> + <entry> + <reference value="MedicationRequest/4e8c932a-bef5-443d-9e85-64bca6d53d53"/> + </entry> + </section> + <section> + <code> + <coding> + <system value="https://fhir.kbv.de/CodeSystem/KBV_CS_ERP_Section_Type"/> + <code value="Coverage"/> + </coding> + </code> + <entry> + <reference value="Coverage/a2ef1193-0739-46de-bc77-65f13feaa7d3"/> + </entry> + </section> + </Composition> + </resource> + </entry> +</Bundle> \ No newline at end of file diff --git a/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml new file mode 100644 index 00000000..95f6d44b --- /dev/null +++ b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml @@ -0,0 +1,14 @@ +<Bundle xmlns="http://hl7.org/fhir"> + <id value="erp-fhir-infos-03-INVALID-fullUrl-format"/> + <meta> + <lastUpdated value="2025-01-15T15:29:00.434+00:00"/> + </meta> + <type value="collection"/> + <timestamp value="2025-01-15T15:29:00.434+00:00"/> + <entry> + <fullUrl value="www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> + </entry> + <entry> + <fullUrl value="Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> + </entry> +</Bundle> \ No newline at end of file diff --git a/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml b/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml new file mode 100644 index 00000000..21f65fd9 --- /dev/null +++ b/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml @@ -0,0 +1,9 @@ +<Patient xmlns="http://hl7.org/fhir"> + <id value="erp-fhir-infos-04-Invalid-Example-Patient-no-id"/> + <name> + <use value="official"/> + <family value="Ludger Königsstein"/> + <given value="Ludger"/> + </name> + <birthDate value="1935-06-22"/> +</Patient> \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh new file mode 100644 index 00000000..fa52c7e2 --- /dev/null +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh @@ -0,0 +1,29 @@ +Instance: erp-fhir-infos-01-INVALID-fullUrl-and-id-missmatch +InstanceOf: Bundle +Usage: #example +Title: "01-INVALID-fullUrl-and-id-missmatch" +Description: "This example demonstrates mismatch between id in fullUrl and id in the resource." +* insert DateTimeStamp(meta.lastUpdated) +* insert DateTimeStamp(timestamp) +* type = #collection +* entry[+].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" +* entry[+].resource = Invalid-Example-Patient + +Instance: erp-fhir-infos-Invalid-Example-Patient +InstanceOf: KBV_PR_FOR_Patient +Usage: #inline +* id = "43ed0c32-27e0-429c-a2fb-8f92518de721" +* identifier[versichertenId_GKV].value = "X234567890" +* name[name] + * .use = #official + * family.extension[nachname].valueString = "Königsstein" + * family = "Ludger Königsstein" + * given = "Ludger" +* birthDate = "1935-06-22" +* address[Strassenanschrift] + * type = #both + * line = "Musterstr. 1" + * line.extension[Hausnummer].valueString = "1" + * line.extension[Strasse].valueString = "Musterstr." + * city = "Berlin" + * postalCode = "10623" \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh new file mode 100644 index 00000000..4d89d117 --- /dev/null +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh @@ -0,0 +1,22 @@ +Instance: erp-fhir-infos-02-INVALID-mixed-reference +InstanceOf: Bundle +Usage: #example +Title: "02-INVALID-mixed-reference" +Description: "This example demonstrates a wrong mixed reference." +* insert DateTimeStamp(meta.lastUpdated) +* insert DateTimeStamp(timestamp) +* type = #document +* entry[+].fullUrl = "urn:uuid:b0e22b86-e7e9-46c1-80fe-e6e24442d77c" +* entry[+].resource = Invalid-Example-Composition + +Instance: Invalid-Example-Composition +InstanceOf: KBV_PR_ERP_Composition +Usage: #inline +* id = "b0e22b86-e7e9-46c1-80fe-e6e24442d77c" +* subject = Reference(Patient/17b0721b-d538-4455-b1bb-2c2dfc19d234) +* insert DateTimeStamp(date) +* author[Arzt] = Reference(Practitioner/407974ea-b5c7-47e5-be09-9310a00afb31) +* author[Pruefnummer].identifier.value = "Y/400/1910/36/346" +* custodian = Reference(Organization/94662b9e-af55-4206-b52a-7e086d0d4d82) +* section[Verordnung_Arzneimittel].entry = Reference(4e8c932a-bef5-443d-9e85-64bca6d53d53) +* section[Krankenversicherungsverhaeltnis].entry = Reference(a2ef1193-0739-46de-bc77-65f13feaa7d3) \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh new file mode 100644 index 00000000..e265bb9d --- /dev/null +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh @@ -0,0 +1,12 @@ +Instance: erp-fhir-infos-03-INVALID-fullUrl-format +InstanceOf: Bundle +Usage: #example +Title: "03-INVALID-fullUrl-format" +Description: "This example demonstrates a wrongly formatted fullUrl." +* insert DateTimeStamp(meta.lastUpdated) +* insert DateTimeStamp(timestamp) +* type = #collection +* entry[+].fullUrl = "www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" +* entry[+].resource = Invalid-Example-Patient +* entry[+].fullUrl = "Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" +* entry[+].resource = Invalid-Example-Patient \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh new file mode 100644 index 00000000..499349b3 --- /dev/null +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh @@ -0,0 +1,8 @@ +Instance: erp-fhir-infos-04-Invalid-Example-Patient-no-id +InstanceOf: Patient +Usage: #example +* name[+] + * .use = #official + * family = "Ludger Königsstein" + * given = "Ludger" +* birthDate = "1935-06-22" \ No newline at end of file From 4f0924b9949050bba2acced1ba27bd662599e9bd Mon Sep 17 00:00:00 2001 From: florianschoffke <florian.schoffke@gematik.de> Date: Mon, 3 Feb 2025 15:44:15 +0100 Subject: [PATCH 2/3] adapt examples --- .../01_INVALID_fullUrl_and_id_missmatch.xml | 43 ++++++++++ .../03_INVALID_fullUrl_format.xml | 86 +++++++++++++++++++ .../04_Invalid_Example_Patient_no_id.xml | 1 - .../erp_fhir_infos/05_INVALID_oid_format.xml | 54 ++++++++++++ .../01_INVALID_fullUrl_and_id_missmatch.fsh | 2 +- .../03-INVALID-fullUrl-format.fsh | 4 +- .../04-Invalid-Example-Patient-no-id.fsh | 2 +- .../05-INVALID-oid-reference.fsh | 10 +++ 8 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml create mode 100644 API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh diff --git a/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml index bb95294d..b87bdc98 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml @@ -8,4 +8,47 @@ <entry> <fullUrl value="http://pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> </entry> + <entry> + <resource> + <Patient> + <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> + <meta> + <profile value="https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.1.0"/> + </meta> + <identifier> + <type> + <coding> + <system value="http://fhir.de/CodeSystem/identifier-type-de-basis"/> + <code value="GKV"/> + </coding> + </type> + <system value="http://fhir.de/sid/gkv/kvid-10"/> + <value value="X234567890"/> + </identifier> + <name> + <use value="official"/> + <family value="Ludger Königsstein"> + <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name"> + <valueString value="Königsstein"/> + </extension> + </family> + <given value="Ludger"/> + </name> + <birthDate value="1935-06-22"/> + <address> + <type value="both"/> + <line value="Musterstr. 1"> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"> + <valueString value="1"/> + </extension> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"> + <valueString value="Musterstr."/> + </extension> + </line> + <city value="Berlin"/> + <postalCode value="10623"/> + </address> + </Patient> + </resource> + </entry> </Bundle> \ No newline at end of file diff --git a/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml index 95f6d44b..7b7aaf67 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml @@ -8,7 +8,93 @@ <entry> <fullUrl value="www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> </entry> + <entry> + <resource> + <Patient> + <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> + <meta> + <profile value="https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.1.0"/> + </meta> + <identifier> + <type> + <coding> + <system value="http://fhir.de/CodeSystem/identifier-type-de-basis"/> + <code value="GKV"/> + </coding> + </type> + <system value="http://fhir.de/sid/gkv/kvid-10"/> + <value value="X234567890"/> + </identifier> + <name> + <use value="official"/> + <family value="Ludger Königsstein"> + <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name"> + <valueString value="Königsstein"/> + </extension> + </family> + <given value="Ludger"/> + </name> + <birthDate value="1935-06-22"/> + <address> + <type value="both"/> + <line value="Musterstr. 1"> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"> + <valueString value="1"/> + </extension> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"> + <valueString value="Musterstr."/> + </extension> + </line> + <city value="Berlin"/> + <postalCode value="10623"/> + </address> + </Patient> + </resource> + </entry> <entry> <fullUrl value="Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> </entry> + <entry> + <resource> + <Patient> + <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> + <meta> + <profile value="https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.1.0"/> + </meta> + <identifier> + <type> + <coding> + <system value="http://fhir.de/CodeSystem/identifier-type-de-basis"/> + <code value="GKV"/> + </coding> + </type> + <system value="http://fhir.de/sid/gkv/kvid-10"/> + <value value="X234567890"/> + </identifier> + <name> + <use value="official"/> + <family value="Ludger Königsstein"> + <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name"> + <valueString value="Königsstein"/> + </extension> + </family> + <given value="Ludger"/> + </name> + <birthDate value="1935-06-22"/> + <address> + <type value="both"/> + <line value="Musterstr. 1"> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"> + <valueString value="1"/> + </extension> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"> + <valueString value="Musterstr."/> + </extension> + </line> + <city value="Berlin"/> + <postalCode value="10623"/> + </address> + </Patient> + </resource> + </entry> </Bundle> \ No newline at end of file diff --git a/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml b/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml index 21f65fd9..19ab5b3c 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/04_Invalid_Example_Patient_no_id.xml @@ -1,5 +1,4 @@ <Patient xmlns="http://hl7.org/fhir"> - <id value="erp-fhir-infos-04-Invalid-Example-Patient-no-id"/> <name> <use value="official"/> <family value="Ludger Königsstein"/> diff --git a/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml b/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml new file mode 100644 index 00000000..b9894e5c --- /dev/null +++ b/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml @@ -0,0 +1,54 @@ +<Bundle xmlns="http://hl7.org/fhir"> + <id value="erp-fhir-infos-05-INVALID-oid-format"/> + <meta> + <lastUpdated value="2025-01-15T15:29:00.434+00:00"/> + </meta> + <type value="collection"/> + <timestamp value="2025-01-15T15:29:00.434+00:00"/> + <entry> + <fullUrl value="urn:oid:1.3.6.1.4.1.12345.1.1.1"/> + </entry> + <entry> + <resource> + <Patient> + <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> + <meta> + <profile value="https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.1.0"/> + </meta> + <identifier> + <type> + <coding> + <system value="http://fhir.de/CodeSystem/identifier-type-de-basis"/> + <code value="GKV"/> + </coding> + </type> + <system value="http://fhir.de/sid/gkv/kvid-10"/> + <value value="X234567890"/> + </identifier> + <name> + <use value="official"/> + <family value="Ludger Königsstein"> + <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name"> + <valueString value="Königsstein"/> + </extension> + </family> + <given value="Ludger"/> + </name> + <birthDate value="1935-06-22"/> + <address> + <type value="both"/> + <line value="Musterstr. 1"> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"> + <valueString value="1"/> + </extension> + <extension url="http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"> + <valueString value="Musterstr."/> + </extension> + </line> + <city value="Berlin"/> + <postalCode value="10623"/> + </address> + </Patient> + </resource> + </entry> +</Bundle> \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh index fa52c7e2..f0e1d409 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh @@ -7,7 +7,7 @@ Description: "This example demonstrates mismatch between id in fullUrl and id in * insert DateTimeStamp(timestamp) * type = #collection * entry[+].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = Invalid-Example-Patient +* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient Instance: erp-fhir-infos-Invalid-Example-Patient InstanceOf: KBV_PR_FOR_Patient diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh index e265bb9d..e623ade2 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh @@ -7,6 +7,6 @@ Description: "This example demonstrates a wrongly formatted fullUrl." * insert DateTimeStamp(timestamp) * type = #collection * entry[+].fullUrl = "www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = Invalid-Example-Patient +* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient * entry[+].fullUrl = "Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = Invalid-Example-Patient \ No newline at end of file +* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh index 499349b3..a5d174df 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/04-Invalid-Example-Patient-no-id.fsh @@ -1,4 +1,4 @@ -Instance: erp-fhir-infos-04-Invalid-Example-Patient-no-id +Instance: erp-fhir-infos-04-INVALID-Example-Patient-no-id InstanceOf: Patient Usage: #example * name[+] diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh new file mode 100644 index 00000000..40ca7e29 --- /dev/null +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh @@ -0,0 +1,10 @@ +Instance: erp-fhir-infos-05-INVALID-oid-format +InstanceOf: Bundle +Usage: #example +Title: "05-INVALID-oid-format" +Description: "This example demonstrates a forbidden oid reference" +* insert DateTimeStamp(meta.lastUpdated) +* insert DateTimeStamp(timestamp) +* type = #collection +* entry[+].fullUrl = "urn:oid:1.3.6.1.4.1.12345.1.1.1" +* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file From c5c8bb9a53441e941238a734f1090ee1de981f2c Mon Sep 17 00:00:00 2001 From: florianschoffke <florian.schoffke@gematik.de> Date: Mon, 3 Feb 2025 15:50:06 +0100 Subject: [PATCH 3/3] fixes for entries in bundles --- .../erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml | 2 -- .../2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml | 2 -- .../2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml | 4 ---- .../2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml | 2 -- .../erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh | 2 +- .../examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh | 2 +- .../fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh | 4 ++-- .../fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh | 2 +- 8 files changed, 5 insertions(+), 15 deletions(-) diff --git a/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml index b87bdc98..57ba94d3 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.xml @@ -7,8 +7,6 @@ <timestamp value="2025-01-15T15:29:00.434+00:00"/> <entry> <fullUrl value="http://pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> - </entry> - <entry> <resource> <Patient> <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> diff --git a/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml b/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml index ab2d66e6..e7d76e8d 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/02_INVALID_mixed_reference.xml @@ -7,8 +7,6 @@ <timestamp value="2025-01-15T15:29:00.434+00:00"/> <entry> <fullUrl value="urn:uuid:b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> - </entry> - <entry> <resource> <Composition> <id value="b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> diff --git a/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml index 7b7aaf67..5967e4f2 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/03_INVALID_fullUrl_format.xml @@ -7,8 +7,6 @@ <timestamp value="2025-01-15T15:29:00.434+00:00"/> <entry> <fullUrl value="www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> - </entry> - <entry> <resource> <Patient> <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> @@ -53,8 +51,6 @@ </entry> <entry> <fullUrl value="Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c"/> - </entry> - <entry> <resource> <Patient> <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> diff --git a/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml b/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml index b9894e5c..af09d692 100644 --- a/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml +++ b/API-Examples/2025-01-15/erp_fhir_infos/05_INVALID_oid_format.xml @@ -7,8 +7,6 @@ <timestamp value="2025-01-15T15:29:00.434+00:00"/> <entry> <fullUrl value="urn:oid:1.3.6.1.4.1.12345.1.1.1"/> - </entry> - <entry> <resource> <Patient> <id value="43ed0c32-27e0-429c-a2fb-8f92518de721"/> diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh index f0e1d409..387452d3 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/01_INVALID_fullUrl_and_id_missmatch.fsh @@ -7,7 +7,7 @@ Description: "This example demonstrates mismatch between id in fullUrl and id in * insert DateTimeStamp(timestamp) * type = #collection * entry[+].fullUrl = "http://pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient +* entry[=].resource = erp-fhir-infos-Invalid-Example-Patient Instance: erp-fhir-infos-Invalid-Example-Patient InstanceOf: KBV_PR_FOR_Patient diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh index 4d89d117..777281a1 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/02-INVALID-mixed-reference.fsh @@ -7,7 +7,7 @@ Description: "This example demonstrates a wrong mixed reference." * insert DateTimeStamp(timestamp) * type = #document * entry[+].fullUrl = "urn:uuid:b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = Invalid-Example-Composition +* entry[=].resource = Invalid-Example-Composition Instance: Invalid-Example-Composition InstanceOf: KBV_PR_ERP_Composition diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh index e623ade2..11e67548 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/03-INVALID-fullUrl-format.fsh @@ -7,6 +7,6 @@ Description: "This example demonstrates a wrongly formatted fullUrl." * insert DateTimeStamp(timestamp) * type = #collection * entry[+].fullUrl = "www.pvs.praxis-topp-gluecklich.local/fhir/Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient +* entry[=].resource = erp-fhir-infos-Invalid-Example-Patient * entry[+].fullUrl = "Patient/b0e22b86-e7e9-46c1-80fe-e6e24442d77c" -* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file +* entry[=].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh index 40ca7e29..ccabe820 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_fhir_infos/05-INVALID-oid-reference.fsh @@ -7,4 +7,4 @@ Description: "This example demonstrates a forbidden oid reference" * insert DateTimeStamp(timestamp) * type = #collection * entry[+].fullUrl = "urn:oid:1.3.6.1.4.1.12345.1.1.1" -* entry[+].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file +* entry[=].resource = erp-fhir-infos-Invalid-Example-Patient \ No newline at end of file