Fixed the fhirpath expression in testscript for ELZ

Author: NictizEduard

output/R4/ELZ-0-2-0-beta/ELZ/Test/Serving-XIS/elz-serving-xis-scenario-1-maximal-json.xml

@@ -47,13 +47,13 @@
    <variable>
       <name value="servicerequestid"/>
       <description value="The resource id from the ServiceRequest"/>
-      <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+      <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
       <sourceId value="taskfromserver"/>
    </variable>
    <variable>
       <name value="compositionid"/>
       <description value="The resource id from the Composition"/>
-      <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+      <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
       <sourceId value="servicerequestfromserver"/>
    </variable>
    <test id="01-serve-Task">

output/R4/ELZ-0-2-0-beta/ELZ/Test/Serving-XIS/elz-serving-xis-scenario-1-maximal-xml.xml

@@ -47,13 +47,13 @@
    <variable>
       <name value="servicerequestid"/>
       <description value="The resource id from the ServiceRequest"/>
-      <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+      <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
       <sourceId value="taskfromserver"/>
    </variable>
    <variable>
       <name value="compositionid"/>
       <description value="The resource id from the Composition"/>
-      <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+      <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
       <sourceId value="servicerequestfromserver"/>
    </variable>
    <test id="01-serve-Task">

output/R4/ELZ-0-2-0-beta/ELZ/Test/Serving-XIS/elz-serving-xis-scenario-2-minimal-json.xml

@@ -47,13 +47,13 @@
    <variable>
       <name value="servicerequestid"/>
       <description value="The resource id of the Servicerequest"/>
-      <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+      <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
       <sourceId value="taskfromserver"/>
    </variable>
    <variable>
       <name value="compositionid"/>
       <description value="The resource id of the Composition"/>
-      <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+      <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
       <sourceId value="servicerequestfromserver"/>
    </variable>
    <test id="01-serve-Task">

output/R4/ELZ-0-2-0-beta/ELZ/Test/Serving-XIS/elz-serving-xis-scenario-2-minimal-xml.xml

@@ -47,13 +47,13 @@
    <variable>
       <name value="servicerequestid"/>
       <description value="The resource id of the Servicerequest"/>
-      <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+      <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
       <sourceId value="taskfromserver"/>
    </variable>
    <variable>
       <name value="compositionid"/>
       <description value="The resource id of the Composition"/>
-      <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+      <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
       <sourceId value="servicerequestfromserver"/>
    </variable>
    <test id="01-serve-Task">

src/ELZ-0-2-0-beta/Test/Serving-XIS/elz-serving-xis-scenario-1-maximal.xml

@@ -23,15 +23,15 @@
      <variable>
          <name value="servicerequestid"/>
          <description value="The resource id from the ServiceRequest"/>
-         <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+         <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
          <sourceId value="taskfromserver"/>
      </variable>
 
 
      <variable>
          <name value="compositionid"/>
          <description value="The resource id from the Composition"/>
-         <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+         <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
          <sourceId value="servicerequestfromserver"/>
      </variable>    
 

src/ELZ-0-2-0-beta/Test/Serving-XIS/elz-serving-xis-scenario-2-minimal.xml

@@ -23,14 +23,14 @@
     <variable>
         <name value="servicerequestid"/>
         <description value="The resource id of the Servicerequest"/>
-        <expression value="Task.focus.reference.substring(Task.focus.reference.lastIndexOf('/') + 1)"/>
+        <expression value="Task.focus.reference.replaceMatches('^.*ServiceRequest/','')"/>
         <sourceId value="taskfromserver"/>
     </variable>
 
     <variable>
         <name value="compositionid"/>
         <description value="The resource id of the Composition"/>
-        <expression value="ServiceRequest.supportingInfo.first().reference.substring(ServiceRequest.supportingInfo.first().reference.lastIndexOf('/') + 1)"/>
+        <expression value="ServiceRequest.supportingInfo.first().reference.replaceMatches('^.*Composition/','')"/>
         <sourceId value="servicerequestfromserver"/>
     </variable>