diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts
index ff01d62..870da3b 100644
--- a/src/controllers/06-request-list-controller.ts
+++ b/src/controllers/06-request-list-controller.ts
@@ -291,6 +291,8 @@ export class RequestListController extends Controller {
       case "InProgress":
       case "Waiting":
       case "Validate":
+      case "Completed":
+      case "Ended":
         await prisma.requestData.update({
           where: {
             id: record.requestWork.requestDataId,
@@ -298,17 +300,18 @@ export class RequestListController extends Controller {
           data: { requestDataStatus: "InProgress" },
         });
         break;
-      case "Completed":
-      case "Ended":
-        if (successAll) {
-          await prisma.requestData.update({
-            where: {
-              id: record.requestWork.requestDataId,
-            },
-            data: { requestDataStatus: "Completed" },
-          });
-        }
-        break;
+    }
+
+    if (
+      successAll &&
+      (payload.requestWorkStatus === "Completed" || payload.requestWorkStatus === "Ended")
+    ) {
+      await prisma.requestData.update({
+        where: {
+          id: record.requestWork.requestDataId,
+        },
+        data: { requestDataStatus: "Completed" },
+      });
     }
 
     return record;