diff --git a/app/Http/Controllers/WorkstationsJobsController.php b/app/Http/Controllers/WorkstationsJobsController.php
index d34da6f1..f2d37036 100644
--- a/app/Http/Controllers/WorkstationsJobsController.php
+++ b/app/Http/Controllers/WorkstationsJobsController.php
@@ -95,7 +95,8 @@ public function receiveAnswersEquipment(Request $request)
         }
 
         // Para criar a divisao do equipamento em entre compo e Obturador 
-        if ($receiveDataControlWs->elemental_tasks_id == 5 || $receiveDataControlWs->elemental_tasks_id == 6) {
+        if ($receiveDataControlWs->elemental_tasks_id == 5 && $receiveDataEquipment->equipment_type_id == 3) {
+
             $nextEquipmentTask1 = DB::select("
                 INSERT INTO control_equipment_workstation
                 (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date)
@@ -119,8 +120,11 @@ public function receiveAnswersEquipment(Request $request)
             return redirect()->route('enterWorkstation');
         }
 
-        // Quando concluir as tarefas 8 e 9 ele apenas deve 
-        else if ($receiveDataControlWs->elemental_tasks_id == 8 || $receiveDataControlWs->elemental_tasks_id == 9) {
+        
+        // Quando concluir as tarefas 8 e 9 
+        else if ($receiveDataEquipment->equipment_type_id == 3 && ($receiveDataControlWs->elemental_tasks_id == 8 || $receiveDataControlWs->elemental_tasks_id == 9)) {
+            // dd('recebe if Quando concluir as tarefas 8 e 9  ');
+
             // Verifique se já existem registros na tabela control_equipment_workstation
             $existingRecords = DB::table('control_equipment_workstation')
                 ->where('equipment_id', $receiveDataControlWs->equipment_id)
@@ -130,6 +134,7 @@ public function receiveAnswersEquipment(Request $request)
 
             // Verifique se há pelo menos dois registros que atendem às condições
             if ($existingRecords->count() >= 2) {
+
                 // Crie um novo registro com elemental_tasks_id igual a 10
                 $nextEquipmentTask3 = DB::table('control_equipment_workstation')->insertGetId([
                     'equipment_id' => $receiveDataControlWs->equipment_id,
@@ -147,6 +152,7 @@ public function receiveAnswersEquipment(Request $request)
 
         //Se a proxima WS for igual a atual deve criar dados para a ws
         else if ($recebeDataControlId->id_workstations == $next_workstation) {
+
             $nextEquipmentTask = DB::select("
             INSERT INTO control_equipment_workstation
                 (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date)
@@ -168,23 +174,22 @@ public function receiveAnswersEquipment(Request $request)
                 'task_todo' => $next_todo
             ]);
             // Se verificar que a proxima tarefa e Null ele deve apenas voltar ao start
-        } else if ($next_todo == null) {
-
-            return redirect()->route('enterWorkstation');
-        } else {
-            $nextEquipmentTask = DB::select("
-            INSERT INTO control_equipment_workstation
-                (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date)
-            VALUES 
-                (:equipment_id,NULL,:elemental_tasks_id,:further_tasks_id,NULL,NULL,NULL)
-            ", [
-                'equipment_id' => $receiveDataEquipment->equipment_id,
-                'elemental_tasks_id' => $elemental_tasks_id,
-                'further_tasks_id' => $further_tasks_id
-            ]);
-
-            return redirect()->route('enterWorkstation');
-        }
+            
+        } 
+          else if ($next_workstation == null) {
+        
+             $nextEquipmentTask = DB::select("
+             INSERT INTO control_equipment_workstation
+                 (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date)
+             VALUES 
+                 (:equipment_id,NULL,:elemental_tasks_id,:further_tasks_id,NULL,NULL,NULL)
+             ", [
+                 'equipment_id' => $receiveDataEquipment->equipment_id,
+                 'elemental_tasks_id' => $elemental_tasks_id,
+                 'further_tasks_id' => $further_tasks_id
+             ]);
+             return redirect()->route('enterWorkstation');
+         }
     }
 
     // Ao selecionar o equipamento para se inicializar a tarefa deve mostrar os dados relacionados.
@@ -273,8 +278,8 @@ public function getEquipmentData($equipment_id)
                 ->whereNotNull('entry_date')
                 ->whereNull('departure_date')
                 ->first();
-                // dd($deleteDataControlWhereRefreashPage);
-                
+            // dd($deleteDataControlWhereRefreashPage);
+
             if ($deleteDataControlWhereRefreashPage) {
                 $deleteDataControlWhereRefreashPage->id_workstations = null;
                 $deleteDataControlWhereRefreashPage->entry_date = null;
@@ -282,7 +287,6 @@ public function getEquipmentData($equipment_id)
                 $deleteDataControlWhereRefreashPage->save();
             }
             return redirect()->route('enterWorkstation');
-
         } else
 
             $receiveDataElementalTask = ElementalTasks::find($recebeDataControlId->elemental_tasks_id);