diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index aa011be1c..4df7f792d 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -267,64 +267,149 @@ export class CreateProcessPage implements OnInit {
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
     const loader = this.toastService.loading()
 
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
 
-        switch (this.taskType) {
-          case '0': // Despacho
-            this.postData = {
-              DistributionType: "Paralelo",
-              CountryCode: 'AO',
-              Priority: this.postData.Priority,
-              UserEmail: this.loggeduser.Email,
-              UsersSelected: attendees,
-              DispatchFolder: this.dispatchFolder,
+    if(this.loggeduser.Profile != 'PR') {
+      switch (this.taskType) {
+        case '0': // Despacho
+          this.postData = {
+            DistributionType: "Paralelo",
+            CountryCode: 'AO',
+            Priority: this.postData.Priority,
+            UserEmail: this.loggeduser.Email,
+            UsersSelected: attendees,
+            DispatchFolder: this.dispatchFolder,
+          }
+
+          try {
+            await this.processes.postDespatcho(this.postData).toPromise();
+            await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
+
+            this.modalController.dismiss();
+            this.toastService._successMessage('Despacho criado');
+          } catch (error) {
+            this.toastService._badRequest('Processo não efectuado');
+
+          } finally {
+            loader.remove()
+          }
+
+          break;
+        case '1': // pedido de Parecer
+          this.postData = {
+            DistributionType: "Paralelo",
+            CountryCode: 'AO',
+            Priority: this.postData.Priority,
+            UserEmail: this.loggeduser.Email,
+            UsersSelected: attendees,
+            DispatchFolder: this.dispatchFolder,
+          }
+
+          try {
+            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, activityInstanceName: this.task.activityInstanceName}).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');
+          }
+          catch (error) {
+            this.toastService._badRequest('Processo não efectuado');
+          } finally {
+            loader.remove()
+          }
+
+          break;
+        case '2': // Pedido de Deferimento
+          this.postData = {
+            DistributionType: "Paralelo",
+            CountryCode: 'AO',
+            Priority: this.postData.Priority,
+            UserEmail: this.loggeduser.Email,
+            UsersSelected: attendees,
+            DispatchFolder: this.dispatchFolder,
+          }
+
+          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');
+          }
+          catch (error) {
+            this.toastService._badRequest('Processo não efectuado');
+          }
+          finally {
+            loader.remove()
+          }
+          break;
+        }
+    } else if (this.loggeduser.Profile == 'PR') {
+      switch (this.taskType) {
+        case '0': // Despacho PR
+          this.postData = {
+            DistributionType: "Paralelo",
+            CountryCode: 'AO',
+            Priority: this.postData.Priority,
+            UserEmail: this.loggeduser.Email,
+            UsersSelected: attendees,
+            DispatchFolder: this.dispatchFolder,
+          }
+
+          if(this.postData.DispatchFolder.Message){
             try {
-              await this.processes.postDespatcho(this.postData).toPromise();
-              await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
+              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) {
               this.toastService._badRequest('Processo não efectuado');
-
             } finally {
-              loader.remove()
+              //loader.remove();
+            }
+          }
+          else{
+            this.validateField = true;
+            this.toastService._badRequest('Por favor adicione uma descrição');
+          }
+          loader.remove();
+          break;
+        case '1': // Pedido de Parecer
+          this.postData = {
+            DistributionType: "Paralelo",
+            CountryCode: 'AO',
+            Priority: this.postData.Priority,
+            UserEmail: this.loggeduser.Email,
+            UsersSelected: attendees,
+            DispatchFolder: this.dispatchFolder,
+          }
+
+          try {
+
+            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, activityInstanceName: this.task.activityInstanceName}).toPromise();
+            } else  {
+              await this.pedidoService.createParecer(this.postData).toPromise();
+              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
             }
 
-            break;
-          case '1': // pedido de Parecer
-            this.postData = {
-              DistributionType: "Paralelo",
-              CountryCode: 'AO',
-              Priority: this.postData.Priority,
-              UserEmail: this.loggeduser.Email,
-              UsersSelected: attendees,
-              DispatchFolder: this.dispatchFolder,
-            }
+            this.modalController.dismiss();
+            this.toastService._successMessage('Pedido de Parecer criado');
+          }
+          catch (error) {
+            this.toastService._badRequest('Processo não efectuado');
+          } finally {
+            loader.remove()
+          }
 
-            try {
-              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, activityInstanceName: this.task.activityInstanceName}).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');
-            }
-            catch (error) {
-              this.toastService._badRequest('Processo não efectuado');
-            } finally {
-              loader.remove()
-            }
-
-            break;
-          case '2': // Pedido de Deferimento
+          break;
+        case '2': // Pedido de Deferimento
             this.postData = {
               DistributionType: "Paralelo",
               CountryCode: 'AO',
@@ -343,102 +428,12 @@ export class CreateProcessPage implements OnInit {
             }
             catch (error) {
               this.toastService._badRequest('Processo não efectuado');
-            }
-            finally {
+            } finally {
               loader.remove()
             }
+
             break;
-          }
-
-        break;
-
-      case 'PR':
-          switch (this.taskType) {
-            case '0': // Despacho PR
-              this.postData = {
-                DistributionType: "Paralelo",
-                CountryCode: 'AO',
-                Priority: this.postData.Priority,
-                UserEmail: this.loggeduser.Email,
-                UsersSelected: attendees,
-                DispatchFolder: this.dispatchFolder,
-              }
-
-              if(this.postData.DispatchFolder.Message){
-                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) {
-                  this.toastService._badRequest('Processo não efectuado');
-                } finally {
-                  //loader.remove();
-                }
-              }
-              else{
-                this.validateField = true;
-                this.toastService._badRequest('Por favor adicione uma descrição');
-              }
-              loader.remove();
-              break;
-            case '1': // Pedido de Parecer
-              this.postData = {
-                DistributionType: "Paralelo",
-                CountryCode: 'AO',
-                Priority: this.postData.Priority,
-                UserEmail: this.loggeduser.Email,
-                UsersSelected: attendees,
-                DispatchFolder: this.dispatchFolder,
-              }
-
-              try {
-
-                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, activityInstanceName: this.task.activityInstanceName}).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');
-              }
-              catch (error) {
-                this.toastService._badRequest('Processo não efectuado');
-              } finally {
-                loader.remove()
-              }
-
-              break;
-            case '2': // Pedido de Deferimento
-                this.postData = {
-                  DistributionType: "Paralelo",
-                  CountryCode: 'AO',
-                  Priority: this.postData.Priority,
-                  UserEmail: this.loggeduser.Email,
-                  UsersSelected: attendees,
-                  DispatchFolder: this.dispatchFolder,
-                }
-
-                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');
-                }
-                catch (error) {
-                  this.toastService._badRequest('Processo não efectuado');
-                } finally {
-                  loader.remove()
-                }
-
-                break;
-          }
-        break;
+      }
     }
 
   }