Skip to content

Commit

Permalink
Merge pull request #138 from fhir-fi/reduce-ipa-dependencies
Browse files Browse the repository at this point in the history
Reduce ipa dependencies
  • Loading branch information
mikajylha committed Aug 10, 2023
2 parents 223d4ec + eacaa2c commit 5df1159
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 25 deletions.
14 changes: 14 additions & 0 deletions input/fsh/examples/medicationStatementInsulin.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Instance: MedicationStatementInsulin
InstanceOf: FiBaseMedicationStatement
Title: "Simple medication statement example"
Description: "Patient states they are taking long acting insulin (Lantus), but not the amount."
Usage: #example
* id = "medication-statement-insulin"
* medicationCodeableConcept
* coding[0] = http://snomed.info/sct#411529005 "Insulin glargine"
* coding[+] = http://www.whocc.no/atc#A10AE04 "insulin glargine"
* text = "Insulin glargine (Lantus)"
* status = #active
* subject = Reference(PatientOfMunicipality)
* effectiveDateTime = "2023-07-22"
* informationSource = Reference(PatientOfMunicipality)
6 changes: 3 additions & 3 deletions input/fsh/medication.fsh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Profile: FiBaseMedication
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medication
Parent: Medication
Id: fi-base-medication
Title: "FI Base Medication"
Description: "This is the Finnish base profile for the Medication resource."
Description: "This is the Finnish base profile for the Medication resource for other than patient access use cases."
* ^status = #draft
* manufacturer only Reference(FiBaseOrganization)
* ingredient.itemReference only Reference(Substance or FiBaseMedication)
* ingredient.itemReference only Reference(Substance or FiBaseMedication or FiBasePatientMedication)
1 change: 1 addition & 0 deletions input/fsh/medicationAdministration.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Title: "FI Base MedicationAdministration"
Description: "This is the Finnish base profile for the MedicationAdministration resource."
* ^status = #draft
* partOf only Reference(FiBaseProcedure or FiBaseMedicationAdministration)
* medicationReference only Reference(FiBasePatientMedication)
* subject only Reference(FiBasePatient or Group)
* context only Reference(FiBaseEncounter or FiBaseEpisodeOfCare)
* performer.actor only Reference(FiBasePractitioner or FiBasePractitionerRole or FiBasePatient or RelatedPerson or Device)
Expand Down
10 changes: 5 additions & 5 deletions input/fsh/medicationRequest.fsh
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Profile: FiBaseMedicationRequest
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationrequest
Parent: MedicationRequest
Id: fi-base-medication-request
Title: "FI Base MedicationRequest"
Description: "This is the Finnish base profile for the MedicationRequest resource."
Description: "This is the Finnish base profile for the MedicationRequest resource, for other than patient access use cases."
* ^status = #draft
* reportedReference only Reference(FiBasePatient or FiBasePractitioner or FiBasePractitionerRole)
* medicationReference only Reference(FiBaseMedication)
* medicationReference only Reference(FiBaseMedication or FiBasePatientMedication)
* subject only Reference(FiBasePatient)
* encounter only Reference(FiBaseEncounter)
* requester only Reference(FiBasePractitioner or FiBasePractitionerRole or FiBasePatient)
* performer only Reference(FiBasePractitioner or FiBasePractitionerRole or FiBasePatient or FiBaseOrganization or Device or RelatedPerson or CareTeam)
* recorder only Reference(FiBasePractitioner or FiBasePractitionerRole)
* reasonReference only Reference(FiBaseCondition or FiBaseObservation)
* eventHistory only Reference(FiBaseProvenance)
* priorPrescription only Reference(FiBaseMedicationRequest)
* priorPrescription only Reference(FiBaseMedicationRequest or FiBasePatientMedicationRequest)
* dispenseRequest.performer only Reference(FiBaseOrganization)
* basedOn only Reference(CarePlan or FiBaseMedicationRequest or ServiceRequest or ImmunizationRecommendation)
* basedOn only Reference(CarePlan or FiBaseMedicationRequest or FiBasePatientMedicationRequest or ServiceRequest or ImmunizationRecommendation)
2 changes: 1 addition & 1 deletion input/fsh/medicationStatement.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Description: "This is the Finnish base profile for the MedicationStatement resou
* ^status = #draft
* basedOn only Reference(FiBaseMedicationRequest or CarePlan or ServiceRequest)
* partOf only Reference(FiBaseMedicationAdministration or MedicationDispense or FiBaseMedicationStatement or FiBaseProcedure or FiBaseObservation)
* medicationReference only Reference(FiBaseMedication)
* medicationReference only Reference(FiBasePatientMedication)
* subject only Reference(FiBasePatient)
* context only Reference(FiBaseEncounter or FiBaseEpisodeOfCare)
* informationSource only Reference(FiBasePatient or FiBasePractitioner or FiBasePractitionerRole or FiBaseOrganization or RelatedPerson)
Expand Down
1 change: 0 additions & 1 deletion input/fsh/patient.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Id: fi-base-patient
Title: "FI Base Patient"
Description: "This is the Finnish base profile for the Patient resource."
* ^status = #draft
* id 1..1
* generalPractitioner only Reference(FiBaseOrganization or FiBasePractitioner or FiBasePractitionerRole)
* managingOrganization only Reference(FiBaseOrganization)
* link.other only Reference(FiBasePatient or RelatedPerson)
Expand Down
8 changes: 8 additions & 0 deletions input/fsh/patientMedication.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Profile: FiBasePatientMedication
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medication
Id: fi-base-patient-medication
Title: "FI Base Patient Medication"
Description: "This is the Finnish base profile for the Medication resource for patient access use case."
* ^status = #draft
* manufacturer only Reference(FiBaseOrganization)
* ingredient.itemReference only Reference(Substance or FiBasePatientMedication)
18 changes: 18 additions & 0 deletions input/fsh/patientMedicationRequest.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Profile: FiBasePatientMedicationRequest
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationrequest
Id: fi-base-patient-medication-request
Title: "FI Base Patient MedicationRequest"
Description: "This is the Finnish base profile for the MedicationRequest resource for the patient access use case."
* ^status = #draft
* reportedReference only Reference(FiBasePatient or FiBasePractitioner or FiBasePractitionerRole)
* medicationReference only Reference(FiBasePatientMedication)
* subject only Reference(FiBasePatient)
* encounter only Reference(FiBaseEncounter)
* requester only Reference(FiBasePractitioner or FiBasePractitionerRole or FiBasePatient)
* performer only Reference(FiBasePractitioner or FiBasePractitionerRole or FiBasePatient or FiBaseOrganization or Device or RelatedPerson or CareTeam)
* recorder only Reference(FiBasePractitioner or FiBasePractitionerRole)
* reasonReference only Reference(FiBaseCondition or FiBaseObservation)
* eventHistory only Reference(FiBaseProvenance)
* priorPrescription only Reference(FiBasePatientMedicationRequest)
* dispenseRequest.performer only Reference(FiBaseOrganization)
* basedOn only Reference(CarePlan or FiBasePatientMedicationRequest or ServiceRequest or ImmunizationRecommendation)
1 change: 0 additions & 1 deletion input/fsh/practitioner.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Id: fi-base-practitioner
Title: "FI Base Practitioner"
Description: "This is the Finnish base profile for the Practitioner resource."
* ^status = #draft
* id 1..1
* qualification.issuer only Reference(FiBaseOrganization)

* identifier ^slicing.discriminator.type = #value
Expand Down
2 changes: 0 additions & 2 deletions input/fsh/reasonForCare.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,3 @@ Description: "Encoded information on the cause of an adverse effect, when involv
* value[x] only Coding
* ^context[+].type = #element
* ^context[=].expression = "Condition"


Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
### Scope and Usage

The FI Base MedicationRequest derives from the MedicationRequest profile of the International
Patient Access specification.
This profile is meant for use cases without patient access perspective. For patient access use
case, please see the
[FI Base Patient Medication Request](StructureDefinition-fi-base-patient-medication-request.html)
profile.

{% include fragment-medication.md %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Scope and Usage

The FI Base MedicationRequest derives from the MedicationRequest profile of the International
Patient Access specification.

For use cases with no patient access perspective, please see also the
[FI Base Medication Request](StructureDefinition-fi-base-medication-request.html) profile.


{% include fragment-medication.md %}
20 changes: 10 additions & 10 deletions sushi-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resources:
Medication/medicationesim1:
name: Myyntiluvallinen lääkevalmiste
description: An example Medication instance from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication
Medication/medicationesim2:
name: Myyntiluvallinen lääkevalmiste, joka on PKV-lääke
description: An example Medication instance from Kanta Prescription API
Expand Down Expand Up @@ -66,39 +66,39 @@ resources:
MedicationRequest/medicationrequestesim1:
name: "1 tabletti 2 kertaa päivässä"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim2:
name: "2 tablettia aamulla ja 1 tabletti illalla 6 päivän ajan"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim3:
name: "1-2 tablettia kerran päivässä"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim4:
name: "1-2 tablettia 1-3 kertaa päivässä"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim5:
name: "Maanantaisin 1 tabletti ja tarvittaessa keskiviikkoisin 0,5 tablettia 01.06.2020 - 31.12.2020"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim6:
name: "Lääke tauolla 1.3.2020 - 30.6.2020. Taukoa edeltävä annostus: 25 mg klo 08:00 10 päivän ajan ihon alle"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim7A:
name: "1 tabletti 2 kertaa päivässä 5 päivän ajan 15.1.2021 alkaen"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim7B:
name: "1 tabletti 2 kertaa päivässä 5-7 päivän ajan 15.1.2021 alkaen"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim8:
name: "Tarvittaessa 2 tablettia 3 kertaa viikossa 16.2.2021 alkaen"
description: An example MedicationRequest from Kanta Prescription API
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-medication-request
exampleCanonical: https://hl7.fi/fhir/finnish-base-profiles/StructureDefinition/fi-base-patient-medication-request
MedicationRequest/medicationrequestesim9:
name: "Tarvittaessa 1-2 tippaa 3-4 tunnin välein"
description: An example MedicationRequest from Kanta Prescription API
Expand Down

0 comments on commit 5df1159

Please sign in to comment.