diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 8394ccbdb..60fc4f987 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -52,14 +52,24 @@ export class ExpedientePage implements OnInit {
     
   }
 
-  LoadList(){
+  async LoadList(){
     this.skeletonLoader = true
 
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      console.log(result);
+    try {
+      const expedientePr: object[] = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise()
+      const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
+  
+      const result = expedientePr.concat(expedienteMD)
+
+      console.log('result', result);
+      console.log('expedientePr', expedientePr)
+      console.log('expedienteMD', expedienteMD)
+
+      
       this.taskslist = new Array();
-      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-      res.forEach(element => {
+      let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
+
+      res.forEach((element: any) => {
         let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);
         let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
@@ -80,10 +90,11 @@ export class ExpedientePage implements OnInit {
       console.log(this.taskslist);
       this.expedienteStorage.reset(this.taskslist);
       this.skeletonLoader = false;
-    }, ()=>{
+    } catch (error) {
       this.toastService.badRequest('Processo não encontrado')
       this.goBack()
-    });
+    }
+
   }
 
   async refreshing() {
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 5b7e4f76d..b75700508 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
-
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
@@ -10,6 +9,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -36,6 +36,7 @@ export class ExpedientesPrPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
+    private location: Location
     ) {
       this.loggeduser = authService.ValidatedUser;
     }
@@ -62,71 +63,35 @@ export class ExpedientesPrPage implements OnInit {
 
   LoadList(){
     this.skeletonLoader = true
-
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
-        this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-          console.log(result);
-          this.skeletonLoader = false
-          this.showLoader =false
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-          res.forEach(element => {
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": element.totalDocuments,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-              "Status": element.workflowInstanceDataFields.Status,
-              }
-              this.taskslist.push(task);
-            });
-          console.log(this.taskslist);
-          this.expedienteprstore.reset(this.taskslist);
-          this.skeletonLoader = false
+    
+    this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
+      console.log(result);
+      this.skeletonLoader = false
+      this.showLoader =false
+      this.taskslist = new Array();
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": taskDate,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": element.totalDocuments,
+          "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
+          "Status": element.workflowInstanceDataFields.Status,
+          }
+          this.taskslist.push(task);
         });
-
-        break;
-      case 'PR':
-          this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-            console.log(result);
-            this.taskslist = new Array();
-            this.skeletonLoader = false
-            this.showLoader =false
-
-            let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-            res.forEach(element => {
-              let date = new Date(element.taskStartDate);
-              date.setMonth(date.getMonth() + 1);
-              let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-              let task: DailyWorkTask = {
-                "SerialNumber": element.serialNumber,
-                "Folio": element.workflowInstanceDataFields.Subject,
-                "Senders": element.originator.email,
-                "CreateDate": taskDate,
-                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                "Remetente": element.workflowInstanceDataFields.Remetente,
-                "DocumentsQty": element.totalDocuments,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-                "Status": element.workflowInstanceDataFields.Status,
-                }
-                this.taskslist.push(task);
-              });
-            console.log(this.taskslist);
-            this.expedienteprstore.reset(this.taskslist);
-            this.showLoader = false;
-          });
-        break;
-    }
+      console.log(this.taskslist);
+      this.expedienteprstore.reset(this.taskslist);
+      this.skeletonLoader = false
+    })
   }
 
   refreshing() {
@@ -164,14 +129,14 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "expedientes-pr": true,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    // let navigationExtras: NavigationExtras = {
+    //   queryParams: {
+    //     "expedientes-pr": true,
+    //   }
+    // };
+    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    // window.history.back();
+    this.location.back();
 
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 16892aa06..ff07e531b 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -493,40 +493,40 @@ export class PedidoPage implements OnInit {
 
   goBack() {
     this.location.back();
-    if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-      if (window.innerWidth <= 700) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
+    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+    //   if (window.innerWidth <= 700) {
+    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
+    //   }
+    //   else {
 
-        let navigationExtras: NavigationExtras;
+    //     let navigationExtras: NavigationExtras;
 
-        if (this.task.activityInstanceName == 'Concluir Deferimento') {
-          navigationExtras= { queryParams: {"deferimento": true,}};
-        } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-          navigationExtras = { queryParams: {"parecer": true,}};
-        }
+    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
+    //       navigationExtras= { queryParams: {"deferimento": true,}};
+    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
+    //       navigationExtras = { queryParams: {"parecer": true,}};
+    //     }
 
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else {
-      if (window.innerWidth <= 700) {
-        this.router.navigate(['/home/gabinete-digital/pedidos']);
-      }
-      else {
+    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    //   }
+    // }
+    // else {
+    //   if (window.innerWidth <= 700) {
+    //     this.router.navigate(['/home/gabinete-digital/pedidos']);
+    //   }
+    //   else {
 
-        let navigationExtras: NavigationExtras;
+    //     let navigationExtras: NavigationExtras;
 
-        if (this.task.activityInstanceName == 'Concluir Deferimento') {
-          navigationExtras= { queryParams: {"deferimento": true,}};
-        } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
+    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
+    //       navigationExtras= { queryParams: {"deferimento": true,}};
+    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
 
-          navigationExtras = { queryParams: {"parecer": true,}};
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
+    //       navigationExtras = { queryParams: {"parecer": true,}};
+    //     }
+    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    //   }
+    // }
   }
 
 }
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 39524b63d..0daaf70f7 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -66,66 +66,31 @@ export class ExpedientesPrPage implements OnInit {
 
   LoadList(){
     this.skeletonLoader = true;
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
-        this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-          console.log(result);
-
-          this.taskslist = []
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-
-          res.forEach(element => {
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": element.totalDocuments,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-              "Status": element.workflowInstanceDataFields.Status,
-              }
-              this.taskslist.push(task);
-          });
-          this.expedienteprstore.reset(this.taskslist);
-          this.skeletonLoader = false;
-        });
-
-        break;
-        case 'PR':
-          this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-            console.log(result);
-            this.taskslist = [];
-            let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-            res.forEach(element => {
-              let date = new Date(element.taskStartDate);
-              date.setMonth(date.getMonth() + 1);
-              let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-              let task: DailyWorkTask = {
-                "SerialNumber": element.serialNumber,
-                "Folio": element.workflowInstanceDataFields.Subject,
-                "Senders": element.workflowInstanceDataFields.Sender,
-                "CreateDate": taskDate,
-                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                "Remetente": element.workflowInstanceDataFields.Remetente,
-                "DocumentsQty": 0,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-                "Status": element.workflowInstanceDataFields.Status,
-                }
-                this.taskslist.push(task);
-            });
-            this.expedienteprstore.reset(this.taskslist);
-            this.skeletonLoader = false;
-          });
-
-        break;
-    }
+    this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
+      console.log(result);
+      this.taskslist = [];
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": taskDate,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": 0,
+          "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
+          "Status": element.workflowInstanceDataFields.Status,
+          }
+          this.taskslist.push(task);
+      });
+      this.expedienteprstore.reset(this.taskslist);
+      this.skeletonLoader = false;
+    });
   }
 
   refreshing() {