From f7bcde7eb8f43b4e245541c5483b57ebb97769f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Tue, 11 Jun 2024 17:40:45 +0300 Subject: [PATCH 1/3] Remove duplicate entries All these are now described in FSH. --- input/examples/patient.xml | 48 ----- .../patient_with_multiple_identifiers.json | 30 ---- .../AppointmentMutabilityExtension.xml | 91 ---------- input/extensions/ChildAppointment.xml | 37 ---- .../extensions/HomeMunicipalityExtension.xml | 62 ------- .../extensions/NotificationInfoExtension.xml | 42 ----- input/extensions/ParentAppointment.xml | 42 ----- .../PatientInstructionURLExtension.xml | 38 ---- .../FinnishAppointmentAppointment.xml | 167 ------------------ .../FinnishAppointmentHealthcareService.xml | 53 ------ input/profiles/FinnishAppointmentLocation.xml | 33 ---- input/profiles/FinnishAppointmentPatient.xml | 122 ------------- .../FinnishAppointmentPractitioner.xml | 103 ----------- input/profiles/FinnishAppointmentSchedule.xml | 31 ---- input/profiles/FinnishAppointmentSlot.xml | 65 ------- 15 files changed, 964 deletions(-) delete mode 100644 input/examples/patient.xml delete mode 100644 input/examples/patient_with_multiple_identifiers.json delete mode 100644 input/extensions/AppointmentMutabilityExtension.xml delete mode 100644 input/extensions/ChildAppointment.xml delete mode 100644 input/extensions/HomeMunicipalityExtension.xml delete mode 100644 input/extensions/NotificationInfoExtension.xml delete mode 100644 input/extensions/ParentAppointment.xml delete mode 100644 input/extensions/PatientInstructionURLExtension.xml delete mode 100644 input/profiles/FinnishAppointmentAppointment.xml delete mode 100644 input/profiles/FinnishAppointmentHealthcareService.xml delete mode 100644 input/profiles/FinnishAppointmentLocation.xml delete mode 100644 input/profiles/FinnishAppointmentPatient.xml delete mode 100644 input/profiles/FinnishAppointmentPractitioner.xml delete mode 100644 input/profiles/FinnishAppointmentSchedule.xml delete mode 100644 input/profiles/FinnishAppointmentSlot.xml diff --git a/input/examples/patient.xml b/input/examples/patient.xml deleted file mode 100644 index 1b02246..0000000 --- a/input/examples/patient.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/examples/patient_with_multiple_identifiers.json b/input/examples/patient_with_multiple_identifiers.json deleted file mode 100644 index f0b440d..0000000 --- a/input/examples/patient_with_multiple_identifiers.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "resourceType": "Patient", - "id": "patient-with-multiple-identifiers", - "identifier": [ - { - "use": "official", - "system": "urn:oid:1.2.246.21", - "value": "010101-123N", - "period": { - "start": "2019-01-01" - } - }, - { - "use": "temp", - "value": "081181-9984", - "period": { - "start": "2018-11-12", - "end": "2019-01-01" - } - } - ], - "name": [ - { - "family": "Testi", - "given": [ - "Anna" - ] - } - ] -} \ No newline at end of file diff --git a/input/extensions/AppointmentMutabilityExtension.xml b/input/extensions/AppointmentMutabilityExtension.xml deleted file mode 100644 index 2d864bc..0000000 --- a/input/extensions/AppointmentMutabilityExtension.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/extensions/ChildAppointment.xml b/input/extensions/ChildAppointment.xml deleted file mode 100644 index 87389fe..0000000 --- a/input/extensions/ChildAppointment.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/extensions/HomeMunicipalityExtension.xml b/input/extensions/HomeMunicipalityExtension.xml deleted file mode 100644 index 3498e57..0000000 --- a/input/extensions/HomeMunicipalityExtension.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - -
Structure for Home municipality of patient
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/extensions/NotificationInfoExtension.xml b/input/extensions/NotificationInfoExtension.xml deleted file mode 100644 index 3ff22dd..0000000 --- a/input/extensions/NotificationInfoExtension.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/extensions/ParentAppointment.xml b/input/extensions/ParentAppointment.xml deleted file mode 100644 index bed6937..0000000 --- a/input/extensions/ParentAppointment.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/extensions/PatientInstructionURLExtension.xml b/input/extensions/PatientInstructionURLExtension.xml deleted file mode 100644 index 8e86183..0000000 --- a/input/extensions/PatientInstructionURLExtension.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentAppointment.xml b/input/profiles/FinnishAppointmentAppointment.xml deleted file mode 100644 index f680612..0000000 --- a/input/profiles/FinnishAppointmentAppointment.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentHealthcareService.xml b/input/profiles/FinnishAppointmentHealthcareService.xml deleted file mode 100644 index c10943f..0000000 --- a/input/profiles/FinnishAppointmentHealthcareService.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentLocation.xml b/input/profiles/FinnishAppointmentLocation.xml deleted file mode 100644 index 825e468..0000000 --- a/input/profiles/FinnishAppointmentLocation.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentPatient.xml b/input/profiles/FinnishAppointmentPatient.xml deleted file mode 100644 index 7f50989..0000000 --- a/input/profiles/FinnishAppointmentPatient.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentPractitioner.xml b/input/profiles/FinnishAppointmentPractitioner.xml deleted file mode 100644 index 12a1be0..0000000 --- a/input/profiles/FinnishAppointmentPractitioner.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentSchedule.xml b/input/profiles/FinnishAppointmentSchedule.xml deleted file mode 100644 index fa11207..0000000 --- a/input/profiles/FinnishAppointmentSchedule.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/input/profiles/FinnishAppointmentSlot.xml b/input/profiles/FinnishAppointmentSlot.xml deleted file mode 100644 index 40e20c8..0000000 --- a/input/profiles/FinnishAppointmentSlot.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 0a0809eb354df9d1f4bbf42cf038b12b8900e86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Tue, 11 Jun 2024 17:42:26 +0300 Subject: [PATCH 2/3] Rename instances Use more descriptive file names instead of the GoFSH-generated ones. --- input/fsh/instances/GOFSH-GENERATED-ID-1.fsh | 11 ----------- ...4453-9f62-bc06de64e9c8.fsh => example-patient.fsh} | 2 +- ...ID-0.fsh => patient-with-multiple-identifiers.fsh} | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 input/fsh/instances/GOFSH-GENERATED-ID-1.fsh rename input/fsh/instances/{ef19597b-623d-4453-9f62-bc06de64e9c8.fsh => example-patient.fsh} (93%) rename input/fsh/instances/{GOFSH-GENERATED-ID-0.fsh => patient-with-multiple-identifiers.fsh} (89%) diff --git a/input/fsh/instances/GOFSH-GENERATED-ID-1.fsh b/input/fsh/instances/GOFSH-GENERATED-ID-1.fsh deleted file mode 100644 index 79d92a8..0000000 --- a/input/fsh/instances/GOFSH-GENERATED-ID-1.fsh +++ /dev/null @@ -1,11 +0,0 @@ -Instance: GOFSH-GENERATED-ID-1 -InstanceOf: Slot -Usage: #example -* identifier.value = "123456789" -* serviceCategory = urn:oid:1.2.246.537.6.50.201801#SOTE19 "Perheoikeudelliset palvelut" -* serviceType = urn:oid:1.2.246.537.6.49.201501#NC "Isyyden selvittämispalvelu" -* appointmentType = urn:oid:1.2.246.537.6.884.2015#10 "Kertakäynti toimipaikassa" -* schedule = Reference(Schedule/234567890) -* status = #free -* start = "2020-01-01T12:00:00+02:00" -* end = "2020-01-01T12:30:00+02:00" \ No newline at end of file diff --git a/input/fsh/instances/ef19597b-623d-4453-9f62-bc06de64e9c8.fsh b/input/fsh/instances/example-patient.fsh similarity index 93% rename from input/fsh/instances/ef19597b-623d-4453-9f62-bc06de64e9c8.fsh rename to input/fsh/instances/example-patient.fsh index f7d0e88..d69b550 100644 --- a/input/fsh/instances/ef19597b-623d-4453-9f62-bc06de64e9c8.fsh +++ b/input/fsh/instances/example-patient.fsh @@ -1,4 +1,4 @@ -Instance: ef19597b-623d-4453-9f62-bc06de64e9c8 +Instance: example-patient InstanceOf: Patient Usage: #example * meta.lastUpdated = "2021-03-02T11:06:59.579+00:00" diff --git a/input/fsh/instances/GOFSH-GENERATED-ID-0.fsh b/input/fsh/instances/patient-with-multiple-identifiers.fsh similarity index 89% rename from input/fsh/instances/GOFSH-GENERATED-ID-0.fsh rename to input/fsh/instances/patient-with-multiple-identifiers.fsh index 1814265..b171dd5 100644 --- a/input/fsh/instances/GOFSH-GENERATED-ID-0.fsh +++ b/input/fsh/instances/patient-with-multiple-identifiers.fsh @@ -1,4 +1,4 @@ -Instance: GOFSH-GENERATED-ID-0 +Instance: patient-with-multiple-identifiers InstanceOf: Patient Usage: #example * identifier[0].use = #official From 260757a22654db6a2aa32446cee32bab8a2b3e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Tue, 11 Jun 2024 17:43:10 +0300 Subject: [PATCH 3/3] Comment out some definitions This is just a quick hack to get the IG to compile. We'll come back to these. --- input/fsh/profiles/FinnishAppointmentAppointment.fsh | 4 +++- input/fsh/profiles/FinnishSchedulingAppointment.fsh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/input/fsh/profiles/FinnishAppointmentAppointment.fsh b/input/fsh/profiles/FinnishAppointmentAppointment.fsh index 0300656..08f7766 100644 --- a/input/fsh/profiles/FinnishAppointmentAppointment.fsh +++ b/input/fsh/profiles/FinnishAppointmentAppointment.fsh @@ -13,7 +13,7 @@ Description: "Profile for appointment (ajanvaraus) in Finnish Scheduling environ * extension contains ParentAppointment named ParentAppointment 0..1 and AppointmentMutabilityExtension named AppointmentMutability 0..1 and - $NotificationInfoExtension named NotificationInfoExtension 0..* and + NotificationInfoExtension named NotificationInfoExtension 0..* and ChildAppointment named ChildAppointment 0..* * extension[ParentAppointment] ^requirements = "12 Pääajanvaraus" * extension[AppointmentMutability] ^requirements = "95 Peruttavissa\r\n96 Siirrettävissä\r\n96.1 Peruutuksen tai siirron aikaraja" @@ -32,11 +32,13 @@ Description: "Profile for appointment (ajanvaraus) in Finnish Scheduling environ * appointmentType.coding.system = "1.2.246.537.6.884.2015" (exactly) * appointmentType.coding.system ^short = "hl7fi: asiointitapa" * appointmentType.coding.system ^definition = "hl7fi: koodilla ilmaistu tieto ammattihenkilön ja asiakkaan välisen asioinnin tavasta" +/* * patientInstruction.extension ^slicing.discriminator.type = #value * patientInstruction.extension ^slicing.discriminator.path = "url" * patientInstruction.extension ^slicing.rules = #open * patientInstruction.extension[PatientInstructionURL] only PatientInstructionURLExtension * patientInstruction.extension[PatientInstructionURL] ^sliceName = "PatientInstructionURL" +*/ * participant ^label = "Patient" * participant ^slicing.discriminator.type = #type * participant ^slicing.discriminator.path = "actor.type" diff --git a/input/fsh/profiles/FinnishSchedulingAppointment.fsh b/input/fsh/profiles/FinnishSchedulingAppointment.fsh index 3501202..de7fbc9 100644 --- a/input/fsh/profiles/FinnishSchedulingAppointment.fsh +++ b/input/fsh/profiles/FinnishSchedulingAppointment.fsh @@ -35,7 +35,7 @@ Description: "Profile for appointment (ajanvaraus) in Finnish Scheduling environ * extension[ParentAppointment] ^requirements = "12 Pääajanvaraus" * extension[SelfServiceExtension] ^requirements = "84 AsiointiURL\r\n84.1 Järjestelmä tukee alaikäisen puolesta asiointia\r\n84.2 Järjestelmä tukee puolesta-asiointia valtakirjalla täysi-ikäisen puolesta\r\n84.3 Järjestelmä tukee rekisteripohjaista puolesta-asiointia täysi-ikäisen puolesta" * extension[ResourceCalendar] ^requirements = "74 Resurssin kalenteritunniste\r\n75 Resurssin nimi" -* extension[ResourceCalendar].extension contains ResourceCalendarName 0..1 +// * extension[ResourceCalendar].extension contains ResourceCalendarName 0..1 * extension[ReferralId] ^requirements = "24 Ajanvaraukseen liittyvän lähetteen tai pyynnön tunniste" * extension[RequestedService] ^requirements = "73 Varaustuote\r\n73.1 Varaustuotteen nimi" * extension[MiscAppointmentData] ^requirements = "91 Muu sisältö" @@ -111,9 +111,11 @@ Description: "Profile for appointment (ajanvaraus) in Finnish Scheduling environ * patientInstruction.extension ^slicing.discriminator.type = #value * patientInstruction.extension ^slicing.discriminator.path = "url" * patientInstruction.extension ^slicing.rules = #open +/* * patientInstruction.extension[PatientInstructionURL] only PatientInstructionURLExtension * patientInstruction.extension[PatientInstructionURL] ^sliceName = "PatientInstructionURL" * patientInstruction.extension[PatientInstructionURL] ^requirements = "100.1 Linkki potilasohjeeseen" +*/ * basedOn ..0 * requestedPeriod ..1 * requestedPeriod ^requirements = "35 Ajankohta, jolloin ajanvaraus ohjeistettu tehtäväksi" \ No newline at end of file