fhir-fi · mrinnetmaki · Oct 26, 2023 · Oct 21, 2023
diff --git a/input/fsh/examples/appointmentGeneralPractitioner.fsh b/input/fsh/examples/appointmentGeneralPractitioner.fsh
@@ -4,7 +4,7 @@ Usage: #example
 Title: "GP appointment"
 Description: "Example of an appointment with general practitioner."
 * id = "appointment-general-practitioner"
-* appointmentType = urn:oid:1.2.246.537.6.884.2015#101
+* appointmentType = urn:oid:1.2.246.537.6.884|2015#101
 * created = "2023-01-20T08:45:15+02:00"
 * description = "Kuume"
 * end = "2023-01-20T10:20:00+02:00"
@@ -27,8 +27,8 @@ Description: "Example of an appointment with general practitioner."
 * participant[=].status = #accepted
 * participant[+].actor = Reference(AT-340)
 * participant[=].status = #accepted
-* serviceCategory = urn:oid:1.2.246.537.6.50.201801#SOTE9.2
-* serviceType = urn:oid:1.2.246.537.6.49.201501#EEA
+* serviceCategory = urn:oid:1.2.246.537.6.50|201801#SOTE9.2
+* serviceType = urn:oid:1.2.246.537.6.49|201501#EEA
 * start = "2023-01-20T10:00:00+02:00"
 * status = #fulfilled
 * slot = Reference(FreeSlot)
diff --git a/input/fsh/examples/diagnosisAdverseEffect.fsh b/input/fsh/examples/diagnosisAdverseEffect.fsh
@@ -4,32 +4,20 @@ Title: "Condition - an example diagnosis with an adverse effect."
 Description: "An example of a diagnosis using the FiBaseReasonForCare profile. This diagnosis demonstrates a case that has an adverse effect."
 Usage: #example
 * id = "id-for-diagnosis-3"
-* category[0].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
-* category[0].coding.code = #encounter-diagnosis
+* category.coding = http://terminology.hl7.org/CodeSystem/condition-category#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.coding = urn:oid:1.2.246.537.6.1|1999#T81.9 "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
+* clinicalStatus.coding = http://terminology.hl7.org/CodeSystem/condition-clinical#active
 
-* 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[PrimaryCondition].valueCoding = urn:oid:1.2.246.537.5.40005|2003#SIVU "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[Permanence].valueCoding = urn:oid:1.2.246.537.5.40003|2003#KER "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[ConditionExternalCause].valueCoding = urn:oid:1.2.246.537.6.1|1999#Y60.0 "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"
+* extension[CauseOfAdverseEffect].valueCoding = urn:oid:1.2.246.537.6.2|2007#JAB10 "Nivustyrän korjaus"
diff --git a/input/fsh/examples/diagnosisMedicationAccident.fsh b/input/fsh/examples/diagnosisMedicationAccident.fsh
@@ -4,36 +4,22 @@ Title: "Condition - an example diagnosis with external cause, accident and medic
 Description: "An example of a diagnosis using the FiBaseReasonForCare profile. This diagnosis demonstrates a case that has external cause, accident and medication information."
 Usage: #example
 * id = "id-for-diagnosis-2"
-* category[0].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
-* category[0].coding.code = #encounter-diagnosis
+* category.coding = http://terminology.hl7.org/CodeSystem/condition-category#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.coding = urn:oid:1.2.246.537.6.1|1999#T88.7 "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
+* clinicalStatus.coding = http://terminology.hl7.org/CodeSystem/condition-clinical#active
 
-* 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[PrimaryCondition].valueCoding = urn:oid:1.2.246.537.5.40005|2003#PAA "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[Permanence].valueCoding = urn:oid:1.2.246.537.5.40003|2003#KER "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[ConditionExternalCause].valueCoding = urn:oid:1.2.246.537.6.1|1999#X44 "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[ConditionCategorizationOfAccident].valueCoding = urn:oid:1.2.246.537.6.1|1999#Y95.0 "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"
+* extension[ConditionCausedByMedication].valueCoding = urn:oid:1.2.246.537.6.32|2007#M01AE01 "BURANA 200 mg tabletti, kalvopäällysteinen"
diff --git a/input/fsh/examples/diagnosisSimple.fsh b/input/fsh/examples/diagnosisSimple.fsh
@@ -4,28 +4,17 @@ Title: "Condition - an example diagnosis"
 Description: "An example of a diagnosis using the FiBaseReasonForCare profile. This diagnosis is asserted by a clinician."
 Usage: #example
 * id = "id-for-diagnosis-1"
-* category[0].coding.system = #http://terminology.hl7.org/CodeSystem/condition-category
-* category[0].coding.code = #encounter-diagnosis
+* category.coding = http://terminology.hl7.org/CodeSystem/condition-category#encounter-diagnosis
 
 * subject = Reference(PatientOfMunicipality)
-* code.coding.system = #urn:oid:1.2.246.537.6.1.1999
-* code.coding.code = #H36.03
-* code.coding.display = "Proliferatiivinen diabeettinen retinopatia"
+* code.coding = urn:oid:1.2.246.537.6.1|1999#H36.03 "Proliferatiivinen diabeettinen retinopatia"
 * code.text = "Proliferatiivinen diabeettinen retinopatia, vasen, laserhoidettu"
 
-* 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"
-
+* evidence.code.coding = urn:oid:1.2.246.537.6.1|1999#E11.3 "Aikuistyypin diabetes diabeteksen silmäkomplikaatiot"
 * onsetDateTime = "2023-01-05T02:06:24+03:00"
 
-* clinicalStatus.coding.code = #active
-* clinicalStatus.coding.system = #http://terminology.hl7.org/CodeSystem/condition-clinical
+* clinicalStatus.coding = http://terminology.hl7.org/CodeSystem/condition-clinical#active
 
-* 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[PrimaryCondition].valueCoding = urn:oid:1.2.246.537.5.40005|2003#PAA "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"
+* extension[Permanence].valueCoding = urn:oid:1.2.246.537.5.40003|2003#PYS "Pysyväisluonteinen"
diff --git a/input/fsh/examples/encounterAmbulatory.fsh b/input/fsh/examples/encounterAmbulatory.fsh
@@ -7,9 +7,7 @@ Usage: #example
 * identifier.use = #usual
 * identifier.value = "id-for-visit"
 * status = #finished
-* class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
-* class.code = #AMB
-* class.display = "ambulatory"
+* class = http://terminology.hl7.org/CodeSystem/v3-ActCode#AMB "ambulatory"
 * subject.reference = "Patient/patient-of-municipality"
 * period.start = "2022-02-28T15:03:00+02:00"
 * period.end = "2022-02-28T15:33:00+02:00"

diff --git a/input/fsh/examples/encounterAtWardInProgress.fsh b/input/fsh/examples/encounterAtWardInProgress.fsh
@@ -7,9 +7,7 @@ Usage: #example
 * identifier.use = #usual
 * identifier.value = "id-for-ward-encounter"
 * status = #in-progress
-* class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
-* class.code = #IMP
-* class.display = "inpatient encounter"
+* class = http://terminology.hl7.org/CodeSystem/v3-ActCode#IMP "inpatient encounter"
 * 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"

diff --git a/input/fsh/examples/encounterPalvelutapahtuma.fsh b/input/fsh/examples/encounterPalvelutapahtuma.fsh
@@ -7,9 +7,7 @@ Usage: #example
 * identifier.use = #official
 * identifier.value = "urn:oid:1.2.246.10.6794809.14011.2023.200035"
 * status = #in-progress
-* class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
-* class.code = #IMP
-* class.display = "inpatient encounter"
+* class = http://terminology.hl7.org/CodeSystem/v3-ActCode#IMP "inpatient encounter"
 * 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"
@@ -21,9 +19,7 @@ Description: "An example of a FI Base encounter which is part of another encount
 Usage: #example
 * id = "id-for-child-encounter"
 * status = #in-progress
-* class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
-* class.code = #IMP
-* class.display = "inpatient encounter"
+* class = http://terminology.hl7.org/CodeSystem/v3-ActCode#IMP "inpatient encounter"
 * partOf = Reference(EncounterPalvelutapahtuma) 
 * subject.reference = "Patient/patient-of-municipality"
 * period.start = "2022-02-27T01:03:00+02:00"
@@ -40,13 +36,10 @@ Description: "An example of a FI Base encounter which is part of another encount
 Usage: #example
 * id = "id-for-child-encounter-2"
 * status = #finished
-* class.system = #http://terminology.hl7.org/CodeSystem/v3-ActCode
-* class.code = #OBSENC
-* class.display = "observation encounter"
+* class = http://terminology.hl7.org/CodeSystem/v3-ActCode#OBSENC "observation encounter"
 * partOf = Reference(EncounterPalvelutapahtuma) 
 * subject.reference = "Patient/patient-of-municipality"
 * period.start = "2022-02-28T12:03:00+02:00"
 * period.end = "2022-02-28T12:18:00+02:00"
 * serviceProvider.type = #ServiceProvider
 * serviceProvider.identifier.value = "1.2.246.10.8286189.10.100014"
-
diff --git a/input/fsh/examples/healthcareServiceExample.fsh b/input/fsh/examples/healthcareServiceExample.fsh
@@ -6,11 +6,11 @@ Usage: #example
 * id = "healthcareService-example"
 * active = true
 * appointmentRequired = true
-* category[0] = urn:oid:1.2.246.537.6.50.201801#SOTE9.2
-* category[+] = urn:oid:1.2.246.537.6.121.201801#E
+* category[0] = urn:oid:1.2.246.537.6.50|201801#SOTE9.2
+* category[+] = urn:oid:1.2.246.537.6.121|201801#E
 * comment = "Normaali vo-aika sh:lle ja lääkäreille"
 * name = "Vastaanottoaika*"
-* type[0] = urn:oid:1.2.246.537.6.49.201501#EEA
-* type[+] = urn:oid:1.2.246.537.6.49.201501#ADA001
-* type[+] = urn:oid:1.2.246.537.6.125.2008#T11
-* type[+] = urn:oid:1.2.246.537.6.124.2008#SH
+* type[0] = urn:oid:1.2.246.537.6.49|201501#EEA
+* type[+] = urn:oid:1.2.246.537.6.49|201501#ADA001
+* type[+] = urn:oid:1.2.246.537.6.125|2008#T11
+* type[+] = urn:oid:1.2.246.537.6.124|2008#SH
diff --git a/input/fsh/examples/immunizationVaccinationExample.fsh b/input/fsh/examples/immunizationVaccinationExample.fsh
@@ -6,27 +6,21 @@ Usage: #example
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:oid:1.3.6.1.4.1.21367.2005.3.7.1234"
 * status = #completed
-* vaccineCode = urn:oid:1.2.246.537.6.32.2007#J07BA01
+* vaccineCode = urn:oid:1.2.246.537.6.32|2007#J07BA01
 * vaccineCode.text = "Inaktivoitu puutiaisaivotulehdusrokote (koko virus)"
 * patient = Reference(PatientOfMunicipality)
 * encounter = Reference(EncounterPalvelutapahtuma)
 * occurrenceDateTime = "2023-01-10"
 * primarySource = false
 * location = Reference(LocationExample)
 * expirationDate = "2025-02-15"
-* site.coding[Vaccination-site]
-  * system = #urn:oid:1.2.246.537.6.110.2007
-  * code = #OO
-* route.coding[Vaccination-route]
-  * system = #urn:oid:1.2.246.537.6.111.2007
-  * code = #IM
+* site.coding[Vaccination-site] = urn:oid:1.2.246.537.6.110|2007#OO
+* route.coding[Vaccination-route] = urn:oid:1.2.246.537.6.111|2007#IM
 * doseQuantity = 5 'mg'
-* protocolApplied.targetDisease.coding
-  * system = #urn:oid:1.2.246.537.6.609.201501
-  * code = #TBE
+* protocolApplied.targetDisease.coding = urn:oid:1.2.246.537.6.609|20150#TBE
 * protocolApplied.doseNumberPositiveInt = 1
 * protocolApplied.seriesDosesPositiveInt = 3
-* performer[+].function = http://terminology.hl7.org/CodeSystem/v2-0443#AP
+* performer[0].function = http://terminology.hl7.org/CodeSystem/v2-0443#AP
 * performer[=].actor = Reference(PractitionerLicensedPhysician)
 * reasonCode = http://snomed.info/sct#429060002
 * extension[vaccinationRecorder].valueReference = Reference(PractitionerLicensedPhysician)
diff --git a/input/fsh/examples/locationBedExample.fsh b/input/fsh/examples/locationBedExample.fsh
@@ -7,5 +7,4 @@ Usage: #example
 * mode = #instance
 * name = "Vuode 3"
 * status = #active
-* physicalType.coding.system = #http://terminology.hl7.org/CodeSystem/location-physical-type
-* physicalType.coding.code = #bd
+* physicalType.coding = http://terminology.hl7.org/CodeSystem/location-physical-type#bd
diff --git a/input/fsh/examples/patientOfMunicipality.fsh b/input/fsh/examples/patientOfMunicipality.fsh
@@ -6,8 +6,7 @@ Usage: #example
 * id = "patient-of-municipality"
 * identifier[PIC]
   * use = #official
-  * type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203"
-  * type.coding.code = #NNFIN
+  * type.coding = http://terminology.hl7.org/CodeSystem/v2-0203#NNFIN
   * system = #urn:oid:1.2.246.21
   * value = "010190-999Y"
 * gender = #male
@@ -20,9 +19,6 @@ Usage: #example
 * address.use = #home
 * address.line[0] = "Testikatu 1"
 * address.line[+] = "37910 Akaa"
-* communication.language.coding.system = #urn:oid:2.16.840.1.113883.4.642.3.20
-* communication.language.coding.code = #fi
+* communication.language.coding = urn:oid:2.16.840.1.113883.4.642.3.20#fi
 * active = true
-* extension[MunicipalityCode].valueCoding.system = #urn:oid:1.2.246.537.6.21.2003
-* extension[MunicipalityCode].valueCoding.code = #020
-* extension[MunicipalityCode].valueCoding.display = "Akaa"
+* extension[MunicipalityCode].valueCoding = urn:oid:1.2.246.537.6.21|2003#020 "Akaa"
diff --git a/input/fsh/examples/patientWithTurvakielto.fsh b/input/fsh/examples/patientWithTurvakielto.fsh
@@ -7,15 +7,12 @@ Usage: #example
 * id = "patient-with-turvakielto"
 * identifier[PIC]
   * use = #official
-  * type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203"
-  * type.coding.code = #NNFIN
+  * type.coding = http://terminology.hl7.org/CodeSystem/v2-0203#NNFIN
   * system = #urn:oid:1.2.246.21
   * value = "010190-999X"
 * birthDate = "1990-01-01"
 * name
   * given = "Turva"
   * family = "Henkilö"
 * active = true
-* extension[MunicipalityCode].valueCoding.system = #urn:oid:1.2.246.537.6.21.2003
-* extension[MunicipalityCode].valueCoding.code = #020
-* extension[MunicipalityCode].valueCoding.display = "Akaa"
+* extension[MunicipalityCode].valueCoding = urn:oid:1.2.246.537.6.21|2003#020 "Akaa"
diff --git a/input/fsh/examples/practitionerLicensedPhysician.fsh b/input/fsh/examples/practitionerLicensedPhysician.fsh
@@ -28,9 +28,9 @@ Usage: #example
 * name.family = "Doctor"
 * name.given = "Dave"
 * name.suffix = "dr."
-* qualification[0].code = urn:oid:1.2.246.537.6.140.2008#001
-* qualification[+].code = urn:oid:1.2.246.537.6.148.2008#86152-322
-* qualification[+].code = urn:oid:1.2.246.537.6.74.2001#2131
+* qualification[0].code = urn:oid:1.2.246.537.6.140|2008#001
+* qualification[+].code = urn:oid:1.2.246.537.6.148|2008#86152-322
+* qualification[+].code = urn:oid:1.2.246.537.6.74|2001#2131
 * qualification[+].code = urn:oid:2.16.840.1.113883.18.220#MD
 * telecom.system = #email
 * telecom.use = #work

diff --git a/input/fsh/examples/procedureColonomy.fsh b/input/fsh/examples/procedureColonomy.fsh
@@ -5,13 +5,9 @@ Description: "This example describes main procedure, colotomy, with reference to
 Usage: #example
 * identifier.value = "3456"
 * status = #completed
-* category.coding[0]
-  * .system = #urn:oid:1.2.246.537.6.601
-  * .code = #TOI
-* code.coding[0].system = #urn:oid:1.2.246.537.6.2
-* code.coding[0].code = #JFA16
-* code.coding[1].system = "http://snomed.info/sct"
-* code.coding[1].code = #9215005
+* category.coding[0] = urn:oid:1.2.246.537.6.601#TOI
+* code.coding[0] = urn:oid:1.2.246.537.6.2#JFA16
+* code.coding[+] = http://snomed.info/sct#9215005
 * code.text = "Colotomy"
 * performedDateTime = "2022-06-08T09:00:00.000Z"
 * subject = Reference(PatientOfMunicipality)

diff --git a/input/fsh/examples/procedurePartOfMainProcedure.fsh b/input/fsh/examples/procedurePartOfMainProcedure.fsh
@@ -6,11 +6,8 @@ Usage: #example
 * identifier.value = "12345"
 * partOf = Reference(ProcedureColotomy)
 * status = #completed
-* category.coding[0]
-  * system = #urn:oid:1.2.246.537.6.601
-  * code = #PIENTOI
-* code.coding[0].system = "http://snomed.info/sct"
-* code.coding[0].code = #76164006
+* category.coding = urn:oid:1.2.246.537.6.601#PIENTOI
+* code.coding = http://snomed.info/sct#76164006
 * code.text = "Biopsy of colon"
 * subject = Reference(PatientOfMunicipality)
 * performer.actor = Reference(PractitionerLicensedPhysician)

diff --git a/input/fsh/examples/provenanceCustodianIndividual.fsh b/input/fsh/examples/provenanceCustodianIndividual.fsh
@@ -8,13 +8,10 @@ Usage: #example
 * recorded = "2015-02-07T13:28:17.239+02:00"
 * agent[custodian]
   * type
-    * coding[0] = http://terminology.hl7.org/CodeSystem/v3-ParticipationType#CST "custodian"
+    * coding = http://terminology.hl7.org/CodeSystem/v3-ParticipationType#CST "custodian"
     * text = "Rekisterinpitäjä"
-  * role[0]
-    * coding[0]
-      * system = "urn:oid:1.2.246.537.5.40172"
-      * code = #2
-      * display = "Yksityinen"
+  * role
+    * coding = urn:oid:1.2.246.537.5.40172#2 "Yksityinen"
     * text = "Yksityinen"
   * who
     * type = #Practitioner

diff --git a/input/fsh/examples/provenanceCustodianOccupationalHealthcare.fsh b/input/fsh/examples/provenanceCustodianOccupationalHealthcare.fsh
@@ -11,10 +11,7 @@ Usage: #example
     * coding[0] = http://terminology.hl7.org/CodeSystem/v3-ParticipationType#CST "custodian"
     * text = "Rekisterinpitäjä"
   * role[0]
-    * coding[0]
-      * system = "urn:oid:1.2.246.537.5.40172"
-      * code = #2
-      * display = "Yksityinen"
+    * coding[0] = urn:oid:1.2.246.537.5.40172#2 "Yksityinen"
     * text = "Yksityinen"
   * who
     * type = #Organization

diff --git a/input/fsh/examples/provenanceCustodianPublicHealthcare.fsh b/input/fsh/examples/provenanceCustodianPublicHealthcare.fsh
@@ -8,13 +8,10 @@ Usage: #example
 * recorded = "2023-08-25T16:42:17.239+03:00"
 * agent[custodian]
   * type
-    * coding[0] = http://terminology.hl7.org/CodeSystem/v3-ParticipationType#CST "custodian"
+    * coding = http://terminology.hl7.org/CodeSystem/v3-ParticipationType#CST "custodian"
     * text = "Rekisterinpitäjä"
-  * role[0]
-    * coding[0]
-      * system = "urn:oid:1.2.246.537.5.40172"
-      * code = #1
-      * display = "Julkinen"
+  * role
+    * coding = urn:oid:1.2.246.537.5.40172#1 "Julkinen"
     * text = "Julkinen"
   * who
     * type = #Organization