modifications according to BusinessRules 1.1

hl7-be · Sep 28, 2023 · a611f93 · a611f93
1 parent e76c289
commit a611f93
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 45 deletions.
diff --git a/input/fsh/codesystems/BeCSPAtientWillCategory.fsh b/input/fsh/codesystems/BeCSPAtientWillCategory.fsh
@@ -1,4 +1,4 @@
-CodeSystem: BeCSPAtientWillCategory
+CodeSystem: BeCSPatientWillCategory
 Id: be-cs-patientwill-category
 Title: "Patient Will Category CodeSystem"
 Description: "Patient Will Category CodeSystem"
@@ -15,19 +15,28 @@ Description: "Patient Will Category CodeSystem"
 * ^jurisdiction.coding[0] = $m49.htm#056
 * ^jurisdiction.coding[+] = urn:iso:std:iso:3166#BE
 * ^content = #complete
+* #negativedeclaration
+* #euthanasia
+* #organdonation
+* #lastwill 
+* #bodydonation 
+* #patientwill 
+* #resuscitation 
+* #hospitalisation 
+
 //* ^count = 1
-* #advanced-care-directive "Advanced Care Directive" "General directives expressed voluntarily by the patient"
-* #advanced-care-directive ^designation[0].language = #fr-BE
-* #advanced-care-directive ^designation[=].value = "Volontés diverses"
-* #advanced-care-directive ^designation[+].language = #nl-BE
-* #advanced-care-directive ^designation[=].value = "Verschillende wensen"
-* #research "Research" "Consent to participate in research protocols and / or share results"
-* #research ^designation[0].language = #fr-BE
-* #research ^designation[=].value = "Recherche"
-* #research ^designation[+].language = #nl-BE
-* #research ^designation[=].value = "Onderzoek"
-* #treatment "Treatment" "Specific treatments in the context of resuscitation and / or during hospitalization"
-* #treatment ^designation[0].language = #fr-BE
-* #treatment ^designation[=].value = "Traitement"
-* #treatment ^designation[+].language = #nl-BE
-* #treatment ^designation[=].value = "Behandeling"
+//* #advanced-care-directive "Advanced Care Directive" "General directives expressed voluntarily by the patient"
+//* #advanced-care-directive ^designation[0].language = #fr-BE
+//* #advanced-care-directive ^designation[=].value = "Volontés diverses"
+//* #advanced-care-directive ^designation[+].language = #nl-BE
+//* #advanced-care-directive ^designation[=].value = "Verschillende wensen"
+//* #research "Research" "Consent to participate in research protocols and / or share results"
+//* #research ^designation[0].language = #fr-BE
+//* #research ^designation[=].value = "Recherche"
+//* #research ^designation[+].language = #nl-BE
+//* #research ^designation[=].value = "Onderzoek"
+//* #treatment "Treatment" "Specific treatments in the context of resuscitation and / or during hospitalization"
+//* #treatment ^designation[0].language = #fr-BE
+//* #treatment ^designation[=].value = "Traitement"
+//* #treatment ^designation[+].language = #nl-BE
+//* #treatment ^designation[=].value = "Behandeling"
diff --git a/input/fsh/codesystems/BeCSPAtientWillCode.fsh b/input/fsh/codesystems/BeCSPAtientWillCode.fsh
@@ -1,4 +1,4 @@
-CodeSystem: BeCSPAtientWillCode
+CodeSystem: BeCSPatientWillCode
 Id: be-cs-patientwill-code
 Title: "Patient Will Directive CodeSystem"
 Description: "Patient Will Directive CodeSystem. Codes as defined by the NIHDI."
@@ -15,18 +15,69 @@ Description: "Patient Will Directive CodeSystem. Codes as defined by the NIHDI."
 * ^jurisdiction.coding[0] = $m49.htm#056
 * ^jurisdiction.coding[+] = urn:iso:std:iso:3166#BE
 * ^content = #complete
-* #euthanasia-request "Euthanasia Request" "Euthanasia request"
-* #intubation-refusal "Intubation Refusal" "Intubation refusal"
-* #organ-donation-consent "Organ Donation Consent" "Organ donation consent"
-* #vaccination-refusal "Vaccination Refusal" "Vaccination refusal"
-* #omission-medical-data "Omission Of Medical Data" "Omission of medical data (cfr annexes)"
-* #blood-transfusion-refusal "Blood Transfusion Refusal" "Refusal of blood transfusion"
-* #clinical-participation-consent "clinical Participation Consent" "Consent to participate in clinical trials"
-* #datareuse-clinicalresearch "Data reuse for clinical research consent" "Consent for data reuse for clinical research"
-* #datareuse-clinicaltrials "Data reuse for clinical trials consent" "Consent for data reuse for clinical trials"
-* #no-therapeutic-limitations "No therapeutic limitations" "No therapeutic limitations (Known as 'dnr0' in KMEHR)"
-* #do-not-resuscitate "Do not resuscitate" "Do not resuscitate (Known as 'dnr1' in KMEHR)"
-* #do-not-resuscitate-or-extend-therapy "Do not resuscitate or extend therapy" "Do not resuscitate or extend therapy (Known as 'dnr2' in KMEHR)"
-* #do-not-resuscitate-and-progressively-reduce-the-therapy "Do not resuscitate and progressively reduce the therapy" "Do not resuscitate and progressively reduce the therapy (Known as 'dnr3' in KMEHR)"
-* #no-hospitalization "No hospitalization" "No hospitalization (Known as 'hos1' in KMEHR')"
-* #hospitalization-only-in-specific-situations "Hospitalization only in specific situations (cfr annexes)" "Hospitalization only in specific situations (cfr annexes)(Known as 'hos2' in KMEHR)"
+//* #euthanasia-request "Euthanasia Request" "Euthanasia request"
+//* #intubation-refusal "Intubation Refusal" "Intubation refusal"
+//* #organ-donation-consent "Organ Donation Consent" "Organ donation consent"
+//* #vaccination-refusal "Vaccination Refusal" "Vaccination refusal"
+//* #omission-medical-data "Omission Of Medical Data" "Omission of medical data (cfr annexes)"
+//* #blood-transfusion-refusal "Blood Transfusion Refusal" "Refusal of blood transfusion"
+//* #clinical-participation-consent "clinical Participation Consent" "Consent to participate in clinical trials"
+//* #datareuse-clinicalresearch "Data reuse for clinical research consent" "Consent for data reuse for clinical research"
+//* #datareuse-clinicaltrials "Data reuse for clinical trials consent" "Consent for data reuse for clinical trials"
+//* #no-therapeutic-limitations "No therapeutic limitations" "No therapeutic limitations (Known as 'dnr0' in KMEHR)"
+//* #do-not-resuscitate "Do not resuscitate" "Do not resuscitate (Known as 'dnr1' in KMEHR)"
+//* #do-not-resuscitate-or-extend-therapy "Do not resuscitate or extend therapy" "Do not resuscitate or extend therapy (Known as 'dnr2' in KMEHR)"
+//* #do-not-resuscitate-and-progressively-reduce-the-therapy "Do not resuscitate and progressively reduce the therapy" "Do not resuscitate and progressively reduce the therapy (Known as 'dnr3' in KMEHR)"
+//* #no-hospitalization "No hospitalization" "No hospitalization (Known as 'hos1' in KMEHR')"
+//* #hospitalization-only-in-specific-situations "Hospitalization only in specific situations (cfr annexes)" "Hospitalization only in specific situations (cfr annexes)(Known as 'hos2' in KMEHR)"
+* #bloodtransfusionrefusal
+* #clinicaltrialparticipationconsent
+* #datareuseforclinicalresearchconsent
+* #datareuseforclinicaltrialsconsent
+* #intubationrefusal
+* #omissionofmedicaldata
+* #vaccinationrefusal
+* #dnr0
+* #dnr1
+* #dnr2
+* #dnr3
+* #hos0
+* #hos2
+* #onlycomfort
+* #onlytestsforcomfort
+* #noantibiotics
+* #noartificialhydratationfeeding
+* #nochemo
+* #noradiation
+* #nooperation
+* #noventilation
+* #nodialysis
+* #noresuscitation
+* #nointensivecare
+* #nohospitalisation
+* #onlytreatmentfororgandonation
+* #other
+* #euthanasiarequest
+* #euthanasiarefusal
+* #organdonationfortransplant
+* #bodymaterialfortransplant
+* #bodymaterialformedication
+* #bodymaterialforresearch
+* #bodydonationforscience
+* #burialbody
+* #burialashescemetry
+* #columbariumashes
+* #scattergardenashes
+* #scatterashesbelgiansea
+* #scatterashesother
+* #burialashesother
+* #storeashesother
+* #norituals
+* #catholic
+* #protestant
+* #anglican
+* #orthodox
+* #jewish
+* #islamic
+* #secular
+* #neutral
diff --git a/input/fsh/instances/patientwill1.fsh b/input/fsh/instances/patientwill1.fsh
@@ -3,14 +3,14 @@ InstanceOf: BePatientWill
 Usage: #example
 * status = #active
 * scope = $consentscope#treatment
-* category = $be-cs-patientwill-category#treatment "Treatment"
-* patient.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/NamingSystem/ssin"
+* category = $be-cs-patientwill-category#resuscitation "Resuscitation"
+* patient.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * patient.identifier.value = "123456789"
 * patient.display = "Jane Fhirwoman"
 * dateTime = "2015-11-18"
-* performer.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/NamingSystem/nihdi"
+* performer.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/nihdi"
 * performer.identifier.value = "11530231003"
 * policyRule.text = "Belgian policy"
 * provision.period.start = "2020-10-06"
-* provision.code = $be-cs-patientwill-code#do-not-resuscitate "Do not resuscitate"
+* provision.code = $be-cs-patientwill-code#dnr1 "Do not resuscitate"
 * provision.code.text = "No resuscitation"
diff --git a/input/fsh/profiles/BePatientWill.fsh b/input/fsh/profiles/BePatientWill.fsh
@@ -15,10 +15,10 @@ Description: "Belgian federal profile for a patient will ONLY in the context of
 * ^contact[=].telecom.value = "message-[email protected]"
 * ^jurisdiction.coding[0] = $m49.htm#056
 * ^jurisdiction.coding[+] = urn:iso:std:iso:3166#BE
-* identifier MS
-* status MS
-* scope MS
-* category MS
+* identifier 0..* MS
+* status 1..1 MS
+* scope 1..1 MS
+* category 1..* MS
 * category from BeVSPatientWillCategory (required)
 * patient 1.. MS
 * patient only Reference(BePatient)
@@ -27,10 +27,10 @@ Description: "Belgian federal profile for a patient will ONLY in the context of
 * dateTime 1.. MS
 * dateTime ^short = "The dateTime when the patient will has been recorded"
 * dateTime ^definition = "The date and/or time when the patient will has been recorded"
-* dateTime ^comment = "This is not the time the patient expressed their will, but the time that this patient was recorded.&#xD;&#xA;"
+* dateTime ^comment = "This is not the time the patient expressed their will, but the time that this patient will was recorded."
 * performer 1.. MS
 * performer only Reference(BeOrganization or BePatient or BePractitioner or BePractitionerRole or RelatedPerson)
-* performer ^comment = "Commonly, the patient will is expressed by the patient, but for some cases it may be some other person.&#xD;&#xA;"
+* performer ^comment = "Commonly, the patient will is expressed by the patient, but for some cases it may be some other person."
 * source[x] MS
 * source[x] ^short = "The evidence used to support the patient will."
 * source[x] ^definition = "Supporting evidence for the patient will (e.g. a paper signed by the patient to refuse a specific treatment)"

diff --git a/input/fsh/valuesets/BeVSPatientWillCategory.fsh b/input/fsh/valuesets/BeVSPatientWillCategory.fsh
@@ -14,4 +14,4 @@ Description: "Patient will category Value Set"
 * ^contact[=].telecom.value = "message-[email protected]"
 * ^jurisdiction.coding[0] = $m49.htm#056
 * ^jurisdiction.coding[+] = urn:iso:std:iso:3166#BE
-* include codes from system BeCSPAtientWillCategory
+* include codes from system BeCSPatientWillCategory
diff --git a/input/fsh/valuesets/BeVSPatientWillCode.fsh b/input/fsh/valuesets/BeVSPatientWillCode.fsh
@@ -14,4 +14,4 @@ Description: "Patient Will code Value Set"
 * ^contact[=].telecom.value = "message-[email protected]"
 * ^jurisdiction.coding[0] = $m49.htm#056
 * ^jurisdiction.coding[+] = urn:iso:std:iso:3166#BE
-* include codes from system BeCSPAtientWillCode
+* include codes from system BeCSPatientWillCode
diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -198,6 +198,6 @@ FSHOnly: false
 #applyExtensionMetadataToRoot: false
 
 dependencies:
-  hl7.fhir.be.core: 2.0.0
+  hl7.fhir.be.core: current