1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/DNPM/services/consent/UkwConsentManagerService.java b/src/main/java/DNPM/services/consent/UkwConsentManagerService.java
index 46b7d05..c22a6e4 100644
--- a/src/main/java/DNPM/services/consent/UkwConsentManagerService.java
+++ b/src/main/java/DNPM/services/consent/UkwConsentManagerService.java
@@ -15,7 +15,7 @@ import java.util.Comparator;
  */
 public class UkwConsentManagerService implements ConsentManagerService {
 
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     private final IOnkostarApi onkostarApi;
 
@@ -48,10 +48,10 @@ public class UkwConsentManagerService implements ConsentManagerService {
                 .ifPresent(lastConsent -> {
                     var date = lastConsent.getStartDate();
                     var status = lastConsent.getValue("status");
-                    if (null == status) {
+                    if (null == date || null == status || status.getString().isBlank()) {
                         logger.warn("Kein DNPM-Einwilligungstatus angegeben");
                         return;
-                    };
+                    }
 
                     dnpmKlinikAnamnese.setValue("ConsentStatusEinwilligungDNPM", new Item("Einwilligung", status.getString()));
                     dnpmKlinikAnamnese.setValue("ConsentDatumEinwilligungDNPM", new Item("DatumEinwilligung", date));