Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce ipa dependencies #138

Merged
merged 18 commits into from
Aug 10, 2023
Merged

Reduce ipa dependencies #138

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fb1aa6a
Move security codesystem to codesystems folder
mrinnetmaki Jun 26, 2023
65b6c2d
Polish the Patient profile intro
mrinnetmaki Jun 26, 2023
0c1437f
Fix terminology page intro
mrinnetmaki Jun 26, 2023
541576f
Add intro texts for TURVAKIELTO
mrinnetmaki Jun 26, 2023
1d98f14
Relax the id cardinality constraint
mrinnetmaki Jun 26, 2023
f814959
Remove extra empty lines
mrinnetmaki Jun 26, 2023
82a11bf
Add an alternative Medication profile
mrinnetmaki Jun 26, 2023
70ab520
Add generic profiles for med request and statement
mrinnetmaki Jun 28, 2023
1011cf9
Explain patient access and other use cases
mrinnetmaki Jun 28, 2023
223d4ec
Merge pull request #137 from fhir-fi/polishing
mrinnetmaki Jun 29, 2023
5d4e0af
Revert "Explain patient access and other use cases"
mrinnetmaki Jul 21, 2023
ab1cb40
Revert "Add generic profiles for med request and statement"
mrinnetmaki Jul 21, 2023
7ecba81
Add generic profile for med request
mrinnetmaki Jul 21, 2023
fe628c9
Constrain the medication reference
mrinnetmaki Jul 21, 2023
31b2c02
Spread medication examples
mrinnetmaki Jul 21, 2023
7955ce6
Add an example for MedicationStatement
mrinnetmaki Jul 22, 2023
7c55f84
Merge branch 'reduce-ipa-dependencies' of https://github.com/fhir-fi/…
teropekkola Aug 4, 2023
eacaa2c
Relax the id cardinality constraint for Patient
teropekkola Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions input/fsh/medication.fsh
View file
Open in desktop
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)
3 changes: 2 additions & 1 deletion input/fsh/medicationAdministration.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ 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(FiBaseMedication or 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)
* reasonReference only Reference(FiBaseCondition or FiBaseObservation or DiagnosticReport)
* request only Reference(FiBaseMedicationRequest)
* request only Reference(FiBaseMedicationRequest or FiBasePatientMedicationRequest)
* eventHistory only Reference(FiBaseProvenance)
10 changes: 5 additions & 5 deletions input/fsh/medicationRequest.fsh
View file
Open in desktop
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)
12 changes: 6 additions & 6 deletions input/fsh/medicationStatement.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Profile: FiBaseMedicationStatement
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationstatement
Parent: MedicationStatement
Id: fi-base-medication-statement
Title: "FI Base MedicationStatement"
Description: "This is the Finnish base profile for the MedicationStatement resource."
Description: "This is the Finnish base profile for the MedicationStatement resource, for other than patient access use cases."
* ^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)
* subject only Reference(FiBasePatient)
* basedOn only Reference(FiBaseMedicationRequest or FiBasePatientMedicationRequest or CarePlan or ServiceRequest)
* partOf only Reference(FiBaseMedicationAdministration or MedicationDispense or FiBaseMedicationStatement or FiBasePatientMedicationStatement or FiBaseProcedure or FiBaseObservation)
* medicationReference only Reference(FiBaseMedication or FiBasePatientMedication)
* subject only Reference(FiBasePatient)
* context only Reference(FiBaseEncounter or FiBaseEpisodeOfCare)
* informationSource only Reference(FiBasePatient or FiBasePractitioner or FiBasePractitionerRole or FiBaseOrganization or RelatedPerson)
* reasonReference only Reference(FiBaseCondition or FiBaseObservation or DiagnosticReport)
8 changes: 8 additions & 0 deletions input/fsh/patientMedication.fsh
View file
Open in desktop
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
View file
Open in desktop
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)
13 changes: 13 additions & 0 deletions input/fsh/patientMedicationStatement.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Profile: FiBasePatientMedicationStatement
Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationstatement
Id: fi-base-patient-medication-statement
Title: "FI Base MedicationStatement"
Description: "This is the Finnish base profile for the MedicationStatement resource for the patient access use case."
* ^status = #draft
* basedOn only Reference(FiBasePatientMedicationRequest or CarePlan or ServiceRequest)
* partOf only Reference(FiBaseMedicationAdministration or MedicationDispense or FiBasePatientMedicationStatement or FiBaseProcedure or FiBaseObservation)
* 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)
* reasonReference only Reference(FiBaseCondition or FiBaseObservation or DiagnosticReport)
1 change: 0 additions & 1 deletion input/fsh/practitioner.fsh
View file
Open in desktop
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
mrinnetmaki marked this conversation as resolved.
Show resolved Hide resolved
* qualification.issuer only Reference(FiBaseOrganization)

* identifier ^slicing.discriminator.type = #value
Expand Down
2 changes: 0 additions & 2 deletions input/fsh/reasonForCare.fsh
View file
Open in desktop
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"