plugin-healthcare · nathan-eza · May 9, 2024 · Jul 3, 2024 · Jul 3, 2024 · Jul 3, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+node_modules/*
 .direnv/*
 .venv/*
 fsh-generated/*

diff --git a/README.md b/README.md
@@ -54,9 +54,13 @@ chmod +x _genonce.sh
 If sushi complains about snapshots (_"Structure Definition http://nictiz.nl/fhir/StructureDefinition/nl-core-Patient is missing a snapshot. Snapshot is required for import."_), please follow these steps:
 
 1. Download the package [nictiz.fhir.nl.r4.nl-core](https://simplifier.net/packages/nictiz.fhir.nl.r4.nl-core) **with snapshots** from Simplifier.
-2. Overwrite the contents of `~/.fhir/packages/nictiz.fhir.nl.r4.nl-core#0.10.0/package` with the contents of the downloaded `tgz`.
+2. Overwrite the contents of `~/.fhir/packages/nictiz.fhir.nl.r4.nl-core#0.11.0/package` with the contents of the downloaded `tgz`.
 3. Re-run `sushi`.
 
 
 > [!warning]
-> The above uses version 0.10.0 of the nl-core package. Please note that version numbers may have changed the meantime.
+> The above uses version 0.11.0 of the nl-core package. Please note that version numbers may have changed the meantime.
+
+### Case sensitive files
+
+When you run into case-sensitivity issues in the IG compile process, run `make clean` and try again. This can be related to MacOS or Windows not using case-sensitive file paths and sushi reusing outdated renamed cached output files.   
diff --git a/ig-template-plugin/content/.index.db b/ig-template-plugin/content/.index.db
diff --git a/ig-template-plugin/content/assets/.index.db b/ig-template-plugin/content/assets/.index.db
diff --git a/ig-template-plugin/content/assets/css/.index.db b/ig-template-plugin/content/assets/css/.index.db
diff --git a/ig-template-plugin/content/assets/ico/.index.db b/ig-template-plugin/content/assets/ico/.index.db
diff --git a/ig-template-plugin/content/assets/images/.index.db b/ig-template-plugin/content/assets/images/.index.db
diff --git a/ig-template-plugin/includes/.index.db b/ig-template-plugin/includes/.index.db
diff --git a/ig-template-plugin/package/.index.db b/ig-template-plugin/package/.index.db
diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh
@@ -13,3 +13,5 @@ Alias: $DHD_DX_TH = https://plugin.healthcare/fhir/CodeSystem/dhd-dx-thesaurus
 
 // diagnosticServiceSectionId
 Alias: $HL7_DX_SERVICE = http://terminology.hl7.org/CodeSystem/v2-0074
+
+// Alias: $ZibProcedureevent = http://nictiz.nl/fhir/StructureDefinition/zib-Procedure-event
diff --git a/input/fsh/models/AIOC/AIOCCommunication.fsh b/input/fsh/models/AIOC/AIOCCommunication.fsh
diff --git a/input/fsh/models/AIOC/AIOCCondition.fsh b/input/fsh/models/AIOC/AIOCCondition.fsh
diff --git a/input/fsh/models/AIOC/AIOCProcedure.fsh b/input/fsh/models/AIOC/AIOCProcedure.fsh
diff --git a/input/fsh/models/AIOC/clinical/AIOCAdmission.fsh b/input/fsh/models/AIOC/clinical/AIOCAdmission.fsh
@@ -0,0 +1,100 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCAdmission
+Id: AIOCAdmission
+Title: "AIOC opname"
+Description:  """Logisch model voor de tabel `opname` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 1..1 Identifier "id van de opname" ""
+* admission_date 1..1 date "Datum van opname." ""
+* admission_time 0..1 time "Tijd van opname." ""
+* discharge_date 0..1 date "Datum van ontslag." ""
+* discharge_time 0..1 time "Tijd van ontslag." ""
+* age_dimension 1..1 CodeableConcept "Leeftijd dimensie "
+* age_at_admission 1..1 integer "Leeftijd bij opname" ""
+* gender 1..1 CodeableConcept "Geslacht" ""
+* urgency  0..1 code "Urgentie van de opname. Gecodeerd als 0: geen urgentie; 1: urgent" ""
+* source_of_admission 0..1 string "" ""
+* destination_after_discharge 0..1 string "" ""
+* clinical_specialty 1..1 CodeableConcept "First or main specialisme code of admission" ""
+
+// -------------------------------------------------------------------------------
+// CodeSystem AIOCAgeDimensionCS
+// -------------------------------------------------------------------------------
+CodeSystem: AIOCAgeDimensionCS
+Id: AIOCAgeDimensionCS
+Title: "AIOC Age Dimension Code System"
+Description: "A code system for age dimension"
+* ^status = #draft
+* #1 "Jaren" "Age measured in years."
+* #2 "Maanden" "Age measured in months."
+* #3 "Dagen" "Age measured in days."
+
+// -------------------------------------------------------------------------------
+// CodeSystem AIOCGenderCS
+// -------------------------------------------------------------------------------
+CodeSystem: AIOCGenderCS
+Id: AIOCGender
+Title: "AIOC Gender Dimension Code System"
+Description: "A code system for gender dimension of the patient"
+* ^status = #draft
+* #0 "Onbekend" "Gender of the patient is unknown"
+* #1 "Mannelijk" "Gender of the patient is male"
+* #2 "Vrouwelijk" "Gender of the patient is female"
+* #3 "Overig" "Gender of the patient is other"
+// -------------------------------------------------------------------------------
+// CodeSystem AIOCUrgencyCS
+// -------------------------------------------------------------------------------
+CodeSystem: AIOCUrgencyCS
+Id: AIOCUrgencyCS
+Title: "AIOC Urgency Code System"
+Description: "A code system for urgency of the admission"
+* ^status = #draft
+* #0 "Geen urgentie" "No urgency"
+* #1 "Urgent" "Urgent"
+// -------------------------------------------------------------------------------
+// CodeSystem AIOCSourceOfAdmissionCS
+// -------------------------------------------------------------------------------
+CodeSystem: AIOCSourceOfAdmissionCS
+Id: AIOCSourceOfAdmissionCS
+Title: "AIOC Source of Admission Code System"
+Description: "A code system for source of admission"
+* ^status = #draft
+* #0 "Eigen woonomgeving" "Own living environment."
+* #1 "Instelling voor revalidatie" "Rehabilitation facility."
+* #2 "Instelling voor verpleging/verzorging" "Nursing/care facility."
+* #3 "Psychiatrisch ziekenhuis" "Psychiatric hospital."
+* #4 "(Ander) academisch ziekenhuis" "Other academic hospital."
+* #5 "(Ander) algemeen ziekenhuis" "Other general hospital."
+* #6 "(Ander) categoraal ziekenhuis" "Other categorical hospital."
+* #7 "(Ander) ZBC" "Other Independent Treatment Center (ZBC)."
+* #8 "Geboren in dit ziekenhuis" "Born in this hospital."
+* #9 "Overige instellingen" "Other institutions."
+* #12 "Ziekenhuis in het buitenland" "Hospital abroad."
+* #13 "Hospice" "Hospice."
+// -------------------------------------------------------------------------------
+// CodeSystem AIOCDestinationAfterDischargeCS
+// -------------------------------------------------------------------------------
+CodeSystem: AIOCDestinationAfterDischargeCS
+Id: AIOCDestinationAfterDischargeCS
+Title: "AIOC Destination After Discharge Code System"
+Description: "A code system for destination after discharge"
+* ^status = #draft
+* #0 "Eigen woonomgeving" "Own living environment."
+* #1 "Instelling voor revalidatie" "Rehabilitation facility."
+* #2 "Instelling voor verpleging/verzorging" "Nursing/care facility."
+* #3 "Psychiatrisch ziekenhuis" "Psychiatric hospital."
+* #4 "(Ander) academisch ziekenhuis" "Other academic hospital."
+* #5 "(Ander) algemeen ziekenhuis" "Other general hospital."
+* #6 "(Ander) categoraal ziekenhuis" "Other categorical hospital."
+* #7 "(Ander) ZBC" "Other Independent Treatment Center (ZBC)."
+* #8 "Geboren in dit ziekenhuis" "Born in this hospital."
+* #9 "Overige instellingen" "Other institutions."
+* #12 "Ziekenhuis in het buitenland" "Hospital abroad."
+* #13 "Hospice" "Hospice."
+// -------------------------------------------------------------------------------
+
+
diff --git a/input/fsh/models/AIOC/clinical/AIOCCondition.fsh b/input/fsh/models/AIOC/clinical/AIOCCondition.fsh
@@ -0,0 +1,20 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCCondition
+Id: AIOCCondition
+Title: "AIOC diagnoses"
+Description:  """Logisch model voor de tabel `diagnoses` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 1..1 Identifier "id van de opname" ""
+* admission_date 1..1 date "Datum van opname." ""
+* discharge_date 1..1 date "Datum van ontslag." ""
+* icd10_diagnosis_code 0..1 CodeableConcept "ICD-code van diagnose" "mandatory for traindata"
+* problemlist 0..1 CodeableConcept "Probleemlijst" "" 
+* diagnosing_clinical_specialty 1..1 CodeableConcept "Specialisme dat de diagnose stelde" ""
+* main_diagnosis_indication 1..1 boolean  "1: hoofddiagnose, 0: niet hoofddiagnose" ""
+* primary_diagnosis_indication 1..1 boolean  "1: primaire diagnose, 0: niet primaire diagnose" ""
+* nas_indication 1..1 boolean  "1: Niet aanwezig bij start opname, 2: wel aanwezig bij start opname" ""
+
diff --git a/input/fsh/models/AIOC/clinical/AIOCDocument.fsh b/input/fsh/models/AIOC/clinical/AIOCDocument.fsh
@@ -0,0 +1,80 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCCommunication
+Id: AIOCCommunication
+Title: "AIOC brievenverslagen"
+Description:  """Logisch model voor de tabel `brievenverslagen` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 0..1 Identifier "id van de opname" ""
+* document_type 1..1 CodeableConcept "?" ""
+* clinical_speciality 1..1 CodeableConcept "Specialisme dat het document opstelde" ""
+* publication_date 1..1 date "Datum van publicatie." ""
+* text 1..1 string "Inhoud van het document" ""
+
+// // -------------------------------------------------------------------------------
+// //  CodeableConcepts
+// // -------------------------------------------------------------------------------
+// Instance: AIOCDocumentTypeVS
+// Id: AIOCDocumentTypeVS
+// Title: "AIOC Document Type Value Set"
+// Description: "Value set voor de verschillende types documenten die in de AIOC use-case voorkomen."
+// * ontslag "Ontslagbrief"
+// * ok "Operatieverslag"
+// * poli "Poliklinische brief"
+// * pa "Poliklinische brief"
+// * scopie "Scopieverslag"
+// * pci/cag "PCI/CAG verslag"
+// * seh "SEH verslag"
+// * radiology "Radiologie verslag"
+// * mdo "MDO verslag"
+// * unknown "Onbekend"
+// // -------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------
+//  CodeSystem
+// -------------------------------------------------------------------------------
+Instance: AIOCDocumentTypeCS
+InstanceOf: CodeSystem
+Title: "AIOC Document Type CodeSystem"
+Description: "CodeSystem voor de verschillende types documenten die in de AIOC use-case voorkomen."
+Usage: #definition
+* url = "https://plugin.healthcare/fhir/CodeSystem/aioc-document-type"
+* name = "AIOCDocumentTypeCS"
+* status = #active
+* content = #complete
+* concept[+].code = #ontslag
+* concept[=].display = "Ontslagbrief"
+* concept[+].code = #ok
+* concept[=].display = "Operatieverslag"
+* concept[+].code = #poli
+* concept[=].display = "Poliklinische brief"
+* concept[+].code = #pa
+* concept[=].display = "Poliklinische brief"
+* concept[+].code = #scopie
+* concept[=].display = "Scopieverslag"
+* concept[+].code = #pci-cag
+* concept[=].display = "PCI/CAG verslag"
+* concept[+].code = #seh
+* concept[=].display = "SEH verslag"
+* concept[+].code = #radiology
+* concept[=].display = "Radiologie verslag"
+* concept[+].code = #mdo
+* concept[=].display = "MDO verslag"
+* concept[+].code = #unknown
+* concept[=].display = "Onbekend"
+
+// -------------------------------------------------------------------------------
+//  ValueSet
+// -------------------------------------------------------------------------------
+Instance: AIOCDocumentTypeVS
+InstanceOf: ValueSet
+Title: "AIOC Document Type Value Set"
+Description: "ValueSet voor de verschillende types documenten die in de AIOC use-case voorkomen."
+Usage: #definition
+* url = "https://plugin.healthcare/fhir/ValueSet/aioc-document-type"
+* name = "AIOCDocumentTypeVS"
+* status = #active
+* compose.include.system = "https://plugin.healthcare/fhir/CodeSystem/aioc-document-type"
diff --git a/input/fsh/models/AIOC/clinical/AIOCProcedure.fsh b/input/fsh/models/AIOC/clinical/AIOCProcedure.fsh
@@ -0,0 +1,16 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCProcedure
+Id: AIOCProcedure
+Title: "AIOC verrichtingen"
+Description:  """Logisch model voor de tabel `verrichtingen` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 0..1 Identifier "id van de opname" ""
+* procedure_date 1..1 date "Datum van verrichting." ""
+* procedure_code 1..1 CodeableConcept "ZA of ZI code van de verrichting" ""
+* requesting_clinical_specialty 1..1 CodeableConcept "Specialisme dat de verrichting aanvraagt" ""
+* executing_clinical_specialty 1..1 CodeableConcept "Specialisme dat de verrichting uitvoert" ""
+* subtraject_id 0..1 Identifier "id van het subtraject" ""
diff --git a/input/fsh/models/AIOC/AIOCEpisodeOfCare.fsh → ...h/models/AIOC/clinical/AIOCSubtraject.fsh b/input/fsh/models/AIOC/AIOCEpisodeOfCare.fsh → ...h/models/AIOC/clinical/AIOCSubtraject.fsh
@@ -10,7 +10,7 @@ Maturity Level: 0 Draft
 * patient_id 1..1 Identifier "id van de patiënt" ""
 * admission_id 1..1 Identifier "id van de opname" ""
 * admission_date 1..1 date "Datum van opname." ""
-* discharge_date 0..1 date "Datum van ontslag." ""
+* discharge_date 1..1 date "Datum van ontslag." ""
 * subtraject_id 1..1 Identifier "id van het (DBC) subtraject" ""
-* dbc_specialitycode 1..1 CodeableConcept "Code van het specialisme dat eigenaar is van de DBC" ""
-* dbc_diagnosecode 1..1 CodeableConcept "Code van de diagnose van de DBC" ""
+* dbc_specialty_code 1..1 CodeableConcept "Code van het specialisme dat eigenaar is van de DBC" ""
+* dbc_diagnosis_code 1..1 CodeableConcept "Code van de diagnose van de DBC" ""
diff --git a/input/fsh/models/AIOC/AIOCAdmission.fsh → input/fsh/models/AIOC/day/AIOCAdmission.fsh b/input/fsh/models/AIOC/AIOCAdmission.fsh → input/fsh/models/AIOC/day/AIOCAdmission.fsh
@@ -1,20 +1,23 @@
 // -------------------------------------------------------------------------------
 //  Logical Model
 // -------------------------------------------------------------------------------
-Logical: AIOCAdmission
-Id: AIOCAdmission
-Title: "AIOC opname"
+Logical: AIOCDayAdmission
+Id: AIOCDayAdmission
+Title: "AIOC dagopname"
 Description:  """Logisch model voor de tabel `opname` zoals gebruikt binnen de use-case AIOC.
 Maturity Level: 0 Draft
 """
 * patient_id 1..1 Identifier "id van de patiënt" ""
-* gender 1..1 CodeableConcept "Geslacht" ""
 * admission_id 1..1 Identifier "id van de opname" ""
+* subtraject_id 1..1 Identifier "id van het subtraject" ""
 * admission_date 1..1 date "Datum van opname." ""
 * admission_time 0..1 time "Tijd van opname." ""
 * discharge_date 0..1 date "Datum van ontslag." ""
 * discharge_time 0..1 time "Tijd van ontslag." ""
-* age_at_admission 1..1 integer "Leeftijd bij opname" ""
-* urgency  0..1 code "Urgentie van de opname. Gecodeerd als 0: geen urgentie; 1: urgent" ""
-* source_of_admission 0..1 string "" ""
-* destination_after_discharge 0..1 string "" ""
+* age 1..1 integer "Leeftijd bij opname" ""
+* gender 1..1 CodeableConcept "Gender" ""
+* specialty_code 1..1 CodeableConcept "Specialisme code" ""
+* dbc_diagnosis_code 1..1 CodeableConcept "DBC diagnose code" ""
+* dbc_specialty_code 1..1 CodeableConcept "DBC specialisme code" ""
+* icd10_subtraject_code 1..1 CodeableConcept "ICD10 subtraject code" ""
+* icd10_main_code 0..1 CodeableConcept "ICD10 hoofddiagnose code alleen verplicht voor traindata" ""
diff --git a/input/fsh/models/AIOC/day/AIOCDocument.fsh b/input/fsh/models/AIOC/day/AIOCDocument.fsh
@@ -0,0 +1,31 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCDayDocument
+Id: AIOCDayDocument
+Title: "AIOC dag brievenverslagen"
+Description:  """Logisch model voor de tabel `brievenverslagen` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 0..1 Identifier "id van de opname" ""
+* document_type 1..1 CodeableConcept "pa, poli, ontslag, ok, scopie, pci/cag" ""
+* publication_specialty 1..1 string "Specialisme dat het document opstelde" ""
+* publication_date 1..1 date "Datum van publicatie." ""
+* text 1..1 string "Inhoud van het document" ""
+
+// // -------------------------------------------------------------------------------
+// //  CodeableConcepts
+// // -------------------------------------------------------------------------------
+// CodeableConcept: AIOCDocumentTypeVS
+// Id: AIOCDayDocumentTypeVS
+// Title: "AIOC Document Type Value Set"
+// Description: "Value set voor de verschillende types documenten die in de AIOC use-case voorkomen. Can be merged with clinical doc types"
+// * ontslag "Ontslagbrief"
+// * ok "Operatieverslag"
+// * poli "Poliklinische brief"
+// * pa "Poliklinische brief"
+// * scopie "Scopieverslag"
+// * pci/cag "PCI/CAG verslag"
+// * unknown "Onbekend"
+// // -------------------------------------------------------------------------------
diff --git a/input/fsh/models/AIOC/day/AIOCProcedure.fsh b/input/fsh/models/AIOC/day/AIOCProcedure.fsh
@@ -0,0 +1,13 @@
+// -------------------------------------------------------------------------------
+//  Logical Model
+// -------------------------------------------------------------------------------
+Logical: AIOCDayProcedure
+Id: AIOCDayProcedure
+Title: "AIOC dag verrichtingen"
+Description:  """Logisch model voor de tabel `verrichtingen` zoals gebruikt binnen de use-case AIOC.
+Maturity Level: 0 Draft
+"""
+* patient_id 1..1 Identifier "id van de patiënt" ""
+* admission_id 0..1 Identifier "id van de opname" ""
+* procedure_date 1..1 date "Datum van verrichting." ""
+* procedure_code 1..1 CodeableConcept "ZA of ZI code van de verrichting" ""
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ Alias: $DHD_DX_TH = https://plugin.healthcare/fhir/CodeSystem/dhd-dx-thesaurus

		// diagnosticServiceSectionId
		Alias: $HL7_DX_SERVICE = http://terminology.hl7.org/CodeSystem/v2-0074

		// Alias: $ZibProcedureevent = http://nictiz.nl/fhir/StructureDefinition/zib-Procedure-event