diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts
index 04c1d2ac5..fd34aecbd 100644
--- a/src/app/Rules/despacho.service.ts
+++ b/src/app/Rules/despacho.service.ts
@@ -68,28 +68,32 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
-  solicitarParecer(task) {
-    // let body = {
-    //   "serialNumber": serialnumber,
-    //   "action": "Conhecimento",
-    //   "ActionTypeId": 92,
-    //   "dataFields": {
-    //     "ReviewUserComment": note,
-    //   },
-    //   "AttachmentList" :documents,
-    // }
+  solicitarParecer({note ='', documents = [], serialnumber}) {
+    let body = {
+      "serialNumber": serialnumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 92,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
   }
 
-  EfectuarDespacho(task) {
-    // let body = {
-    //   "serialNumber": serialnumber,
-    //   "action": "Conhecimento",
-    //   "ActionTypeId": 94,
-    //   "dataFields": {
-    //     "ReviewUserComment": note,
-    //   },
-    //   "AttachmentList" :documents,
-    // }
+  EfectuarDespacho({note = '', documents = [], serialnumber}) {
+    let body = {
+      "serialNumber": serialnumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 94,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+       "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
   }
 
   rexecucao({note, documents, serialnumber}) {
@@ -106,6 +110,9 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+  /**
+   * @description efetuar despacho
+   */
   CompleteTask({serialNumber}) {
 
     const body = {
@@ -121,6 +128,7 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+
   // Finalizar({serialNumber}) {
   //   const body = {
   //     "serialNumber": serialNumber,
@@ -150,4 +158,13 @@ export class DespachoService {
     }
   }
 
+
+  createParecer(body: any) {
+    if(this.p.userRole(['PR'])) {
+      return this.processes.postParecerPr(body)
+    } else {
+      return this.processes.postParecer(body)
+    }
+  }
+
 }
diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts
index ef83cd95e..deeb7042c 100644
--- a/src/app/Rules/pedido.service.ts
+++ b/src/app/Rules/pedido.service.ts
@@ -46,7 +46,7 @@ export class PedidoService {
 
     const body = {
       "serialNumber": serialNumber,
-      "action": "Parecer",
+      "action": "Deferimento",
       "ActionTypeId": 93, // Pedido de deferimento
       "dataFields": {
         "ReviewUserComment": '',
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 6b54d101f..02e545265 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -138,7 +138,7 @@
             </div> 
           </ion-label>
         </div>
-  
+
         <div class="list "  *ngFor="let document of documents; let i = index" > 
           <ion-list>
             <ion-item>
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 457dc6bf5..ba650dcb3 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -265,6 +265,7 @@ export class CreateProcessPage implements OnInit {
             try {
               await this.processes.postDespatcho(this.postData).toPromise();
               await this.FinalizarDespacho(loader, 'Despacho criado');
+              this.modalController.dismiss();
             } catch (error) {
               this.toastService.badRequest('Processo não efectuado');
               loader.remove()
@@ -283,8 +284,14 @@ export class CreateProcessPage implements OnInit {
             console.log(this.postData);
 
             try {
-              await this.pedidoService.createParecer(this.postData).toPromise();
-              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
+                await this.despachoService.createParecer(this.postData).toPromise();
+                await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber}).toPromise();
+              } else  {
+                await this.pedidoService.createParecer(this.postData).toPromise();
+                await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              }
+              
               this.modalController.dismiss();
               this.toastService.successMessage('Pedido de Parecer enviado');
             }
@@ -339,6 +346,7 @@ export class CreateProcessPage implements OnInit {
               try {
                 await this.despachoService.createDespacho(this.postData).toPromise();
                 await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise();
+                
                 this.modalController.dismiss();
                 this.toastService.successMessage('Despacho criado');
               } catch (error) {
@@ -360,8 +368,15 @@ export class CreateProcessPage implements OnInit {
               console.log(this.postData);
 
               try {
-                await this.pedidoService.createParecer(this.postData).toPromise();
-                await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+
+                if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
+                  await this.despachoService.createParecer(this.postData).toPromise();
+                  await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber}).toPromise();
+                } else  {
+                  await this.pedidoService.createParecer(this.postData).toPromise();
+                  await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+                }
+
                 this.modalController.dismiss();
                 this.toastService.successMessage('Pedido de Parecer criado');
               }
@@ -386,6 +401,7 @@ export class CreateProcessPage implements OnInit {
                 try {
                   await this.pedidoService.createDeferimento(this.postData).toPromise();
                   await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
+
                   this.modalController.dismiss();
                   this.toastService.successMessage('Pedido de Deferimento criado');
                 }
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 89d9c684d..f70c7b561 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -28,7 +28,7 @@
       </div>
 
       <div class="overflow-y-auto">
-        <div class="upper-content">
+        <div class="upper-content ml-45">
           <div class="content-location">
             <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
           </div>