WIP

IKNL · Jan 22, 2025 · bdb604d · bdb604d
1 parent 89f654e
commit bdb604d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh
@@ -3,6 +3,7 @@ Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203
 Alias: $v3-AdministrativeGender = http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender
 Alias: $diagnosis-role = http://terminology.hl7.org/CodeSystem/diagnosis-role
 Alias: $condition-category = http://terminology.hl7.org/CodeSystem/condition-category
+Alias: $condition-category-vs = http://hl7.org/fhir/ValueSet/condition-category
 Alias: $condition-clinical = http://terminology.hl7.org/CodeSystem/condition-clinical
 Alias: $icd-10-nl = http://hl7.org/fhir/sid/icd-10-nl
 Alias: $sct = http://snomed.info/sct

diff --git a/input/fsh/profiles/NcrEhrCondition.fsh b/input/fsh/profiles/NcrEhrCondition.fsh
@@ -11,7 +11,7 @@ Id: ncr-ehr-condition
 * category ^mustSupport = false
 * category ^binding.strength = #required
 * category contains ncr-ehr-category 1..1 MS
-* category[ncr-ehr-category] ^binding.strength = #required
+* category[ncr-ehr-category] from $condition-category-vs (required)
 * code 1.. MS
 * code.coding ^slicing.discriminator.type = #value
 * code.coding ^slicing.discriminator.path = "system"

diff --git a/input/fsh/profiles/NcrEhrEpisodeOfCare.fsh b/input/fsh/profiles/NcrEhrEpisodeOfCare.fsh
@@ -7,7 +7,6 @@ Id: ncr-ehr-episode-of-care
 * ^contact.telecom.system = #email
 * ^contact.telecom.value = "fhir@iknl.nl"
 * diagnosis.extension contains NcrEhrDiagnosisGroup named ncrEhrDiagnosisGroup 0..1
-* diagnosis.extension[ncrEhrDiagnosisGroup] ^isModifier = false
 * diagnosis.extension[ncrEhrDiagnosisGroup].value[x] MS
 * diagnosis.condition only Reference(NcrEhrCondition)
 * diagnosis.condition ^type.aggregation = #bundled

diff --git a/input/fsh/profiles/NcrEhrMedication.fsh b/input/fsh/profiles/NcrEhrMedication.fsh
@@ -13,14 +13,13 @@ Id: ncr-ehr-medication
     and atcCoding 1..1 MS
 * code.coding[ziCoding].system = "urn:oid:2.16.840.1.113883.2.4.4.8" (exactly)
 * code.coding[ziCoding].code 1..1
+* code.coding[ziCoding].display 1..
 * code.coding[atcCoding].system = "http://www.whocc.no/atc" (exactly)
 * code.coding[atcCoding].code 1..
+* code.coding[atcCoding].display 1..
 // [TODO] ZI-restricties in valueset
 // - ATC-code met een beperkte selectie op L01E, L01F en L01X
 // - 5.	Moeten de ATC-codes beginnend met L01B, L01C en L01D toegevoegd worden aan de query? Ja toevoegen en een lijst met eventuele exoten bijvoegen.
-* code.coding[ziCoding] ^sliceIsConstraining = true
-* code.coding[ziCoding].display 1..
-* code.coding[atcCoding].display 1..
 * form 0..1 MS
 * form.coding ^slicing.discriminator.type = #value
 * form.coding ^slicing.discriminator.path = "$this"