Fixed issue where attendance audit number would incorrectly be added

hmcts · Aug 27, 2024 · f1eceb9 · f1eceb9
1 parent 3d2745f
commit f1eceb9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/uk/gov/hmcts/juror/api/moj/service/trial/TrialServiceImpl.java b/src/main/java/uk/gov/hmcts/juror/api/moj/service/trial/TrialServiceImpl.java
@@ -263,12 +263,14 @@ public void returnJury(BureauJwtPayload payload, String trialNumber, String loca
                     log.debug("setting time in for juror %s".formatted(jurorNumber));
                 }
 
-                if (appearance.getTimeOut() == null && StringUtils.isNotEmpty(returnJuryDto.getCheckOut())) {
-                    appearance.setAppearanceStage(AppearanceStage.EXPENSE_ENTERED);
-                    appearance.setTimeOut(LocalTime.parse(returnJuryDto.getCheckOut()));
+                if (StringUtils.isNotEmpty(returnJuryDto.getCheckOut())) {
+                    if (appearance.getTimeOut() == null) {
+                        appearance.setAppearanceStage(AppearanceStage.EXPENSE_ENTERED);
+                        appearance.setTimeOut(LocalTime.parse(returnJuryDto.getCheckOut()));
+                        log.debug("setting time out for juror %s".formatted(jurorNumber));
+                    }
                     //Only give them an attendance number if they were checked out via this process
                     appearance.setAttendanceAuditNumber("J" + attendanceAuditNumber);
-                    log.debug("setting time out for juror %s".formatted(jurorNumber));
                 }
                 appearance.setTrialNumber(trialNumber);
                 appearance.setSatOnJury(true);