Merge pull request #103 from fhir-fi/condition_and_encounter_fixes

Condition, Encounter and Provenance fixes

input/fsh/condition.fsh

@@ -23,6 +23,8 @@ Description: "Encoded information of whether this is the primary/main condition
 * value[x] only Coding
 * valueCoding 1..1
   * system = #urn:oid:1.2.246.537.5.40005.2003
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: Permanence
 Id: condition-permanence
@@ -31,6 +33,8 @@ Description: "Encoded information of whether this is the permanent."
 * value[x] only Coding
 * valueCoding 1..1
   * system = #urn:oid:1.2.246.537.5.40003.2003
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: PhysicalExcercise
 Id: condition-physical-excercise
@@ -39,40 +43,54 @@ Description: "Encoded information of the type of physical exercise during which
 * value[x] only Coding
 * valueCoding 1..1
   * system = #urn:oid:1.2.246.537.6.301.201601
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: EndocrinologicalDisorder
 Id: condition-endocrinological-disorder
 Title: "Endocrinological disorder"
 Description: "Code for Endocrinological disorder."
 * value[x] only Coding
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: ConditionCausedByMedication
 Id: condition-caused-by-medication
 Title: "Medication that caused this condition"
 Description: "Encoded information of medication that caused this condition. Uses ATC-coding."
 * value[x] only Coding
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: ConditionExternalCause
 Id: condition-external-cause
 Title: "External cause for diagnosis"
 Description: "External cause for diagnosis."
 * value[x] only Coding
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: ConditionCategorizationOfAccident
 Id: condition-categorization-of-accident
 Title: "Categorization of the type of accident"
 Description: "Encoded categorization of the type of accident leading to injury, illness or death."
 * value[x] only Coding
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 Extension: CauseOfAdverseEffect
 Id: condition-cause-of-adverse-effect
 Title: "Cause of an adverse effect"
 Description: "Encoded information on the cause of an adverse effect, when involving a procedure or medication"
 * value[x] only Coding
+* ^context[+].type = #element
+* ^context[=].expression = "Condition"
 
 CodeSystem: FiBaseConditionCategory
 Id: fi-base-condition-category
 Title: "Finnish Condition categories"
 Description: "Additional categories for the Finnish Base Condition profile"
+* ^experimental = false
+* ^caseSensitive  = true
 * #reason-for-visit "Reason for visit"
     "Indicates that this Condition is reason for visit (or treatment period). Reason for visit may be a diagnosis asserted by a clinician (a Diagnosis or Diagnoosi in finnish) or other healthcare professional (Käyntisyy in finnish)."

input/fsh/examples/encounterAtWardInProgress.fsh

@@ -10,7 +10,7 @@ Usage: #example
 * class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
 * class.code = #IMP
 * class.display = "inpatient encounter"
-* subject.reference = "Patient/patient-of-municipalityt"
+* subject.reference = "Patient/patient-of-municipality"
 * period.start = "2022-02-27T01:03:00+02:00"
 * serviceProvider.reference = "Organization/1.2.246.10.8286189.10.100012"
 * location[0].status = #active

input/fsh/examples/locationBedExample.fsh

@@ -0,0 +1,10 @@
+Instance: LocationBedExample
+InstanceOf: FiBaseLocation
+Usage: #example
+Description: "Example of a bed."
+* id = "id-for-bed-3"
+* mode = #instance
+* name = "Vuode 3"
+* status = #active
+* physicalType.coding.system = #http://terminology.hl7.org/CodeSystem/location-physical-type
+* physicalType.coding.code = #bd

input/fsh/examples/organizationHospitalUnit.fsh

@@ -0,0 +1,21 @@
+Instance: OrganizationHospitalUnit
+InstanceOf: FiBaseOrganization
+Title: "Encounter - example primary care organization"
+// using partOf would cause warnings unless we add the full hierarchy in this repo. 
+Description: "An example of a FI Base organization, a surgical ward. The partOf reference removed for brevity."
+Usage: #example
+* id = "1.2.246.10.8286189.10.100012"
+* identifier.use = #official
+* identifier.system = #urn:oid:1.2.246.537.6.202.2008
+* identifier.value = "1.2.246.10.8286189.10.100012"
+* name = "Kirurgian vuodeosasto 4B, Länsi-Pohjan keskussairaala, LPSHP"
+* alias = "Kirurgian vuodeosasto 4B, LPKS, LPSHP"
+* address[0].type = #postal
+* address[0].line[0] = "Kauppakatu 25, 94100 KEMI"
+* address[0].postalCode = "94100"
+* address[0].city = "KEMI"
+* address[1].type = #physical
+* address[1].line[0] = "Kauppakatu 25, 94100 KEMI"
+* address[1].postalCode = "94100"
+* address[1].city = "KEMI"
+* active = true

input/fsh/examples/organizationPrimaryCareUnit.fsh

@@ -1,6 +1,6 @@
 Instance: OrganizationPrimaryCare
 InstanceOf: FiBaseOrganization
-Title: "Encounter - example primary care organization"
+Title: "Organization - example primary care organization"
 Description: "An example of a FI Base organization, a doctor's reception office. Data is from national SOTE-Rekisteri."
 Usage: #example
 * id = "1.2.246.10.2085212.10.1314"
@@ -20,3 +20,17 @@ Usage: #example
 * telecom[0].system = #phone
 * telecom[0].value = "0401578947"
 * active = true
+
+// Providing minimal info of the parent organization for the example above,
+// no need to express full hierarchy here.
+Instance: OrganizationPrimaryCareParent
+InstanceOf: FiBaseOrganization
+Title: "Organization - example of a parent organization"
+Description: "An example of a FI Base organization. Acts as a parent organization for another."
+Usage: #example
+* id = "1.2.246.10.2085212.10.1306"
+* identifier.use = #official
+* identifier.system = #urn:oid:1.2.246.537.6.202.2008
+* identifier.value = "1.2.246.10.2085212.10.1306"
+* name = "Vastaanotot, SoTe kuntayhtymä Saarikka"
+* active = true

input/fsh/examples/provenanceWithCustodianInformation.fsh

@@ -7,7 +7,7 @@ Description: "Example of provenance that communicates custodian information for
 * recorded = "2015-02-07T13:28:17.239+02:00"
 * agent[0].who.type = #Organization
 * agent[0].who.identifier.value = "1.2.246.10.32213043.19.0"
-* agent[0].type.coding[0].system = "http://hl7.org/fhir/ValueSet/participation-role-type"
+* agent[0].type.coding[0].system = "http://terminology.hl7.org/CodeSystem/v3-ParticipationType"
 * agent[0].type.coding[0].code = #custodian
 
 * extension[RegisterTypeCode].valueCoding.system = #urn:oid:1.2.246.537.5.40150.2009