diff --git a/app/doctor/consultas/page.tsx b/app/doctor/consultas/page.tsx
index 8eca4d2..0bc765f 100644
--- a/app/doctor/consultas/page.tsx
+++ b/app/doctor/consultas/page.tsx
@@ -56,7 +56,7 @@ export default function DoctorAppointmentsPage() {
       const patientsMap = new Map<string, { name: string; phone: string }>(
         patientsList.map((p: any) => [p.id, { name: p.full_name, phone: p.phone_mobile }])
       );
-      
+
       const enrichedAppointments = appointmentsList.map((apt: any) => ({
         id: apt.id,
         patientName: patientsMap.get(apt.patient_id)?.name || "Paciente Desconhecido",
@@ -85,10 +85,10 @@ export default function DoctorAppointmentsPage() {
     const appointmentsToDisplay = selectedDate
       ? allAppointments.filter(app => app.scheduled_at && app.scheduled_at.startsWith(format(selectedDate, "yyyy-MM-dd")))
       : allAppointments.filter(app => {
-          if (!app.scheduled_at) return false;
-          const dateObj = parseISO(app.scheduled_at);
-          return isValid(dateObj) && isFuture(dateObj);
-        });
+        if (!app.scheduled_at) return false;
+        const dateObj = parseISO(app.scheduled_at);
+        return isValid(dateObj) && isFuture(dateObj);
+      });
 
     return appointmentsToDisplay.reduce((acc, appointment) => {
       const dateKey = format(parseISO(appointment.scheduled_at), "yyyy-MM-dd");
@@ -162,7 +162,7 @@ export default function DoctorAppointmentsPage() {
             <Card>
               <CardHeader><CardTitle className="flex items-center"><CalendarIcon className="mr-2 h-5 w-5" />Filtrar por Data</CardTitle><CardDescription>Selecione um dia para ver os detalhes.</CardDescription></CardHeader>
               <CardContent className="flex justify-center p-2">
-                <CalendarShadcn mode="single" selected={selectedDate} onSelect={setSelectedDate} modifiers={{ booked: bookedDays }} modifiersClassNames={{ booked: "bg-primary/20" }} className="rounded-md border p-2" locale={ptBR}/>
+                <CalendarShadcn mode="single" selected={selectedDate} onSelect={setSelectedDate} modifiers={{ booked: bookedDays }} modifiersClassNames={{ booked: "bg-primary/20" }} className="rounded-md border p-2" locale={ptBR} />
               </CardContent>
             </Card>
           </div>
@@ -197,7 +197,7 @@ export default function DoctorAppointmentsPage() {
                                 {format(scheduledAtDate, "HH:mm")}
                               </div>
                             </div>
-                            
+
                             {/* Coluna 2: Status e Telefone */}
                             <div className="col-span-1 flex flex-col items-center gap-2">
                                <Badge variant="outline" className={getStatusVariant(appointment.status)}>{statusPT[appointment.status].replace('_', ' ')}</Badge>
diff --git a/app/doctor/dashboard/page.tsx b/app/doctor/dashboard/page.tsx
index aa382d4..45fd3d7 100644
--- a/app/doctor/dashboard/page.tsx
+++ b/app/doctor/dashboard/page.tsx
@@ -24,6 +24,15 @@ import Link from "next/link";
 import { useEffect, useState } from "react";
 import { toast } from "@/hooks/use-toast";
 
+// --- IMPORTS ADICIONADOS PARA A CORREÇÃO ---
+import { useAuthLayout } from "@/hooks/useAuthLayout";
+import { patientsService } from "@/services/patientsApi.mjs";
+// --- FIM DOS IMPORTS ADICIONADOS ---
+
+import { appointmentsService } from "@/services/appointmentsApi.mjs";
+import { format, parseISO, isAfter, isSameMonth, startOfToday } from "date-fns";
+import { ptBR } from "date-fns/locale";
+
 import { AvailabilityService } from "@/services/availabilityApi.mjs";
 import { exceptionsService } from "@/services/exceptionApi.mjs";
 import { doctorsService } from "@/services/doctorsApi.mjs";
@@ -122,127 +131,120 @@ interface Exception {
 }
 
 export default function PatientDashboard() {
-  const [loggedDoctor, setLoggedDoctor] = useState<Doctor>();
-  const [userData, setUserData] = useState<UserData>();
-  const [availability, setAvailability] = useState<any | null>(null);
-  const [exceptions, setExceptions] = useState<Exception[]>([]);
-  const [schedule, setSchedule] = useState<
-    Record<string, { start: string; end: string }[]>
-  >({});
-  const formatTime = (time?: string | null) =>
-    time?.split(":")?.slice(0, 2).join(":") ?? "";
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [exceptionToDelete, setExceptionToDelete] = useState<string | null>(
-    null
-  );
-  const [error, setError] = useState<string | null>(null);
+    // --- USA O HOOK DE AUTENTICAÇÃO PARA PEGAR O USUÁRIO LOGADO ---
+    const { user } = useAuthLayout({ requiredRole: ['medico'] });
 
-  // Mapa de tradução
-  const weekdaysPT: Record<string, string> = {
-    sunday: "Domingo",
-    monday: "Segunda",
-    tuesday: "Terça",
-    wednesday: "Quarta",
-    thursday: "Quinta",
-    friday: "Sexta",
-    saturday: "Sábado",
-  };
+    const [loggedDoctor, setLoggedDoctor] = useState<Doctor | null>(null);
+    const [userData, setUserData] = useState<UserData>();
+    const [availability, setAvailability] = useState<any | null>(null);
+    const [exceptions, setExceptions] = useState<Exception[]>([]);
+    const [schedule, setSchedule] = useState<Record<string, { start: string; end: string }[]>>({});
+    const formatTime = (time?: string | null) => time?.split(":")?.slice(0, 2).join(":") ?? "";
+    const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+    const [exceptionToDelete, setExceptionToDelete] = useState<string | null>(null);
+    const [error, setError] = useState<string | null>(null);
 
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        const doctorsList: Doctor[] = await doctorsService.list();
-        const doctor = doctorsList[0];
+    // --- ESTADOS PARA OS CARDS ATUALIZADOS ---
+    const [nextAppointment, setNextAppointment] = useState<EnrichedAppointment | null>(null);
+    const [monthlyCount, setMonthlyCount] = useState<number>(0);
 
-        // Salva no estado
-        setLoggedDoctor(doctor);
+    const weekdaysPT: Record<string, string> = { sunday: "Domingo", monday: "Segunda", tuesday: "Terça", wednesday: "Quarta", thursday: "Quinta", friday: "Sexta", saturday: "Sábado" };
 
-        // Busca disponibilidade
-        const availabilityList = await AvailabilityService.list();
+    // ▼▼▼ LÓGICA DE BUSCA CORRIGIDA E ATUALIZADA ▼▼▼
+    useEffect(() => {
+        const fetchData = async () => {
+            if (!user?.id) return; // Aguarda o usuário ser carregado
 
-        // Filtra já com a variável local
-        const filteredAvail = availabilityList.filter(
-          (disp: { doctor_id: string }) => disp.doctor_id === doctor?.id
-        );
-        setAvailability(filteredAvail);
+            try {
+                // Encontra o perfil de médico correspondente ao usuário logado
+                const doctorsList: Doctor[] = await doctorsService.list();
+                const currentDoctor = doctorsList.find(doc => doc.user_id === user.id);
+
+                if (!currentDoctor) {
+                    setError("Perfil de médico não encontrado para este usuário.");
+                    return;
+                }
+                setLoggedDoctor(currentDoctor);
+
+                // Busca todos os dados necessários em paralelo
+                const [appointmentsList, patientsList, availabilityList, exceptionsList] = await Promise.all([
+                    appointmentsService.list(),
+                    patientsService.list(),
+                    AvailabilityService.list(),
+                    exceptionsService.list()
+                ]);
+
+                // Mapeia pacientes por ID para consulta rápida
+                const patientsMap = new Map(patientsList.map((p: any) => [p.id, p.full_name]));
+
+                // Filtra e enriquece as consultas APENAS do médico logado
+                const doctorAppointments = appointmentsList
+                    .filter((apt: any) => apt.doctor_id === currentDoctor.id)
+                    .map((apt: any): EnrichedAppointment => ({
+                        ...apt,
+                        patientName: patientsMap.get(apt.patient_id) || "Paciente Desconhecido",
+                    }));
+
+                // 1. Lógica para "Próxima Consulta"
+                const today = startOfToday();
+                const upcomingAppointments = doctorAppointments
+                    .filter(apt => isAfter(parseISO(apt.scheduled_at), today))
+                    .sort((a, b) => new Date(a.scheduled_at).getTime() - new Date(b.scheduled_at).getTime());
+                setNextAppointment(upcomingAppointments[0] || null);
+
+                // 2. Lógica para "Consultas Este Mês" (apenas ativas)
+                const activeStatuses = ['confirmed', 'requested', 'checked_in'];
+                const currentMonthAppointments = doctorAppointments.filter(apt =>
+                    isSameMonth(parseISO(apt.scheduled_at), new Date()) && activeStatuses.includes(apt.status)
+                );
+                setMonthlyCount(currentMonthAppointments.length);
+
+                // Busca e filtra o restante dos dados
+                setAvailability(availabilityList.filter((d: any) => d.doctor_id === currentDoctor.id));
+                setExceptions(exceptionsList.filter((e: any) => e.doctor_id === currentDoctor.id));
 
-                // Busca exceções
-                const exceptionsList = await exceptionsService.list();
-                const filteredExc = exceptionsList.filter((exc: { doctor_id: string }) => exc.doctor_id === doctor?.id);
-                setExceptions(filteredExc);
             } catch (e: any) {
-                alert(`${e?.error} ${e?.message}`);
+                setError(e?.message || "Erro ao buscar dados do dashboard");
+                console.error("Erro no dashboard:", e);
             }
         };
 
-          fetchData();
-      }, []);
+        fetchData();
+    }, [user]); // A busca de dados agora depende do usuário logado
+    // ▲▲▲ FIM DA LÓGICA DE BUSCA ATUALIZADA ▲▲▲
 
-  // Função auxiliar para filtrar o id do doctor correspondente ao user logado
-  function findDoctorById(id: string, doctors: Doctor[]) {
-    return doctors.find((doctor) => doctor.user_id === id);
-  }
-
-  const openDeleteDialog = (exceptionId: string) => {
-    setExceptionToDelete(exceptionId);
-    setDeleteDialogOpen(true);
-  };
-
-  const handleDeleteException = async (ExceptionId: string) => {
-    try {
-      alert(ExceptionId);
-      const res = await exceptionsService.delete(ExceptionId);
-
-      let message = "Exceção deletada com sucesso";
-      try {
-        if (res) {
-          throw new Error(
-            `${res.error} ${res.message}` || "A API retornou erro"
-          );
-        } else {
-          console.log(message);
-        }
-      } catch {}
-
-      toast({
-        title: "Sucesso",
-        description: message,
-      });
-
-      setExceptions((prev: Exception[]) =>
-        prev.filter((p) => String(p.id) !== String(ExceptionId))
-      );
-    } catch (e: any) {
-      toast({
-        title: "Erro",
-        description: e?.message || "Não foi possível deletar a exceção",
-      });
+    function findDoctorById(id: string, doctors: Doctor[]) {
+        return doctors.find((doctor) => doctor.user_id === id);
     }
-    setDeleteDialogOpen(false);
-    setExceptionToDelete(null);
-  };
 
-  function formatAvailability(data: Availability[]) {
-    // Agrupar os horários por dia da semana
-    const schedule = data.reduce((acc: any, item) => {
-      const { weekday, start_time, end_time } = item;
+    const openDeleteDialog = (exceptionId: string) => {
+        setExceptionToDelete(exceptionId);
+        setDeleteDialogOpen(true);
+    };
 
-      // Se o dia ainda não existe, cria o array
-      if (!acc[weekday]) {
-        acc[weekday] = [];
-      }
+    const handleDeleteException = async (ExceptionId: string) => {
+        try {
+            const res = await exceptionsService.delete(ExceptionId);
+            if (res && res.error) { throw new Error(res.message || "A API retornou um erro"); }
+            toast({ title: "Sucesso", description: "Exceção deletada com sucesso" });
+            setExceptions((prev: Exception[]) => prev.filter((p) => String(p.id) !== String(ExceptionId)));
+        } catch (e: any) {
+            toast({ title: "Erro", description: e?.message || "Não foi possível deletar a exceção" });
+        }
+        setDeleteDialogOpen(false);
+        setExceptionToDelete(null);
+    };
 
-      // Adiciona o horário do dia
-      acc[weekday].push({
-        start: start_time,
-        end: end_time,
-      });
-
-      return acc;
-    }, {} as Record<string, { start: string; end: string }[]>);
-
-    return schedule;
-  }
+    function formatAvailability(data: Availability[]) {
+        if (!data) return {};
+        const schedule = data.reduce((acc: any, item) => {
+            const { weekday, start_time, end_time } = item;
+            if (!acc[weekday]) acc[weekday] = [];
+            acc[weekday].push({ start: start_time, end: end_time });
+            return acc;
+        }, {} as Record<string, { start: string; end: string }[]>);
+        return schedule;
+    }
 
   useEffect(() => {
     if (availability) {
@@ -261,32 +263,45 @@ export default function PatientDashboard() {
           </p>
         </div>
 
-        <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-6">
-          <Card>
-            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-              <CardTitle className="text-sm font-medium">
-                Próxima Consulta
-              </CardTitle>
-              <Calendar className="h-4 w-4 text-muted-foreground" />
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold">02 out</div>
-              <p className="text-xs text-muted-foreground">Dr. Silva - 14:30</p>
-            </CardContent>
-          </Card>
+                <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-6">
+                    {/* ▼▼▼ CARD "PRÓXIMA CONSULTA" CORRIGIDO PARA MOSTRAR NOME DO PACIENTE ▼▼▼ */}
+                    <Card>
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Próxima Consulta</CardTitle>
+                            <Calendar className="h-4 w-4 text-muted-foreground" />
+                        </CardHeader>
+                        <CardContent>
+                            {nextAppointment ? (
+                                <>
+                                    <div className="text-2xl font-bold capitalize">
+                                        {format(parseISO(nextAppointment.scheduled_at), "dd MMM", { locale: ptBR })}
+                                    </div>
+                                    <p className="text-xs text-muted-foreground">
+                                        {nextAppointment.patientName} - {format(parseISO(nextAppointment.scheduled_at), "HH:mm")}
+                                    </p>
+                                </>
+                            ) : (
+                                <>
+                                    <div className="text-2xl font-bold">Nenhuma</div>
+                                    <p className="text-xs text-muted-foreground">Sem próximas consultas</p>
+                                </>
+                            )}
+                        </CardContent>
+                    </Card>
+                    {/* ▲▲▲ FIM DO CARD ATUALIZADO ▲▲▲ */}
 
-          <Card>
-            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-              <CardTitle className="text-sm font-medium">
-                Consultas Este Mês
-              </CardTitle>
-              <Clock className="h-4 w-4 text-muted-foreground" />
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold">4</div>
-              <p className="text-xs text-muted-foreground">4 agendadas</p>
-            </CardContent>
-          </Card>
+                    {/* ▼▼▼ CARD "CONSULTAS ESTE MÊS" CORRIGIDO PARA CONTAGEM CORRETA ▼▼▼ */}
+                    <Card>
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Consultas Este Mês</CardTitle>
+                            <Clock className="h-4 w-4 text-muted-foreground" />
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{monthlyCount}</div>
+                            <p className="text-xs text-muted-foreground">{monthlyCount === 1 ? '1 agendada' : `${monthlyCount} agendadas`}</p>
+                        </CardContent>
+                    </Card>
+                    {/* ▲▲▲ FIM DO CARD ATUALIZADO ▲▲▲ */}
 
           <Card>
             <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
@@ -300,23 +315,22 @@ export default function PatientDashboard() {
           </Card>
         </div>
 
-        <div className="grid md:grid-cols-2 gap-6">
-          <Card>
-            <CardHeader>
-              <CardTitle>Ações Rápidas</CardTitle>
-              <CardDescription>
-                Acesse rapidamente as principais funcionalidades
-              </CardDescription>
-            </CardHeader>
-            <CardContent className="space-y-4">
-              <Link href="/doctor/medicos/consultas">
-                <Button className="bg-blue-600 hover:bg-blue-700 text-white cursor-pointer">
-                  <Calendar className="mr-2 h-4 w-4 text-white" />
-                  Ver Minhas Consultas
-                </Button>
-              </Link>
-            </CardContent>
-          </Card>
+                {/* O restante do código permanece o mesmo */}
+                <div className="grid md:grid-cols-2 gap-6">
+                    <Card>
+                        <CardHeader>
+                            <CardTitle>Ações Rápidas</CardTitle>
+                            <CardDescription>Acesse rapidamente as principais funcionalidades</CardDescription>
+                        </CardHeader>
+                        <CardContent className="space-y-4">
+                            <Link href="/doctor/medicos/consultas">
+                                <Button className="w-full justify-start">
+                                    <Calendar className="mr-2 h-4 w-4" />
+                                    Ver Minhas Consultas
+                                </Button>
+                            </Link>
+                        </CardContent>
+                    </Card>
 
                     <Card>
                         <CardHeader>
@@ -355,16 +369,15 @@ export default function PatientDashboard() {
                             <CardDescription>Bloqueios e liberações eventuais de agenda</CardDescription>
                         </CardHeader>
 
-            <CardContent className="space-y-4 grid md:grid-cols-7 gap-2">
-              {exceptions && exceptions.length > 0 ? (
-                exceptions.map((ex: Exception) => {
-                  // Formata data e hora
-                  const date = new Date(ex.date).toLocaleDateString("pt-BR", {
-                    weekday: "long",
-                    day: "2-digit",
-                    month: "long",
-                    timeZone: "UTC",
-                  });
+                        <CardContent className="space-y-4 grid md:grid-cols-7 gap-2">
+                            {exceptions && exceptions.length > 0 ? (
+                                exceptions.map((ex: Exception) => {
+                                    const date = new Date(ex.date).toLocaleDateString("pt-BR", {
+                                        weekday: "long",
+                                        day: "2-digit",
+                                        month: "long",
+                                        timeZone: "UTC"
+                                    });
 
                   const startTime = formatTime(ex.start_time);
                   const endTime = formatTime(ex.end_time);
@@ -374,7 +387,11 @@ export default function PatientDashboard() {
                                             <div className="flex flex-col items-center justify-between p-3 bg-blue-50 rounded-lg shadow-sm">
                                                 <div className="text-center">
                                                     <p className="font-semibold capitalize">{date}</p>
-                                                    <p className="text-sm text-gray-600">{startTime && endTime ? `${startTime} - ${endTime}` : "Dia todo"}</p>
+                                                    <p className="text-sm text-gray-600">
+                                                        {startTime && endTime
+                                                            ? `${startTime} - ${endTime}`
+                                                            : "Dia todo"}
+                                                    </p>
                                                 </div>
                                                 <div className="text-center mt-2">
                                                     <p className={`text-sm font-medium ${ex.kind === "bloqueio" ? "text-red-600" : "text-green-600"}`}>{ex.kind === "bloqueio" ? "Bloqueio" : "Liberação"}</p>
@@ -412,4 +429,4 @@ export default function PatientDashboard() {
             </div>
         </Sidebar>
     );
-}
+}
\ No newline at end of file
diff --git a/app/doctor/medicos/[id]/laudos/[laudoId]/editar/page.tsx b/app/doctor/medicos/[id]/laudos/[laudoId]/editar/page.tsx
index 52525fd..acce902 100644
--- a/app/doctor/medicos/[id]/laudos/[laudoId]/editar/page.tsx
+++ b/app/doctor/medicos/[id]/laudos/[laudoId]/editar/page.tsx
@@ -144,10 +144,6 @@ export default function EditarLaudoPage() {
                     <CardContent>
                         <form onSubmit={handleSubmit} className="space-y-6">
                             <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-                                <div className="space-y-2">
-                                    <Label htmlFor="order_number">Nº do Pedido</Label>
-                                    <Input id="order_number" value={formData.order_number || ''} onChange={handleInputChange} />
-                                </div>
                                 <div className="space-y-2">
                                     <Label htmlFor="exam">Exame</Label>
                                     <Input id="exam" value={formData.exam || ''} onChange={handleInputChange} />
diff --git a/app/doctor/medicos/[id]/laudos/novo/page.tsx b/app/doctor/medicos/[id]/laudos/novo/page.tsx
index 9c9b8a9..1bac56b 100644
--- a/app/doctor/medicos/[id]/laudos/novo/page.tsx
+++ b/app/doctor/medicos/[id]/laudos/novo/page.tsx
@@ -1,5 +1,4 @@
- 
-"use client";
+ "use client";
 
 import { useParams, useRouter } from "next/navigation";
 import { useState } from "react";
@@ -106,10 +105,6 @@ export default function NovoLaudoPage() {
                     <CardContent>
                         <form onSubmit={handleSubmit} className="space-y-6">
                             <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-                                <div className="space-y-2">
-                                    <Label htmlFor="order_number">Nº do Pedido</Label>
-                                    <Input id="order_number" value={formData.order_number} onChange={handleInputChange} />
-                                </div>
                                 <div className="space-y-2">
                                     <Label htmlFor="exam">Exame</Label>
                                     <Input id="exam" value={formData.exam} onChange={handleInputChange} />
diff --git a/app/doctor/medicos/page.tsx b/app/doctor/medicos/page.tsx
index 1502fab..7973a65 100644
--- a/app/doctor/medicos/page.tsx
+++ b/app/doctor/medicos/page.tsx
@@ -8,7 +8,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Eye, Edit, Calendar, Trash2, Loader2 } from "lucide-react";
+import { Eye, Edit, Calendar, Trash2, Loader2, MoreVertical } from "lucide-react";
 import { api } from "@/services/api.mjs";
 import { PatientDetailsModal } from "@/components/ui/patient-details-modal";
 import {
@@ -50,7 +50,7 @@ export default function PacientesPage() {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
   // --- Lógica de Paginação INÍCIO ---
-  const [itemsPerPage, setItemsPerPage] = useState(5);
+  const [itemsPerPage, setItemsPerPage] = useState(10);
   const [currentPage, setCurrentPage] = useState(1);
 
   const totalPages = Math.ceil(pacientes.length / itemsPerPage);
@@ -197,14 +197,6 @@ export default function PacientesPage() {
                 <SelectItem value="20">20 por página</SelectItem>
               </SelectContent>
             </Select>
-            <Link href="/doctor/pacientes/novo" className="w-full sm:w-auto">
-              <Button
-                variant="default"
-                className="bg-blue-600 hover:bg-blue-700 w-full sm:w-auto"
-              >
-                Novo Paciente
-              </Button>
-            </Link>
           </div>
         </div>
 
@@ -291,9 +283,10 @@ export default function PacientesPage() {
                       <td className="p-3 sm:p-4">
                         <DropdownMenu>
                           <DropdownMenuTrigger asChild>
-                            <button className="text-primary hover:underline text-sm sm:text-base">
-                              Ações
-                            </button>
+                            <Button variant="ghost" className="h-8 w-8 p-0">
+                              <span className="sr-only">Abrir menu</span>
+                              <MoreVertical className="h-4 w-4" />
+                            </Button>
                           </DropdownMenuTrigger>
                           <DropdownMenuContent align="end">
                             <DropdownMenuItem
@@ -303,19 +296,11 @@ export default function PacientesPage() {
                               Ver detalhes
                             </DropdownMenuItem>
                             <DropdownMenuItem asChild>
-                              <Link href={`/doctor/pacientes/${p.id}/laudos`}>
+                              <Link href={`/doctor/medicos/${p.id}/laudos`}>
                                 <Edit className="w-4 h-4 mr-2" />
                                 Laudos
                               </Link>
                             </DropdownMenuItem>
-                            <DropdownMenuItem
-                              onClick={() =>
-                                alert(`Agenda para paciente ID: ${p.id}`)
-                              }
-                            >
-                              <Calendar className="w-4 h-4 mr-2" />
-                              Ver agenda
-                            </DropdownMenuItem>
                             <DropdownMenuItem
                               onClick={() => {
                                 const newPacientes = pacientes.filter(
diff --git a/app/globals.css b/app/globals.css
index d0b1400..95ff1b4 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -1,8 +1,6 @@
-@import 'tailwindcss';
-@import 'tw-animate-css';
-
+@import "tailwindcss";
+@import "tw-animate-css";
 @custom-variant dark (&:is(.dark *));
-
 :root {
   --background: oklch(1 0 0);
   --foreground: oklch(0.145 0 0);
@@ -75,33 +73,33 @@
 }
 
 .high-contrast {
-    --background: oklch(0 0 0);
-    --foreground: oklch(1 0.5 100);
-    --card: oklch(0 0 0);
-    --card-foreground: oklch(1 0.5 100);
-    --popover: oklch(0 0 0);
-    --popover-foreground: oklch(1 0.5 100);
-    --primary: oklch(1 0.5 100);
-    --primary-foreground: oklch(0 0 0);
-    --secondary: oklch(0 0 0);
-    --secondary-foreground: oklch(1 0.5 100);
-    --muted: oklch(0 0 0);
-    --muted-foreground: oklch(1 0.5 100);
-    --accent: oklch(0 0 0);
-    --accent-foreground: oklch(1 0.5 100);
-    --destructive: oklch(0.5 0.3 30);
-    --destructive-foreground: oklch(0 0 0);
-    --border: oklch(1 0.5 100);
-    --input: oklch(0 0 0);
-    --ring: oklch(1 0.5 100);
-    --sidebar: oklch(0 0 0);
-    --sidebar-foreground: oklch(1 0.5 100);
-    --sidebar-primary: oklch(1 0.5 100);
-    --sidebar-primary-foreground: oklch(0 0 0);
-    --sidebar-accent: oklch(0 0 0);
-    --sidebar-accent-foreground: oklch(1 0.5 100);
-    --sidebar-border: oklch(1 0.5 100);
-    --sidebar-ring: oklch(1 0.5 100);
+  --background: oklch(0 0 0);
+  --foreground: oklch(1 0.5 100);
+  --card: oklch(0 0 0);
+  --card-foreground: oklch(1 0.5 100);
+  --popover: oklch(0 0 0);
+  --popover-foreground: oklch(1 0.5 100);
+  --primary: oklch(1 0.5 100);
+  --primary-foreground: oklch(0 0 0);
+  --secondary: oklch(0 0 0);
+  --secondary-foreground: oklch(1 0.5 100);
+  --muted: oklch(0 0 0);
+  --muted-foreground: oklch(1 0.5 100);
+  --accent: oklch(0 0 0);
+  --accent-foreground: oklch(1 0.5 100);
+  --destructive: oklch(0.5 0.3 30);
+  --destructive-foreground: oklch(0 0 0);
+  --border: oklch(1 0.5 100);
+  --input: oklch(0 0 0);
+  --ring: oklch(1 0.5 100);
+  --sidebar: oklch(0 0 0);
+  --sidebar-foreground: oklch(1 0.5 100);
+  --sidebar-primary: oklch(1 0.5 100);
+  --sidebar-primary-foreground: oklch(0 0 0);
+  --sidebar-accent: oklch(0 0 0);
+  --sidebar-accent-foreground: oklch(1 0.5 100);
+  --sidebar-border: oklch(1 0.5 100);
+  --sidebar-ring: oklch(1 0.5 100);
 }
 
 @theme inline {
@@ -153,4 +151,4 @@
     @apply bg-background text-foreground;
     transition: background-color 0.3s, color 0.3s;
   }
-}
\ No newline at end of file
+}
diff --git a/app/manager/dashboard/page.tsx b/app/manager/dashboard/page.tsx
index 6562eef..11f5c19 100644
--- a/app/manager/dashboard/page.tsx
+++ b/app/manager/dashboard/page.tsx
@@ -8,12 +8,13 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
-import { Calendar, Clock, Plus, User } from "lucide-react";
+import { Clock, Plus, User } from "lucide-react"; // Removi 'Calendar' que não estava sendo usado
 import Link from "next/link";
 import React, { useState, useEffect } from "react";
 import { usersService } from "services/usersApi.mjs";
 import { doctorsService } from "services/doctorsApi.mjs";
 import Sidebar from "@/components/Sidebar";
+import { api } from "services/api.mjs"; // <-- ADICIONEI ESTE IMPORT
 
 export default function ManagerDashboard() {
   // 🔹 Estados para usuários
@@ -24,20 +25,48 @@ export default function ManagerDashboard() {
   const [doctors, setDoctors] = useState<any[]>([]);
   const [loadingDoctors, setLoadingDoctors] = useState(true);
 
-  // 🔹 Buscar primeiro usuário
-  useEffect(() => {
-    async function fetchFirstUser() {
-      try {
-        const data = await usersService.list_roles();
-        if (Array.isArray(data) && data.length > 0) {
-          setFirstUser(data[0]);
+    // 🔹 Buscar primeiro usuário (LÓGICA ATUALIZADA)
+    useEffect(() => {
+        async function fetchFirstUser() {
+            setLoadingUser(true); // Garante que o estado de loading inicie como true
+            try {
+                // 1. Busca a lista de usuários com seus cargos (roles)
+                const rolesData = await usersService.list_roles();
+
+                // 2. Verifica se a lista não está vazia
+                if (Array.isArray(rolesData) && rolesData.length > 0) {
+                    const firstUserRole = rolesData[0];
+                    const firstUserId = firstUserRole.user_id;
+
+                    if (!firstUserId) {
+                        throw new Error("O primeiro usuário da lista não possui um ID válido.");
+                    }
+
+                    // 3. Usa o ID para buscar o perfil (com nome e email) do usuário
+                    const profileData = await api.get(
+                        `/rest/v1/profiles?select=full_name,email&id=eq.${firstUserId}`
+                    );
+
+                    // 4. Verifica se o perfil foi encontrado
+                    if (Array.isArray(profileData) && profileData.length > 0) {
+                        const userProfile = profileData[0];
+                        // 5. Combina os dados do cargo e do perfil e atualiza o estado
+                        setFirstUser({
+                            ...firstUserRole,
+                            ...userProfile
+                        });
+                    } else {
+                        // Se não encontrar o perfil, exibe os dados que temos
+                        setFirstUser(firstUserRole);
+                    }
+                }
+            } catch (error) {
+                console.error("Erro ao carregar usuário:", error);
+                setFirstUser(null); // Limpa o usuário em caso de erro
+            } finally {
+                setLoadingUser(false);
+            }
         }
-      } catch (error) {
-        console.error("Erro ao carregar usuário:", error);
-      } finally {
-        setLoadingUser(false);
-      }
-    }
 
     fetchFirstUser();
   }, []);
@@ -71,23 +100,9 @@ export default function ManagerDashboard() {
           </p>
         </div>
 
-        {/* Cards principais */}
-        <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-6">
-          {/* Card 1 */}
-          <Card>
-            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-              <CardTitle className="text-sm font-medium">
-                Relatórios gerenciais
-              </CardTitle>
-              <Calendar className="h-4 w-4 text-muted-foreground" />
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold">0</div>
-              <p className="text-xs text-muted-foreground">
-                Relatórios disponíveis
-              </p>
-            </CardContent>
-          </Card>
+                {/* Cards principais */}
+                <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-6">
+
 
           {/* Card 2 — Gestão de usuários */}
           <Card>
@@ -224,4 +239,4 @@ export default function ManagerDashboard() {
       </div>
     </Sidebar>
   );
-}
+}
\ No newline at end of file
diff --git a/app/manager/home/[id]/editar/page.tsx b/app/manager/home/[id]/editar/page.tsx
index 89a5afb..b3bfeea 100644
--- a/app/manager/home/[id]/editar/page.tsx
+++ b/app/manager/home/[id]/editar/page.tsx
@@ -9,47 +9,47 @@ import { Label } from "@/components/ui/label"
 import { Textarea } from "@/components/ui/textarea"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Checkbox } from "@/components/ui/checkbox"
-import { Save, Loader2, ArrowLeft } from "lucide-react" 
+import { Save, Loader2, ArrowLeft } from "lucide-react"
 import Sidebar from "@/components/Sidebar"
-import { doctorsService } from "services/doctorsApi.mjs"; 
+import { doctorsService } from "services/doctorsApi.mjs";
 
 const UF_LIST = ["AC", "AL", "AP", "AM", "BA", "CE", "DF", "ES", "GO", "MA", "MT", "MS", "MG", "PA", "PB", "PR", "PE", "PI", "RJ", "RN", "RS", "RO", "RR", "SC", "SP", "SE", "TO"];
 
 interface DoctorFormData {
-  nomeCompleto: string; 
-  crm: string;
-  crmEstado: string; 
-  especialidade: string; 
-  cpf: string; 
-  email: string; 
-  dataNascimento: string; 
-  rg: string; 
-  telefoneCelular: string; 
-  telefone2: string; 
-  cep: string; 
-  endereco: string; 
-  numero: string; 
-  complemento: string; 
-  bairro: string; 
-  cidade: string; 
-  estado: string; 
-  ativo: boolean; 
-  observacoes: string;
+    nomeCompleto: string;
+    crm: string;
+    crmEstado: string;
+    especialidade: string;
+    cpf: string;
+    email: string;
+    dataNascimento: string;
+    rg: string;
+    telefoneCelular: string;
+    telefone2: string;
+    cep: string;
+    endereco: string;
+    numero: string;
+    complemento: string;
+    bairro: string;
+    cidade: string;
+    estado: string;
+    ativo: boolean;
+    observacoes: string;
 }
 const apiMap: { [K in keyof DoctorFormData]: string | null } = {
-  nomeCompleto: 'full_name', crm: 'crm', crmEstado: 'crm_uf', especialidade: 'specialty',
-  cpf: 'cpf', email: 'email', dataNascimento: 'birth_date', rg: 'rg', 
-  telefoneCelular: 'phone_mobile', telefone2: 'phone2', cep: 'cep', 
-  endereco: 'street', numero: 'number', complemento: 'complement', 
-  bairro: 'neighborhood', cidade: 'city', estado: 'state', ativo: 'active',
-  observacoes: null, 
+    nomeCompleto: 'full_name', crm: 'crm', crmEstado: 'crm_uf', especialidade: 'specialty',
+    cpf: 'cpf', email: 'email', dataNascimento: 'birth_date', rg: 'rg',
+    telefoneCelular: 'phone_mobile', telefone2: 'phone2', cep: 'cep',
+    endereco: 'street', numero: 'number', complemento: 'complement',
+    bairro: 'neighborhood', cidade: 'city', estado: 'state', ativo: 'active',
+    observacoes: null,
 };
 
 const defaultFormData: DoctorFormData = {
-  nomeCompleto: '', crm: '', crmEstado: '', especialidade: '', cpf: '', email: '', 
-  dataNascimento: '', rg: '', telefoneCelular: '', telefone2: '', cep: '',
-  endereco: '', numero: '', complemento: '', bairro: '', cidade: '', estado: '',
-  ativo: true, observacoes: '',
+    nomeCompleto: '', crm: '', crmEstado: '', especialidade: '', cpf: '', email: '',
+    dataNascimento: '', rg: '', telefoneCelular: '', telefone2: '', cep: '',
+    endereco: '', numero: '', complemento: '', bairro: '', cidade: '', estado: '',
+    ativo: true, observacoes: '',
 };
 
 const cleanNumber = (value: string): string => value.replace(/\D/g, '');
@@ -73,420 +73,420 @@ const formatPhoneMobile = (value: string): string => {
 };
 
 export default function EditarMedicoPage() {
-  const router = useRouter();
-  const params = useParams();
-  const id = Array.isArray(params.id) ? params.id[0] : params.id; 
-  const [formData, setFormData] = useState<DoctorFormData>(defaultFormData);
-  const [loading, setLoading] = useState(true);
-  const [isSaving, setIsSaving] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const apiToFormMap: { [key: string]: keyof DoctorFormData } = {
-      'full_name': 'nomeCompleto', 'crm': 'crm', 'crm_uf': 'crmEstado', 'specialty': 'especialidade',
-      'cpf': 'cpf', 'email': 'email', 'birth_date': 'dataNascimento', 'rg': 'rg',
-      'phone_mobile': 'telefoneCelular', 'phone2': 'telefone2', 'cep': 'cep', 
-      'street': 'endereco', 'number': 'numero', 'complement': 'complemento', 
-      'neighborhood': 'bairro', 'city': 'cidade', 'state': 'estado', 'active': 'ativo'
-  };
-
- 
-  useEffect(() => {
-    if (!id) return;
-
-    const fetchDoctor = async () => {
-      try {
-        const data = await doctorsService.getById(id);
-
-        if (!data) {
-          setError("Médico não encontrado.");
-          setLoading(false);
-          return;
-        }
-
-        const initialData: Partial<DoctorFormData> = {};
-        
-        Object.keys(data).forEach(key => {
-            const formKey = apiToFormMap[key];
-            if (formKey) {
-                let value = data[key] === null ? '' : data[key];
-                if (formKey === 'ativo') {
-                    value = !!value; 
-                } else if (typeof value !== 'boolean') {
-                    value = String(value);
-                }               
-                initialData[formKey] = value as any;
-            }
-        });
-        initialData.observacoes = "Observação carregada do sistema (exemplo de campo interno)"; 
-        
-        setFormData(prev => ({ ...prev, ...initialData }));
-      } catch (e) {
-        console.error("Erro ao carregar dados:", e);
-        setError("Não foi possível carregar os dados do médico.");
-      } finally {
-        setLoading(false);
-      }
+    const router = useRouter();
+    const params = useParams();
+    const id = Array.isArray(params.id) ? params.id[0] : params.id;
+    const [formData, setFormData] = useState<DoctorFormData>(defaultFormData);
+    const [loading, setLoading] = useState(true);
+    const [isSaving, setIsSaving] = useState(false);
+    const [error, setError] = useState<string | null>(null);
+    const apiToFormMap: { [key: string]: keyof DoctorFormData } = {
+        'full_name': 'nomeCompleto', 'crm': 'crm', 'crm_uf': 'crmEstado', 'specialty': 'especialidade',
+        'cpf': 'cpf', 'email': 'email', 'birth_date': 'dataNascimento', 'rg': 'rg',
+        'phone_mobile': 'telefoneCelular', 'phone2': 'telefone2', 'cep': 'cep',
+        'street': 'endereco', 'number': 'numero', 'complement': 'complemento',
+        'neighborhood': 'bairro', 'city': 'cidade', 'state': 'estado', 'active': 'ativo'
     };
-    fetchDoctor();
-  }, [id]); 
-
-  const handleInputChange = (key: keyof DoctorFormData, value: string | boolean) => {
-    
-   
-    if (typeof value === 'string') {
-        let maskedValue = value;
-        if (key === 'cpf') maskedValue = formatCPF(value);
-        if (key === 'cep') maskedValue = formatCEP(value);
-        if (key === 'telefoneCelular' || key === 'telefone2') maskedValue = formatPhoneMobile(value);
-        
-        setFormData((prev) => ({ ...prev, [key]: maskedValue }));
-    } else {
-        setFormData((prev) => ({ ...prev, [key]: value }));
-    }
-  };
 
 
+    useEffect(() => {
+        if (!id) return;
 
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setError(null);
-    setIsSaving(true);
-    
-    if (!id) {
-        setError("ID do médico ausente.");
-        setIsSaving(false);
-        return;
-    }
+        const fetchDoctor = async () => {
+            try {
+                const data = await doctorsService.getById(id);
 
-    const finalPayload: { [key: string]: any } = {};
-    const formKeys = Object.keys(formData) as Array<keyof DoctorFormData>;
+                if (!data) {
+                    setError("Médico não encontrado.");
+                    setLoading(false);
+                    return;
+                }
 
-  
-    formKeys.forEach((key) => {
-        const apiFieldName = apiMap[key];
-        
-        if (!apiFieldName) return; 
+                const initialData: Partial<DoctorFormData> = {};
+
+                Object.keys(data).forEach(key => {
+                    const formKey = apiToFormMap[key];
+                    if (formKey) {
+                        let value = data[key] === null ? '' : data[key];
+                        if (formKey === 'ativo') {
+                            value = !!value;
+                        } else if (typeof value !== 'boolean') {
+                            value = String(value);
+                        }
+                        initialData[formKey] = value as any;
+                    }
+                });
+                initialData.observacoes = "Observação carregada do sistema (exemplo de campo interno)";
+
+                setFormData(prev => ({ ...prev, ...initialData }));
+            } catch (e) {
+                console.error("Erro ao carregar dados:", e);
+                setError("Não foi possível carregar os dados do médico.");
+            } finally {
+                setLoading(false);
+            }
+        };
+        fetchDoctor();
+    }, [id]);
+
+    const handleInputChange = (key: keyof DoctorFormData, value: string | boolean) => {
 
-        let value = formData[key];
 
         if (typeof value === 'string') {
-            let trimmedValue = value.trim();         
-            if (trimmedValue === '') {
-                finalPayload[apiFieldName] = null;
-                return;
-            }
-            if (key === 'crmEstado' || key === 'estado') {
-                trimmedValue = trimmedValue.toUpperCase();
-            }
-            
-            value = trimmedValue;
-        }
-        
-        finalPayload[apiFieldName] = value;
-    });
+            let maskedValue = value;
+            if (key === 'cpf') maskedValue = formatCPF(value);
+            if (key === 'cep') maskedValue = formatCEP(value);
+            if (key === 'telefoneCelular' || key === 'telefone2') maskedValue = formatPhoneMobile(value);
 
-    delete finalPayload.user_id; 
-    try {
-      await doctorsService.update(id, finalPayload); 
-      router.push("/manager/home"); 
-    } catch (e: any) {
-      console.error("Erro ao salvar o médico:", e);
-      let detailedError = "Erro ao atualizar. Verifique os dados e tente novamente.";
-      
-      if (e.message && e.message.includes("duplicate key value violates unique constraint")) {
-           detailedError = "O CPF ou CRM informado já está cadastrado em outro registro.";
-      } else if (e.message && e.message.includes("Detalhes:")) {
-          detailedError = e.message.split("Detalhes:")[1].trim();
-      } else if (e.message) {
-          detailedError = e.message;
-      }
-        
-      setError(`Erro ao atualizar. Detalhes: ${detailedError}`);
-    } finally {
-      setIsSaving(false);
+            setFormData((prev) => ({ ...prev, [key]: maskedValue }));
+        } else {
+            setFormData((prev) => ({ ...prev, [key]: value }));
+        }
+    };
+
+
+
+    const handleSubmit = async (e: React.FormEvent) => {
+        e.preventDefault();
+        setError(null);
+        setIsSaving(true);
+
+        if (!id) {
+            setError("ID do médico ausente.");
+            setIsSaving(false);
+            return;
+        }
+
+        const finalPayload: { [key: string]: any } = {};
+        const formKeys = Object.keys(formData) as Array<keyof DoctorFormData>;
+
+
+        formKeys.forEach((key) => {
+            const apiFieldName = apiMap[key];
+
+            if (!apiFieldName) return;
+
+            let value = formData[key];
+
+            if (typeof value === 'string') {
+                let trimmedValue = value.trim();
+                if (trimmedValue === '') {
+                    finalPayload[apiFieldName] = null;
+                    return;
+                }
+                if (key === 'crmEstado' || key === 'estado') {
+                    trimmedValue = trimmedValue.toUpperCase();
+                }
+
+                value = trimmedValue;
+            }
+
+            finalPayload[apiFieldName] = value;
+        });
+
+        delete finalPayload.user_id;
+        try {
+            await doctorsService.update(id, finalPayload);
+            router.push("/manager/home");
+        } catch (e: any) {
+            console.error("Erro ao salvar o médico:", e);
+            let detailedError = "Erro ao atualizar. Verifique os dados e tente novamente.";
+
+            if (e.message && e.message.includes("duplicate key value violates unique constraint")) {
+                detailedError = "O CPF ou CRM informado já está cadastrado em outro registro.";
+            } else if (e.message && e.message.includes("Detalhes:")) {
+                detailedError = e.message.split("Detalhes:")[1].trim();
+            } else if (e.message) {
+                detailedError = e.message;
+            }
+
+            setError(`Erro ao atualizar. Detalhes: ${detailedError}`);
+        } finally {
+            setIsSaving(false);
+        }
+    };
+    if (loading) {
+        return (
+            <Sidebar>
+                <div className="flex justify-center items-center h-full w-full py-16">
+                    <Loader2 className="w-8 h-8 animate-spin text-green-600" />
+                    <p className="ml-2 text-gray-600">Carregando dados do médico...</p>
+                </div>
+            </Sidebar>
+        );
     }
-  };
-  if (loading) {
+
     return (
         <Sidebar>
-            <div className="flex justify-center items-center h-full w-full py-16">
-                <Loader2 className="w-8 h-8 animate-spin text-green-600" />
-                <p className="ml-2 text-gray-600">Carregando dados do médico...</p>
+            <div className="w-full space-y-6 p-4 md:p-8">
+                <div className="flex items-center justify-between">
+                    <div>
+                        <h1 className="text-2xl font-bold text-gray-900">
+                            Editar Médico: <span className="text-green-600">{formData.nomeCompleto}</span>
+                        </h1>
+                        <p className="text-sm text-gray-500">
+                            Atualize as informações do médico
+                        </p>
+                    </div>
+                    <Link href="/manager/home">
+                        <Button variant="outline">
+                            <ArrowLeft className="w-4 h-4 mr-2" />
+                            Voltar
+                        </Button>
+                    </Link>
+                </div>
+
+                <form onSubmit={handleSubmit} className="space-y-6">
+
+                    {error && (
+                        <div className="p-3 bg-red-100 text-red-700 rounded-lg border border-red-300">
+                            <p className="font-medium">Erro na Atualização:</p>
+                            <p className="text-sm">{error}</p>
+                        </div>
+                    )}
+
+                    <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
+                        <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
+                            Dados Principais e Pessoais
+                        </h2>
+                        <div className="grid md:grid-cols-4 gap-4">
+                            <div className="space-y-2 col-span-2">
+                                <Label htmlFor="nomeCompleto">Nome Completo (full_name)</Label>
+                                <Input
+                                    id="nomeCompleto"
+                                    value={formData.nomeCompleto}
+                                    onChange={(e) => handleInputChange("nomeCompleto", e.target.value)}
+                                    placeholder="Nome do Médico"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="crm">CRM</Label>
+                                <Input
+                                    id="crm"
+                                    value={formData.crm}
+                                    onChange={(e) => handleInputChange("crm", e.target.value)}
+                                    placeholder="Ex: 123456"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="crmEstado">UF do CRM (crm_uf)</Label>
+                                <Select value={formData.crmEstado} onValueChange={(v) => handleInputChange("crmEstado", v)}>
+                                    <SelectTrigger id="crmEstado">
+                                        <SelectValue placeholder="UF" />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        {UF_LIST.map(uf => (
+                                            <SelectItem key={uf} value={uf}>{uf}</SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                            </div>
+                        </div>
+
+
+                        <div className="grid md:grid-cols-3 gap-4">
+                            <div className="space-y-2">
+                                <Label htmlFor="especialidade">Especialidade (specialty)</Label>
+                                <Input
+                                    id="especialidade"
+                                    value={formData.especialidade}
+                                    onChange={(e) => handleInputChange("especialidade", e.target.value)}
+                                    placeholder="Ex: Cardiologia"
+                                />
+                            </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="cpf">CPF</Label>
+                                <Input
+                                    id="cpf"
+                                    value={formData.cpf}
+                                    onChange={(e) => handleInputChange("cpf", e.target.value)}
+                                    placeholder="000.000.000-00"
+                                    maxLength={14}
+                                />
+                            </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="rg">RG</Label>
+                                <Input
+                                    id="rg"
+                                    value={formData.rg}
+                                    onChange={(e) => handleInputChange("rg", e.target.value)}
+                                    placeholder="00.000.000-0"
+                                />
+                            </div>
+                        </div>
+
+                        <div className="grid md:grid-cols-4 gap-4">
+                            <div className="space-y-2 col-span-2">
+                                <Label htmlFor="email">E-mail</Label>
+                                <Input
+                                    id="email"
+                                    type="email"
+                                    value={formData.email}
+                                    onChange={(e) => handleInputChange("email", e.target.value)}
+                                    placeholder="exemplo@dominio.com"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="dataNascimento">Data de Nascimento (birth_date)</Label>
+                                <Input
+                                    id="dataNascimento"
+                                    type="date"
+                                    value={formData.dataNascimento}
+                                    onChange={(e) => handleInputChange("dataNascimento", e.target.value)}
+                                />
+                            </div>
+                            <div className="space-y-2 flex items-end justify-center pb-1">
+                                <div className="flex items-center space-x-2">
+                                    <Checkbox
+                                        id="ativo"
+                                        checked={formData.ativo}
+                                        onCheckedChange={(checked) => handleInputChange("ativo", checked === true)}
+                                    />
+                                    <Label htmlFor="ativo">Médico Ativo (active)</Label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
+                        <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
+                            Contato e Endereço
+                        </h2>
+
+                        <div className="grid md:grid-cols-2 gap-4">
+                            <div className="space-y-2">
+                                <Label htmlFor="telefoneCelular">Telefone Celular (phone_mobile)</Label>
+                                <Input
+                                    id="telefoneCelular"
+                                    value={formData.telefoneCelular}
+                                    onChange={(e) => handleInputChange("telefoneCelular", e.target.value)}
+                                    placeholder="(00) 00000-0000"
+                                    maxLength={15}
+                                />
+                            </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="telefone2">Telefone Adicional (phone2)</Label>
+                                <Input
+                                    id="telefone2"
+                                    value={formData.telefone2}
+                                    onChange={(e) => handleInputChange("telefone2", e.target.value)}
+                                    placeholder="(00) 00000-0000"
+                                    maxLength={15}
+                                />
+                            </div>
+                        </div>
+
+
+                        <div className="grid md:grid-cols-4 gap-4">
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="cep">CEP</Label>
+                                <Input
+                                    id="cep"
+                                    value={formData.cep}
+                                    onChange={(e) => handleInputChange("cep", e.target.value)}
+                                    placeholder="00000-000"
+                                    maxLength={9}
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-3">
+                                <Label htmlFor="endereco">Logradouro (street)</Label>
+                                <Input
+                                    id="endereco"
+                                    value={formData.endereco}
+                                    onChange={(e) => handleInputChange("endereco", e.target.value)}
+                                    placeholder="Rua, Avenida, etc."
+                                />
+                            </div>
+                        </div>
+
+                        <div className="grid md:grid-cols-4 gap-4">
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="numero">Número</Label>
+                                <Input
+                                    id="numero"
+                                    value={formData.numero}
+                                    onChange={(e) => handleInputChange("numero", e.target.value)}
+                                    placeholder="123"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-3">
+                                <Label htmlFor="complemento">Complemento</Label>
+                                <Input
+                                    id="complemento"
+                                    value={formData.complemento}
+                                    onChange={(e) => handleInputChange("complemento", e.target.value)}
+                                    placeholder="Apto, Bloco, etc."
+                                />
+                            </div>
+                        </div>
+
+                        <div className="grid md:grid-cols-4 gap-4">
+                            <div className="space-y-2 col-span-2">
+                                <Label htmlFor="bairro">Bairro</Label>
+                                <Input
+                                    id="bairro"
+                                    value={formData.bairro}
+                                    onChange={(e) => handleInputChange("bairro", e.target.value)}
+                                    placeholder="Bairro"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="cidade">Cidade</Label>
+                                <Input
+                                    id="cidade"
+                                    value={formData.cidade}
+                                    onChange={(e) => handleInputChange("cidade", e.target.value)}
+                                    placeholder="São Paulo"
+                                />
+                            </div>
+                            <div className="space-y-2 col-span-1">
+                                <Label htmlFor="estado">Estado (state)</Label>
+                                <Input
+                                    id="estado"
+                                    value={formData.estado}
+                                    onChange={(e) => handleInputChange("estado", e.target.value)}
+                                    placeholder="SP"
+                                />
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
+                        <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
+                            Observações (Apenas internas)
+                        </h2>
+                        <Textarea
+                            id="observacoes"
+                            value={formData.observacoes}
+                            onChange={(e) => handleInputChange("observacoes", e.target.value)}
+                            placeholder="Notas internas sobre o médico..."
+                            className="min-h-[100px]"
+                        />
+                    </div>
+
+
+                    <div className="flex justify-end gap-4 pb-8 pt-4">
+                        <Link href="/manager/home">
+                            <Button type="button" variant="outline" disabled={isSaving}>
+                                Cancelar
+                            </Button>
+                        </Link>
+                        <Button
+                            type="submit"
+                            className="bg-green-600 hover:bg-green-700"
+                            disabled={isSaving}
+                        >
+                            {isSaving ? (
+                                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                            ) : (
+                                <Save className="w-4 h-4 mr-2" />
+                            )}
+                            {isSaving ? "Salvando..." : "Salvar Alterações"}
+                        </Button>
+                    </div>
+                </form>
             </div>
         </Sidebar>
     );
-  }
-
-  return (
-    <Sidebar>
-    <div className="w-full space-y-6 p-4 md:p-8"> 
-      <div className="flex items-center justify-between">
-        <div>
-          <h1 className="text-2xl font-bold text-gray-900">
-            Editar Médico: <span className="text-green-600">{formData.nomeCompleto}</span>
-          </h1>
-          <p className="text-sm text-gray-500">
-            Atualize as informações do médico (ID: {id}).
-          </p>
-        </div>
-        <Link href="/manager/home">
-          <Button variant="outline">
-            <ArrowLeft className="w-4 h-4 mr-2" />
-            Voltar
-          </Button>
-        </Link>
-      </div>
-
-      <form onSubmit={handleSubmit} className="space-y-6">
-      
-        {error && (
-             <div className="p-3 bg-red-100 text-red-700 rounded-lg border border-red-300">
-                <p className="font-medium">Erro na Atualização:</p>
-                <p className="text-sm">{error}</p>
-            </div>
-        )}
-
-        <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
-          <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
-            Dados Principais e Pessoais
-          </h2>
-          <div className="grid md:grid-cols-4 gap-4">
-            <div className="space-y-2 col-span-2">
-              <Label htmlFor="nomeCompleto">Nome Completo (full_name)</Label>
-              <Input
-                id="nomeCompleto"
-                value={formData.nomeCompleto}
-                onChange={(e) => handleInputChange("nomeCompleto", e.target.value)}
-                placeholder="Nome do Médico"
-              />
-            </div>
-            <div className="space-y-2 col-span-1">
-              <Label htmlFor="crm">CRM</Label>
-              <Input
-                id="crm"
-                value={formData.crm}
-                onChange={(e) => handleInputChange("crm", e.target.value)}
-                placeholder="Ex: 123456"
-              />
-            </div>
-            <div className="space-y-2 col-span-1">
-              <Label htmlFor="crmEstado">UF do CRM (crm_uf)</Label>
-              <Select value={formData.crmEstado} onValueChange={(v) => handleInputChange("crmEstado", v)}>
-                <SelectTrigger id="crmEstado">
-                  <SelectValue placeholder="UF" />
-                </SelectTrigger>
-                <SelectContent>
-                  {UF_LIST.map(uf => (
-                    <SelectItem key={uf} value={uf}>{uf}</SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          </div>
-          
-       
-          <div className="grid md:grid-cols-3 gap-4">
-             <div className="space-y-2">
-              <Label htmlFor="especialidade">Especialidade (specialty)</Label>
-              <Input
-                id="especialidade"
-                value={formData.especialidade}
-                onChange={(e) => handleInputChange("especialidade", e.target.value)}
-                placeholder="Ex: Cardiologia"
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="cpf">CPF</Label>
-              <Input
-                id="cpf"
-                value={formData.cpf}
-                onChange={(e) => handleInputChange("cpf", e.target.value)}
-                placeholder="000.000.000-00"
-                maxLength={14}
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="rg">RG</Label>
-              <Input
-                id="rg"
-                value={formData.rg}
-                onChange={(e) => handleInputChange("rg", e.target.value)}
-                placeholder="00.000.000-0"
-              />
-            </div>
-          </div>
-          
-          <div className="grid md:grid-cols-4 gap-4">
-            <div className="space-y-2 col-span-2">
-              <Label htmlFor="email">E-mail</Label>
-              <Input
-                id="email"
-                type="email"
-                value={formData.email}
-                onChange={(e) => handleInputChange("email", e.target.value)}
-                placeholder="exemplo@dominio.com"
-              />
-            </div>
-             <div className="space-y-2 col-span-1">
-              <Label htmlFor="dataNascimento">Data de Nascimento (birth_date)</Label>
-              <Input
-                id="dataNascimento"
-                type="date"
-                value={formData.dataNascimento}
-                onChange={(e) => handleInputChange("dataNascimento", e.target.value)}
-              />
-            </div>
-            <div className="space-y-2 flex items-end justify-center pb-1">
-                <div className="flex items-center space-x-2">
-                    <Checkbox
-                        id="ativo"
-                        checked={formData.ativo}
-                        onCheckedChange={(checked) => handleInputChange("ativo", checked === true)}
-                    />
-                    <Label htmlFor="ativo">Médico Ativo (active)</Label>
-                </div>
-            </div>
-          </div>
-        </div>
-
-        <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
-          <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
-            Contato e Endereço
-          </h2>
-        
-          <div className="grid md:grid-cols-2 gap-4">
-            <div className="space-y-2">
-              <Label htmlFor="telefoneCelular">Telefone Celular (phone_mobile)</Label>
-              <Input
-                id="telefoneCelular"
-                value={formData.telefoneCelular}
-                onChange={(e) => handleInputChange("telefoneCelular", e.target.value)}
-                placeholder="(00) 00000-0000"
-                maxLength={15}
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="telefone2">Telefone Adicional (phone2)</Label>
-              <Input
-                id="telefone2"
-                value={formData.telefone2}
-                onChange={(e) => handleInputChange("telefone2", e.target.value)}
-                placeholder="(00) 00000-0000"
-                maxLength={15}
-              />
-            </div>
-          </div>
-
-          
-          <div className="grid md:grid-cols-4 gap-4">
-              <div className="space-y-2 col-span-1">
-                  <Label htmlFor="cep">CEP</Label>
-                  <Input 
-                      id="cep" 
-                      value={formData.cep}
-                      onChange={(e) => handleInputChange("cep", e.target.value)}
-                      placeholder="00000-000" 
-                      maxLength={9}
-                  />
-              </div>
-              <div className="space-y-2 col-span-3">
-                  <Label htmlFor="endereco">Logradouro (street)</Label>
-                  <Input 
-                      id="endereco" 
-                      value={formData.endereco}
-                      onChange={(e) => handleInputChange("endereco", e.target.value)}
-                      placeholder="Rua, Avenida, etc." 
-                  />
-              </div>
-          </div>
-        
-          <div className="grid md:grid-cols-4 gap-4">
-            <div className="space-y-2 col-span-1">
-              <Label htmlFor="numero">Número</Label>
-              <Input
-                id="numero"
-                value={formData.numero}
-                onChange={(e) => handleInputChange("numero", e.target.value)}
-                placeholder="123"
-              />
-            </div>
-            <div className="space-y-2 col-span-3">
-              <Label htmlFor="complemento">Complemento</Label>
-              <Input
-                id="complemento"
-                value={formData.complemento}
-                onChange={(e) => handleInputChange("complemento", e.target.value)}
-                placeholder="Apto, Bloco, etc."
-              />
-            </div>
-          </div>
-          
-          <div className="grid md:grid-cols-4 gap-4">
-              <div className="space-y-2 col-span-2">
-                  <Label htmlFor="bairro">Bairro</Label>
-                  <Input
-                      id="bairro"
-                      value={formData.bairro}
-                      onChange={(e) => handleInputChange("bairro", e.target.value)}
-                      placeholder="Bairro"
-                  />
-              </div>
-              <div className="space-y-2 col-span-1">
-                  <Label htmlFor="cidade">Cidade</Label>
-                  <Input
-                      id="cidade"
-                      value={formData.cidade}
-                      onChange={(e) => handleInputChange("cidade", e.target.value)}
-                      placeholder="São Paulo"
-                  />
-              </div>
-              <div className="space-y-2 col-span-1">
-                  <Label htmlFor="estado">Estado (state)</Label>
-                  <Input
-                      id="estado"
-                      value={formData.estado}
-                      onChange={(e) => handleInputChange("estado", e.target.value)}
-                      placeholder="SP"
-                  />
-              </div>
-          </div>
-        </div>
-
-      
-        <div className="space-y-4 p-4 border rounded-xl shadow-sm bg-white">
-          <h2 className="text-lg font-semibold text-gray-800 border-b pb-2">
-            Observações (Apenas internas)
-          </h2>
-          <Textarea 
-              id="observacoes"
-              value={formData.observacoes}
-              onChange={(e) => handleInputChange("observacoes", e.target.value)}
-              placeholder="Notas internas sobre o médico..."
-              className="min-h-[100px]"
-          />
-        </div>
-
-
-        <div className="flex justify-end gap-4 pb-8 pt-4">
-          <Link href="/manager/home">
-            <Button type="button" variant="outline" disabled={isSaving}>
-              Cancelar
-            </Button>
-          </Link>
-          <Button 
-            type="submit" 
-            className="bg-green-600 hover:bg-green-700"
-            disabled={isSaving}
-          >
-            {isSaving ? (
-                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-            ) : (
-                <Save className="w-4 h-4 mr-2" />
-            )}
-            {isSaving ? "Salvando..." : "Salvar Alterações"}
-          </Button>
-        </div>
-      </form>
-    </div>
-    </Sidebar>
-  );
 }
\ No newline at end of file
diff --git a/app/manager/home/page.tsx b/app/manager/home/page.tsx
index 55c0eff..720398e 100644
--- a/app/manager/home/page.tsx
+++ b/app/manager/home/page.tsx
@@ -4,34 +4,19 @@ import React, { useEffect, useState, useCallback, useMemo } from "react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { Edit, Trash2, Eye, Calendar, Filter, Loader2 } from "lucide-react";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Edit, Trash2, Eye, Calendar, Loader2, MoreVertical } from "lucide-react";
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog";
 
-import { doctorsService } from "services/doctorsApi.mjs";
+// Imports dos Serviços
+import { doctorsService } from "@/services/doctorsApi.mjs";
 import Sidebar from "@/components/Sidebar";
 
+// --- NOVOS IMPORTS (Certifique-se que criou os arquivos no passo anterior) ---
+import { FilterBar } from "@/components/ui/filter-bar";
+import { normalizeSpecialty, getUniqueSpecialties } from "@/lib/normalization";
+
 interface Doctor {
   id: number;
   full_name: string;
@@ -66,119 +51,111 @@ interface DoctorDetails {
 export default function DoctorsPage() {
   const router = useRouter();
 
-  const [doctors, setDoctors] = useState<Doctor[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
-  const [doctorDetails, setDoctorDetails] = useState<DoctorDetails | null>(
-    null
-  );
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [doctorToDeleteId, setDoctorToDeleteId] = useState<number | null>(null);
+    // --- Estados de Dados ---
+    const [doctors, setDoctors] = useState<Doctor[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
 
-  // --- Estados para Filtros ---
-  const [specialtyFilter, setSpecialtyFilter] = useState("all");
-  const [statusFilter, setStatusFilter] = useState("all");
+    // --- Estados de Modais ---
+    const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
+    const [doctorDetails, setDoctorDetails] = useState<DoctorDetails | null>(null);
+    const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+    const [doctorToDeleteId, setDoctorToDeleteId] = useState<number | null>(null);
 
-  // --- Estados para Paginação ---
-  const [itemsPerPage, setItemsPerPage] = useState(10);
-  const [currentPage, setCurrentPage] = useState(1);
+    // --- Estados de Filtro e Busca ---
+    const [searchTerm, setSearchTerm] = useState("");
+    const [filters, setFilters] = useState({
+        specialty: "all",
+        status: "all"
+    });
 
-  const fetchDoctors = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const data: Doctor[] = await doctorsService.list();
-      const dataWithStatus = data.map((doc, index) => ({
-        ...doc,
-        status:
-          index % 3 === 0 ? "Inativo" : index % 2 === 0 ? "Férias" : "Ativo",
-      }));
-      setDoctors(dataWithStatus || []);
-      setCurrentPage(1);
-    } catch (e: any) {
-      console.error("Erro ao carregar lista de médicos:", e);
-      setError(
-        "Não foi possível carregar a lista de médicos. Verifique a conexão com a API."
-      );
-      setDoctors([]);
-    } finally {
-      setLoading(false);
-    }
-  }, []);
+    // --- Estados de Paginação ---
+    const [itemsPerPage, setItemsPerPage] = useState(10);
+    const [currentPage, setCurrentPage] = useState(1);
+
+    // 1. Buscar Médicos na API
+    const fetchDoctors = useCallback(async () => {
+        setLoading(true);
+        setError(null);
+        try {
+            const data: Doctor[] = await doctorsService.list();
+            // Mockando status para visualização (conforme original)
+            const dataWithStatus = data.map((doc, index) => ({
+                ...doc,
+                status: index % 3 === 0 ? "Inativo" : index % 2 === 0 ? "Férias" : "Ativo",
+            }));
+            setDoctors(dataWithStatus || []);
+            // Não resetamos a página aqui para manter a navegação fluida se apenas recarregar dados
+        } catch (e: any) {
+            console.error("Erro ao carregar lista de médicos:", e);
+            setError("Não foi possível carregar a lista de médicos. Verifique a conexão com a API.");
+            setDoctors([]);
+        } finally {
+            setLoading(false);
+        }
+    }, []);
 
   useEffect(() => {
     fetchDoctors();
   }, [fetchDoctors]);
 
-  const openDetailsDialog = async (doctor: Doctor) => {
-    setDetailsDialogOpen(true);
-    setDoctorDetails({
-      nome: doctor.full_name,
-      crm: doctor.crm,
-      especialidade: doctor.specialty,
-      contato: { celular: doctor.phone_mobile ?? undefined },
-      endereco: {
-        cidade: doctor.city ?? undefined,
-        estado: doctor.state ?? undefined,
-      },
-      status: doctor.status || "Ativo",
-      convenio: "Particular",
-      vip: false,
-      ultimo_atendimento: "N/A",
-      proximo_atendimento: "N/A",
-    });
-  };
+    // 2. Gerar lista única de especialidades (Normalizada)
+    const uniqueSpecialties = useMemo(() => {
+        return getUniqueSpecialties(doctors);
+    }, [doctors]);
 
-  const handleDelete = async () => {
-    if (doctorToDeleteId === null) return;
-    setLoading(true);
-    try {
-      await doctorsService.delete(doctorToDeleteId);
-      setDeleteDialogOpen(false);
-      setDoctorToDeleteId(null);
-      await fetchDoctors();
-    } catch (e) {
-      console.error("Erro ao excluir:", e);
-      alert("Erro ao excluir médico.");
-    } finally {
-      setLoading(false);
-    }
-  };
+    // 3. Lógica de Filtragem Centralizada
+    const filteredDoctors = useMemo(() => {
+        return doctors.filter((doctor) => {
+            // Normaliza a especialidade do médico atual para comparar
+            const normalizedDocSpecialty = normalizeSpecialty(doctor.specialty);
+            
+            // Filtros exatos
+            const specialtyMatch = filters.specialty === "all" || normalizedDocSpecialty === filters.specialty;
+            const statusMatch = filters.status === "all" || doctor.status === filters.status;
+            
+            // Busca textual (Nome, Telefone, CRM)
+            const searchLower = searchTerm.toLowerCase();
+            const nameMatch = doctor.full_name?.toLowerCase().includes(searchLower);
+            const phoneMatch = doctor.phone_mobile?.includes(searchLower);
+            const crmMatch = doctor.crm?.toLowerCase().includes(searchLower);
 
-  const openDeleteDialog = (doctorId: number) => {
-    setDoctorToDeleteId(doctorId);
-    setDeleteDialogOpen(true);
-  };
+            return specialtyMatch && statusMatch && (searchTerm === "" || nameMatch || phoneMatch || crmMatch);
+        });
+    }, [doctors, filters, searchTerm]);
 
-  const uniqueSpecialties = useMemo(() => {
-    const specialties = doctors
-      .map((doctor) => doctor.specialty)
-      .filter(Boolean);
-    return [...new Set(specialties)];
-  }, [doctors]);
+    // --- Handlers de Controle (Com Reset de Paginação) ---
 
-  const filteredDoctors = doctors.filter((doctor) => {
-    const specialtyMatch =
-      specialtyFilter === "all" || doctor.specialty === specialtyFilter;
-    const statusMatch =
-      statusFilter === "all" || doctor.status === statusFilter;
-    return specialtyMatch && statusMatch;
-  });
+    const handleSearch = (term: string) => {
+        setSearchTerm(term);
+        setCurrentPage(1); // Correção: Reseta para página 1 ao buscar
+    };
 
-  const totalPages = Math.ceil(filteredDoctors.length / itemsPerPage);
-  const indexOfLastItem = currentPage * itemsPerPage;
-  const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-  const currentItems = filteredDoctors.slice(indexOfFirstItem, indexOfLastItem);
-  const paginate = (pageNumber: number) => setCurrentPage(pageNumber);
+    const handleFilterChange = (key: string, value: string) => {
+        setFilters(prev => ({ ...prev, [key]: value }));
+        setCurrentPage(1); // Correção: Reseta para página 1 ao filtrar
+    };
 
-  const goToPrevPage = () => {
-    setCurrentPage((prev) => Math.max(1, prev - 1));
-  };
+    const handleClearFilters = () => {
+        setSearchTerm("");
+        setFilters({ specialty: "all", status: "all" });
+        setCurrentPage(1); // Correção: Reseta para página 1 ao limpar
+    };
 
-  const goToNextPage = () => {
-    setCurrentPage((prev) => Math.min(totalPages, prev + 1));
-  };
+    const handleItemsPerPageChange = (value: string) => {
+        setItemsPerPage(Number(value));
+        setCurrentPage(1);
+    };
+
+    // --- Lógica de Paginação ---
+    const totalPages = Math.ceil(filteredDoctors.length / itemsPerPage);
+    const indexOfLastItem = currentPage * itemsPerPage;
+    const indexOfFirstItem = indexOfLastItem - itemsPerPage;
+    const currentItems = filteredDoctors.slice(indexOfFirstItem, indexOfLastItem);
+
+    const paginate = (pageNumber: number) => setCurrentPage(pageNumber);
+    const goToPrevPage = () => setCurrentPage((prev) => Math.max(1, prev - 1));
+    const goToNextPage = () => setCurrentPage((prev) => Math.min(totalPages, prev + 1));
 
   const getVisiblePageNumbers = (totalPages: number, currentPage: number) => {
     const pages: number[] = [];
@@ -204,10 +181,43 @@ export default function DoctorsPage() {
 
   const visiblePageNumbers = getVisiblePageNumbers(totalPages, currentPage);
 
-  const handleItemsPerPageChange = (value: string) => {
-    setItemsPerPage(Number(value));
-    setCurrentPage(1);
-  };
+    // --- Handlers de Ações (Detalhes e Delete) ---
+    const openDetailsDialog = (doctor: Doctor) => {
+        setDetailsDialogOpen(true);
+        setDoctorDetails({
+            nome: doctor.full_name,
+            crm: doctor.crm,
+            especialidade: normalizeSpecialty(doctor.specialty), // Exibe normalizado
+            contato: { celular: doctor.phone_mobile ?? undefined },
+            endereco: { cidade: doctor.city ?? undefined, estado: doctor.state ?? undefined },
+            status: doctor.status || "Ativo",
+            convenio: "Particular",
+            vip: false,
+            ultimo_atendimento: "N/A",
+            proximo_atendimento: "N/A",
+        });
+    };
+
+    const openDeleteDialog = (doctorId: number) => {
+        setDoctorToDeleteId(doctorId);
+        setDeleteDialogOpen(true);
+    };
+
+    const handleDelete = async () => {
+        if (doctorToDeleteId === null) return;
+        setLoading(true);
+        try {
+            await doctorsService.delete(doctorToDeleteId);
+            setDeleteDialogOpen(false);
+            setDoctorToDeleteId(null);
+            await fetchDoctors();
+        } catch (e) {
+            console.error("Erro ao excluir:", e);
+            alert("Erro ao excluir médico.");
+        } finally {
+            setLoading(false);
+        }
+    };
 
   return (
     <Sidebar>
@@ -224,257 +234,194 @@ export default function DoctorsPage() {
           </div>
         </div>
 
-        {/* Filtros e Itens por Página */}
-        <div className="flex flex-wrap items-center gap-3 bg-white p-3 sm:p-4 rounded-lg border border-gray-200">
-          <div className="flex items-center gap-2 w-full md:w-auto">
-            <span className="text-sm font-medium text-foreground">
-              Especialidade
-            </span>
-            <Select value={specialtyFilter} onValueChange={setSpecialtyFilter}>
-              <SelectTrigger className="w-[160px] sm:w-[180px]">
-                <SelectValue placeholder="Especialidade" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">Todas</SelectItem>
-                {uniqueSpecialties.map((specialty) => (
-                  <SelectItem key={specialty} value={specialty}>
-                    {specialty}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          <div className="flex items-center gap-2 w-full md:w-auto">
-            <span className="text-sm font-medium text-foreground">Status</span>
-            <Select value={statusFilter} onValueChange={setStatusFilter}>
-              <SelectTrigger className="w-[160px] sm:w-[180px]">
-                <SelectValue placeholder="Status" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">Todos</SelectItem>
-                <SelectItem value="Ativo">Ativo</SelectItem>
-                <SelectItem value="Férias">Férias</SelectItem>
-                <SelectItem value="Inativo">Inativo</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <div className="flex items-center gap-2 w-full md:w-auto">
-            <span className="text-sm font-medium text-foreground">
-              Itens por página
-            </span>
-            <Select
-              onValueChange={handleItemsPerPageChange}
-              defaultValue={String(itemsPerPage)}
-            >
-              <SelectTrigger className="w-[140px]">
-                <SelectValue placeholder="Itens por pág." />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="5">5 por página</SelectItem>
-                <SelectItem value="10">10 por página</SelectItem>
-                <SelectItem value="20">20 por página</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <Button variant="outline" className="ml-auto w-full md:w-auto">
-            <Filter className="w-4 h-4 mr-2" />
-            Filtro avançado
-          </Button>
-        </div>
-
-        {/* Tabela de Médicos (Visível em Telas Médias e Maiores) */}
-        <div className="bg-white rounded-lg border border-gray-200 shadow-md overflow-hidden hidden md:block">
-          {loading ? (
-            <div className="p-8 text-center text-gray-500">
-              <Loader2 className="w-8 h-8 animate-spin mx-auto mb-3 text-green-600" />
-              Carregando médicos...
-            </div>
-          ) : error ? (
-            <div className="p-8 text-center text-red-600">{error}</div>
-          ) : filteredDoctors.length === 0 ? (
-            <div className="p-8 text-center text-gray-500">
-              {doctors.length === 0 ? (
-                <>
-                  Nenhum médico cadastrado.{" "}
-                  <Link
-                    href="/manager/home/novo"
-                    className="text-green-600 hover:underline"
-                  >
-                    Adicione um novo
-                  </Link>
-                  .
-                </>
-              ) : (
-                "Nenhum médico encontrado com os filtros aplicados."
-              )}
-            </div>
-          ) : (
-            <div className="overflow-x-auto">
-              <table className="w-full min-w-[600px]">
-                <thead className="bg-gray-50 border-b border-gray-200">
-                  <tr>
-                    <th className="text-left p-2 md:p-4 font-medium text-gray-700">
-                      Nome
-                    </th>
-                    <th className="text-left p-2 md:p-4 font-medium text-gray-700">
-                      CRM
-                    </th>
-                    <th className="text-left p-2 md:p-4 font-medium text-gray-700">
-                      Especialidade
-                    </th>
-                    <th className="text-left p-2 md:p-4 font-medium text-gray-700 hidden lg:table-cell">
-                      Status
-                    </th>
-                    <th className="text-left p-2 md:p-4 font-medium text-gray-700 hidden xl:table-cell">
-                      Cidade/Estado
-                    </th>
-                    <th className="text-right p-4 font-medium text-gray-700">
-                      Ações
-                    </th>
-                  </tr>
-                </thead>
-                <tbody className="bg-white divide-y divide-gray-200">
-                  {currentItems.map((doctor) => (
-                    <tr key={doctor.id} className="hover:bg-gray-50 transition">
-                      <td className="px-4 py-3 font-medium text-gray-900">
-                        {doctor.full_name}
-                      </td>
-                      <td className="px-4 py-3 text-gray-500 hidden sm:table-cell">
-                        {doctor.crm}
-                      </td>
-                      <td className="px-4 py-3 text-gray-500 hidden md:table-cell">
-                        {doctor.specialty}
-                      </td>
-                      <td className="px-4 py-3 text-gray-500 hidden lg:table-cell">
-                        {doctor.status || "N/A"}
-                      </td>
-                      <td className="px-4 py-3 text-gray-500 hidden xl:table-cell">
-                        {doctor.city || doctor.state
-                          ? `${doctor.city || ""}${
-                              doctor.city && doctor.state ? "/" : ""
-                            }${doctor.state || ""}`
-                          : "N/A"}
-                      </td>
-                      <td className="px-4 py-3 text-right">
-                        <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <div className="text-blue-600 cursor-pointer inline-block">
-                              Ações
-                            </div>
-                          </DropdownMenuTrigger>
-                          <DropdownMenuContent align="end">
-                            <DropdownMenuItem
-                              onClick={() => openDetailsDialog(doctor)}
-                            >
-                              <Eye className="mr-2 h-4 w-4" />
-                              Ver detalhes
-                            </DropdownMenuItem>
-                            <DropdownMenuItem asChild>
-                              <Link href={`/manager/home/${doctor.id}/editar`}>
-                                <Edit className="mr-2 h-4 w-4" />
-                                Editar
-                              </Link>
-                            </DropdownMenuItem>
-                            <DropdownMenuItem>
-                              <Calendar className="mr-2 h-4 w-4" />
-                              Marcar consulta
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                              className="text-red-600"
-                              onClick={() => openDeleteDialog(doctor.id)}
-                            >
-                              <Trash2 className="mr-2 h-4 w-4" />
-                              Excluir
-                            </DropdownMenuItem>
-                          </DropdownMenuContent>
-                        </DropdownMenu>
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-          )}
-        </div>
-
-        {/* Cards de Médicos (Visível Apenas em Telas Pequenas) */}
-        <div className="bg-white rounded-lg border border-gray-200 shadow-md p-4 block md:hidden">
-          {loading ? (
-            <div className="p-8 text-center text-gray-500">
-              <Loader2 className="w-8 h-8 animate-spin mx-auto mb-3 text-green-600" />
-              Carregando médicos...
-            </div>
-          ) : error ? (
-            <div className="p-8 text-center text-red-600">{error}</div>
-          ) : filteredDoctors.length === 0 ? (
-            <div className="p-8 text-center text-gray-500">
-              {doctors.length === 0 ? (
-                <>
-                  Nenhum médico cadastrado.{" "}
-                  <Link
-                    href="/manager/home/novo"
-                    className="text-green-600 hover:underline"
-                  >
-                    Adicione um novo
-                  </Link>
-                  .
-                </>
-              ) : (
-                "Nenhum médico encontrado com os filtros aplicados."
-              )}
-            </div>
-          ) : (
-            <div className="space-y-4">
-              {currentItems.map((doctor) => (
-                <div
-                  key={doctor.id}
-                  className="bg-white-50 rounded-lg p-4 flex justify-between items-center border border-white-200"
+                {/* --- NOVO COMPONENTE DE FILTRO --- */}
+                <FilterBar
+                    searchTerm={searchTerm}
+                    onSearch={handleSearch}
+                    activeFilters={filters}
+                    onFilterChange={handleFilterChange}
+                    onClearFilters={handleClearFilters}
+                    searchPlaceholder="Buscar por nome, CRM ou telefone..."
+                    filters={[
+                        { 
+                            key: "specialty", 
+                            label: "Especialidade", 
+                            options: uniqueSpecialties 
+                        },
+                        { 
+                            key: "status", 
+                            label: "Status", 
+                            options: ["Ativo", "Férias", "Inativo"] 
+                        }
+                    ]}
                 >
-                  <div>
-                    <div className="font-semibold text-gray-900">
-                      {doctor.full_name}
+                    {/* Seletor de Itens por Página (Filho do FilterBar) */}
+                    <div className="hidden lg:block">
+                        <Select onValueChange={handleItemsPerPageChange} defaultValue={String(itemsPerPage)}>
+                            <SelectTrigger className="w-[70px]">
+                                <SelectValue placeholder="10" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="5">5</SelectItem>
+                                <SelectItem value="10">10</SelectItem>
+                                <SelectItem value="20">20</SelectItem>
+                            </SelectContent>
+                        </Select>
                     </div>
-                    <div className="text-sm text-gray-600">
-                      {doctor.specialty}
-                    </div>
-                  </div>
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                      <div className="text-blue-600 cursor-pointer inline-block">
-                        Ações
-                      </div>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="end">
-                      <DropdownMenuItem
-                        onClick={() => openDetailsDialog(doctor)}
-                      >
-                        <Eye className="mr-2 h-4 w-4" />
-                        Ver detalhes
-                      </DropdownMenuItem>
-                      <DropdownMenuItem asChild>
-                        <Link href={`/manager/home/${doctor.id}/editar`}>
-                          <Edit className="mr-2 h-4 w-4" />
-                          Editar
-                        </Link>
-                      </DropdownMenuItem>
-                      <DropdownMenuItem>
-                        <Calendar className="mr-2 h-4 w-4" />
-                        Marcar consulta
-                      </DropdownMenuItem>
-                      <DropdownMenuItem
-                        className="text-red-600"
-                        onClick={() => openDeleteDialog(doctor.id)}
-                      >
-                        <Trash2 className="mr-2 h-4 w-4" />
-                        Excluir
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
+                </FilterBar>
+
+                {/* Tabela de Médicos */}
+                <div className="bg-white rounded-lg border border-gray-200 shadow-md overflow-hidden hidden md:block">
+                    {loading ? (
+                        <div className="p-8 text-center text-gray-500">
+                            <Loader2 className="w-8 h-8 animate-spin mx-auto mb-3 text-green-600" />
+                            Carregando médicos...
+                        </div>
+                    ) : error ? (
+                        <div className="p-8 text-center text-red-600">{error}</div>
+                    ) : filteredDoctors.length === 0 ? (
+                        <div className="p-8 text-center text-gray-500">
+                            {doctors.length === 0
+                                ? <>Nenhum médico cadastrado. <Link href="/manager/home/novo" className="text-green-600 hover:underline">Adicione um novo</Link>.</>
+                                : "Nenhum médico encontrado com os filtros aplicados."
+                            }
+                        </div>
+                    ) : (
+                        <div className="overflow-x-auto">
+                            <table className="w-full min-w-[600px]">
+                                <thead className="bg-gray-50 border-b border-gray-200">
+                                    <tr>
+                                        <th className="text-left p-2 md:p-4 font-medium text-gray-700">Nome</th>
+                                        <th className="text-left p-2 md:p-4 font-medium text-gray-700">CRM</th>
+                                        <th className="text-left p-2 md:p-4 font-medium text-gray-700">Especialidade</th>
+                                        <th className="text-left p-2 md:p-4 font-medium text-gray-700 hidden lg:table-cell">Status</th>
+                                        <th className="text-left p-2 md:p-4 font-medium text-gray-700 hidden xl:table-cell">Cidade/Estado</th>
+                                        <th className="text-right p-4 font-medium text-gray-700">Ações</th>
+                                    </tr>
+                                </thead>
+                                <tbody className="bg-white divide-y divide-gray-200">
+                                    {currentItems.map((doctor) => (
+                                        <tr key={doctor.id} className="hover:bg-gray-50 transition">
+                                            <td className="px-4 py-3 font-medium text-gray-900">
+                                                {doctor.full_name}
+                                            </td>
+                                            <td className="px-4 py-3 text-gray-500 hidden sm:table-cell">{doctor.crm}</td>
+                                            <td className="px-4 py-3 text-gray-500 hidden md:table-cell">
+                                                {/* Exibe Especialidade Normalizada */}
+                                                {normalizeSpecialty(doctor.specialty)}
+                                            </td>
+                                            <td className="px-4 py-3 text-gray-500 hidden lg:table-cell">
+                                                <span className={`px-2 py-1 rounded-full text-xs ${
+                                                    doctor.status === 'Ativo' ? 'bg-green-100 text-green-800' : 
+                                                    doctor.status === 'Inativo' ? 'bg-red-100 text-red-800' : 'bg-yellow-100 text-yellow-800'
+                                                }`}>
+                                                    {doctor.status || "N/A"}
+                                                </span>
+                                            </td>
+                                            <td className="px-4 py-3 text-gray-500 hidden xl:table-cell">
+                                                {(doctor.city || doctor.state)
+                                                    ? `${doctor.city || ""}${doctor.city && doctor.state ? '/' : ''}${doctor.state || ""}`
+                                                    : "N/A"}
+                                            </td>
+                                            <td className="px-4 py-3 text-right">
+                                                <DropdownMenu>
+                                                    <DropdownMenuTrigger asChild>
+                                                        <div className="text-black-600 cursor-pointer inline-block">
+                                                            <MoreVertical className="h-4 w-4" />
+                                                        </div>
+                                                    </DropdownMenuTrigger>
+                                                    <DropdownMenuContent align="end">
+                                                        <DropdownMenuItem onClick={() => openDetailsDialog(doctor)}>
+                                                            <Eye className="mr-2 h-4 w-4" />
+                                                            Ver detalhes
+                                                        </DropdownMenuItem>
+                                                        <DropdownMenuItem asChild>
+                                                            <Link href={`/manager/home/${doctor.id}/editar`}>
+                                                                <Edit className="mr-2 h-4 w-4" />
+                                                                Editar
+                                                            </Link>
+                                                        </DropdownMenuItem>
+                                                        <DropdownMenuItem>
+                                                            <Calendar className="mr-2 h-4 w-4" />
+                                                            Marcar consulta
+                                                        </DropdownMenuItem>
+                                                        <DropdownMenuItem className="text-red-600" onClick={() => openDeleteDialog(doctor.id)}>
+                                                            <Trash2 className="mr-2 h-4 w-4" />
+                                                            Excluir
+                                                        </DropdownMenuItem>
+                                                    </DropdownMenuContent>
+                                                </DropdownMenu>
+                                            </td>
+                                        </tr>
+                                    ))}
+                                </tbody>
+                            </table>
+                        </div>
+                    )}
+                </div>
+
+                {/* Cards de Médicos (Mobile) */}
+                <div className="bg-white rounded-lg border border-gray-200 shadow-md p-4 block md:hidden">
+                    {loading ? (
+                        <div className="p-8 text-center text-gray-500">
+                            <Loader2 className="w-8 h-8 animate-spin mx-auto mb-3 text-green-600" />
+                            Carregando médicos...
+                        </div>
+                    ) : error ? (
+                        <div className="p-8 text-center text-red-600">{error}</div>
+                    ) : filteredDoctors.length === 0 ? (
+                        <div className="p-8 text-center text-gray-500">
+                            {doctors.length === 0
+                                ? <>Nenhum médico cadastrado. <Link href="/manager/home/novo" className="text-green-600 hover:underline">Adicione um novo</Link>.</>
+                                : "Nenhum médico encontrado com os filtros aplicados."
+                            }
+                        </div>
+                    ) : (
+                        <div className="space-y-4">
+                            {currentItems.map((doctor) => (
+                                <div key={doctor.id} className="bg-gray-50 rounded-lg p-4 flex justify-between items-center border border-gray-100">
+                                    <div>
+                                        <div className="font-semibold text-gray-900">{doctor.full_name}</div>
+                                        <div className="text-xs text-gray-500 mb-1">{doctor.phone_mobile}</div>
+                                        <div className="text-sm text-gray-600">{normalizeSpecialty(doctor.specialty)}</div>
+                                        <div className="text-xs mt-1">
+                                            <span className={`px-2 py-0.5 rounded-full text-xs ${
+                                                    doctor.status === 'Ativo' ? 'bg-green-100 text-green-800' : 
+                                                    doctor.status === 'Inativo' ? 'bg-red-100 text-red-800' : 'bg-yellow-100 text-yellow-800'
+                                                }`}>
+                                                    {doctor.status || "N/A"}
+                                            </span>
+                                        </div>
+                                    </div>
+                                    <DropdownMenu>
+                                        <DropdownMenuTrigger asChild>
+                                            <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+                                                <span className="sr-only">Abrir menu</span>
+                                                <div className="font-bold text-gray-500">...</div>
+                                            </Button>
+                                        </DropdownMenuTrigger>
+                                        <DropdownMenuContent align="end">
+                                            <DropdownMenuItem onClick={() => openDetailsDialog(doctor)}>
+                                                <Eye className="mr-2 h-4 w-4" />
+                                                Ver detalhes
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem asChild>
+                                                <Link href={`/manager/home/${doctor.id}/editar`}>
+                                                    <Edit className="mr-2 h-4 w-4" />
+                                                    Editar
+                                                </Link>
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem className="text-red-600" onClick={() => openDeleteDialog(doctor.id)}>
+                                                <Trash2 className="mr-2 h-4 w-4" />
+                                                Excluir
+                                            </DropdownMenuItem>
+                                        </DropdownMenuContent>
+                                    </DropdownMenu>
+                                </div>
+                            ))}
+                        </div>
+                    )}
                 </div>
-              ))}
-            </div>
-          )}
-        </div>
 
         {/* Paginação */}
         {totalPages > 1 && (
@@ -511,31 +458,22 @@ export default function DoctorsPage() {
           </div>
         )}
 
-        {/* Dialogs de Exclusão e Detalhes */}
-        <AlertDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
-          <AlertDialogContent>
-            <AlertDialogHeader>
-              <AlertDialogTitle>Confirma a exclusão?</AlertDialogTitle>
-              <AlertDialogDescription>
-                Esta ação é irreversível e excluirá permanentemente o registro
-                deste médico.
-              </AlertDialogDescription>
-            </AlertDialogHeader>
-            <AlertDialogFooter>
-              <AlertDialogCancel disabled={loading}>Cancelar</AlertDialogCancel>
-              <AlertDialogAction
-                onClick={handleDelete}
-                className="bg-red-600 hover:bg-red-700"
-                disabled={loading}
-              >
-                {loading ? (
-                  <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-                ) : null}
-                Excluir
-              </AlertDialogAction>
-            </AlertDialogFooter>
-          </AlertDialogContent>
-        </AlertDialog>
+                {/* Dialogs (Exclusão e Detalhes) */}
+                <AlertDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
+                    <AlertDialogContent>
+                        <AlertDialogHeader>
+                            <AlertDialogTitle>Confirma a exclusão?</AlertDialogTitle>
+                            <AlertDialogDescription>Esta ação é irreversível e excluirá permanentemente o registro deste médico.</AlertDialogDescription>
+                        </AlertDialogHeader>
+                        <AlertDialogFooter>
+                            <AlertDialogCancel disabled={loading}>Cancelar</AlertDialogCancel>
+                            <AlertDialogAction onClick={handleDelete} className="bg-red-600 hover:bg-red-700" disabled={loading}>
+                                {loading ? <Loader2 className="w-4 h-4 mr-2 animate-spin" /> : null}
+                                Excluir
+                            </AlertDialogAction>
+                        </AlertDialogFooter>
+                    </AlertDialogContent>
+                </AlertDialog>
 
         <AlertDialog
           open={detailsDialogOpen}
diff --git a/app/manager/pacientes/page.tsx b/app/manager/pacientes/page.tsx
index 82d5d57..e2938ee 100644
--- a/app/manager/pacientes/page.tsx
+++ b/app/manager/pacientes/page.tsx
@@ -16,7 +16,16 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { Edit, Trash2, Eye, Calendar, Filter, Loader2 } from "lucide-react";
+import {
+  Plus,
+  Edit,
+  Trash2,
+  Eye,
+  Calendar,
+  Filter,
+  Loader2,
+  MoreVertical,
+} from "lucide-react";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -81,7 +90,9 @@ export default function PacientesPage() {
         estado: p.state ?? "—",
         // Formate as datas se necessário, aqui usamos como string
         ultimoAtendimento: p.last_visit_at?.split("T")[0] ?? "—",
-        proximoAtendimento: p.next_appointment_at?.split("T")[0] ?? "—",
+        proximoAtendimento: p.next_appointment_at
+          ? p.next_appointment_at.split("T")[0].split("-").reverse().join("-")
+          : "—",
         vip: Boolean(p.vip ?? false),
         convenio: p.convenio ?? "Particular", // Define um valor padrão
         status: p.status ?? undefined,
@@ -302,7 +313,6 @@ export default function PacientesPage() {
                                 {patient.nome?.charAt(0) || "?"}
                               </span>
                             </div>
-
                             <span className="font-medium text-gray-900">
                               {patient.nome}
                               {patient.vip && (
@@ -330,8 +340,8 @@ export default function PacientesPage() {
                         <td className="p-4">
                           <DropdownMenu>
                             <DropdownMenuTrigger asChild>
-                              <div className="text-blue-600 cursor-pointer">
-                                Ações
+                              <div className="text-black-600 cursor-pointer">
+                                <MoreVertical className="h-4 w-4" />
                               </div>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent align="end">
@@ -343,7 +353,6 @@ export default function PacientesPage() {
                                 <Eye className="w-4 h-4 mr-2" />
                                 Ver detalhes
                               </DropdownMenuItem>
-
                               <DropdownMenuItem asChild>
                                 <Link
                                   href={`/secretary/pacientes/${patient.id}/editar`}
@@ -379,90 +388,6 @@ export default function PacientesPage() {
           </div>
         </div>
 
-        {/* --- SEÇÃO DE CARDS (VISÍVEL APENAS EM TELAS MENORES QUE MD) --- */}
-        {/* Garantir que os cards apareçam em telas menores e se escondam em MD+ */}
-        <div className="bg-white rounded-lg border border-gray-200 shadow-md p-4 block md:hidden">
-          {error ? (
-            <div className="p-6 text-red-600">{`Erro ao carregar pacientes: ${error}`}</div>
-          ) : loading ? (
-            <div className="p-6 text-center text-gray-500 flex items-center justify-center">
-              <Loader2 className="w-6 h-6 mr-2 animate-spin text-green-600" />{" "}
-              Carregando pacientes...
-            </div>
-          ) : filteredPatients.length === 0 ? (
-            <div className="p-8 text-center text-gray-500">
-              {allPatients.length === 0
-                ? "Nenhum paciente cadastrado"
-                : "Nenhum paciente encontrado com os filtros aplicados"}
-            </div>
-          ) : (
-            <div className="space-y-4">
-              {currentPatients.map((patient) => (
-                <div
-                  key={patient.id}
-                  className="bg-gray-50 rounded-lg p-4 flex flex-col sm:flex-row justify-between items-start sm:items-center border border-gray-200"
-                >
-                  <div className="flex-grow mb-2 sm:mb-0">
-                    <div className="font-semibold text-lg text-gray-900 flex items-center">
-                      {patient.nome}
-                      {patient.vip && (
-                        <span className="ml-2 px-2 py-0.5 text-xs font-semibold text-purple-600 bg-purple-100 rounded-full">
-                          VIP
-                        </span>
-                      )}
-                    </div>
-                    <div className="text-sm text-gray-600">
-                      Telefone: {patient.telefone}
-                    </div>
-                    <div className="text-sm text-gray-600">
-                      Convênio: {patient.convenio}
-                    </div>
-                  </div>
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                      <div className="w-full">
-                        <Button variant="outline" className="w-full">
-                          Ações
-                        </Button>
-                      </div>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="end">
-                      <DropdownMenuItem
-                        onClick={() => openDetailsDialog(String(patient.id))}
-                      >
-                        <Eye className="w-4 h-4 mr-2" />
-                        Ver detalhes
-                      </DropdownMenuItem>
-
-                      <DropdownMenuItem asChild>
-                        <Link
-                          href={`/secretary/pacientes/${patient.id}/editar`}
-                          className="flex items-center w-full"
-                        >
-                          <Edit className="w-4 h-4 mr-2" />
-                          Editar
-                        </Link>
-                      </DropdownMenuItem>
-
-                      <DropdownMenuItem>
-                        <Calendar className="w-4 h-4 mr-2" />
-                        Marcar consulta
-                      </DropdownMenuItem>
-                      <DropdownMenuItem
-                        className="text-red-600"
-                        onClick={() => openDeleteDialog(String(patient.id))}
-                      >
-                        <Trash2 className="w-4 h-4 mr-2" />
-                        Excluir
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-
         {/* Paginação */}
         {totalPages > 1 && !loading && (
           <div className="flex flex-col sm:flex-row items-center justify-center p-4 border-t border-gray-200">
diff --git a/app/manager/usuario/page.tsx b/app/manager/usuario/page.tsx
index 53b557f..c0c478e 100644
--- a/app/manager/usuario/page.tsx
+++ b/app/manager/usuario/page.tsx
@@ -3,23 +3,10 @@
 import React, { useEffect, useState, useCallback } from "react";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { Plus, Eye, Filter, Loader2 } from "lucide-react";
-import {
-  AlertDialog,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Input } from "@/components/ui/input"; // <--- 1. Importação Adicionada
+import { Plus, Eye, Filter, Loader2, Search } from "lucide-react"; // <--- 1. Ícone Search Adicionado
+import { AlertDialog, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog";
 import { api, login } from "services/api.mjs";
 import { usersService } from "services/usersApi.mjs";
 import Sidebar from "@/components/Sidebar";
@@ -41,12 +28,15 @@ interface UserInfoResponse {
 }
 
 export default function UsersPage() {
-  const [users, setUsers] = useState<FlatUser[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
-  const [userDetails, setUserDetails] = useState<UserInfoResponse | null>(null);
-  const [selectedRole, setSelectedRole] = useState<string>("all");
+    const [users, setUsers] = useState<FlatUser[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+    const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
+    const [userDetails, setUserDetails] = useState<UserInfoResponse | null>(null);
+    
+    // --- Estados de Filtro ---
+    const [searchTerm, setSearchTerm] = useState(""); // <--- 2. Estado da busca
+    const [selectedRole, setSelectedRole] = useState<string>("all");
 
   // --- Lógica de Paginação INÍCIO ---
   const [itemsPerPage, setItemsPerPage] = useState(10);
@@ -130,10 +120,21 @@ export default function UsersPage() {
     }
   };
 
-  const filteredUsers =
-    selectedRole && selectedRole !== "all"
-      ? users.filter((u) => u.role === selectedRole)
-      : users;
+    // --- 3. Lógica de Filtragem Atualizada ---
+    const filteredUsers = users.filter((u) => {
+        // Filtro por Papel (Role)
+        const roleMatch = selectedRole === "all" || u.role === selectedRole;
+
+        // Filtro da Barra de Pesquisa (Nome, Email ou Telefone)
+        const searchLower = searchTerm.toLowerCase();
+        const nameMatch = u.full_name?.toLowerCase().includes(searchLower);
+        const emailMatch = u.email?.toLowerCase().includes(searchLower);
+        const phoneMatch = u.phone?.includes(searchLower);
+        
+        const searchMatch = !searchTerm || nameMatch || emailMatch || phoneMatch;
+
+        return roleMatch && searchMatch;
+    });
 
   const indexOfLastItem = currentPage * itemsPerPage;
   const indexOfFirstItem = indexOfLastItem - itemsPerPage;
@@ -191,63 +192,71 @@ export default function UsersPage() {
           </Link>
         </div>
 
-        {/* Filtro e Itens por Página */}
-        <div className="flex flex-wrap items-center gap-3 bg-white p-4 rounded-lg border border-gray-200">
-          {/* Select de Filtro por Papel - Ajustado para resetar a página */}
-          <div className="flex items-center gap-2 w-full md:w-auto">
-            <span className="text-sm font-medium text-foreground whitespace-nowrap">
-              Filtrar por papel
-            </span>
-            <Select
-              onValueChange={(value) => {
-                setSelectedRole(value);
-                setCurrentPage(1);
-              }}
-              value={selectedRole}
-            >
-              <SelectTrigger className="w-full sm:w-[180px]">
-                {" "}
-                {/* w-full para mobile, w-[180px] para sm+ */}
-                <SelectValue placeholder="Filtrar por papel" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">Todos</SelectItem>
-                <SelectItem value="admin">Admin</SelectItem>
-                <SelectItem value="gestor">Gestor</SelectItem>
-                <SelectItem value="medico">Médico</SelectItem>
-                <SelectItem value="secretaria">Secretária</SelectItem>
-                <SelectItem value="user">Usuário</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
+                {/* --- 4. Filtro (Barra de Pesquisa + Selects) --- */}
+                <div className="flex flex-col md:flex-row items-start md:items-center gap-3 bg-white p-4 rounded-lg border border-gray-200">
 
-          {/* Select de Itens por Página */}
-          <div className="flex items-center gap-2 w-full md:w-auto">
-            <span className="text-sm font-medium text-foreground whitespace-nowrap">
-              Itens por página
-            </span>
-            <Select
-              onValueChange={handleItemsPerPageChange}
-              defaultValue={String(itemsPerPage)}
-            >
-              <SelectTrigger className="w-full sm:w-[140px]">
-                {" "}
-                {/* w-full para mobile, w-[140px] para sm+ */}
-                <SelectValue placeholder="Itens por pág." />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="5">5 por página</SelectItem>
-                <SelectItem value="10">10 por página</SelectItem>
-                <SelectItem value="20">20 por página</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <Button variant="outline" className="ml-auto w-full md:w-auto">
-            <Filter className="w-4 h-4 mr-2" />
-            Filtro avançado
-          </Button>
-        </div>
-        {/* Fim do Filtro e Itens por Página */}
+                    {/* Barra de Pesquisa */}
+                    <div className="relative w-full md:flex-1">
+                        <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-gray-400" />
+                        <Input 
+                            placeholder="Buscar por nome, e-mail ou telefone..." 
+                            value={searchTerm}
+                            onChange={(e) => {
+                                setSearchTerm(e.target.value);
+                                setCurrentPage(1); // Reseta a paginação ao pesquisar
+                            }}
+                            className="pl-10 w-full bg-gray-50 border-gray-200 focus:bg-white transition-colors"
+                        />
+                    </div>
+
+                    <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">
+                        {/* Select de Filtro por Papel */}
+                        <div className="flex items-center gap-2 w-full md:w-auto">
+                            <Select
+                                onValueChange={(value) => {
+                                    setSelectedRole(value);
+                                    setCurrentPage(1);
+                                }}
+                                value={selectedRole}>
+
+                                <SelectTrigger className="w-full sm:w-[150px]">
+                                    <SelectValue placeholder="Papel" />
+                                </SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="all">Todos</SelectItem>
+                                    <SelectItem value="admin">Admin</SelectItem>
+                                    <SelectItem value="gestor">Gestor</SelectItem>
+                                    <SelectItem value="medico">Médico</SelectItem>
+                                    <SelectItem value="secretaria">Secretária</SelectItem>
+                                    <SelectItem value="user">Usuário</SelectItem>
+                                </SelectContent>
+                            </Select>
+                        </div>
+
+                        {/* Select de Itens por Página */}
+                        <div className="flex items-center gap-2 w-full md:w-auto">
+                            <Select
+                                onValueChange={handleItemsPerPageChange}
+                                defaultValue={String(itemsPerPage)}
+                            >
+                                <SelectTrigger className="w-full sm:w-[80px]">
+                                    <SelectValue placeholder="10" />
+                                </SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="5">5</SelectItem>
+                                    <SelectItem value="10">10</SelectItem>
+                                    <SelectItem value="20">20</SelectItem>
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        
+                        <Button variant="outline" className="ml-auto w-full md:w-auto hidden lg:flex">
+                            <Filter className="w-4 h-4 mr-2" />
+                            Filtros
+                        </Button>
+                    </div>
+                </div>
+                {/* Fim do Filtro */}
 
         {/* Tabela/Lista */}
         <div className="bg-white rounded-lg border border-gray-200 shadow-md overflow-x-auto">
@@ -315,34 +324,34 @@ export default function UsersPage() {
                 </tbody>
               </table>
 
-              {/* Layout em Cards/Lista para Telas Pequenas */}
-              <div className="md:hidden divide-y divide-gray-200">
-                {currentItems.map((u) => (
-                  <div
-                    key={u.id}
-                    className="flex items-center justify-between p-4 hover:bg-gray-50"
-                  >
-                    <div className="flex-1 min-w-0">
-                      <div className="text-sm font-medium text-gray-900 truncate">
-                        {u.full_name || "—"}
-                      </div>
-                      <div className="text-sm text-gray-500 capitalize">
-                        {u.role || "—"}
-                      </div>
-                    </div>
-                    <div className="ml-4 flex-shrink-0">
-                      <Button
-                        variant="outline"
-                        size="icon"
-                        onClick={() => openDetailsDialog(u)}
-                        title="Visualizar"
-                      >
-                        <Eye className="h-4 w-4" />
-                      </Button>
-                    </div>
-                  </div>
-                ))}
-              </div>
+                            {/* Layout em Cards/Lista para Telas Pequenas */}
+                            <div className="md:hidden divide-y divide-gray-200">
+                                {currentItems.map((u) => (
+                                    <div key={u.id} className="flex items-center justify-between p-4 hover:bg-gray-50">
+                                        <div className="flex-1 min-w-0">
+                                            <div className="text-sm font-medium text-gray-900 truncate">
+                                                {u.full_name || "—"}
+                                            </div>
+                                            <div className="text-xs text-gray-500 truncate">
+                                                {u.email}
+                                            </div>
+                                            <div className="text-sm text-gray-500 capitalize mt-1">
+                                                {u.role || "—"}
+                                            </div>
+                                        </div>
+                                        <div className="ml-4 flex-shrink-0">
+                                            <Button
+                                                variant="outline"
+                                                size="icon"
+                                                onClick={() => openDetailsDialog(u)}
+                                                title="Visualizar"
+                                            >
+                                                <Eye className="h-4 w-4" />
+                                            </Button>
+                                        </div>
+                                    </div>
+                                ))}
+                            </div>
 
               {/* Paginação */}
               {totalPages > 1 && (
diff --git a/app/page.tsx b/app/page.tsx
index 6a6ce1f..2779431 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -100,7 +100,7 @@ export default function InicialPage() {
           <Link href="/login">
             <Button
               variant="outline"
-              className="rounded-full px-6 py-2 border-2 border-[#007BFF] text-[#007BFF] hover:bg-[#007BFF] hover:text-white transition"
+              className="rounded-full px-6 py-2 border-2 border-[#007BFF] text-[#007BFF] hover:bg-[#007BFF] hover:text-white transition cursor-pointer"
             >
               Login
             </Button>
diff --git a/app/secretary/appointments/page.tsx b/app/secretary/appointments/page.tsx
index acd1c87..e1702e2 100644
--- a/app/secretary/appointments/page.tsx
+++ b/app/secretary/appointments/page.tsx
@@ -283,33 +283,24 @@ export default function SecretaryAppointments() {
                     </div>
                   </div>
 
-                  <div className="flex gap-2 mt-4 pt-4 border-t">
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      onClick={() => handleEdit(appointment)}
-                    >
-                      <Pencil className="mr-2 h-4 w-4" />
-                      Editar
-                    </Button>
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      className="text-red-600 hover:text-red-700 hover:bg-red-50 bg-transparent"
-                      onClick={() => handleDelete(appointment)}
-                    >
-                      <Trash2 className="mr-2 h-4 w-4" />
-                      Deletar
-                    </Button>
-                  </div>
-                </CardContent>
-              </Card>
-            ))
-          ) : (
-            <p>Nenhuma consulta encontrada.</p>
-          )}
-        </div>
-      </div>
+                                    <div className="flex gap-2 mt-4 pt-4 border-t">
+                                        <Button variant="outline" size="sm" onClick={() => handleEdit(appointment)}>
+                                            <Pencil className="mr-2 h-4 w-4" />
+                                            Editar
+                                        </Button>
+                                        <Button variant="outline" size="sm" className="text-red-600 hover:text-red-700 hover:bg-red-50 bg-transparent" onClick={() => handleDelete(appointment)}>
+                                            <Trash2 className="mr-2 h-4 w-4" />
+                                            Cancelar
+                                        </Button>
+                                    </div>
+                                </CardContent>
+                            </Card>
+                        ))
+                    ) : (
+                        <p>Nenhuma consulta encontrada.</p>
+                    )}
+                </div>
+            </div>
 
       {/* MODAL DE EDIÇÃO */}
       <Dialog open={editModal} onOpenChange={setEditModal}>
diff --git a/app/secretary/pacientes/page.tsx b/app/secretary/pacientes/page.tsx
index e91048c..4a68031 100644
--- a/app/secretary/pacientes/page.tsx
+++ b/app/secretary/pacientes/page.tsx
@@ -4,38 +4,11 @@
 import { useState, useEffect, useCallback } from "react";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import {
-  Plus,
-  Edit,
-  Trash2,
-  Eye,
-  Calendar,
-  Filter,
-  Loader2,
-} from "lucide-react";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Plus, Edit, Trash2, Eye, Calendar, Filter, Loader2, MoreVertical } from "lucide-react";
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog";
+import SecretaryLayout from "@/components/secretary-layout";
 import { patientsService } from "@/services/patientsApi.mjs";
 import Sidebar from "@/components/Sidebar";
 
@@ -43,58 +16,59 @@ import Sidebar from "@/components/Sidebar";
 const PAGE_SIZE = 5;
 
 export default function PacientesPage() {
-  // --- ESTADOS DE DADOS E GERAL ---
-  const [searchTerm, setSearchTerm] = useState("");
-  const [convenioFilter, setConvenioFilter] = useState("all");
-  const [vipFilter, setVipFilter] = useState("all");
+    // --- ESTADOS DE DADOS E GERAL ---
+    const [searchTerm, setSearchTerm] = useState("");
+    const [convenioFilter, setConvenioFilter] = useState("all");
+    const [vipFilter, setVipFilter] = useState("all");
 
-  // Lista completa, carregada da API uma única vez
-  const [allPatients, setAllPatients] = useState<any[]>([]);
-  // Lista após a aplicação dos filtros (base para a paginação)
-  const [filteredPatients, setFilteredPatients] = useState<any[]>([]);
+    // Lista completa, carregada da API uma única vez
+    const [allPatients, setAllPatients] = useState<any[]>([]);
+    // Lista após a aplicação dos filtros (base para a paginação)
+    const [filteredPatients, setFilteredPatients] = useState<any[]>([]);
 
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
 
-  // --- ESTADOS DE PAGINAÇÃO ---
-  const [page, setPage] = useState(1);
+    // --- ESTADOS DE PAGINAÇÃO ---
+    const [page, setPage] = useState(1);
 
-  // CÁLCULO DA PAGINAÇÃO
-  const totalPages = Math.ceil(filteredPatients.length / PAGE_SIZE);
-  const startIndex = (page - 1) * PAGE_SIZE;
-  const endIndex = startIndex + PAGE_SIZE;
-  // Pacientes a serem exibidos na tabela (aplicando a paginação)
-  const currentPatients = filteredPatients.slice(startIndex, endIndex);
+    // CÁLCULO DA PAGINAÇÃO
+    const totalPages = Math.ceil(filteredPatients.length / PAGE_SIZE);
+    const startIndex = (page - 1) * PAGE_SIZE;
+    const endIndex = startIndex + PAGE_SIZE;
+    // Pacientes a serem exibidos na tabela (aplicando a paginação)
+    const currentPatients = filteredPatients.slice(startIndex, endIndex);
 
-  // --- ESTADOS DE DIALOGS ---
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [patientToDelete, setPatientToDelete] = useState<string | null>(null);
-  const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
-  const [patientDetails, setPatientDetails] = useState<any | null>(null);
+    // --- ESTADOS DE DIALOGS ---
+    const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+    const [patientToDelete, setPatientToDelete] = useState<string | null>(null);
+    const [detailsDialogOpen, setDetailsDialogOpen] = useState(false);
+    const [patientDetails, setPatientDetails] = useState<any | null>(null);
 
-  // --- FUNÇÕES DE LÓGICA ---
+    // --- FUNÇÕES DE LÓGICA ---
 
-  // 1. Função para carregar TODOS os pacientes da API
-  const fetchAllPacientes = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      // Como o backend retorna um array, chamamos sem paginação
-      const res = await patientsService.list();
+    // 1. Função para carregar TODOS os pacientes da API
+    const fetchAllPacientes = useCallback(
+        async () => {
+            setLoading(true);
+            setError(null);
+            try {
+                // Como o backend retorna um array, chamamos sem paginação
+                const res = await patientsService.list();
 
-      const mapped = res.map((p: any) => ({
-        id: String(p.id ?? ""),
-        nome: p.full_name ?? "—",
-        telefone: p.phone_mobile ?? p.phone1 ?? "—",
-        cidade: p.city ?? "—",
-        estado: p.state ?? "—",
-        // Formate as datas se necessário, aqui usamos como string
-        ultimoAtendimento: p.last_visit_at?.split("T")[0] ?? "—",
-        proximoAtendimento: p.next_appointment_at?.split("T")[0] ?? "—",
-        vip: Boolean(p.vip ?? false),
-        convenio: p.convenio ?? "Particular", // Define um valor padrão
-        status: p.status ?? undefined,
-      }));
+                const mapped = res.map((p: any) => ({
+                    id: String(p.id ?? ""),
+                    nome: p.full_name ?? "—",
+                    telefone: p.phone_mobile ?? p.phone1 ?? "—",
+                    cidade: p.city ?? "—",
+                    estado: p.state ?? "—",
+                    // Formate as datas se necessário, aqui usamos como string
+                    ultimoAtendimento: p.last_visit_at?.split('T')[0] ?? "—",
+                    proximoAtendimento: p.next_appointment_at?.split('T')[0] ?? "—",
+                    vip: Boolean(p.vip ?? false),
+                    convenio: p.convenio ?? "Particular", // Define um valor padrão
+                    status: p.status ?? undefined,
+                }));
 
       setAllPatients(mapped);
     } catch (e: any) {
@@ -105,31 +79,32 @@ export default function PacientesPage() {
     }
   }, []);
 
-  // 2. Efeito para aplicar filtros e calcular a lista filtrada (chama-se quando allPatients ou filtros mudam)
-  useEffect(() => {
-    const filtered = allPatients.filter((patient) => {
-      // Filtro por termo de busca (Nome ou Telefone)
-      const matchesSearch =
-        patient.nome?.toLowerCase().includes(searchTerm.toLowerCase()) ||
-        patient.telefone?.includes(searchTerm);
+    // 2. Efeito para aplicar filtros e calcular a lista filtrada (chama-se quando allPatients ou filtros mudam)
+    useEffect(() => {
+        const filtered = allPatients.filter((patient) => {
+            // Filtro por termo de busca (Nome ou Telefone)
+            const matchesSearch =
+                patient.nome?.toLowerCase().includes(searchTerm.toLowerCase()) ||
+                patient.telefone?.includes(searchTerm);
 
-      // Filtro por Convênio
-      const matchesConvenio =
-        convenioFilter === "all" || patient.convenio === convenioFilter;
+            // Filtro por Convênio
+            const matchesConvenio =
+                convenioFilter === "all" ||
+                patient.convenio === convenioFilter;
 
-      // Filtro por VIP
-      const matchesVip =
-        vipFilter === "all" ||
-        (vipFilter === "vip" && patient.vip) ||
-        (vipFilter === "regular" && !patient.vip);
+            // Filtro por VIP
+            const matchesVip =
+                vipFilter === "all" ||
+                (vipFilter === "vip" && patient.vip) ||
+                (vipFilter === "regular" && !patient.vip);
 
-      return matchesSearch && matchesConvenio && matchesVip;
-    });
+            return matchesSearch && matchesConvenio && matchesVip;
+        });
 
-    setFilteredPatients(filtered);
-    // Garante que a página atual seja válida após a filtragem
-    setPage(1);
-  }, [allPatients, searchTerm, convenioFilter, vipFilter]);
+        setFilteredPatients(filtered);
+        // Garante que a página atual seja válida após a filtragem
+        setPage(1);
+    }, [allPatients, searchTerm, convenioFilter, vipFilter]);
 
   // 3. Efeito inicial para buscar os pacientes
   useEffect(() => {
@@ -137,18 +112,18 @@ export default function PacientesPage() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  // --- LÓGICA DE AÇÕES (DELETAR / VER DETALHES) ---
+    // --- LÓGICA DE AÇÕES (DELETAR / VER DETALHES) ---
 
-  const openDetailsDialog = async (patientId: string) => {
-    setDetailsDialogOpen(true);
-    setPatientDetails(null);
-    try {
-      const res = await patientsService.getById(patientId);
-      setPatientDetails(Array.isArray(res) ? res[0] : res); // Supondo que retorne um array com um item
-    } catch (e: any) {
-      setPatientDetails({ error: e?.message || "Erro ao buscar detalhes" });
-    }
-  };
+    const openDetailsDialog = async (patientId: string) => {
+        setDetailsDialogOpen(true);
+        setPatientDetails(null);
+        try {
+            const res = await patientsService.getById(patientId);
+            setPatientDetails(Array.isArray(res) ? res[0] : res); // Supondo que retorne um array com um item
+        } catch (e: any) {
+            setPatientDetails({ error: e?.message || "Erro ao buscar detalhes" });
+        }
+    };
 
   const handleDeletePatient = async (patientId: string) => {
     try {
@@ -192,19 +167,18 @@ export default function PacientesPage() {
           </div>
         </div>
 
-        {/* Bloco de Filtros (Responsividade APLICADA) */}
-        <div className="flex flex-wrap items-center gap-4 bg-card p-4 rounded-lg border border-border">
-          <Filter className="w-5 h-5 text-gray-400" />
+                {/* Bloco de Filtros (Responsividade APLICADA) */}
+                <div className="flex flex-wrap items-center gap-4 bg-card p-4 rounded-lg border border-border">
+                    <Filter className="w-5 h-5 text-gray-400" />
 
-          {/* Busca - Ocupa 100% no mobile, depois cresce */}
-          <input
-            type="text"
-            placeholder="Buscar por nome ou telefone..."
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            // w-full no mobile, depois flex-grow para ocupar o espaço disponível
-            className="w-full sm:flex-grow sm:max-w-[300px] p-2 border rounded-md text-sm"
-          />
+                    {/* Busca - Ocupa 100% no mobile, depois cresce */}
+                    <input
+                        type="text"
+                        placeholder="Buscar por nome ou telefone..."
+                        value={searchTerm}
+                        onChange={(e) => setSearchTerm(e.target.value)}
+                        className="w-full sm:flex-grow sm:min-w-[150px] p-2 border rounded-md text-sm"
+                    />
 
           {/* Convênio - Ocupa a largura total em telas pequenas, depois se ajusta */}
           <div className="flex items-center gap-2 w-full sm:w-auto sm:flex-grow sm:max-w-[200px]">
@@ -227,31 +201,24 @@ export default function PacientesPage() {
             </Select>
           </div>
 
-          {/* VIP - Ocupa a largura total em telas pequenas, depois se ajusta */}
-          <div className="flex items-center gap-2 w-full sm:w-auto sm:flex-grow sm:max-w-[150px]">
-            <span className="text-sm font-medium text-foreground whitespace-nowrap hidden md:block">
-              VIP
-            </span>
-            <Select value={vipFilter} onValueChange={setVipFilter}>
-              <SelectTrigger className="w-full sm:w-32">
-                {" "}
-                {/* w-full para mobile, w-32 para sm+ */}
-                <SelectValue placeholder="VIP" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">Todos</SelectItem>
-                <SelectItem value="vip">VIP</SelectItem>
-                <SelectItem value="regular">Regular</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-
-          {/* Aniversariantes - Ocupa 100% no mobile, e se alinha à direita no md+ */}
-          <Button variant="outline" className="w-full md:w-auto md:ml-auto">
-            <Calendar className="w-4 h-4 mr-2" />
-            Aniversariantes
-          </Button>
-        </div>
+                    {/* VIP - Ocupa a largura total em telas pequenas, depois se ajusta */}
+                    <div className="flex items-center gap-2 w-full sm:w-auto sm:flex-grow sm:max-w-[150px]">
+                        <span className="text-sm font-medium text-foreground whitespace-nowrap hidden md:block">VIP</span>
+                        <Select value={vipFilter} onValueChange={setVipFilter}>
+                            <SelectTrigger className="w-full sm:w-32"> {/* w-full para mobile, w-32 para sm+ */}
+                                <SelectValue placeholder="VIP" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">Todos</SelectItem>
+                                <SelectItem value="vip">VIP</SelectItem>
+                                <SelectItem value="regular">Regular</SelectItem>
+                            </SelectContent>
+                        </Select>
+                    </div>
+                    
+                
+                    
+                </div>
 
         {/* --- SEÇÃO DE TABELA (VISÍVEL EM TELAS MAIORES OU IGUAIS A MD) --- */}
         {/* Garantir que a tabela se esconda em telas menores e apareça em MD+ */}
diff --git a/components/schedule/schedule-form.tsx b/components/schedule/schedule-form.tsx
index 4747258..08a4e16 100644
--- a/components/schedule/schedule-form.tsx
+++ b/components/schedule/schedule-form.tsx
@@ -1,22 +1,43 @@
-"use client"
-import { useState, useEffect, useCallback, useRef } from "react"
-import type React from "react"
+"use client";
 
-import { usersService } from "@/services/usersApi.mjs"
-import { patientsService } from "@/services/patientsApi.mjs"
-import { doctorsService } from "@/services/doctorsApi.mjs"
-import { appointmentsService } from "@/services/appointmentsApi.mjs"
-import { AvailabilityService } from "@/services/availabilityApi.mjs"
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
-import { Button } from "@/components/ui/button"
-import { Label } from "@/components/ui/label"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { Textarea } from "@/components/ui/textarea"
-import { Calendar as CalendarShadcn } from "@/components/ui/calendar"
-import { format, addDays } from "date-fns"
-import { User, StickyNote } from "lucide-react"
-import { smsService } from "@/services/Sms.mjs"
-import { toast } from "@/hooks/use-toast"
+import { useState, useEffect, useCallback, useRef } from "react";
+import { usersService } from "@/services/usersApi.mjs";
+import { patientsService } from "@/services/patientsApi.mjs";
+import { doctorsService } from "@/services/doctorsApi.mjs";
+import { appointmentsService } from "@/services/appointmentsApi.mjs";
+import { AvailabilityService } from "@/services/availabilityApi.mjs";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Textarea } from "@/components/ui/textarea";
+import { Calendar as CalendarShadcn } from "@/components/ui/calendar";
+import { format, addDays } from "date-fns";
+import { User, StickyNote, Check, ChevronsUpDown } from "lucide-react";
+import { smsService } from "@/services/Sms.mjs";
+import { toast } from "@/hooks/use-toast";
+import { cn } from "@/lib/utils";
+
+// Componentes do Combobox (Barra de Pesquisa)
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/components/ui/command";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
 
 export default function ScheduleForm() {
   // Estado do usuário e role
@@ -24,16 +45,20 @@ export default function ScheduleForm() {
   const [userId, setUserId] = useState<string | null>(null)
 
   // Listas e seleções
-  const [patients, setPatients] = useState<any[]>([])
-  const [selectedPatient, setSelectedPatient] = useState("")
-  const [doctors, setDoctors] = useState<any[]>([])
-  const [selectedDoctor, setSelectedDoctor] = useState("")
-  const [selectedDate, setSelectedDate] = useState("")
-  const [selectedTime, setSelectedTime] = useState("")
-  const [notes, setNotes] = useState("")
-  const [availableTimes, setAvailableTimes] = useState<string[]>([])
-  const [loadingDoctors, setLoadingDoctors] = useState(true)
-  const [loadingSlots, setLoadingSlots] = useState(false)
+  const [patients, setPatients] = useState<any[]>([]);
+  const [selectedPatient, setSelectedPatient] = useState("");
+  const [openPatientCombobox, setOpenPatientCombobox] = useState(false);
+
+  const [doctors, setDoctors] = useState<any[]>([]);
+  const [selectedDoctor, setSelectedDoctor] = useState("");
+  const [openDoctorCombobox, setOpenDoctorCombobox] = useState(false); // Novo estado para médico
+
+  const [selectedDate, setSelectedDate] = useState("");
+  const [selectedTime, setSelectedTime] = useState("");
+  const [notes, setNotes] = useState("");
+  const [availableTimes, setAvailableTimes] = useState<string[]>([]);
+  const [loadingDoctors, setLoadingDoctors] = useState(true);
+  const [loadingSlots, setLoadingSlots] = useState(false);
 
   // Outras configs
   const [tipoConsulta] = useState("presencial")
@@ -100,7 +125,10 @@ export default function ScheduleForm() {
     }
   }, [])
 
-  const computeAvailabilityCountsPreview = async (doctorId: string, dispList: any[]) => {
+  const computeAvailabilityCountsPreview = async (
+    doctorId: string,
+    dispList: any[]
+  ) => {
     try {
       const today = new Date()
       const start = format(today, "yyyy-MM-dd")
@@ -225,18 +253,18 @@ export default function ScheduleForm() {
         appointment_type: tipoConsulta,
       }
 
-      await appointmentsService.create(body)
+      await appointmentsService.create(body);
 
-      const dateFormatted = selectedDate.split("-").reverse().join("/")
+      const dateFormatted = selectedDate.split("-").reverse().join("/");
 
       toast({
         title: "Consulta agendada!",
         description: `Consulta marcada para ${dateFormatted} às ${selectedTime} com o(a) médico(a) ${
           doctors.find((d) => d.id === selectedDoctor)?.full_name || ""
         }.`,
-      })
+      });
 
-      let phoneNumber = "+5511999999999"
+      let phoneNumber = "+5511999999999";
 
       try {
         if (isSecretaryLike) {
@@ -274,24 +302,25 @@ export default function ScheduleForm() {
         })
 
         if (smsRes?.success) {
-          console.log("✅ SMS enviado com sucesso:", smsRes.message_sid)
+          console.log("✅ SMS enviado com sucesso:", smsRes.message_sid);
         } else {
-          console.warn("⚠️ Falha no envio do SMS:", smsRes)
+          console.warn("⚠️ Falha no envio do SMS:", smsRes);
         }
       } catch (smsErr) {
-        console.error("❌ Erro ao enviar SMS:", smsErr)
+        console.error("❌ Erro ao enviar SMS:", smsErr);
       }
 
-      setSelectedDoctor("")
-      setSelectedDate("")
-      setSelectedTime("")
-      setNotes("")
-      setSelectedPatient("")
+      // 🧹 limpa os campos
+      setSelectedDoctor("");
+      setSelectedDate("");
+      setSelectedTime("");
+      setNotes("");
+      setSelectedPatient("");
     } catch (err) {
-      console.error("❌ Erro ao agendar consulta:", err)
-      toast({ title: "Erro", description: "Falha ao agendar consulta." })
+      console.error("❌ Erro ao agendar consulta:", err);
+      toast({ title: "Erro", description: "Falha ao agendar consulta." });
     }
-  }
+  };
 
   // 🔹 Tooltip no calendário
   useEffect(() => {
@@ -392,7 +421,11 @@ export default function ScheduleForm() {
                   <CalendarShadcn
                     mode="single"
                     disabled={!selectedDoctor}
-                    selected={selectedDate ? new Date(selectedDate + "T12:00:00") : undefined}
+                    selected={
+                      selectedDate
+                        ? new Date(selectedDate + "T12:00:00")
+                        : undefined
+                    }
                     onSelect={(date) => {
                       if (!date) return
                       const formatted = format(new Date(date.getTime() + 12 * 60 * 60 * 1000), "yyyy-MM-dd")
diff --git a/components/ui/button.tsx b/components/ui/button.tsx
index a45c066..14b6319 100644
--- a/components/ui/button.tsx
+++ b/components/ui/button.tsx
@@ -41,8 +41,10 @@ export interface ButtonProps
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? Slot : 'button'
+
     return (
       <Comp
+        data-slot="button"
         className={cn(buttonVariants({ variant, size, className }))}
         ref={ref}
         {...props}
diff --git a/components/ui/filter-bar.tsx b/components/ui/filter-bar.tsx
new file mode 100644
index 0000000..d7064b0
--- /dev/null
+++ b/components/ui/filter-bar.tsx
@@ -0,0 +1,115 @@
+"use client";
+
+import React from "react";
+import { Search, Filter, X } from "lucide-react";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+
+export interface FilterOption {
+  label: string;
+  value: string;
+}
+
+export interface FilterConfig {
+  key: string;        // O nome do estado que vai guardar esse valor (ex: 'specialty')
+  label: string;      // O placeholder do select (ex: 'Especialidade')
+  options: FilterOption[] | string[]; // Opções do dropdown
+}
+
+interface FilterBarProps {
+  onSearch: (term: string) => void;
+  searchTerm: string;
+  searchPlaceholder?: string;
+  filters?: FilterConfig[];
+  activeFilters: Record<string, string>;
+  onFilterChange: (key: string, value: string) => void;
+  onClearFilters?: () => void;
+  className?: string;
+  children?: React.ReactNode; // Para botões extras (ex: "Novo Médico", paginação)
+}
+
+export function FilterBar({
+  onSearch,
+  searchTerm,
+  searchPlaceholder = "Pesquisar...",
+  filters = [],
+  activeFilters,
+  onFilterChange,
+  onClearFilters,
+  children,
+  className,
+}: FilterBarProps) {
+  
+  // Verifica se tem algum filtro ativo para mostrar o botão de limpar
+  const hasActiveFilters = 
+    searchTerm !== "" || 
+    Object.values(activeFilters).some(val => val !== "all" && val !== "");
+
+  return (
+    <div className={`flex flex-col md:flex-row items-start md:items-center gap-3 bg-white p-4 rounded-lg border border-gray-200 ${className}`}>
+      
+      {/* Barra de Pesquisa */}
+      <div className="relative w-full md:flex-1">
+        <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-gray-400" />
+        <Input
+          placeholder={searchPlaceholder}
+          value={searchTerm}
+          onChange={(e) => onSearch(e.target.value)}
+          className="pl-10 w-full bg-gray-50 border-gray-200 focus:bg-white transition-colors"
+        />
+      </div>
+
+      {/* Filtros Dinâmicos (Selects) */}
+      <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">
+        {filters.map((filter) => (
+          <div key={filter.key} className="w-full sm:w-auto">
+            <Select
+              value={activeFilters[filter.key] || "all"}
+              onValueChange={(value) => onFilterChange(filter.key, value)}
+            >
+              <SelectTrigger className="w-full sm:w-[180px]">
+                <SelectValue placeholder={filter.label} />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="all">Todos: {filter.label}</SelectItem>
+                {filter.options.map((opt) => {
+                  // Suporta tanto array de strings quanto array de objetos {label, value}
+                  const value = typeof opt === 'string' ? opt : opt.value;
+                  const label = typeof opt === 'string' ? opt : opt.label;
+                  return (
+                    <SelectItem key={value} value={value}>
+                      {label}
+                    </SelectItem>
+                  );
+                })}
+              </SelectContent>
+            </Select>
+          </div>
+        ))}
+
+        {/* Botão de Limpar Filtros */}
+        {hasActiveFilters && onClearFilters && (
+          <Button 
+            variant="ghost" 
+            size="icon" 
+            onClick={onClearFilters}
+            className="text-gray-500 hover:text-red-600"
+            title="Limpar filtros"
+          >
+            <X className="h-4 w-4" />
+          </Button>
+        )}
+
+        {/* Botões Extras (ex: Novo Médico, Paginação) passados como children */}
+        {children}
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/ui/patient-details-modal.tsx b/components/ui/patient-details-modal.tsx
index fea1040..8a37050 100644
--- a/components/ui/patient-details-modal.tsx
+++ b/components/ui/patient-details-modal.tsx
@@ -1,96 +1,147 @@
-'use client'
+"use client";
 
 import {
-  Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter, DialogClose
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+
+interface Paciente {
+    id: string;
+    nome: string;
+    telefone: string;
+    cidade: string;
+    estado: string;
+    email?: string;
+    birth_date?: string;
+    cpf?: string;
+    blood_type?: string;
+    weight_kg?: number;
+    height_m?: number;
+    street?: string;
+    number?: string;
+    complement?: string;
+    neighborhood?: string;
+    cep?: string;
+    [key: string]: any; // Para permitir outras propriedades se necessário
+}
 
 interface PatientDetailsModalProps {
+  patient: Paciente | null;
   isOpen: boolean;
-  patient: any;
   onClose: () => void;
 }
 
-export function PatientDetailsModal({ patient, isOpen, onClose }: PatientDetailsModalProps) {
+export function PatientDetailsModal({
+  patient,
+  isOpen,
+  onClose,
+}: PatientDetailsModalProps) {
   if (!patient) return null;
 
   return (
     <Dialog open={isOpen} onOpenChange={onClose}>
-      <DialogContent className="sm:max-w-[600px]">
+      <DialogContent className="max-w-[95%] sm:max-w-lg max-h-[90vh] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>Detalhes do Paciente</DialogTitle>
-          <DialogDescription>Informações detalhadas sobre o paciente.</DialogDescription>
+          <DialogTitle className="text-xl font-bold">Detalhes do Paciente</DialogTitle>
+          <DialogDescription>
+            Informações detalhadas sobre o paciente.
+          </DialogDescription>
         </DialogHeader>
-        <div className="grid gap-4 py-4">
-          <div className="grid grid-cols-2 gap-4">
+
+        <div className="space-y-4 py-2">
+          {/* Grid Principal */}
+          <div className="grid grid-cols-2 gap-4 text-sm">
             <div>
-              <p className="font-semibold">Nome Completo</p>
-              <p>{patient.nome}</p>
+              <p className="font-semibold text-gray-900">Nome Completo</p>
+              <p className="text-gray-700">{patient.nome}</p>
             </div>
+            
+            {/* CORREÇÃO AQUI: Adicionado 'break-all' para quebrar o email */}
             <div>
-              <p className="font-semibold">Email</p>
-              <p>{patient.email}</p>
+              <p className="font-semibold text-gray-900">Email</p>
+              <p className="text-gray-700 break-all">{patient.email || "N/A"}</p>
             </div>
+
             <div>
-              <p className="font-semibold">Telefone</p>
-              <p>{patient.telefone}</p>
+              <p className="font-semibold text-gray-900">Telefone</p>
+              <p className="text-gray-700">{patient.telefone}</p>
             </div>
+
             <div>
-              <p className="font-semibold">Data de Nascimento</p>
-              <p>{patient.birth_date}</p>
+              <p className="font-semibold text-gray-900">Data de Nascimento</p>
+              <p className="text-gray-700">{patient.birth_date || "N/A"}</p>
             </div>
+
             <div>
-              <p className="font-semibold">CPF</p>
-              <p>{patient.cpf}</p>
+              <p className="font-semibold text-gray-900">CPF</p>
+              <p className="text-gray-700">{patient.cpf || "N/A"}</p>
             </div>
+
             <div>
-              <p className="font-semibold">Tipo Sanguíneo</p>
-              <p>{patient.blood_type}</p>
+              <p className="font-semibold text-gray-900">Tipo Sanguíneo</p>
+              <p className="text-gray-700">{patient.blood_type || "N/A"}</p>
             </div>
+
             <div>
-              <p className="font-semibold">Peso (kg)</p>
-              <p>{patient.weight_kg}</p>
+              <p className="font-semibold text-gray-900">Peso (kg)</p>
+              <p className="text-gray-700">{patient.weight_kg || "0"}</p>
             </div>
+
             <div>
-              <p className="font-semibold">Altura (m)</p>
-              <p>{patient.height_m}</p>
+              <p className="font-semibold text-gray-900">Altura (m)</p>
+              <p className="text-gray-700">{patient.height_m || "0"}</p>
             </div>
           </div>
-          <div className="border-t pt-4 mt-4">
-            <h3 className="font-semibold mb-2">Endereço</h3>
-            <div className="grid grid-cols-2 gap-4">
+
+          <hr className="border-gray-200" />
+
+          {/* Seção de Endereço */}
+          <div>
+            <h4 className="font-semibold mb-3 text-gray-900">Endereço</h4>
+            <div className="grid grid-cols-2 gap-4 text-sm">
               <div>
-                <p className="font-semibold">Rua</p>
-                <p>{`${patient.street}, ${patient.number}`}</p>
+                <p className="font-semibold text-gray-900">Rua</p>
+                <p className="text-gray-700">
+                  {patient.street && patient.street !== "N/A" 
+                    ? `${patient.street}, ${patient.number || ""}` 
+                    : "N/A"}
+                </p>
               </div>
               <div>
-                <p className="font-semibold">Complemento</p>
-                <p>{patient.complement}</p>
+                <p className="font-semibold text-gray-900">Complemento</p>
+                <p className="text-gray-700">{patient.complement || "N/A"}</p>
               </div>
               <div>
-                <p className="font-semibold">Bairro</p>
-                <p>{patient.neighborhood}</p>
+                <p className="font-semibold text-gray-900">Bairro</p>
+                <p className="text-gray-700">{patient.neighborhood || "N/A"}</p>
               </div>
               <div>
-                <p className="font-semibold">Cidade</p>
-                <p>{patient.cidade}</p>
+                <p className="font-semibold text-gray-900">Cidade</p>
+                <p className="text-gray-700">{patient.cidade || "N/A"}</p>
               </div>
               <div>
-                <p className="font-semibold">Estado</p>
-                <p>{patient.estado}</p>
+                <p className="font-semibold text-gray-900">Estado</p>
+                <p className="text-gray-700">{patient.estado || "N/A"}</p>
               </div>
               <div>
-                <p className="font-semibold">CEP</p>
-                <p>{patient.cep}</p>
+                <p className="font-semibold text-gray-900">CEP</p>
+                <p className="text-gray-700">{patient.cep || "N/A"}</p>
               </div>
             </div>
           </div>
         </div>
+
         <DialogFooter>
-          <DialogClose asChild>
-            <button type="button" className="px-4 py-2 bg-gray-200 rounded-md">Fechar</button>
-          </DialogClose>
+          <Button variant="secondary" onClick={onClose} className="w-full sm:w-auto">
+            Fechar
+          </Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
   );
-}
+}
\ No newline at end of file
diff --git a/lib/normalization.ts b/lib/normalization.ts
new file mode 100644
index 0000000..038b23a
--- /dev/null
+++ b/lib/normalization.ts
@@ -0,0 +1,94 @@
+// lib/normalization.ts
+
+/**
+ * Mapa de normalização.
+ * A chave é o termo "sujo" (em minúsculo) e o valor é o termo "Canônico" (Bonito).
+ */
+const SPECIALTY_MAPPING: Record<string, string> = {
+  // --- Cardiologia ---
+  "cardiologista": "Cardiologia",
+  "cardio": "Cardiologia",
+  "cardiologia": "Cardiologia",
+  
+  // --- Dermatologia ---
+  "dermatologista": "Dermatologia",
+  "dermato": "Dermatologia",
+  "dermatologia": "Dermatologia",
+  
+  // --- Ortopedia ---
+  "ortopedista": "Ortopedia",
+  "ortopedia": "Ortopedia",
+  
+  // --- Ginecologia ---
+  "ginecologista": "Ginecologia",
+  "ginecologia": "Ginecologia",
+  "ginecologistaa": "Ginecologia", // Erro de digitação comum
+  "gineco": "Ginecologia",
+  
+  // --- Pediatria ---
+  "pediatra": "Pediatria",
+  "pediatria": "Pediatria",
+  
+  // --- Clínica Geral (Onde estava o erro) ---
+  "clinico geral": "Clínica Geral",
+  "clínico geral": "Clínica Geral",
+  "clinica geral": "Clínica Geral",
+  "clínica geral": "Clínica Geral", // <--- ADICIONADO
+  "geral": "Clínica Geral",
+  "medico geral": "Clínica Geral",
+  "médico geral": "Clínica Geral",
+
+  // --- Neurologia ---
+  "neurologista": "Neurologia",
+  "neurologia": "Neurologia",
+  "neuro": "Neurologia",
+  "neurocirurgiao": "Neurocirurgia",
+  "neurocirurgião": "Neurocirurgia",
+
+  // --- Limpeza de Lixo / Outros ---
+  "asdw": "Outros", 
+  "teste": "Outros",
+  "n/a": "Não Informado", // <--- Transforma o "N/A" da imagem
+  "na": "Não Informado",
+};
+
+/**
+ * Recebe uma especialidade suja e retorna a versão limpa.
+ */
+export function normalizeSpecialty(raw: string | null | undefined): string {
+  if (!raw) return "Não Informado";
+  
+  // Remove espaços extras e joga para minúsculo
+  const lower = raw.trim().toLowerCase();
+  
+  // Se for uma string vazia ou traço
+  if (lower === "" || lower === "-") return "Não Informado";
+
+  // Verifica no mapa
+  if (SPECIALTY_MAPPING[lower]) {
+    return SPECIALTY_MAPPING[lower];
+  }
+
+  // Fallback: Capitaliza a primeira letra de cada palavra
+  // Ex: "cirurgia plastica" -> "Cirurgia Plastica"
+  return lower.replace(/\b\w/g, (l) => l.toUpperCase());
+}
+
+/**
+ * Extrai uma lista única de especialidades normalizadas.
+ */
+export function getUniqueSpecialties(items: any[]): string[] {
+  const specialties = new Set<string>();
+  
+  items.forEach(item => {
+    // Normaliza antes de adicionar ao Set
+    const normalized = normalizeSpecialty(item.specialty);
+    
+    // Só adiciona se não for "Não Informado" ou "Outros" (Opcional: remova o if se quiser mostrar tudo)
+    if (normalized && normalized !== "Não Informado") {
+      specialties.add(normalized);
+    }
+  });
+
+  return Array.from(specialties).sort();
+}
\ No newline at end of file