Merge pull request #108 from hl7-be/issue-106

Issue 106

input/fsh/aliases.fsh

@@ -1,57 +1,14 @@
 Alias: $be-causativeagent = https://www.ehealth.fgov.be/standards/fhir/allergy/ValueSet/be-causativeagent
 Alias: $be-noallergy = https://www.ehealth.fgov.be/standards/fhir/allergy/ValueSet/be-noallergy
-/*/
-Alias: $nihdi-physiotherapy-pathologysituationcode = http://www.mycarenet.be/fhir/CodeSystem/nihdi-physiotherapy-pathologysituationcode
-Alias: $v3-NullFlavor = http://terminology.hl7.org/CodeSystem/v3-NullFlavor
-Alias: $v3-ActReason = http://terminology.hl7.org/CodeSystem/v3-ActReason
-*/
 Alias: $sct = http://snomed.info/sct
 Alias: $allergyintolerance-clinical = http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical
 Alias: $allergyintolerance-verification = http://terminology.hl7.org/CodeSystem/allergyintolerance-verification
 Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203
 Alias: $jurisdiction = urn:iso:std:iso:3166
-/*
-Alias: $cd-hcparty = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty
-Alias: $v3-DataOperation = http://terminology.hl7.org/CodeSystem/v3-DataOperation
-Alias: $provenance-participant-type = http://terminology.hl7.org/CodeSystem/provenance-participant-type
-Alias: $loinc = http://loinc.org
-Alias: $communication-category = http://terminology.hl7.org/CodeSystem/communication-category
-Alias: $be-cs-diarytopic = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-diarytopic
-Alias: $cvx = http://hl7.org/fhir/sid/cvx
-Alias: $immunization-recommendation-status = http://terminology.hl7.org/CodeSystem/immunization-recommendation-status
-Alias: $observation-category = http://terminology.hl7.org/CodeSystem/observation-category
-Alias: $my-own-custom-codes = http://my-own-custom-codes
-*/
 Alias: $cd-fed-country = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-fed-country
 Alias: $v3-MaritalStatus = http://terminology.hl7.org/CodeSystem/v3-MaritalStatus
 Alias: $cd-civilstate = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-civilstate
 Alias: $v2-0131 = http://terminology.hl7.org/CodeSystem/v2-0131
 Alias: $cd-contact-person = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-contact-person
-/*
-Alias: $consentscope = http://terminology.hl7.org/CodeSystem/consentscope
-Alias: $be-cs-patientwill-category = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-patientwill-category
-Alias: $be-cs-patientwill-code = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-patientwill-code
-Alias: $condition-clinical = http://terminology.hl7.org/CodeSystem/condition-clinical
-Alias: $condition-ver-status = http://terminology.hl7.org/CodeSystem/condition-ver-status
-Alias: $be-cs-problem-category = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-problem-category
-Alias: $be-cs-bodysite = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-bodysite
-Alias: $be-cs-score-category = https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/be-cs-score-category
-Alias: $v3-ObservationInterpretation = http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation
-Alias: $m49.htm = http://unstats.un.org/unsd/methods/m49/m49.htm
-Alias: $vitalsigns = http://hl7.org/fhir/StructureDefinition/vitalsigns
-Alias: $language = http://hl7.org/fhir/StructureDefinition/language
-Alias: $iso21090-ADXP-streetName = http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName
-Alias: $iso21090-ADXP-houseNumber = http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber
-Alias: $iso21090-ADXP-postBox = http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-postBox
-Alias: $patient-nationality = http://hl7.org/fhir/StructureDefinition/patient-nationality
-Alias: $patient-birthPlace = http://hl7.org/fhir/StructureDefinition/patient-birthPlace
-Alias: $patient-birthTime = http://hl7.org/fhir/StructureDefinition/patient-birthTime
-*/
 Alias: $be-riskmanifestation = https://www.ehealth.fgov.be/standards/fhir/allergy/ValueSet/be-riskmanifestation
 Alias: $be-exposureroute = https://www.ehealth.fgov.be/standards/fhir/allergy/ValueSet/be-exposureroute
-/*
-Alias: $be-vs-diarytopic = https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-vs-diarytopic
-Alias: $be-civilstate = https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-civilstate
-Alias: $be-contactperson = https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-contactperson
-Alias: $be-vs-score = https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-vs-score
-*/

input/fsh/extensions/BeExtAllergyType.fsh

@@ -5,4 +5,6 @@ Description: "extension to be replaced by http://hl7.org/fhir/5.0/StructureDefin
 * value[x] only CodeableConcept
 * valueCodeableConcept MS
 * valueCodeableConcept from BeVSAllergyIntoleranceType (extensible)
-* ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 1  
+* ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 1
+* ^context.type = #element
+* ^context.expression = "AllergyIntolerance"

input/fsh/instances/be-causativeagent.fsh

@@ -6,13 +6,15 @@ Description: "Causative Agents for Allergy (non medication)"
 * ^url = "https://www.ehealth.fgov.be/standards/fhir/allergy/ValueSet/be-causativeagent"
 * ^version = "1.0.0"
 * ^experimental = false
-//* ^url = "http://snomed.info/sct/11000172109/version/20220315?fhir_vs=refset/751000172100"
-//* ^version = "MAIN/SNOMEDCT-BE/2022-03-15"
 * ^status = #active
 * ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (SNOMED International), and distributed by agreement between SNOMED International and HL7. Implementer use of SNOMED CT is not covered by this agreement"
-//* include codes from system SNOMED_CT where concept in "751000172100"
-* ^compose.include[0].version = "http://snomed.info/sct/11000172109"
+* ^compose.include[+].version = "http://snomed.info/sct/11000172109"
 * ^compose.include[=].system = "http://snomed.info/sct"
 * ^compose.include[=].filter[0].property = #"concept"
 * ^compose.include[=].filter[=].op = #"in"
-* ^compose.include[=].filter[=].value = "751000172100"  
+* ^compose.include[=].filter[=].value = "50851000172106"
+* ^compose.include[+].version = "http://snomed.info/sct/11000172109"
+* ^compose.include[=].system = "http://snomed.info/sct"
+* ^compose.include[=].filter[0].property = #"concept"
+* ^compose.include[=].filter[=].op = #"in"
+* ^compose.include[=].filter[=].value = "50841000172109"  

input/fsh/instances/terminology-expansion.fsh

@@ -2,4 +2,4 @@ Instance: terminology-expansion
 InstanceOf: Parameters
 Usage: #example
 * parameter[+].name = "includeDesignations"
-* parameter[=].valueBoolean = true
+* parameter[=].valueBoolean = true

input/fsh/profiles/BeAllergyIntolerance.fsh

@@ -55,12 +55,14 @@ Description: "Belgian federal profile for an allergy and/or an intolerance. Init
 * identifier[allergy].system 1..
 * identifier[allergy].system = "https://www.ehealth.fgov.be/standards/fhir/allergy/NamingSystem/be-ns-allergy" (exactly)
 * identifier[allergy].value 1..
+/*
 * obeys be-inv-asserter-person-rel-type
 
 Invariant: be-inv-asserter-person-rel-type
 Description: "Checks that the person relationship type of the RelatedPerson in asserter is from BeVSPatientRelationshipType"
 Expression: "asserter.empty() or (asserter.resolve() is RelatedPerson implies asserter.resolve().relationship.memberOf('https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-vs-patient-relationship-type'))"
-Severity: #error
+Severity: #warning
+*/
 
 Invariant: be-inv-type-verification-status
 Description: "Checks that if the type is empty, the verificationStatus is unconfirmed"