Refactor content assertions for functionalMentalStatus and Medicaldevicestatement

Author: mikdejong

src/BgZ-MSZ-2-0/Test/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml

@@ -89,10 +89,14 @@
         <nts:include value="assert.response.numResources" scope="common" 
             resource="Observation" count="2" nts:in-targets="#default"/>
 
-        <nts:contentAsserts href="resources/BgZ-FuncMentStat-msz-da9d7592-6aff-11ec-0000-2.xml" 
-            description="contains .code.coding.code = '401049002'" discriminator="code.where(coding.where(code = '401049002'))" nts:in-targets="CheckContent"/>
-        <nts:contentAsserts href="resources/BgZ-FuncMentStat-msz-6fd26405-6b39-11ec-0000-2.xml" 
-            description="contains .code.coding.code = '47078008'" discriminator="code.where(coding.where(code = '47078008'))" nts:in-targets="CheckContent"/>
+        <nts:contentAsserts href="resources/BgZ-FuncMentStat-msz-6fd26405-6b39-11ec-0000-2.xml"
+            description="contains .code.coding.code = '401049002'"
+            discriminator="code.where(coding.where(code = '401049002'))"
+            nts:in-targets="CheckContent" />
+        <nts:contentAsserts href="resources/BgZ-FuncMentStat-msz-da9d7592-6aff-11ec-0000-2.xml"
+            description="contains .code.coding.code = '47078008'"
+            discriminator="code.where(coding.where(code = '47078008'))"
+            nts:in-targets="CheckContent" />
     </test>
 
     <test id="07-serve-Problem">
@@ -292,10 +296,10 @@
             description="contains .device with reference to Device with type.coding.code = '183125006'" discriminator="device.resolve().type.where(coding.where(code = '183125006'))" nts:in-targets="CheckContent"/>
         <nts:contentAsserts href="resources/zib-MedicalDevice-msz-198d0d8f-6ade-11ec-0000-2.xml" 
             description="contains .device with reference to Device with type.coding.code = '702171001'" discriminator="device.resolve().type.where(coding.where(code = '702171001'))" nts:in-targets="CheckContent"/>
-        <nts:contentAsserts href="resources/zib-MedicalDevice-msz-c6f4c86e-6ad3-11ec-0000-2.xml" 
-            description="contains .device with reference to Device with type.coding.code = '700654009'" discriminator="device.resolve().type.where(coding.where(code = '860586000'))" nts:in-targets="CheckContent"/>
-        <nts:contentAsserts href="resources/zib-MedicalDevice-msz-6647560f-6b3b-11ec-0000-2.xml" 
-            description="contains .device with reference to Device with type.coding.code = '860586000'" discriminator="device.resolve().type.where(coding.where(code = '466193006'))" nts:in-targets="CheckContent"/>
+        <nts:contentAsserts href="resources/zib-MedicalDevice-msz-c6f4c86e-6ad3-11ec-0000-2.xml"
+            description="contains .device with reference to Device with type.coding.code = '700654009'" discriminator="device.resolve().type.where(coding.where(code = '700654009'))" nts:in-targets="CheckContent" />
+        <nts:contentAsserts href="resources/zib-MedicalDevice-msz-6647560f-6b3b-11ec-0000-2.xml"
+            description="contains .device with reference to Device with type.coding.code = '860586000'" discriminator="device.resolve().type.where(coding.where(code = '860586000'))" nts:in-targets="CheckContent" />
         <nts:contentAsserts href="resources/zib-MedicalDeviceProduct-msz-9ccc0819-6ac9-11ec-0000-2.xml" 
             description="contains .type.coding.code = '183125006'" discriminator="type.where(coding.where(code = '183125006'))" nts:in-targets="CheckContent"/>
         <nts:contentAsserts href="resources/zib-MedicalDeviceProduct-msz-198d0d8f-6ade-11ec-0000-2.xml"