From 1d98f1436500671bae9b839652f54d77d56920bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Mon, 26 Jun 2023 21:41:59 +0300
Subject: [PATCH 01/12] Relax the id cardinality constraint

How did this ever get here, anyway?
Id should be very widely supported for all resources. But there are cases where it is not required, such as when posting a new resource to a server.
See https://hl7.org/fhir/R4/resource.html#id for details.
---
 input/fsh/practitioner.fsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/input/fsh/practitioner.fsh b/input/fsh/practitioner.fsh
index 9464c9d..9d5dee2 100644
--- a/input/fsh/practitioner.fsh
+++ b/input/fsh/practitioner.fsh
@@ -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

From f81495973187f048730272b836d521772e3c33e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Mon, 26 Jun 2023 21:42:46 +0300
Subject: [PATCH 02/12] Remove extra empty lines

---
 input/fsh/reasonForCare.fsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/input/fsh/reasonForCare.fsh b/input/fsh/reasonForCare.fsh
index 0c971f3..d86af7f 100644
--- a/input/fsh/reasonForCare.fsh
+++ b/input/fsh/reasonForCare.fsh
@@ -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"
-
-

From 82a11bf0144769aa906f0444924c6bf3bca6e5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Mon, 26 Jun 2023 22:57:05 +0300
Subject: [PATCH 03/12] Add an alternative Medication profile

Because the IPA profile for medications has constraints that are suitable for patient access use case, but not for all use cases.
This is just one potential approach. We could also use the more fine-grained mechanisms like the Obligations extension or other extensions for indicating conformance to another IG or profile.
---
 input/fsh/medication.fsh          | 6 +++---
 input/fsh/medicationRequest.fsh   | 2 +-
 input/fsh/medicationStatement.fsh | 2 +-
 input/fsh/patientMedication.fsh   | 8 ++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 input/fsh/patientMedication.fsh

diff --git a/input/fsh/medication.fsh b/input/fsh/medication.fsh
index 145658d..dd04046 100644
--- a/input/fsh/medication.fsh
+++ b/input/fsh/medication.fsh
@@ -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)
\ No newline at end of file
+* ingredient.itemReference only Reference(Substance or FiBaseMedication or FiBasePatientMedication)
\ No newline at end of file
diff --git a/input/fsh/medicationRequest.fsh b/input/fsh/medicationRequest.fsh
index 8fae10a..f4b9fc8 100644
--- a/input/fsh/medicationRequest.fsh
+++ b/input/fsh/medicationRequest.fsh
@@ -5,7 +5,7 @@ Title: "FI Base MedicationRequest"
 Description: "This is the Finnish base profile for the MedicationRequest resource."
 * ^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)
diff --git a/input/fsh/medicationStatement.fsh b/input/fsh/medicationStatement.fsh
index 6917c3b..032e0d0 100644
--- a/input/fsh/medicationStatement.fsh
+++ b/input/fsh/medicationStatement.fsh
@@ -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(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)
diff --git a/input/fsh/patientMedication.fsh b/input/fsh/patientMedication.fsh
new file mode 100644
index 0000000..6c9ef56
--- /dev/null
+++ b/input/fsh/patientMedication.fsh
@@ -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)
\ No newline at end of file

From 70ab5205078a0a1a1890932113ec26125085abc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Wed, 28 Jun 2023 13:51:13 +0300
Subject: [PATCH 04/12] Add generic profiles for med request and statement

We need the generic profiles that can refer to the Medication profile that does not derive from IPA.

Also noting a related article here: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC9904180/.

Clarifying test is still required.
---
 input/fsh/medicationAdministration.fsh   |  3 ++-
 input/fsh/medicationRequest.fsh          |  8 ++++----
 input/fsh/medicationStatement.fsh        | 10 +++++-----
 input/fsh/patientMedicationRequest.fsh   | 18 ++++++++++++++++++
 input/fsh/patientMedicationStatement.fsh | 13 +++++++++++++
 5 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 input/fsh/patientMedicationRequest.fsh
 create mode 100644 input/fsh/patientMedicationStatement.fsh

diff --git a/input/fsh/medicationAdministration.fsh b/input/fsh/medicationAdministration.fsh
index 32d144a..9b998f6 100644
--- a/input/fsh/medicationAdministration.fsh
+++ b/input/fsh/medicationAdministration.fsh
@@ -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)
\ No newline at end of file
diff --git a/input/fsh/medicationRequest.fsh b/input/fsh/medicationRequest.fsh
index f4b9fc8..d9562fa 100644
--- a/input/fsh/medicationRequest.fsh
+++ b/input/fsh/medicationRequest.fsh
@@ -1,8 +1,8 @@
 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 or FiBasePatientMedication)
@@ -13,6 +13,6 @@ Description: "This is the Finnish base profile for the MedicationRequest resourc
 * 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)	
\ No newline at end of file
+* basedOn only Reference(CarePlan or FiBaseMedicationRequest or FiBasePatientMedicationRequest or ServiceRequest or ImmunizationRecommendation)	
\ No newline at end of file
diff --git a/input/fsh/medicationStatement.fsh b/input/fsh/medicationStatement.fsh
index 032e0d0..e156f49 100644
--- a/input/fsh/medicationStatement.fsh
+++ b/input/fsh/medicationStatement.fsh
@@ -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)
+* 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)
+* 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)
diff --git a/input/fsh/patientMedicationRequest.fsh b/input/fsh/patientMedicationRequest.fsh
new file mode 100644
index 0000000..463cc88
--- /dev/null
+++ b/input/fsh/patientMedicationRequest.fsh
@@ -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)	
\ No newline at end of file
diff --git a/input/fsh/patientMedicationStatement.fsh b/input/fsh/patientMedicationStatement.fsh
new file mode 100644
index 0000000..5e0e533
--- /dev/null
+++ b/input/fsh/patientMedicationStatement.fsh
@@ -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)

From 1011cf9bfde7c00802079dda61fbd2919f75a125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Wed, 28 Jun 2023 14:07:34 +0300
Subject: [PATCH 05/12] Explain patient access and other use cases

Add descriptive text for Medication related resources regarding the patient access and other use cases.

The new profiles don't yet have examples.
---
 .../StructureDefinition-fi-base-medication-intro.md    |  5 +++--
 ...ctureDefinition-fi-base-medication-request-intro.md |  6 ++++--
 ...ureDefinition-fi-base-medication-statement-intro.md |  6 ++++--
 ...ctureDefinition-fi-base-patient-medication-intro.md |  9 +++++++++
 ...inition-fi-base-patient-medication-request-intro.md | 10 ++++++++++
 ...ition-fi-base-patient-medication-statement-intro.md |  9 +++++++++
 6 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
 create mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
 create mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md

diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
index b3e716f..4e88a8a 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
@@ -1,6 +1,7 @@
 ### Scope and Usage
 
-The FI Base Medication derives from the Medication 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](StructureDefinition-fi-base-patient-medication.html) profile.
 
 {% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
index a0a8cf1..bbf5b03 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
@@ -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 %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
index 67370b4..ed7bbee 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
@@ -1,6 +1,8 @@
 ### Scope and Usage
 
-The FI Base MedicationStatement derives from the MedicationStatement 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 Statement](StructureDefinition-fi-base-patient-medication-statement.html)
+profile.
 
 {% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
new file mode 100644
index 0000000..a879307
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
@@ -0,0 +1,9 @@
+### Scope and Usage
+
+The FI Base Medication derives from the Medication profile of the International Patient Access
+specification.
+
+For use cases with no patient access perspective, please see also the
+[FI Base Medication](StructureDefinition-fi-base-medication.html) profile.
+
+{% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
new file mode 100644
index 0000000..65c47d0
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
@@ -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 %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md
new file mode 100644
index 0000000..ee29cc4
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md
@@ -0,0 +1,9 @@
+### Scope and Usage
+
+The FI Base MedicationStatement derives from the MedicationStatement profile of the International
+Patient Access specification.
+
+For use cases with no patient access perspective, please see also the
+[FI Base Medication Statement](StructureDefinition-fi-base-medication-statement.html) profile.
+
+{% include fragment-medication.md %}
\ No newline at end of file

From 5d4e0af270b868566f3dbbfc85f2da148be799c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Fri, 21 Jul 2023 23:23:39 +0300
Subject: [PATCH 06/12] Revert "Explain patient access and other use cases"

This reverts commit 1011cf9bfde7c00802079dda61fbd2919f75a125.
---
 .../StructureDefinition-fi-base-medication-intro.md    |  5 ++---
 ...ctureDefinition-fi-base-medication-request-intro.md |  6 ++----
 ...ureDefinition-fi-base-medication-statement-intro.md |  6 ++----
 ...ctureDefinition-fi-base-patient-medication-intro.md |  9 ---------
 ...inition-fi-base-patient-medication-request-intro.md | 10 ----------
 ...ition-fi-base-patient-medication-statement-intro.md |  9 ---------
 6 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
 delete mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
 delete mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md

diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
index 4e88a8a..b3e716f 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-intro.md
@@ -1,7 +1,6 @@
 ### Scope and Usage
 
-This profile is meant for use cases without patient access perspective. For patient access use
-case, please see the
-[FI Base Patient Medication](StructureDefinition-fi-base-patient-medication.html) profile.
+The FI Base Medication derives from the Medication profile of the International Patient Access
+specification.
 
 {% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
index bbf5b03..a0a8cf1 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
@@ -1,8 +1,6 @@
 ### Scope and Usage
 
-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.
+The FI Base MedicationRequest derives from the MedicationRequest profile of the International
+Patient Access specification.
 
 {% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
index ed7bbee..67370b4 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-statement-intro.md
@@ -1,8 +1,6 @@
 ### Scope and Usage
 
-This profile is meant for use cases without patient access perspective. For patient access use
-case, please see the
-[FI Base Patient Medication Statement](StructureDefinition-fi-base-patient-medication-statement.html)
-profile.
+The FI Base MedicationStatement derives from the MedicationStatement profile of the International
+Patient Access specification.
 
 {% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
deleted file mode 100644
index a879307..0000000
--- a/input/pagecontent/StructureDefinition-fi-base-patient-medication-intro.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Scope and Usage
-
-The FI Base Medication derives from the Medication profile of the International Patient Access
-specification.
-
-For use cases with no patient access perspective, please see also the
-[FI Base Medication](StructureDefinition-fi-base-medication.html) profile.
-
-{% include fragment-medication.md %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
deleted file mode 100644
index 65c47d0..0000000
--- a/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
+++ /dev/null
@@ -1,10 +0,0 @@
-### 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 %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md
deleted file mode 100644
index ee29cc4..0000000
--- a/input/pagecontent/StructureDefinition-fi-base-patient-medication-statement-intro.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Scope and Usage
-
-The FI Base MedicationStatement derives from the MedicationStatement profile of the International
-Patient Access specification.
-
-For use cases with no patient access perspective, please see also the
-[FI Base Medication Statement](StructureDefinition-fi-base-medication-statement.html) profile.
-
-{% include fragment-medication.md %}
\ No newline at end of file

From ab1cb40fdcd30ecd61e4f325af94f0a21eb60cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Fri, 21 Jul 2023 23:23:45 +0300
Subject: [PATCH 07/12] Revert "Add generic profiles for med request and
 statement"

This reverts commit 70ab5205078a0a1a1890932113ec26125085abc6.
---
 input/fsh/medicationAdministration.fsh   |  3 +--
 input/fsh/medicationRequest.fsh          |  8 ++++----
 input/fsh/medicationStatement.fsh        | 10 +++++-----
 input/fsh/patientMedicationRequest.fsh   | 18 ------------------
 input/fsh/patientMedicationStatement.fsh | 13 -------------
 5 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 input/fsh/patientMedicationRequest.fsh
 delete mode 100644 input/fsh/patientMedicationStatement.fsh

diff --git a/input/fsh/medicationAdministration.fsh b/input/fsh/medicationAdministration.fsh
index 9b998f6..32d144a 100644
--- a/input/fsh/medicationAdministration.fsh
+++ b/input/fsh/medicationAdministration.fsh
@@ -5,10 +5,9 @@ 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 or FiBasePatientMedicationRequest)
+* request only Reference(FiBaseMedicationRequest)
 * eventHistory only Reference(FiBaseProvenance)
\ No newline at end of file
diff --git a/input/fsh/medicationRequest.fsh b/input/fsh/medicationRequest.fsh
index d9562fa..f4b9fc8 100644
--- a/input/fsh/medicationRequest.fsh
+++ b/input/fsh/medicationRequest.fsh
@@ -1,8 +1,8 @@
 Profile: FiBaseMedicationRequest
-Parent: MedicationRequest
+Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationrequest
 Id: fi-base-medication-request
 Title: "FI Base MedicationRequest"
-Description: "This is the Finnish base profile for the MedicationRequest resource, for other than patient access use cases."
+Description: "This is the Finnish base profile for the MedicationRequest resource."
 * ^status = #draft
 * reportedReference only Reference(FiBasePatient or FiBasePractitioner or FiBasePractitionerRole)
 * medicationReference only Reference(FiBaseMedication or FiBasePatientMedication)
@@ -13,6 +13,6 @@ Description: "This is the Finnish base profile for the MedicationRequest resourc
 * recorder only Reference(FiBasePractitioner or FiBasePractitionerRole)
 * reasonReference only Reference(FiBaseCondition or FiBaseObservation)
 * eventHistory only Reference(FiBaseProvenance)
-* priorPrescription only Reference(FiBaseMedicationRequest or FiBasePatientMedicationRequest)
+* priorPrescription only Reference(FiBaseMedicationRequest)
 * dispenseRequest.performer only Reference(FiBaseOrganization)
-* basedOn only Reference(CarePlan or FiBaseMedicationRequest or FiBasePatientMedicationRequest or ServiceRequest or ImmunizationRecommendation)	
\ No newline at end of file
+* basedOn only Reference(CarePlan or FiBaseMedicationRequest or ServiceRequest or ImmunizationRecommendation)	
\ No newline at end of file
diff --git a/input/fsh/medicationStatement.fsh b/input/fsh/medicationStatement.fsh
index e156f49..032e0d0 100644
--- a/input/fsh/medicationStatement.fsh
+++ b/input/fsh/medicationStatement.fsh
@@ -1,13 +1,13 @@
 Profile: FiBaseMedicationStatement
-Parent: MedicationStatement
+Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationstatement
 Id: fi-base-medication-statement
 Title: "FI Base MedicationStatement"
-Description: "This is the Finnish base profile for the MedicationStatement resource, for other than patient access use cases."
+Description: "This is the Finnish base profile for the MedicationStatement resource."
 * ^status = #draft
-* basedOn only Reference(FiBaseMedicationRequest or FiBasePatientMedicationRequest or CarePlan or ServiceRequest)
-* partOf only Reference(FiBaseMedicationAdministration or MedicationDispense or FiBaseMedicationStatement or FiBasePatientMedicationStatement or FiBaseProcedure or FiBaseObservation)
+* basedOn only Reference(FiBaseMedicationRequest or CarePlan or ServiceRequest)
+* partOf only Reference(FiBaseMedicationAdministration or MedicationDispense or FiBaseMedicationStatement or FiBaseProcedure or FiBaseObservation)
 * medicationReference only Reference(FiBaseMedication or FiBasePatientMedication)
-* subject only Reference(FiBasePatient) 
+* 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)
diff --git a/input/fsh/patientMedicationRequest.fsh b/input/fsh/patientMedicationRequest.fsh
deleted file mode 100644
index 463cc88..0000000
--- a/input/fsh/patientMedicationRequest.fsh
+++ /dev/null
@@ -1,18 +0,0 @@
-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)	
\ No newline at end of file
diff --git a/input/fsh/patientMedicationStatement.fsh b/input/fsh/patientMedicationStatement.fsh
deleted file mode 100644
index 5e0e533..0000000
--- a/input/fsh/patientMedicationStatement.fsh
+++ /dev/null
@@ -1,13 +0,0 @@
-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)

From 7ecba816fbe16a18c1a15c4669eee0425ef80d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Fri, 21 Jul 2023 23:41:53 +0300
Subject: [PATCH 08/12] Add generic profile for med request

We don't foresee the need for MedicationStatement or MedicationAdministration where we could not use the IPA profile for Medication, right?
---
 input/fsh/medicationRequest.fsh                |  8 ++++----
 input/fsh/medicationStatement.fsh              |  2 +-
 input/fsh/patientMedicationRequest.fsh         | 18 ++++++++++++++++++
 ...inition-fi-base-medication-request-intro.md |  6 ++++--
 ...fi-base-patient-medication-request-intro.md | 10 ++++++++++
 5 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 input/fsh/patientMedicationRequest.fsh
 create mode 100644 input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md

diff --git a/input/fsh/medicationRequest.fsh b/input/fsh/medicationRequest.fsh
index f4b9fc8..d9562fa 100644
--- a/input/fsh/medicationRequest.fsh
+++ b/input/fsh/medicationRequest.fsh
@@ -1,8 +1,8 @@
 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 or FiBasePatientMedication)
@@ -13,6 +13,6 @@ Description: "This is the Finnish base profile for the MedicationRequest resourc
 * 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)	
\ No newline at end of file
+* basedOn only Reference(CarePlan or FiBaseMedicationRequest or FiBasePatientMedicationRequest or ServiceRequest or ImmunizationRecommendation)	
\ No newline at end of file
diff --git a/input/fsh/medicationStatement.fsh b/input/fsh/medicationStatement.fsh
index 032e0d0..d3427ec 100644
--- a/input/fsh/medicationStatement.fsh
+++ b/input/fsh/medicationStatement.fsh
@@ -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 or FiBasePatientMedication)
+* 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)
diff --git a/input/fsh/patientMedicationRequest.fsh b/input/fsh/patientMedicationRequest.fsh
new file mode 100644
index 0000000..463cc88
--- /dev/null
+++ b/input/fsh/patientMedicationRequest.fsh
@@ -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)	
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
index a0a8cf1..bbf5b03 100644
--- a/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
+++ b/input/pagecontent/StructureDefinition-fi-base-medication-request-intro.md
@@ -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 %}
\ No newline at end of file
diff --git a/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md b/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
new file mode 100644
index 0000000..65c47d0
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-fi-base-patient-medication-request-intro.md
@@ -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 %}
\ No newline at end of file

From fe628c9f46b1a8435ac68e1f4f8836aac620238b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Fri, 21 Jul 2023 23:42:37 +0300
Subject: [PATCH 09/12] Constrain the medication reference

To the profile for the patient access use case
---
 input/fsh/medicationAdministration.fsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/input/fsh/medicationAdministration.fsh b/input/fsh/medicationAdministration.fsh
index 32d144a..fdc0afb 100644
--- a/input/fsh/medicationAdministration.fsh
+++ b/input/fsh/medicationAdministration.fsh
@@ -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)

From 31b2c0276661fbae425daf318f8ac5b205df60e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Fri, 21 Jul 2023 23:44:48 +0300
Subject: [PATCH 10/12] Spread medication examples

Between the patient access and the non-patient-access use cases.
---
 sushi-config.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sushi-config.yaml b/sushi-config.yaml
index 959a822..20c7dc1 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -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
@@ -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

From 7955ce6474fa371ebceb7768afb2adcda3f35c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= <mikael@sensotrend.com>
Date: Sat, 22 Jul 2023 22:55:53 +0300
Subject: [PATCH 11/12] Add an example for MedicationStatement

---
 input/fsh/examples/medicationStatementInsulin.fsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 input/fsh/examples/medicationStatementInsulin.fsh

diff --git a/input/fsh/examples/medicationStatementInsulin.fsh b/input/fsh/examples/medicationStatementInsulin.fsh
new file mode 100644
index 0000000..5c1eb97
--- /dev/null
+++ b/input/fsh/examples/medicationStatementInsulin.fsh
@@ -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)

From eacaa2ce95bc598c9a75e3fac7dd9682468fbc17 Mon Sep 17 00:00:00 2001
From: Tero Pekkola <Tero.Pekkola@eskosystems.fi>
Date: Fri, 4 Aug 2023 15:33:23 +0300
Subject: [PATCH 12/12] Relax the id cardinality constraint for Patient

---
 input/fsh/patient.fsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/input/fsh/patient.fsh b/input/fsh/patient.fsh
index 03491e3..217e14a 100644
--- a/input/fsh/patient.fsh
+++ b/input/fsh/patient.fsh
@@ -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)