remove duplicate content asserts and move content asserts.

Author: Hdj81

src/Geboortezorg-3-2/Dev/XIS-Server/gbz-fhir3-0-2-izk-xis-2-2.xml

@@ -301,13 +301,6 @@
          <nts:with-parameter name="code" value="698350008"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(alcohol use)"/>
-         <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="228273003"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
-      </nts:include>
       <nts:include value="gbz-assert-returnCountWithCode">
          <nts:with-parameter name="additionalDescription" value="(Apgar Score 10-minuten)"/>
          <nts:with-parameter name="resource" value="Observation"/>
@@ -385,13 +378,6 @@
          <nts:with-parameter name="code" value="11977-6"/>
          <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tobacco use)"/>
-         <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="365980008"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
-      </nts:include>
       <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-bc-AbilityToTakeCareOfChild129879003-8b35ed8a-8d86-4b2d-ab59-f54d7d73c3d3.xml" nts:in-targets="CheckContent">
          <nts:discriminator>code.where(coding.where(code=129879003))</nts:discriminator>
       </nts:contentAsserts>
@@ -437,9 +423,6 @@
       <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-bc-MaternalObservation169740003-8469601b-1169-4a16-aa6f-aef7a9a46fda.xml" nts:in-targets="CheckContent">
          <nts:discriminator>code.where(coding.where(code=169740003))</nts:discriminator>
       </nts:contentAsserts>
-      <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-AlcoholUse228273003-48c8a133-ec39-4907-ba76-b1c5eb98bd95.xml" nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=228273003))</nts:discriminator>
-      </nts:contentAsserts>
       <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-ApgarScore9271-8-2b619c6c-ef73-414c-bff7-8dfec68908d3.xml" nts:in-targets="CheckContent">
          <nts:discriminator>code.where(coding.where(code='9271-8'))</nts:discriminator>
       </nts:contentAsserts>
@@ -468,9 +451,6 @@
       <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-bc-DeliveryObservation364332008-b9be3a20-85a8-4c2a-8b10-a0f7c16712b3.xml" nts:in-targets="CheckContent">
          <nts:discriminator>code.where(coding.where(code=364332008))</nts:discriminator>
       </nts:contentAsserts>
-      <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-TobaccoUse365980008-003653d0-140a-45ab-8c14-d5e11be28bf3.xml" nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=365980008))</nts:discriminator>
-      </nts:contentAsserts>
    </test>
 
    <!-- Observations - Observaties gekoppeld aan prenatale controle -->
@@ -485,14 +465,17 @@
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-            <!-- alcoholgebruik -->
+      <!-- alcoholgebruik -->
       <nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
          <nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
          <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
          <nts:with-parameter name="count" value="1"></nts:with-parameter>
          <nts:with-parameter name="code" value="228273003"></nts:with-parameter>
          <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
       </nts:include>
+      <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-AlcoholUse228273003-48c8a133-ec39-4907-ba76-b1c5eb98bd95.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code=228273003))</nts:discriminator>
+      </nts:contentAsserts>
       <!-- tabakgebruik -->
       <nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
          <nts:with-parameter name="additionalDescription" value="(tobacco use)"></nts:with-parameter>
@@ -501,6 +484,9 @@
          <nts:with-parameter name="code" value="365980008"></nts:with-parameter>
          <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
       </nts:include>
+      <nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-TobaccoUse365980008-003653d0-140a-45ab-8c14-d5e11be28bf3.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code=365980008))</nts:discriminator>
+      </nts:contentAsserts>
    </test>
 
    <!-- Alle verrichtingen -->

src/Geboortezorg-3-2/Dev/XIS-Server/gbz-fhir3-0-2-izk-xis-4-1.xml

@@ -522,13 +522,6 @@
          <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
       <!-- bloeddruk -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(lichaamslengte)"/>
-         <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="8302-2"/>
-         <nts:with-parameter name="system" value="http://loinc.org"/>
-      </nts:include>
       <nts:include value="gbz-assert-returnCountWithCode">
          <nts:with-parameter name="additionalDescription" value="(bloeddruk)"/>
          <nts:with-parameter name="resource" value="Observation"/>