diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
index 097e6588..5e350dd6 100644
--- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
+++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
@@ -569,16 +569,15 @@ public class TicketController extends ControllerBase {
      */
     @PostMapping("call/hangUp")
     public ApiResult<Void> hangUp(@Valid @RequestBody TicketCallHangUpRequest request) {
-        boolean flag=false;
+        TicketCall ticketCall = ticketCallService.getLast(request.getTicketId());
         if (request.getReject()) {
-            TicketCall ticketCall = ticketCallService.getLast(request.getTicketId());
             if (Objects.isNull(ticketCall)) return ApiResult.success();
             if (StrUtil.equals(request.getFrom(), Constant.FROM_APP) && Objects.equals(AppUserUtil.getUserId(), request.getFromUserId())) {
                 AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
                 Ticket ticket = ticketService.getById(request.getTicketId());
-                int handlerId= Integer.parseInt(StrUtil.split(ticket.getHandle(), ",").stream().findFirst().get());
+                int handlerId = Integer.parseInt(StrUtil.split(ticket.getHandle(), ",").stream().findFirst().get());
                 uniPushService.send(new UniPushMessage()
-                        .setSenderId(ticket.getUserPlatform()+"-uid-" + appUser.getId())
+                        .setSenderId(ticket.getUserPlatform() + "-uid-" + appUser.getId())
                         .setReceiverId("admin-uid-" + handlerId)
                         .setSendData(new UniPushMessageBody()
                                 .setTitle("挂断视频通话")
@@ -594,12 +593,11 @@ public class TicketController extends ControllerBase {
                         )
                 );
                 ssePushService.sendTicketCallCancelToAdmin(request.getTicketId(), handlerId, appUser);
-                flag = ticketCallService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
-            }else {
+            } else {
                 AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
                 Ticket ticket = ticketService.getById(request.getTicketId());
                 uniPushService.send(new UniPushMessage()
-                        .setSenderId(ticket.getUserPlatform()+"-uid-" + appUser.getId())
+                        .setSenderId(ticket.getUserPlatform() + "-uid-" + appUser.getId())
                         .setReceiverId("admin-uid-" + request.getFromUserId())
                         .setSendData(new UniPushMessageBody()
                                 .setTitle("拒绝视频通话")
@@ -615,10 +613,9 @@ public class TicketController extends ControllerBase {
                         )
                 );
                 ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser);
-                flag = ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
             }
         }
-        if (flag){
+        if (ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true)) {
             ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
         }
         return ApiResult.success();