Merge branch 'main' into qa-tweaks

# Conflicts: # known-issues.yml
Nictiz · Aug 28, 2023 · 62b3eca · 62b3eca
2 parents cdd1bf1 + 3cc28e6
commit 62b3eca
Show file tree

Hide file tree

Showing 26 changed files with 219 additions and 87 deletions.
diff --git a/examples/nl-core-Alert-01-Condition-01.xml b/examples/nl-core-Alert-01-Condition-01.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Condition xmlns="http://hl7.org/fhir">
+   <id value="nl-core-Alert-01-Condition-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Problem"/>
+   </meta>
+   <clinicalStatus>
+      <coding>
+         <system value="http://terminology.hl7.org/CodeSystem/condition-clinical"/>
+         <code value="active"/>
+         <display value="Active"/>
+      </coding>
+   </clinicalStatus>
+   <verificationStatus>
+      <coding>
+         <system value="http://terminology.hl7.org/CodeSystem/condition-ver-status"/>
+         <code value="confirmed"/>
+         <display value="Confirmed"/>
+      </coding>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="410605003"/>
+         <display value="Aanwezigheid bevestigd"/>
+      </coding>
+   </verificationStatus>
+   <category>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="404684003"/>
+         <display value="Klinische bevinding"/>
+      </coding>
+   </category>
+   <code>
+      <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-Problem.FurtherSpecificationProblemName">
+         <valueString value="tweeling"/>
+      </extension>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="77386006"/>
+         <display value="Klinische bevinding"/>
+      </coding>
+   </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <onsetDateTime value="2012-09-15"/>
+</Condition>
diff --git a/examples/nl-core-Alert-01.xml b/examples/nl-core-Alert-01.xml
@@ -29,7 +29,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <period>
       <start value="2012-09-15"/>

diff --git a/examples/nl-core-Alert-02.xml b/examples/nl-core-Alert-02.xml
@@ -22,7 +22,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <period>
       <start value="2010-06-01"/>

diff --git a/examples/nl-core-AllergyIntolerance-01.xml b/examples/nl-core-AllergyIntolerance-01.xml
@@ -43,7 +43,7 @@
    <patient>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </patient>
    <onsetDateTime value="2008-11-08"/>
    <lastOccurrence value="2009-11-15"/>

diff --git a/examples/nl-core-AllergyIntolerance-02.xml b/examples/nl-core-AllergyIntolerance-02.xml
@@ -43,7 +43,7 @@
    <patient>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </patient>
    <onsetDateTime value="1995-01-01"/>
    <lastOccurrence value="1998-06-02"/>

diff --git a/examples/nl-core-ChecklistPainBehavior-01.xml b/examples/nl-core-ChecklistPainBehavior-01.xml
@@ -13,9 +13,9 @@
       </coding>
    </code>
    <subject>
-      <reference value="Patient/nl-core-TreatmentDirective2-02-Patient-01"/>
+      <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Jan Pieter Mark (Piet) Pietersen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <effectiveDateTime value="2016-12-19T10:45:00+01:00"/>
    <valueInteger value="6"/>

diff --git a/examples/nl-core-Encounter-01.xml b/examples/nl-core-Encounter-01.xml
@@ -4,7 +4,8 @@
    <meta>
       <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Encounter"/>
    </meta>
-   <status value="finished"/>
+   <!--.status: Dependent on outcome of https://github.com/Nictiz/Nictiz-R4-zib2020/issues/194-->
+   <status value="unknown"/>
    <class>
       <system value="http://terminology.hl7.org/CodeSystem/v3-ActCode"/>
       <code value="IMP"/>
@@ -21,12 +22,6 @@
       <start value="2012-08-16"/>
       <end value="2012-08-19"/>
    </period>
-   <reasonReference>
-      <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-Comment">
-         <valueString value="Buikpijn"/>
-      </extension>
-      <!--TODO: nl-core-LaboratoryTestResult-->
-   </reasonReference>
    <hospitalization>
       <admitSource>
          <coding>

diff --git a/examples/nl-core-EpisodeOfCare-01-Condition-01.xml b/examples/nl-core-EpisodeOfCare-01-Condition-01.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Condition xmlns="http://hl7.org/fhir">
+   <id value="nl-core-EpisodeOfCare-01-Condition-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Problem"/>
+   </meta>
+   <category>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="404684003"/>
+         <display value="Klinische bevinding"/>
+      </coding>
+   </category>
+   <code>
+      <coding>
+         <system value="http://hl7.org/fhir/sid/icpc-1-nl"/>
+         <code value="A91.05"/>
+         <display value="Gestoorde glucosetolerantie"/>
+      </coding>
+   </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <onsetDateTime value="2014-04-05"/>
+</Condition>
diff --git a/examples/nl-core-EpisodeOfCare-02-Condition-01.xml b/examples/nl-core-EpisodeOfCare-02-Condition-01.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Condition xmlns="http://hl7.org/fhir">
+   <id value="nl-core-EpisodeOfCare-02-Condition-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Problem"/>
+   </meta>
+   <category>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="282291009"/>
+         <display value="Interpretatie van diagnose"/>
+      </coding>
+   </category>
+   <code>
+      <coding>
+         <system value="http://hl7.org/fhir/sid/icpc-1-nl"/>
+         <code value="T90.02"/>
+         <display value="Diabetes Mellitus type 2"/>
+      </coding>
+   </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <onsetDateTime value="2014-05-21"/>
+</Condition>
diff --git a/examples/nl-core-LaboratoryTestResult-02.xml b/examples/nl-core-LaboratoryTestResult-02.xml
@@ -26,6 +26,11 @@
          <display value="Chloride"/>
       </coding>
    </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
    <effectiveDateTime value="2012-05-23T08:08:00+02:00"/>
    <valueQuantity>
       <value value="109"/>
@@ -39,6 +44,11 @@
          <code value="281302008"/>
          <display value="Boven referentiebereik"/>
       </coding>
+      <coding>
+         <system value="http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation"/>
+         <code value="H"/>
+         <display value="High"/>
+      </coding>
    </interpretation>
    <specimen>
       <reference value="Specimen/nl-core-LaboratoryTestResult.Specimen-02"/>

diff --git a/examples/nl-core-LaboratoryTestResult.Specimen-02.xml b/examples/nl-core-LaboratoryTestResult.Specimen-02.xml
@@ -11,4 +11,9 @@
          <display value="bloed"/>
       </coding>
    </type>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
 </Specimen>
diff --git a/examples/nl-core-LegalSituation-LegalStatus-01.xml b/examples/nl-core-LegalSituation-LegalStatus-01.xml
@@ -28,7 +28,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <onsetDateTime value="2018-01-01"/>
    <abatementDateTime value="2020-01-01"/>

diff --git a/examples/nl-core-LegalSituation-Representation-02.xml b/examples/nl-core-LegalSituation-Representation-02.xml
@@ -28,7 +28,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <onsetDateTime value="2018-01-01"/>
    <abatementDateTime value="2020-01-01"/>

diff --git a/examples/nl-core-LifeStance-01.xml b/examples/nl-core-LifeStance-01.xml
@@ -13,9 +13,9 @@
       </coding>
    </code>
    <subject>
-      <reference value="Patient/nl-core-TreatmentDirective2-02-Patient-01"/>
+      <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Jan Pieter Mark (Piet) Pietersen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <valueCodeableConcept>
       <coding>

diff --git a/examples/nl-core-LivingSituation-01.xml b/examples/nl-core-LivingSituation-01.xml
@@ -12,6 +12,11 @@
          <display value="Residence and accommodation circumstances - finding"/>
       </coding>
    </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
    <valueCodeableConcept>
       <coding>
          <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.13.1"/>

diff --git a/examples/nl-core-NutritionAdvice-01.xml b/examples/nl-core-NutritionAdvice-01.xml
@@ -18,14 +18,16 @@
       <type value="Patient"/>
       <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </patient>
-   <dateTime value="2022-09-29T13:29:38.301302+02:00"/>
+   <dateTime value="2023-08-21T12:55:18.827972+02:00"/>
    <oralDiet>
       <type>
          <text value="Energie verrijkt"/>
       </type>
-      <fluidConsistencyType>
-         <text value="Dikvloeibaar"/>
-      </fluidConsistencyType>
+      <texture>
+         <modifier>
+            <text value="Dikvloeibaar"/>
+         </modifier>
+      </texture>
    </oralDiet>
    <note>
       <text value="Sinds een week dieet veranderd in energieverrijkt."/>

diff --git a/examples/nl-core-PharmaceuticalProduct-01.xml b/examples/nl-core-PharmaceuticalProduct-01.xml
@@ -9,6 +9,8 @@
          <system value="urn:oid:2.16.840.1.113883.2.4.4.1"/>
          <code value="71587"/>
          <display value="LISINOPRIL 10MG TABLET"/>
+         <userSelected value="true"/>
       </coding>
+      <text value="LISINOPRIL 10MG TABLET"/>
    </code>
 </Medication>
diff --git a/examples/nl-core-PharmaceuticalProduct-02.xml b/examples/nl-core-PharmaceuticalProduct-02.xml
@@ -9,6 +9,8 @@
          <system value="urn:oid:2.16.840.1.113883.2.4.4.1"/>
          <code value="89907"/>
          <display value="Methotrexaat injvlst 25mg/ml 0,6 ml"/>
+         <userSelected value="true"/>
       </coding>
+      <text value="Methotrexaat injvlst 25mg/ml 0,6 ml"/>
    </code>
 </Medication>
diff --git a/examples/nl-core-PharmaceuticalProduct-INV-invalid.xml b/examples/nl-core-PharmaceuticalProduct-INV-invalid.xml
diff --git a/examples/nl-core-PharmaceuticalProduct-OTH.xml b/examples/nl-core-PharmaceuticalProduct-OTH.xml
diff --git a/examples/nl-core-PharmaceuticalProduct-randomCode-invalid.xml b/examples/nl-core-PharmaceuticalProduct-randomCode-invalid.xml