diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 088b16cc0..a5741501f 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -131,7 +131,6 @@ export class DespachosPrPage implements OnInit {
         if(SessionStore.user.Profile != 'Consultant') {
           despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
         } else {
-          // console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma'))
           despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho" || 
           data.activityInstanceName == "Gerar Diploma");
         }
@@ -289,26 +288,6 @@ export class DespachosPrPage implements OnInit {
   }
 
 
-  // async distartExpedientModal() {
-
-  //   const modal = await this.modalController.create({
-  //     component: DiscartExpedientModalPage,
-  //     componentProps: {
-  //       action: 'complete',
-  //     },
-  //     cssClass: 'discart-expedient-modal',
-  //     backdropDismiss: false
-  //   });
-
-  //   await modal.present();
-  //   modal.onDidDismiss().then(res=>{
-  //     if(res['data']=='close'){
-
-  //     }
-
-  //   });
-  // }
-
   docIndex(index: number) {
     this.dicIndex = index;
   }
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index dbba689b4..1094eb55f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -19,7 +19,7 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
-//import { NotificationsService } from 'src/app/services/notifications.service';
+
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { PermissionService } from 'src/app/services/permission.service';
@@ -375,6 +375,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
 
+
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -389,6 +391,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
       }
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+        alert('bug!')
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -543,74 +547,17 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
   async LoadCounts() {
 
-    let allPreocesses_;
+    let expedientes;
 
     try {
-      allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
+      expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
       this.loadCount = true;
     } catch(error) {
       this.loadCount = true;
     }
 
-    let allProcessesList = allPreocesses_;
 
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
-
-    if(SessionStore.user.Profile != 'Consultant') {
-      allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    } else {
-      console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma'))
-    }
-
-
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
-
-    if (!this.p.userRole(['PR'])) {
-      allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas')
-    } else if (this.p.userRole(['PR'])) {
-      allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado')
-    }
-
-    this.addProcessToDB(allProcessesList)
-    this.skeletonLoader = true;
-
-    this.allProcessesList = [];
-
-    allProcessesList.forEach(element => {
-      let date = new Date(element.taskStartDate);
-      date.setMonth(date.getMonth() + 1);
-
-      let task = {
-        "SerialNumber": element.serialNumber,
-        "Folio": element.workflowInstanceDataFields.Subject,
-        "Senders": element.workflowInstanceDataFields.Sender,
-        "CreateDate": new Date(element.taskStartDate),
-        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-        "Remetente": element.workflowInstanceDataFields.Remetente,
-        "DocumentsQty": element.totalDocuments,
-        "DocId": element.workflowInstanceDataFields.DispatchDocId,
-        "FolderID": element.workflowInstanceDataFields.FolderID,
-        "WorkflowName": element.workflowDisplayName,
-        "activityInstanceName": element.activityInstanceName,
-        "Status": element.workflowInstanceDataFields.Status,
-        "Agenda": element.workflowInstanceDataFields.Agenda,
-        "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
-      }
-
-      this.allProcessesList.push(task);
-    });
-
-    this.allProcessesList = removeDuplicate(this.allProcessesList);
-    this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
-    let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();
+    
     expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
 
     expedientes = expedientes.filter((item) => {
@@ -660,7 +607,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
       if(SessionStore.user.Profile != 'Consultant') {
         despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
       } else {
-        // console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma'))
         despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho" || 
         data.activityInstanceName == "Gerar Diploma");
       }
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index b998b1f2b..1eaa3e04d 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -196,6 +196,8 @@ export class AllProcessesPage implements OnInit {
   }
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -210,6 +212,8 @@ export class AllProcessesPage implements OnInit {
       }
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+        alert('Bug!')
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {