fixed resource order in generated bundle, includes from search first

The change will result in observation reference in blood-gas-panel to
occur first in the generated bundle and as such being created first.

Author: hhund

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClient.java

@@ -30,6 +30,7 @@
 import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r4.model.Bundle.BundleType;
 import org.hl7.fhir.r4.model.Bundle.HTTPVerb;
+import org.hl7.fhir.r4.model.Bundle.SearchEntryMode;
 import org.hl7.fhir.r4.model.DomainResource;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Identifier;
@@ -587,9 +588,16 @@ protected Stream<DomainResource> getDomainResources(Bundle bundle)
 
 	private Stream<DomainResource> getDomainResourcesFromBundle(Bundle bundle)
 	{
-		return bundle.getEntry().stream().filter(BundleEntryComponent::hasResource)
-				.map(BundleEntryComponent::getResource).filter(r -> r instanceof DomainResource)
-				.map(r -> (DomainResource) r);
+		// includes first
+		return Stream.concat(
+				bundle.getEntry().stream().filter(BundleEntryComponent::hasResource)
+						.filter(e -> e.hasSearch() && SearchEntryMode.INCLUDE.equals(e.getSearch().getMode()))
+						.map(BundleEntryComponent::getResource).filter(r -> r instanceof DomainResource)
+						.map(r -> (DomainResource) r),
+				bundle.getEntry().stream().filter(BundleEntryComponent::hasResource)
+						.filter(e -> e.hasSearch() && SearchEntryMode.MATCH.equals(e.getSearch().getMode()))
+						.map(BundleEntryComponent::getResource).filter(r -> r instanceof DomainResource)
+						.map(r -> (DomainResource) r));
 	}
 
 	private Stream<DomainResource> doGetDomainResources(String nextUrl, int subTotal)