[26313] reload biller as mandator before adding to fire fhir bundle

elexis · Dec 12, 2024 · a55081d · a55081d
1 parent 590401f
commit a55081d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bundles/ch.elexis.fire.core/src/ch/elexis/fire/core/internal/FIREService.java b/bundles/ch.elexis.fire.core/src/ch/elexis/fire/core/internal/FIREService.java
@@ -430,7 +430,9 @@ private BundleFile addIncrementalEncounters(List<IEncounter> changedEncounters,
 					addMandatorToBundle(en.getMandator(), currentBundle.getBundle());
 					if (en.getMandator().getBiller().isPerson() && en.getMandator().getBiller().isMandator()
 							&& !en.getMandator().equals(en.getMandator().getBiller())) {
-						addMandatorToBundle((IMandator) en.getMandator().getBiller(), currentBundle.getBundle());
+						IContact biller = en.getMandator().getBiller();
+						addMandatorToBundle(coreModelService.load(biller.getId(), IMandator.class).get(),
+								currentBundle.getBundle());
 					}
 				}
 				toFIRE(fhirEncounter.get());