Nictiz · DanielPuettmann · Oct 23, 2025 · Oct 22, 2025 · Oct 22, 2025 · Oct 22, 2025
diff --git a/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml b/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml
diff --git a/.../BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml b/.../BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml
diff --git a/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml b/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml
diff --git a/.../BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml b/.../BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml
diff --git a/.../Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml b/.../Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml
diff --git a/...0/Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml b/...0/Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml
diff --git a/.../Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml b/.../Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml
diff --git a/...0/Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml b/...0/Retrieve-BgZ/Cert/Validation-Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml
diff --git a/...TU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml b/...TU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml
diff --git a/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-06d229cf-6b5e-11ec-0000-2.xml b/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-06d229cf-6b5e-11ec-0000-2.xml
@@ -11,7 +11,7 @@
         <tbody>
           <tr>
             <th>Doel</th>
-            <td>Bovendruk: 128 mm[Hg] Onderdruk: 85 mm[Hg]. Datum/tijd gemeten: 09 OCT, 2023 16:00</td>
+            <td>Bovendruk: 128 mm[Hg]/Onderdruk: 85 mm[Hg]. Datum/tijd gemeten: 09 OCT, 2023 16:00</td>
           </tr>
           <tr>
             <th>Registratiedatum</th>
@@ -35,7 +35,7 @@
   </text>
   <target>
     <reference value="Observation/zib-BloodPressure-msz-a0edd1cf-6b69-11ec-0000-2"/>
-    <display value="Bovendruk: 128 mm[Hg] Onderdruk: 85 mm[Hg]. Datum/tijd gemeten: 09 OCT, 2023 16:00"/>
+    <display value="Bovendruk: 128 mm[Hg]/Onderdruk: 85 mm[Hg]. Datum/tijd gemeten: 09 OCT, 2023 16:00"/>
   </target>
   <recorded value="${DATE, T, D, -22}T15:05:00+02:00"/>
   <activity>

diff --git a/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-97c8f361-6aad-11ec-0000-2.xml b/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-97c8f361-6aad-11ec-0000-2.xml
@@ -11,7 +11,7 @@
         <tbody>
           <tr>
             <th>Doel</th>
-            <td>fractuur van enkel, Bovendruk: 130 mm[Hg] Onderdruk: 79 mm[Hg]. Datum/tijd gemeten: T-43D{10:00}</td>
+            <td>Bovendruk: 130 mm[Hg]/Onderdruk: 79 mm[Hg]. Datum/tijd gemeten: T-43D{10:00}, fractuur van enkel, polsfractuur, traumatische huidscheur</td>
           </tr>
           <tr>
             <th>Registratiedatum</th>
@@ -34,12 +34,20 @@
     </div>
   </text>
   <target>
-    <reference value="Condition/BgZ-Problem-msz-4c1fb8c9-6b65-11ec-0000-2"/>
+    <reference value="Observation/zib-BloodPressure-msz-a05bf7e1-6b55-11ec-0000-2"/>
+    <display value="Bovendruk: 130 mm[Hg]/Onderdruk: 79 mm[Hg]. Datum/tijd gemeten: T-43D{10:00}"/>
+  </target>
+  <target>
+    <reference value="Condition/zib-Problem-msz-4c1fb8c9-6b65-11ec-0000-2"/>
     <display value="fractuur van enkel"/>
   </target>
   <target>
-    <reference value="Observation/zib-BloodPressure-msz-a05bf7e1-6b55-11ec-0000-2"/>
-    <display value="Bovendruk: 130 mm[Hg] Onderdruk: 79 mm[Hg]. Datum/tijd gemeten: T-43D{10:00}"/>
+    <reference value="Condition/zib-Problem-msz-5cbb6f2a-6b05-11ec-0000-2"/>
+    <display value="polsfractuur"/>
+  </target>
+  <target>
+    <reference value="Condition/zib-Problem-msz-f8e1d2c9-6aff-11ec-0000-2"/>
+    <display value="traumatische huidscheur"/>
   </target>
   <recorded value="${DATE, T, D, -45}T15:00:00+02:00"/>
   <activity>

diff --git a/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-b8e76196-6b7d-11ec-0000-2.xml b/...2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Metadata-msz-b8e76196-6b7d-11ec-0000-2.xml
@@ -11,7 +11,7 @@
         <tbody>
           <tr>
             <th>Doel</th>
-            <td>Status: anders, Drugssoort: Laxans</td>
+            <td>Status: anders, Drugssoort: Laxans, Status: heeft in het verleden drugs gebruikt, Drugssoort: Cannabis, wiet marihuana, hasj</td>
           </tr>
           <tr>
             <th>Registratiedatum</th>
@@ -37,6 +37,10 @@
     <reference value="Observation/zib-DrugUse-msz-9de5b8a5-6b4e-11ec-0000-2"/>
     <display value="Status: anders, Drugssoort: Laxans"/>
   </target>
+  <target>
+    <reference value="Observation/zib-DrugUse-msz-4d519fa2-6b44-11ec-0000-2"/>
+    <display value="Status: heeft in het verleden drugs gebruikt, Drugssoort: Cannabis, wiet marihuana, hasj"/>
+  </target>
   <recorded value="2005-03-04T11:11:11+01:00"/>
   <activity>
     <system value="http://hl7.org/fhir/v3/DataOperation"/>

diff --git a/...-2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Problem-msz-9bd3ddcf-6b5e-11ec-0000-2.xml b/...-2-0/Retrieve-BgZ/Cert/_reference/resources/BgZ-Problem-msz-9bd3ddcf-6b5e-11ec-0000-2.xml
diff --git a/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/_reference/resources/JAN-ADRIANUS-J-A-H--JAN-VAN-HOUTEN.xml b/...BgZ-MSZ-2-0/Retrieve-BgZ/Cert/_reference/resources/JAN-ADRIANUS-J-A-H--JAN-VAN-HOUTEN.xml
@@ -1,21 +1,22 @@
 <Patient xmlns="http://hl7.org/fhir">
   <id value="JAN-ADRIANUS-J-A-H--JAN-VAN-HOUTEN"/>
   <meta>
+    <profile value="http://fhir.nl/fhir/StructureDefinition/nl-core-patient"/>
     <profile value="http://nictiz.nl/fhir/StructureDefinition/BgZ-Patient"/>
   </meta>
   <text>
     <status value="extensions"/>
     <div xmlns="http://www.w3.org/1999/xhtml">
-      <div>Id 999909587 (BSN), <span title="Naamsamenstelling: Eigennaam">Jan Adrianus J.A.H. van Houten</span> (Jan), Man, 25 juli 1954, Geen meerling</div>
+      <div>Id 999909587 (BSN), <span title="Naamsamenstelling: Eigennaam">Jan Adrianus J.A.H. van Houten</span> (Jan), Man, 25 juli 1954, Geen meerling, <span title="Gehuwd (M - v3/MaritalStatus)">Gehuwd</span>
+      </div>
       <div>
         <a href="tel:+316-99990001">+316-99990001</a> (Mobiel Privé), <a href="mailto:[email protected]">[email protected]</a> (E-mail Privé)</div>
-      <div>Knolweg 1000 het groene huis, 9999XA STITSWERD, Nederland (Bezoek)</div>
+      <div>Knolweg 1000 het groene huis, 9999XA STITSWERD, NL (Bezoek)</div>
       <div>
         <span title="Zoon (SONC - v3/RoleCode)">Zoon</span>, <span title="Eerste relatie/contactpersoon (1 - RoleCodeLijst (COD472-VEKT))">Eerste relatie/contactpersoon</span> Peter P.H. van Houten (Peter)<div>
-          <a href="tel:+316-99990003">+316-99990003</a> (Mobiel Privé), <a href="mailto:[email protected]">[email protected]</a> (E-mail Privé), Knolweg 1002 to, 9999ZZ Stitswerd, Nederland (Bezoek)</div>
-      </div>
-      <div>Huisarts: Meindert M. Meindert Aanmoedigend<div>Zorgverlenerrol: Huisarts</div>
+          <a href="tel:+316-99990003">+316-99990003</a> (Mobiel Privé), <a href="mailto:[email protected]">[email protected]</a> (E-mail Privé), Knolweg 1002 to, 9999ZZ Stitswerd, NL (Bezoek)</div>
       </div>
+      <div>Huisarts: Meindert M. Meindert Aanmoedigend || Huisarts || Huisartsenpraktijk van aanpakken</div>
     </div>
   </text>
   <identifier>
@@ -26,6 +27,7 @@
     <extension url="http://hl7.org/fhir/StructureDefinition/humanname-assembly-order">
       <valueCode value="NL1"/>
     </extension>
+    <text value="Jan Adrianus J.A.H. van Houten"/>
     <family value="van Houten">
       <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-prefix">
         <valueString value="van"/>
@@ -107,7 +109,7 @@
     </line>
     <city value="STITSWERD"/>
     <postalCode value="9999XA"/>
-    <country value="Nederland">
+    <country value="NL">
       <extension url="http://nictiz.nl/fhir/StructureDefinition/code-specification">
         <valueCodeableConcept>
           <coding>
@@ -120,6 +122,13 @@
       </extension>
     </country>
   </address>
+  <maritalStatus>
+    <coding>
+      <system value="http://hl7.org/fhir/v3/MaritalStatus"/>
+      <code value="M"/>
+      <display value="Gehuwd"/>
+    </coding>
+  </maritalStatus>
   <multipleBirthBoolean value="false"/>
   <contact>
     <relationship>
@@ -137,6 +146,7 @@
       </coding>
     </relationship>
     <name>
+      <text value="Peter P.H. van Houten"/>
       <family value="van Houten">
         <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-prefix">
           <valueString value="van"/>
@@ -205,7 +215,7 @@
       </line>
       <city value="Stitswerd"/>
       <postalCode value="9999ZZ"/>
-      <country value="Nederland">
+      <country value="NL">
         <extension url="http://nictiz.nl/fhir/StructureDefinition/code-specification">
           <valueCodeableConcept>
             <coding>
@@ -222,8 +232,8 @@
   <generalPractitioner>
     <extension url="http://nictiz.nl/fhir/StructureDefinition/practitionerrole-reference">
       <valueReference>
-        <reference value="PractitionerRole/nl-core-practitionerrole-msz-1000000101-015"/>
-        <display value="Huisarts"/>
+        <reference value="PractitionerRole/nl-core-practitionerrole-msz-1000000101-01520000001"/>
+        <display value="Meindert M. Meindert Aanmoedigend || Huisarts || Huisartsenpraktijk van aanpakken"/>
       </valueReference>
     </extension>
     <reference value="Practitioner/nl-core-practitioner-msz-2-16-840-1-113883-2-4-6-1-10000001"/>

diff --git a/...tResult-msz-0efd45f1-6a9f-11ec-0000-2.xml → ...rvation-msz-0efd45f1-6a9f-11ec-0000-2.xml b/...tResult-msz-0efd45f1-6a9f-11ec-0000-2.xml → ...rvation-msz-0efd45f1-6a9f-11ec-0000-2.xml
@@ -1,13 +1,13 @@
 <Observation xmlns="http://hl7.org/fhir">
-  <id value="zib-LabTestResult-msz-0efd45f1-6a9f-11ec-0000-2"/>
+  <id value="b-LaboratoryTestResult-Observation-msz-0efd45f1-6a9f-11ec-0000-2"/>
   <meta>
     <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-LaboratoryTestResult-Observation"/>
   </meta>
   <text>
     <status value="extensions"/>
     <div xmlns="http://www.w3.org/1999/xhtml">
       <table>
-        <caption>Observatie/bepaling. Subject: Jan Adrianus J.A.H. Jan van Houten. Categorie: <span title="bevinding betreffende laboratoriumonderzoek (49581000146104 - SNOMED CT)">bevinding betreffende laboratoriumonderzoek</span>, Status: definitief</caption>
+        <caption>Observatie/bepaling. Subject: Jan Adrianus J.A.H. Jan van Houten. Categorie: <span title="Laboratory (laboratory - observation-category)">Laboratory</span>, Status: definitief</caption>
         <tbody>
           <tr>
             <th>Code</th>
@@ -35,6 +35,11 @@
     </extension>
   </status>
   <category>
+    <coding>
+      <system value="http://hl7.org/fhir/observation-category"/>
+      <code value="laboratory"/>
+      <display value="Laboratory"/>
+    </coding>
     <coding>
       <system value="http://snomed.info/sct"/>
       <code value="49581000146104"/>

diff --git a/...tResult-msz-156c6601-6b1b-11ec-0000-2.xml → ...rvation-msz-156c6601-6b1b-11ec-0000-2.xml b/...tResult-msz-156c6601-6b1b-11ec-0000-2.xml → ...rvation-msz-156c6601-6b1b-11ec-0000-2.xml
@@ -1,13 +1,13 @@
 <Observation xmlns="http://hl7.org/fhir">
-  <id value="zib-LabTestResult-msz-156c6601-6b1b-11ec-0000-2"/>
+  <id value="b-LaboratoryTestResult-Observation-msz-156c6601-6b1b-11ec-0000-2"/>
   <meta>
     <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-LaboratoryTestResult-Observation"/>
   </meta>
   <text>
     <status value="extensions"/>
     <div xmlns="http://www.w3.org/1999/xhtml">
       <table>
-        <caption>Observatie/bepaling. Subject: Michelle M.B. Michelle Bergzoon Verheul. Categorie: <span title="bevinding betreffende laboratoriumonderzoek (49581000146104 - SNOMED CT)">bevinding betreffende laboratoriumonderzoek</span>, Status: definitief</caption>
+        <caption>Observatie/bepaling. Subject: Michelle M.B. Michelle Bergzoon Verheul. Categorie: <span title="Laboratory (laboratory - observation-category)">Laboratory</span>, Status: definitief</caption>
         <tbody>
           <tr>
             <th>Code</th>
@@ -35,6 +35,11 @@
     </extension>
   </status>
   <category>
+    <coding>
+      <system value="http://hl7.org/fhir/observation-category"/>
+      <code value="laboratory"/>
+      <display value="Laboratory"/>
+    </coding>
     <coding>
       <system value="http://snomed.info/sct"/>
       <code value="49581000146104"/>

diff --git a/...tResult-msz-1b29c7f0-6af4-11ec-0000-2.xml → ...rvation-msz-1b29c7f0-6af4-11ec-0000-2.xml b/...tResult-msz-1b29c7f0-6af4-11ec-0000-2.xml → ...rvation-msz-1b29c7f0-6af4-11ec-0000-2.xml
@@ -1,13 +1,13 @@
 <Observation xmlns="http://hl7.org/fhir">
-  <id value="zib-LabTestResult-msz-1b29c7f0-6af4-11ec-0000-2"/>
+  <id value="b-LaboratoryTestResult-Observation-msz-1b29c7f0-6af4-11ec-0000-2"/>
   <meta>
     <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-LaboratoryTestResult-Observation"/>
   </meta>
   <text>
     <status value="extensions"/>
     <div xmlns="http://www.w3.org/1999/xhtml">
       <table>
-        <caption>Observatie/bepaling. Subject: Jan Adrianus J.A.H. Jan van Houten. Categorie: <span title="bevinding betreffende laboratoriumonderzoek (49581000146104 - SNOMED CT)">bevinding betreffende laboratoriumonderzoek</span>, Status: definitief</caption>
+        <caption>Observatie/bepaling. Subject: Jan Adrianus J.A.H. Jan van Houten. Categorie: <span title="Laboratory (laboratory - observation-category)">Laboratory</span>, Status: definitief</caption>
         <tbody>
           <tr>
             <th>Code</th>
@@ -35,6 +35,11 @@
     </extension>
   </status>
   <category>
+    <coding>
+      <system value="http://hl7.org/fhir/observation-category"/>
+      <code value="laboratory"/>
+      <display value="Laboratory"/>
+    </coding>
     <coding>
       <system value="http://snomed.info/sct"/>
       <code value="49581000146104"/>

diff --git a/...tResult-msz-2107b74f-6b71-11ec-0000-2.xml → ...rvation-msz-2107b74f-6b71-11ec-0000-2.xml b/...tResult-msz-2107b74f-6b71-11ec-0000-2.xml → ...rvation-msz-2107b74f-6b71-11ec-0000-2.xml
@@ -1,13 +1,13 @@
 <Observation xmlns="http://hl7.org/fhir">
-  <id value="zib-LabTestResult-msz-2107b74f-6b71-11ec-0000-2"/>
+  <id value="b-LaboratoryTestResult-Observation-msz-2107b74f-6b71-11ec-0000-2"/>
   <meta>
     <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-LaboratoryTestResult-Observation"/>
   </meta>
   <text>
     <status value="extensions"/>
     <div xmlns="http://www.w3.org/1999/xhtml">
       <table>
-        <caption>Observatie/bepaling. Subject: Michelle M.B. Michelle Bergzoon Verheul. Categorie: <span title="bevinding betreffende laboratoriumonderzoek (49581000146104 - SNOMED CT)">bevinding betreffende laboratoriumonderzoek</span>, Status: definitief</caption>
+        <caption>Observatie/bepaling. Subject: Michelle M.B. Michelle Bergzoon Verheul. Categorie: <span title="Laboratory (laboratory - observation-category)">Laboratory</span>, Status: definitief</caption>
         <tbody>
           <tr>
             <th>Bepalingdatum/tijd</th>
@@ -39,6 +39,11 @@
     </extension>
   </status>
   <category>
+    <coding>
+      <system value="http://hl7.org/fhir/observation-category"/>
+      <code value="laboratory"/>
+      <display value="Laboratory"/>
+    </coding>
     <coding>
       <system value="http://snomed.info/sct"/>
       <code value="49581000146104"/>