IKNL · HarmkeKoning · Jun 2, 2026 · Jun 2, 2026 · Jun 2, 2026 · Jun 2, 2026
diff --git a/input/fsh/ValueSet.fsh b/input/fsh/ValueSet.fsh
@@ -1,6 +1,6 @@
 ValueSet: ACPPreferredPlaceOfDeathVS
-Id: ACP-PreferredPlaceOfDeath
-Title: "ACP Preferred Place of Death"
+Id: ACP-PreferredPlaceOfDeathVS
+Title: "ACP Preferred Place of Death Codes"
 Description: "ValueSet for Preferred Place of Death, representing the place where the patient prefers to die, if possible."
 * insert MetaRules
 * ^copyright = "This artefact includes content from SNOMED Clinical Terms® (SNOMED CT®) which is copyright of the International Health Terminology Standards Development Organisation (IHTSDO). Implementers of these artefacts must have the appropriate SNOMED CT Affiliate license - for more information contact http://www.snomed.org/snomed-ct/getsnomed-ct or [email protected]."
@@ -94,8 +94,8 @@ Description: "ValueSet for Preferred Place of Death, representing the place wher
 
 
 ValueSet: ACPPositionRegardingEuthanasiaVS
-Id: ACP-PositionRegardingEuthanasia
-Title: "ACP Position Regarding Euthanasia"
+Id: ACP-PositionRegardingEuthanasiaVS
+Title: "ACP Position Regarding Euthanasia Codes"
 Description: "ValueSet for Position Regarding Euthanasia, representing the the patient's position regarding euthanasia and information on the presence of a euthanasia statement."
 * insert MetaRules
 * ^copyright = "This artefact includes content from SNOMED Clinical Terms® (SNOMED CT®) which is copyright of the International Health Terminology Standards Development Organisation (IHTSDO). Implementers of these artefacts must have the appropriate SNOMED CT Affiliate license - for more information contact http://www.snomed.org/snomed-ct/getsnomed-ct or [email protected]."
@@ -109,8 +109,8 @@ Description: "ValueSet for Position Regarding Euthanasia, representing the the p
 
 
 ValueSet: ACPMedicalPolicyGoalVS
-Id: ACP-MedicalPolicyGoal
-Title: "ACP Primary Agreed-upon Goal of Medical Policy"
+Id: ACP-MedicalPolicyGoalVS
+Title: "ACP Primary Agreed-upon Goal of Medical Policy Codes"
 Description: "ValueSet for Medical Policy Goal, representing the primary agreed-upon goal of a patient's medical treatment policy."
 * insert MetaRules
 * ^copyright = "This artefact includes content from SNOMED Clinical Terms® (SNOMED CT®) which is copyright of the International Health Terminology Standards Development Organisation (IHTSDO). Implementers of these artefacts must have the appropriate SNOMED CT Affiliate license - for more information contact http://www.snomed.org/snomed-ct/getsnomed-ct or [email protected]."
@@ -121,7 +121,7 @@ Description: "ValueSet for Medical Policy Goal, representing the primary agreed-
 
 
 ValueSet: ACPMedicalDeviceProductTypeICDVS
-Id: ACP-MedicalDeviceProductType-ICD
+Id: ACP-MedicalDeviceProductType-ICDVS
 Title: "ACP MedicalDevice ProductType ICD"
 Description: "ICD product code for MedicalDevice ProductType. This ValueSet is conceptually based on SNOMED CT codes that are descendants of `72506001` (implanteerbare cardioverter-defibrillator), i.e. an `is-a` filter. However, the codes are explicitly enumerated rather than using an intensional `is-a` filter to make the ValueSet easier to understand and implement for consumers."
 * insert MetaRules
@@ -134,7 +134,7 @@ Description: "ICD product code for MedicalDevice ProductType. This ValueSet is c
 * $snomed#1236894001 "subcutane implanteerbare cardioverter-defibrillator"
 
 ValueSet: ACPContactPersonRoleVS
-Id: ACP-ContactPersonRole
+Id: ACP-ContactPersonRoleVS
 Title: "ACP ContactPerson Role zib2024 backport"
 Description: "ValueSet containing additional codes to the ContactPerson's [RolCodelijst](http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.3.1.2--20200901000000). These codes are applied from the zib2024 release onwards. Currently, the ValueSet contains only SNOMED CT code `310141000146103` (Schriftelijk gemachtigde zorg en behandeling / Holder of medical power of attorney) from the zib2024 release. The ValueSet is bound to a slice in `RelatedPerson.relationship."
 * insert MetaRules
@@ -144,7 +144,7 @@ Description: "ValueSet containing additional codes to the ContactPerson's [RolCo
 
 ValueSet: ACPYesNoUnknownVS
 Id: ACP-YesNoUnknownVS
-Title: "ACP Yes, No, Unknown valueSet"
+Title: "ACP Yes, No, Unknown Codes"
 Description: "ValueSet representing 'Yes, No, Unknown' answers."
 * insert MetaRules
 * ^copyright = "This artefact includes content from SNOMED Clinical Terms® (SNOMED CT®) which is copyright of the International Health Terminology Standards Development Organisation (IHTSDO). Implementers of these artefacts must have the appropriate SNOMED CT Affiliate license - for more information contact http://www.snomed.org/snomed-ct/getsnomed-ct or [email protected]."
@@ -221,7 +221,7 @@ Description: "ValueSet representing 'Yes, No, Unknown' answers."
 
 
 ValueSet: ACPProcedureTypeVS
-Id: ACP-ProcedureType
+Id: ACP-ProcedureTypeVS
 Title: "ACP ProcedureType"
 Description: "ValueSet for ProcedureType, representing allowed codes for the ACP conversation. The DHD Verrichtingenthesaurus code `0000106562` (proactieve zorgplanning in palliatieve fase) is not included in this ValueSet, as this set is not meant to be used for exchange (see [ZIB-1233](https://nictiz.atlassian.net/browse/ZIB-1233)). The included SNOMED code is part of the referentieset of the DHD Verrichtingenthesaurus."
 * insert MetaRules

diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
@@ -18,8 +18,11 @@
 
 # Manual check in latest version of SNOMED does find the code '1351964001'. The error might be due to a older version of SNOMED available in tx.fhir.org/r4 
 %Unknown code '1351964001' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/11000146104/version/20240930'%
-%Geen van de gevonden codings bestaan in waardelijst 'ACP Primary Agreed-upon Goal of Medical Policy' (https://api.iknl.nl/docs/pzp/r4/ValueSet/ACP-MedicalPolicyGoal|1.0.0-rc2) en een coding uit deze waardelijst is verplicht (codes = http://snomed.info/sct#1351964001)%
-%None of the codings provided are in the value set 'ACP Primary Agreed-upon Goal of Medical Policy' (https://api.iknl.nl/docs/pzp/r4/ValueSet/ACP-MedicalPolicyGoal|1.0.0-rc2), and a coding from this value set is required) (codes = http://snomed.info/sct#1351964001)%
+%Geen van de gevonden codings bestaan in waardelijst 'ACP Primary Agreed-upon Goal of Medical Policy Codes' (https://api.iknl.nl/docs/pzp/r4/ValueSet/ACP-MedicalPolicyGoalVS|1.0.0-rc2) en een coding uit deze waardelijst is verplicht (codes = http://snomed.info/sct#1351964001)%
+%None of the codings provided are in the value set 'ACP Primary Agreed-upon Goal of Medical Policy Codes' (https://api.iknl.nl/docs/pzp/r4/ValueSet/ACP-MedicalPolicyGoalVS|1.0.0-rc2), and a coding from this value set is required) (codes = http://snomed.info/sct#1351964001)%
+
+# Manual check in latest version of SNOMED does find the code '665671000146101'. The error might be due to a older version of SNOMED available in tx.fhir.org/r4
+%Unknown code '665671000146101' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/11000146104/version/20240930' (Netherlands Edition)%
 
 # This is a proposed fixed value in the Nictiz Consent profiles as there is no better alternative.
 %URL-waarde 'https://wetten.overheid.nl/' komt nergens uit%

diff --git a/input/pagecontent/StructureDefinition-ACP-ContactPerson-intro.md b/input/pagecontent/StructureDefinition-ACP-ContactPerson-intro.md
@@ -2,4 +2,4 @@
 
 This profile adds ACP-specific mappings to the ART-DECOR dataset and obligation extensions for Provider and Consulter actors. Profile references are constrained to ACP profiles where available. The following change affects implementation beyond the base nl-core profile:
 
-* An additional slice `.relationship:roleAdditional` has been added, bound to [ACPContactPersonRoleVS](ValueSet-ACPContactPersonRoleVS.html). This slice accommodates role codes required by the ACP dataset that are not included in the `RolCodelijst` bound to `.relationship:role` (e.g. SNOMED CT code `310141000146103` _Schriftelijk gemachtigde zorg en behandeling_, pre-adopted from the [RolCodelijst in zib Contactpersoon v4.1 (2024)](https://zibs.nl/wiki/Contactpersoon-v4.1(2024NL)#RolCodelijst)).
+* An additional slice `.relationship:roleAdditional` has been added, bound to [ACPContactPersonRoleVS](ValueSet-ACP-ContactPersonRoleVS.html). This slice accommodates role codes required by the ACP dataset that are not included in the `RolCodelijst` bound to `.relationship:role` (e.g. SNOMED CT code `310141000146103` _Schriftelijk gemachtigde zorg en behandeling_, pre-adopted from the [RolCodelijst in zib Contactpersoon v4.1 (2024)](https://zibs.nl/wiki/Contactpersoon-v4.1(2024NL)#RolCodelijst)).
diff --git a/input/resources/Questionnaire-ACP-zib2020.json b/input/resources/Questionnaire-ACP-zib2020.json
@@ -51,7 +51,7 @@
     {
       "linkId": "967",
       "text": "Geboortedatum patiënt",
-      "type": "dateTime",
+      "type": "date",
       "required": false,
       "repeats": false
     },

diff --git a/input/resources/QuestionnaireResponse-HendrikHartman-20201001.json b/input/resources/QuestionnaireResponse-HendrikHartman-20201001.json
@@ -173,9 +173,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Privé e-mailadres"
                           }
                         }
                       ],
@@ -726,7 +726,7 @@
                   "valueCoding": {
                     "system": "http://terminology.hl7.org/CodeSystem/v3-NullFlavor",
                     "code": "UNK",
-                    "display": "onbekend"
+                    "display": "nog onbekend"
                   },
                   "item": [
                     {

diff --git a/input/resources/QuestionnaireResponse-HendrikHartman-20221108.json b/input/resources/QuestionnaireResponse-HendrikHartman-20221108.json
@@ -173,9 +173,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Privé e-mailadres"
                           }
                         }
                       ],

diff --git a/input/resources/QuestionnaireResponse-SamiraVanDerSluijs-20251117.json b/input/resources/QuestionnaireResponse-SamiraVanDerSluijs-20251117.json
@@ -200,9 +200,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-system",
-                            "code": "phone",
-                            "display": "Phone"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "MC",
+                            "display": "Mobiel telefoonnummer"
                           }
                         }
                       ],
@@ -213,9 +213,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Telefoonnummer thuis"
                           }
                         }
                       ],
@@ -241,9 +241,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Privé e-mailadres"
                           }
                         }
                       ],
@@ -343,9 +343,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-system",
-                            "code": "phone",
-                            "display": "Phone"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "MC",
+                            "display": "Mobiel telefoonnummer"
                           }
                         }
                       ],
@@ -356,9 +356,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Telefoonnummer thuis"
                           }
                         }
                       ],
@@ -384,9 +384,9 @@
                       "answer": [
                         {
                           "valueCoding": {
-                            "system": "http://hl7.org/fhir/contact-point-use",
-                            "code": "home",
-                            "display": "Home"
+                            "system": "http://terminology.hl7.org/CodeSystem/v3-AddressUse",
+                            "code": "HP",
+                            "display": "Privé e-mailadres"
                           }
                         }
                       ],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		This profile adds ACP-specific mappings to the ART-DECOR dataset and obligation extensions for Provider and Consulter actors. Profile references are constrained to ACP profiles where available. The following change affects implementation beyond the base nl-core profile:

		* An additional slice `.relationship:roleAdditional` has been added, bound to [ACPContactPersonRoleVS](ValueSet-ACPContactPersonRoleVS.html). This slice accommodates role codes required by the ACP dataset that are not included in the `RolCodelijst` bound to `.relationship:role` (e.g. SNOMED CT code `310141000146103` _Schriftelijk gemachtigde zorg en behandeling_, pre-adopted from the [RolCodelijst in zib Contactpersoon v4.1 (2024)](https://zibs.nl/wiki/Contactpersoon-v4.1(2024NL)#RolCodelijst)).
		* An additional slice `.relationship:roleAdditional` has been added, bound to [ACPContactPersonRoleVS](ValueSet-ACP-ContactPersonRoleVS.html). This slice accommodates role codes required by the ACP dataset that are not included in the `RolCodelijst` bound to `.relationship:role` (e.g. SNOMED CT code `310141000146103` _Schriftelijk gemachtigde zorg en behandeling_, pre-adopted from the [RolCodelijst in zib Contactpersoon v4.1 (2024)](https://zibs.nl/wiki/Contactpersoon-v4.1(2024NL)#RolCodelijst)).