Improvements on condition profile based on feedback

input/fsh/condition.fsh

@@ -1,56 +1,75 @@
-
 Profile: FiBaseCondition
 Parent: http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-condition
 Id: fi-base-condition
 Title: "FI Base Condition"
 Description: "This is the Finnish base profile for the Condition resource."
 * ^status = #draft
 
-* extension contains Sport named sport 0..1
+* subject only Reference(FiBasePatient)
+
+* extension contains PrimaryCondition named primaryCondition 0..1
+* extension contains Permanence named permanence 0..1
+* extension contains PhysicalExcercise named physicalExcercise 0..1
 * extension contains EndocrinologicalDisorder named endocrinologicalDisorder 0..1
+* extension contains ConditionCausedByMedication named conditionCausedByMedication 0..1
+* extension contains ConditionExternalCause named conditionExternalCause 0..1
+* extension contains ConditionCategorizationOfAccident named conditionCategorizationOfAccident 0..1
+* extension contains CauseOfAdverseEffect named causeOfAdverseEffect 0..1
+
+Extension: PrimaryCondition
+Id: condition-primary
+Title: "Primary condition for encounter"
+Description: "Encoded information of whether this is the primary/main condition for encounter."
+* value[x] only Coding
+* valueCoding 1..1
+  * system = #urn:oid:1.2.246.537.5.40005.2003
 
-Extension: Sport
-Id: condition-sport
-Title: "Type of sport in injury"
-Description: "koodilla ilmaistu tieto liikuntalajista, jossa tapaturma on sattunut"
+Extension: Permanence
+Id: condition-permanence
+Title: "Permanence of condition"
+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
+
+Extension: PhysicalExcercise
+Id: condition-physical-excercise
+Title: "Type of physical exercise during which injury occurred."
+Description: "Encoded information of the type of physical exercise during which injury occurred."
 * value[x] only Coding
 * valueCoding 1..1
   * system = #urn:oid:1.2.246.537.6.301.201601
 
 Extension: EndocrinologicalDisorder
 Id: condition-endocrinological-disorder
 Title: "Endocrinological disorder"
-Description: "Code for Endocrinological disorder"
+Description: "Code for Endocrinological disorder."
 * value[x] only Coding
 
-/*
-
-Extension: TODO
-Id: condition-TODO
-Title: "Aiheuttajan ATC-koodi"
-Description: "potilaan terveydentilan aiheuttanutta lääkeainetta kuvaava diagnoosikoodin osa"
+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
 
-Extension: TODO
-Id: condition-TODO
-Title: "Diagnoosin ulkoinen syy"
-Description: "Diagnoosin ulkoinen syy"
+Extension: ConditionExternalCause
+Id: condition-external-cause
+Title: "External cause for diagnosis"
+Description: "External cause for diagnosis."
 * value[x] only Coding
 
-Extension: TODO
-Id: condition-TODO
-Title: "Diagnoosin tapaturmatyyppi"
-Description: "koodilla ilmaistu tieto vamman, sairauden tai kuoleman aiheuttaneen tapaturman tyypistä"
+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
 
-Extension: TODO
-Id: condition-TODO
-Title: "Haittavaikutuksen aiheuttaja"
-Description: "koodilla ilmaistu tieto haittavaikutuksen ulkoisesta syystä silloin, kun syynä on toimenpide tai lääke"
+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
 
-  */
-
 CodeSystem: FiBaseConditionCategory
 Id: fi-base-condition-category
 Title: "Finnish Condition categories"

input/fsh/examples/diagnosisAdverseEffect.fsh

@@ -0,0 +1,38 @@
+Instance: DiagnosisAdverseEffect
+InstanceOf: FiBaseCondition
+Title: "Condition - an example diagnosis with an adverse effect."
+Description: "An example of a diagnosis using the FiBaseCondition pofile. This diagnosis demonstrates a case that has an adverse effect."
+Usage: #example
+* id = "id-for-diagnosis-3"
+* category[0].coding.system = #https://hl7.fi/fhir/finnish-base-profiles/CodeSystem/fi-base-condition-category
+* category[0].coding.code = #reason-for-visit
+
+* category[1].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
+* category[1].coding.code = #encounter-diagnosis
+
+* subject = Reference(PatientOfMunicipality)
+* code.coding.system = #urn:oid:1.2.246.537.6.1.1999
+* code.coding.code = #T81.9
+* code.coding.display = "Määrittämätön toimenpidekomplikaatio"
+* code.text = "Määrittämätön toimenpidekomplikaatio"
+
+* onsetDateTime = "2023-01-05T02:06:24+03:00"
+
+* clinicalStatus.coding.code = #active
+* clinicalStatus.coding.system = #http://terminology.hl7.org/CodeSystem/condition-clinical
+
+* extension[PrimaryCondition].valueCoding.system = #urn:oid:1.2.246.537.5.40005.2003
+* extension[PrimaryCondition].valueCoding.code = #SIVU
+* extension[PrimaryCondition].valueCoding.display = "Sivudiagnoosi tai toissijainen toimenpide"
+
+* extension[Permanence].valueCoding.system = #urn:oid:1.2.246.537.5.40003.2003
+* extension[Permanence].valueCoding.code = #KER
+* extension[Permanence].valueCoding.display = "Kertaluonteinen"
+
+* extension[ConditionExternalCause].valueCoding.system = #urn:oid:1.2.246.537.6.1.1999
+* extension[ConditionExternalCause].valueCoding.code = #Y60.0
+* extension[ConditionExternalCause].valueCoding.display = "Leikkauksen yhteydessä vahingossa syntynyt haava, punktio, perforaatio tai verenvuoto"
+
+* extension[CauseOfAdverseEffect].valueCoding.system = #urn:oid:1.2.246.537.6.2.2007
+* extension[CauseOfAdverseEffect].valueCoding.code = #JAB10
+* extension[CauseOfAdverseEffect].valueCoding.display = "Nivustyrän korjaus"

input/fsh/examples/diagnosisMedicationAccident.fsh

@@ -0,0 +1,42 @@
+Instance: DiagnosisMedicationAccident
+InstanceOf: FiBaseCondition
+Title: "Condition - an example diagnosis with external cause, accident and medication information."
+Description: "An example of a diagnosis using the FiBaseCondition pofile. This diagnosis demonstrates a case that has external cause, accident and medication information."
+Usage: #example
+* id = "id-for-diagnosis-2"
+* category[0].coding.system = #https://hl7.fi/fhir/finnish-base-profiles/CodeSystem/fi-base-condition-category
+* category[0].coding.code = #reason-for-visit
+
+* category[1].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
+* category[1].coding.code = #encounter-diagnosis
+
+* subject = Reference(PatientOfMunicipality)
+* code.coding.system = #urn:oid:1.2.246.537.6.1.1999
+* code.coding.code = #T88.7
+* code.coding.display = "Määrittämätön lääkeaineen epäedullinen vaikutus"
+* code.text = "Määrittämätön lääkeaineen epäedullinen vaikutus"
+
+* onsetDateTime = "2023-01-05T02:06:24+03:00"
+
+* clinicalStatus.coding.code = #active
+* clinicalStatus.coding.system = #http://terminology.hl7.org/CodeSystem/condition-clinical
+
+* extension[PrimaryCondition].valueCoding.system = #urn:oid:1.2.246.537.5.40005.2003
+* extension[PrimaryCondition].valueCoding.code = #PAA
+* extension[PrimaryCondition].valueCoding.display = "Päädiagnoosi tai päätoimenpide"
+
+* extension[Permanence].valueCoding.system = #urn:oid:1.2.246.537.5.40003.2003
+* extension[Permanence].valueCoding.code = #KER
+* extension[Permanence].valueCoding.display = "Kertaluonteinen"
+
+* extension[ConditionExternalCause].valueCoding.system = #urn:oid:1.2.246.537.6.1.1999
+* extension[ConditionExternalCause].valueCoding.code = #X44
+* extension[ConditionExternalCause].valueCoding.display = "Lääkkeiden tai lääkkeenomaisten aineiden aiheuttama myrkytystapaturma tai muu altistuminen"
+
+* extension[ConditionCategorizationOfAccident].valueCoding.system = #urn:oid:1.2.246.537.6.1.1999
+* extension[ConditionCategorizationOfAccident].valueCoding.code = #Y95.0
+* extension[ConditionCategorizationOfAccident].valueCoding.display = "Tapaturma sairaalassa tai sairaalaoloihin liittyvä ulkoinen tekijä"
+
+* extension[ConditionCausedByMedication].valueCoding.system = #urn:oid:1.2.246.537.6.32.2007
+* extension[ConditionCausedByMedication].valueCoding.code = #M01AE01
+* extension[ConditionCausedByMedication].valueCoding.display = "BURANA 200 mg tabletti, kalvopäällysteinen"

input/fsh/examples/diagnosisSimple.fsh

@@ -10,23 +10,25 @@ Usage: #example
 * category[1].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
 * category[1].coding.code = #encounter-diagnosis
 
-* category[2].coding.system = #urn:oid:1.2.246.537.5.40005.2003
-* category[2].coding.code = #PAA
-* category[2].coding.display = "Päädiagnoosi tai päätoimenpide"
-
-* category[3].coding.system = #urn:1.2.246.537.5.40003.2003
-* category[3].coding.code = #PYS
-* category[3].coding.display = "Pysyväisluonteinen"
-
 * subject = Reference(PatientOfMunicipality)
-* code.coding.system = #1.2.246.537.6.1.1999
+* code.coding.system = #urn:oid:1.2.246.537.6.1.1999
 * code.coding.code = #H36.03
 * code.coding.display = "Proliferatiivinen diabeettinen retinopatia"
 * code.text = "Proliferatiivinen diabeettinen retinopatia, vasen, laserhoidettu"
 
-* evidence[0].code.coding.system = #1.2.246.537.6.1.1999
+* evidence[0].code.coding.system = #urn:oid:1.2.246.537.6.1.1999
 * evidence[0].code.coding.code = #E11.3
 * evidence[0].code.coding.display = "Aikuistyypin diabetes diabeteksen silmäkomplikaatiot"
 
 * onsetDateTime = "2023-01-05T02:06:24+03:00"
-* clinicalStatus = #active
+
+* clinicalStatus.coding.code = #active
+* clinicalStatus.coding.system = #http://terminology.hl7.org/CodeSystem/condition-clinical
+
+* extension[PrimaryCondition].valueCoding.system = #urn:oid:1.2.246.537.5.40005.2003
+* extension[PrimaryCondition].valueCoding.code = #PAA
+* extension[PrimaryCondition].valueCoding.display = "Päädiagnoosi tai päätoimenpide"
+
+* extension[Permanence].valueCoding.system = #urn:oid:1.2.246.537.5.40003.2003
+* extension[Permanence].valueCoding.code = #PYS
+* extension[Permanence].valueCoding.display = "Pysyväisluonteinen"