diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 2a3e1bf5a..42530955c 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -198,48 +198,65 @@
           </div>
         </div>
 
-        <div class="container-div">
-          <div class="ion-item-class-2">
+        <div class="container-div width-100">
+          <div class="ion-item-class-2 d-flex">
             <div class="ion-icon-class">
               <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
             </div>
-            <div class="ion-input-class">
-              <ion-select
-                class="d-block d-md-none"
-                [(ngModel)]="postData.IsRecurring"
-                placeholder="Selecione repetição*"
-                value="false"
-                interface="action-sheet"
-                Cancel-text="Cancelar"
-                required
-
-              >
-                <ion-select-option value="false">Não se repete</ion-select-option>
-                <ion-select-option value="true">Repete</ion-select-option>
-                <!-- <ion-select-option value="true">Semanal</ion-select-option>
-                <ion-select-option value="true">Diário</ion-select-option>
-                <ion-select-option value="true">Anual</ion-select-option> -->
-              </ion-select>
-
-
-              <mat-form-field
-                floatLabel="never"
-                class="width-100 d-none d-md-block"
-                value="false"
-                interface="action-sheet"
-                required
-                appearance="none"
-              >
-                <mat-select placeholder="Selecione repetição*" [(ngModel)]="postData.IsRecurring" >
-                  <mat-option value="false">
-                    Não se repete
-                  </mat-option>
-                  <mat-option value="true">
-                    Repete
+            <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
+    
+              <mat-form-field   appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
+                <mat-select placeholder="Selecione repetição*"
+                [(ngModel)]="EventRecurrenceType"
+                (ngModelChange)="onSelectedRecurringChanged($event)">
+                  <mat-option
+                  *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
+                  >
+                  {{recurring.Description}}
                   </mat-option>
                 </mat-select>
               </mat-form-field>
+    
+            </div>
+          </div>
+        </div>
 
+        <div *ngIf="EventRecurrenceType != '-1'" class="container-div width-100">
+          <div class="ion-item-class-2 d-flex">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+            </div>
+            <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
+              <!-- <ion-datetime
+                placeholder="Última ocorrência"
+                [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
+                displayFormat="DD MMM YYYY"
+                monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
+                min="2021"
+                max="2045"
+              >
+              </ion-datetime> -->
+              <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+    
+             <!--  [formControl]="dateControlOccurrence" -->
+    
+              <mat-form-field class="date-hour-picker">
+                <input matInput [ngxMatDatetimePicker]="occurrrence"
+                  placeholder="Choose a date"
+                  [(ngModel)]="Occurrence"
+                  [disabled]="disabled"
+                >
+                <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
+                <ngx-mat-datetime-picker #occurrrence
+                  [showSpinners]="showSpinners"
+                  [showSeconds]="showSeconds"
+                  [stepHour]="stepHour" [stepMinute]="stepMinute"
+                  [stepSecond]="stepSecond"
+                  [touchUi]="touchUi"
+                  >
+                </ngx-mat-datetime-picker>
+              </mat-form-field>
+    
             </div>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index a896dddc0..685b26696 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -35,7 +35,6 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   }
 }
 
-
 @Component({
   selector: 'app-book-meeting-modal',
   templateUrl: './book-meeting-modal.page.html',
@@ -69,6 +68,9 @@ export class BookMeetingModalPage implements OnInit {
 
   Form: FormGroup;
   validateFrom = false
+  recurringTypes = [];
+  Occurrence: Date = new Date()
+  EventRecurrenceType = '-1'
 
   showLoader = false
 
@@ -154,8 +156,17 @@ export class BookMeetingModalPage implements OnInit {
     console.log(this.task);
     this.getAttachments();
     this.setDefaultTime()
+    this.getRecurrenceTypes();
+
   }
 
+  getRecurrenceTypes() {
+    this.calendarService.getRecurrenceTypes().subscribe(res=>{
+      this.recurringTypes = res;
+    });
+  }
+
+
   setDefaultTime() {
     this.postData.StartDate =  new Date()
     this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
@@ -220,9 +231,8 @@ export class BookMeetingModalPage implements OnInit {
     if(this.loggeduser.Profile == 'MDGPR') {
       this.injectValidation()
       this.runValidation()
+      if(this.Form.invalid) return false
     }
-
-    // if(this.Form.invalid) return false
     
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
@@ -248,7 +258,10 @@ export class BookMeetingModalPage implements OnInit {
       Organizer: null,
       Category: 'Reunião',
       HasAttachments: true,
-      EventRecurrence: null,
+      EventRecurrence: {
+        Type: this.EventRecurrenceType,
+        LastOccurrence: this.Occurrence
+      },
     }
 
     console.log(this.postData);
@@ -339,6 +352,13 @@ export class BookMeetingModalPage implements OnInit {
     }
   }
 
+  openLastOccurrence() {
+    let input: any = document.querySelector('#last-occurrence')
+    if(input) {
+      input.click()
+    }
+  }
+
   async addParticipantsCc() {
 
     this.adding = "CC";