Seção de Relatórios
Acesse a seção de relatórios médicos para gerenciar, visualizar e exportar documentos.
diff --git a/susconecta/app/(main-routes)/dashboard/relatorios/page.tsx b/susconecta/app/(main-routes)/dashboard/relatorios/page.tsx
index 126fc8e..c70081a 100644
--- a/susconecta/app/(main-routes)/dashboard/relatorios/page.tsx
+++ b/susconecta/app/(main-routes)/dashboard/relatorios/page.tsx
@@ -1,16 +1,29 @@
"use client";
+import React, { useEffect, useState } from "react";
import { Button } from "@/components/ui/button";
import { FileDown, BarChart2, Users, DollarSign, TrendingUp, UserCheck, CalendarCheck, ThumbsUp, User, Briefcase } from "lucide-react";
import jsPDF from "jspdf";
import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer, LineChart, Line, PieChart, Pie, Cell } from "recharts";
+import {
+ countTotalPatients,
+ countTotalDoctors,
+ countAppointmentsToday,
+ getAppointmentsByDateRange,
+ listarAgendamentos,
+ getUpcomingAppointments,
+ getNewUsersLastDays,
+ getPendingReports,
+ buscarMedicosPorIds,
+ buscarPacientesPorIds,
+} from "@/lib/api";
// Dados fictícios para demonstração
const metricas = [
{ label: "Atendimentos", value: 1240, icon: },
{ label: "Absenteísmo", value: "7,2%", icon: },
- { label: "Satisfação", value: "92%", icon: },
+ { label: "Satisfação", value: "Dados não foram disponibilizados", icon: },
{ label: "Faturamento (Mês)", value: "R$ 45.000", icon: },
{ label: "No-show", value: "5,1%", icon: },
];
@@ -42,13 +55,7 @@ const taxaNoShow = [
{ mes: "Jun", noShow: 4.7 },
];
-const pacientesMaisAtendidos = [
- { nome: "Ana Souza", consultas: 18 },
- { nome: "Bruno Lima", consultas: 15 },
- { nome: "Carla Menezes", consultas: 13 },
- { nome: "Diego Alves", consultas: 12 },
- { nome: "Fernanda Dias", consultas: 11 },
-];
+// pacientesMaisAtendidos static list removed — data will be fetched from the API
const medicosMaisProdutivos = [
{ nome: "Dr. Carlos Andrade", consultas: 62 },
@@ -81,19 +88,260 @@ function exportPDF(title: string, content: string) {
}
export default function RelatoriosPage() {
+ // Local state that will be replaced by API data when available
+ // Start with empty data to avoid showing fictitious frontend data while loading
+ const [metricsState, setMetricsState] = useState>([]);
+ const [consultasData, setConsultasData] = useState>([]);
+ const [faturamentoData, setFaturamentoData] = useState>([]);
+ const [taxaNoShowState, setTaxaNoShowState] = useState>([]);
+ const [pacientesTop, setPacientesTop] = useState>([]);
+ const [medicosTop, setMedicosTop] = useState(medicosMaisProdutivos);
+ const [medicosPerformance, setMedicosPerformance] = useState>([]);
+ const [loading, setLoading] = useState(true);
+ const [error, setError] = useState(null);
+ const [conveniosData, setConveniosData] = useState>(convenios);
+
+ useEffect(() => {
+ let mounted = true;
+ async function load() {
+ setLoading(true);
+ try {
+ // Fetch counts in parallel, then try to fetch a larger appointments list via listarAgendamentos.
+ // If listarAgendamentos fails (for example: unauthenticated), fall back to getAppointmentsByDateRange(30).
+ const [patientsCount, doctorsCount, appointmentsToday] = await Promise.all([
+ countTotalPatients().catch(() => 0),
+ countTotalDoctors().catch(() => 0),
+ countAppointmentsToday().catch(() => 0),
+ ]);
+
+ let appointments: any[] = [];
+ try {
+ // Try to get a larger set of appointments (up to 1000) to compute top patients
+ // select=patient_id,doctor_id,scheduled_at,status to reduce payload
+ // include insurance_provider so we can aggregate convênios client-side
+ appointments = await listarAgendamentos('select=patient_id,doctor_id,scheduled_at,status,insurance_provider&order=scheduled_at.desc&limit=1000');
+ } catch (e) {
+ // Fallback to the smaller helper if listarAgendamentos cannot be used (e.g., no auth token)
+ console.warn('[relatorios] listarAgendamentos falhou, usando getAppointmentsByDateRange fallback', e);
+ appointments = await getAppointmentsByDateRange(30).catch(() => []);
+ }
+
+ if (!mounted) return;
+
+ // Update top metrics card
+ setMetricsState([
+ { label: "Atendimentos", value: appointmentsToday ?? 0, icon: },
+ { label: "Absenteísmo", value: "—", icon: },
+ { label: "Satisfação", value: "Dados não foram disponibilizados", icon: },
+ { label: "Faturamento (Mês)", value: "—", icon: },
+ { label: "No-show", value: "—", icon: },
+ ]);
+
+ // Build last 30 days series for consultas
+ const daysCount = 30;
+ const now = new Date();
+ const start = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+ const startTs = start.getTime() - (daysCount - 1) * 86400000; // include today
+ const dayBuckets: Record = {};
+ for (let i = 0; i < daysCount; i++) {
+ const d = new Date(startTs + i * 86400000);
+ const iso = d.toISOString().split("T")[0];
+ const periodo = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}`;
+ dayBuckets[iso] = { periodo, consultas: 0 };
+ }
+
+ // Count appointments per day
+ const appts = Array.isArray(appointments) ? appointments : [];
+ for (const a of appts) {
+ try {
+ const iso = (a.scheduled_at || '').toString().split('T')[0];
+ if (iso && dayBuckets[iso]) dayBuckets[iso].consultas += 1;
+ } catch (e) {
+ // ignore malformed
+ }
+ }
+ const consultasArr = Object.values(dayBuckets);
+ setConsultasData(consultasArr);
+
+ // Estimate monthly faturamento for last 6 months using doctor.valor_consulta when available
+ const monthsBack = 6;
+ const monthMap: Record = {};
+ const nowMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+ const monthKeys: string[] = [];
+ for (let i = monthsBack - 1; i >= 0; i--) {
+ const m = new Date(nowMonth.getFullYear(), nowMonth.getMonth() - i, 1);
+ const key = `${m.getFullYear()}-${String(m.getMonth() + 1).padStart(2, '0')}`;
+ monthKeys.push(key);
+ monthMap[key] = { mes: m.toLocaleString('pt-BR', { month: 'short' }), valor: 0, totalAppointments: 0, noShowCount: 0 };
+ }
+
+ // Filter appointments within monthsBack and group
+ const apptsForMonths = appts.filter((a) => {
+ try {
+ const d = new Date(a.scheduled_at);
+ const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`;
+ return key in monthMap;
+ } catch (e) {
+ return false;
+ }
+ });
+
+ // Collect unique doctor ids to fetch valor_consulta in bulk
+ const doctorIds = Array.from(new Set(apptsForMonths.map((a: any) => String(a.doctor_id).trim()).filter(Boolean)));
+ const doctors = doctorIds.length ? await buscarMedicosPorIds(doctorIds) : [];
+ const doctorMap = new Map();
+ for (const d of doctors) doctorMap.set(String(d.id), d);
+
+ for (const a of apptsForMonths) {
+ try {
+ const d = new Date(a.scheduled_at);
+ const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`;
+ const doc = doctorMap.get(String(a.doctor_id));
+ const price = doc && doc.valor_consulta ? Number(doc.valor_consulta) : 0;
+ monthMap[key].valor += price;
+ monthMap[key].totalAppointments += 1;
+ if (String(a.status || '').toLowerCase() === 'no_show' || String(a.status || '').toLowerCase() === 'no-show') {
+ monthMap[key].noShowCount += 1;
+ }
+ } catch (e) {}
+ }
+
+ const faturamentoArr = monthKeys.map((k) => ({ mes: monthMap[k].mes, valor: Math.round(monthMap[k].valor) }));
+ setFaturamentoData(faturamentoArr);
+
+ // Taxa no-show per month
+ const taxaArr = monthKeys.map((k) => {
+ const total = monthMap[k].totalAppointments || 0;
+ const noShow = monthMap[k].noShowCount || 0;
+ const pct = total ? Number(((noShow / total) * 100).toFixed(1)) : 0;
+ return { mes: monthMap[k].mes, noShow: pct };
+ });
+ setTaxaNoShowState(taxaArr);
+
+ // Top patients and doctors (by number of appointments in the period)
+ const patientCounts: Record = {};
+ const doctorCounts: Record = {};
+ const doctorNoShowCounts: Record = {};
+ for (const a of apptsForMonths) {
+ if (a.patient_id) patientCounts[String(a.patient_id)] = (patientCounts[String(a.patient_id)] || 0) + 1;
+ if (a.doctor_id) {
+ const did = String(a.doctor_id);
+ doctorCounts[did] = (doctorCounts[did] || 0) + 1;
+ const status = String(a.status || '').toLowerCase();
+ if (status === 'no_show' || status === 'no-show') doctorNoShowCounts[did] = (doctorNoShowCounts[did] || 0) + 1;
+ }
+ }
+
+ const topPatientIds = Object.entries(patientCounts).sort((a, b) => b[1] - a[1]).slice(0, 5).map((x) => x[0]);
+ const topDoctorIds = Object.entries(doctorCounts).sort((a, b) => b[1] - a[1]).slice(0, 5).map((x) => x[0]);
+
+ const [patientsFetched, doctorsFetched] = await Promise.all([
+ topPatientIds.length ? buscarPacientesPorIds(topPatientIds) : Promise.resolve([]),
+ topDoctorIds.length ? buscarMedicosPorIds(topDoctorIds) : Promise.resolve([]),
+ ]);
+
+ const pacientesList = topPatientIds.map((id) => {
+ const p = (patientsFetched || []).find((x: any) => String(x.id) === String(id));
+ return { nome: p ? p.full_name : id, consultas: patientCounts[id] || 0 };
+ });
+
+ const medicosList = topDoctorIds.map((id) => {
+ const m = (doctorsFetched || []).find((x: any) => String(x.id) === String(id));
+ return { nome: m ? m.full_name : id, consultas: doctorCounts[id] || 0 };
+ });
+
+ // Build performance list (consultas + absenteísmo)
+ const perfIds = Object.keys(doctorCounts).sort((a, b) => (doctorCounts[b] || 0) - (doctorCounts[a] || 0)).slice(0, 5);
+ const perfDoctors = (doctorsFetched && doctorsFetched.length) ? doctorsFetched : doctors;
+ const perfList = perfIds.map((id) => {
+ const d = (perfDoctors || []).find((x: any) => String(x.id) === String(id));
+ const consultas = doctorCounts[id] || 0;
+ const noShow = doctorNoShowCounts[id] || 0;
+ const absenteismo = consultas ? Number(((noShow / consultas) * 100).toFixed(1)) : 0;
+ return { nome: d ? d.full_name : id, consultas, absenteismo };
+ });
+
+ // Use fetched list (may be empty) — do not fall back to static data for patients, but keep fallback for medicosTop
+ setPacientesTop(pacientesList);
+ setMedicosTop(medicosList.length ? medicosList : medicosMaisProdutivos);
+ setMedicosPerformance(perfList.length ? perfList.slice(0,5) : performancePorMedico.map((p) => ({ nome: p.nome, consultas: p.consultas, absenteismo: p.absenteismo })).slice(0,5));
+
+ // Aggregate convênios (insurance providers) from appointments in the period
+ try {
+ const providerCounts: Record = {};
+ for (const a of apptsForMonths) {
+ let prov: any = a?.insurance_provider ?? a?.insuranceProvider ?? a?.insurance ?? '';
+ // If provider is an object, try to extract a human-friendly name
+ if (prov && typeof prov === 'object') prov = prov.name || prov.full_name || prov.title || '';
+ prov = String(prov || '').trim();
+ const key = prov || 'Não disponibilizado';
+ providerCounts[key] = (providerCounts[key] || 0) + 1;
+ }
+
+ let conveniosArr = Object.entries(providerCounts).map(([nome, valor]) => ({ nome, valor }));
+ if (!conveniosArr.length) {
+ // No provider info at all — present a single bucket showing the total count as 'Não disponibilizado'
+ conveniosArr = [{ nome: 'Não disponibilizado', valor: apptsForMonths.length }];
+ } else {
+ // Sort and keep top 5, group the rest into 'Outros'
+ conveniosArr.sort((a, b) => b.valor - a.valor);
+ if (conveniosArr.length > 5) {
+ const top = conveniosArr.slice(0, 5);
+ const others = conveniosArr.slice(5).reduce((s, c) => s + c.valor, 0);
+ top.push({ nome: 'Outros', valor: others });
+ conveniosArr = top;
+ }
+ }
+ setConveniosData(conveniosArr);
+ } catch (e) {
+ // keep existing static conveniosData if something goes wrong
+ console.warn('[relatorios] erro ao agregar convênios', e);
+ }
+
+ // Update metrics cards with numbers we fetched
+ setMetricsState([
+ { label: "Atendimentos", value: appointmentsToday ?? 0, icon: },
+ { label: "Absenteísmo", value: '—', icon: },
+ { label: "Satisfação", value: 'Dados não foram disponibilizados', icon: },
+ { label: "Faturamento (Mês)", value: `R$ ${faturamentoArr.at(-1)?.valor ?? 0}`, icon: },
+ { label: "No-show", value: `${taxaArr.at(-1)?.noShow ?? 0}%`, icon: },
+ ] as any);
+
+ } catch (err: any) {
+ console.error('[relatorios] erro ao carregar dados', err);
+ if (mounted) setError(err?.message ?? String(err));
+ } finally {
+ if (mounted) setLoading(false);
+ }
+ }
+ load();
+ return () => { mounted = false; };
+ }, []);
+
return (
Dashboard Executivo de Relatórios
{/* Métricas principais */}
- {metricas.map((m) => (
-
- {m.icon}
- {m.value}
- {m.label}
-
- ))}
+ {loading ? (
+ // simple skeletons while loading to avoid showing fake data
+ Array.from({ length: 5 }).map((_, i) => (
+
+ ))
+ ) : (
+ metricsState.map((m) => (
+
+ {m.icon}
+ {m.value}
+ {m.label}
+
+ ))
+ )}
{/* Gráficos e Relatórios */}
@@ -102,34 +350,42 @@ export default function RelatoriosPage() {
Consultas por Período
-
+
-
-
-
-
-
-
-
-
-
+ {loading ? (
+
Carregando dados...
+ ) : (
+
+
+
+
+
+
+
+
+
+ )}
{/* Faturamento mensal/anual */}
Faturamento Mensal
-
+
-
-
-
-
-
-
-
-
-
+ {loading ? (
+
Carregando dados...
+ ) : (
+
+
+
+
+
+
+
+
+
+ )}
@@ -138,27 +394,31 @@ export default function RelatoriosPage() {
Taxa de No-show
-
+
-
-
-
-
-
-
-
-
-
+ {loading ? (
+
Carregando dados...
+ ) : (
+
+
+
+
+
+
+
+
+
+ )}
{/* Indicadores de satisfação */}
Satisfação dos Pacientes
-
+
- 92%
+ Dados não foram disponibilizados
Índice de satisfação geral
@@ -169,7 +429,7 @@ export default function RelatoriosPage() {
Pacientes Mais Atendidos
-
+
@@ -179,12 +439,22 @@ export default function RelatoriosPage() {
- {pacientesMaisAtendidos.map((p) => (
-
- | {p.nome} |
- {p.consultas} |
+ {loading ? (
+
+ | Carregando pacientes... |
- ))}
+ ) : pacientesTop && pacientesTop.length ? (
+ pacientesTop.map((p: { nome: string; consultas: number }) => (
+
+ | {p.nome} |
+ {p.consultas} |
+
+ ))
+ ) : (
+
+ | Nenhum paciente encontrado |
+
+ )}
@@ -193,7 +463,7 @@ export default function RelatoriosPage() {
Médicos Mais Produtivos
-
+
@@ -203,12 +473,22 @@ export default function RelatoriosPage() {
- {medicosMaisProdutivos.map((m) => (
-
- | {m.nome} |
- {m.consultas} |
+ {loading ? (
+
+ | Carregando médicos... |
- ))}
+ ) : medicosTop && medicosTop.length ? (
+ medicosTop.map((m) => (
+
+ | {m.nome} |
+ {m.consultas} |
+
+ ))
+ ) : (
+
+ | Nenhum médico encontrado |
+
+ )}
@@ -219,26 +499,30 @@ export default function RelatoriosPage() {
Análise de Convênios
-
+
-
-
-
- {convenios.map((entry, index) => (
- |
- ))}
-
-
-
-
-
+ {loading ? (
+
Carregando dados...
+ ) : (
+
+
+
+ {conveniosData.map((entry, index) => (
+ |
+ ))}
+
+
+
+
+
+ )}
{/* Performance por médico */}
Performance por Médico
-
+
@@ -249,7 +533,7 @@ export default function RelatoriosPage() {
- {performancePorMedico.map((m) => (
+ {(loading ? performancePorMedico : medicosPerformance).map((m) => (
| {m.nome} |
{m.consultas} |
diff --git a/susconecta/app/(main-routes)/doutores/page.tsx b/susconecta/app/(main-routes)/doutores/page.tsx
index 3e958f7..5761f68 100644
--- a/susconecta/app/(main-routes)/doutores/page.tsx
+++ b/susconecta/app/(main-routes)/doutores/page.tsx
@@ -9,9 +9,9 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, Di
import { Label } from "@/components/ui/label";
import { MoreHorizontal, Plus, Search, Edit, Trash2, ArrowLeft, Eye, Users } from "lucide-react";
import { Badge } from "@/components/ui/badge";
-import { DoctorRegistrationForm } from "@/components/forms/doctor-registration-form";
-import AvailabilityForm from '@/components/forms/availability-form'
-import ExceptionForm from '@/components/forms/exception-form'
+import { DoctorRegistrationForm } from "@/components/features/forms/doctor-registration-form";
+import AvailabilityForm from '@/components/features/forms/availability-form'
+import ExceptionForm from '@/components/features/forms/exception-form'
import { listarDisponibilidades, DoctorAvailability, deletarDisponibilidade, listarExcecoes, DoctorException, deletarExcecao } from '@/lib/api'
@@ -20,7 +20,7 @@ import { listAssignmentsForUser } from '@/lib/assignment';
function normalizeMedico(m: any): Medico {
const normalizeSex = (v: any) => {
- if (v === null || typeof v === 'undefined') return null;
+ if (v === undefined) return null;
const s = String(v || '').trim().toLowerCase();
if (!s) return null;
const male = new Set(['m','masc','male','masculino','homem','h','1','mas']);
@@ -623,7 +623,7 @@ export default function DoutoresPage() {
size="sm"
onClick={() => setCurrentPage(1)}
disabled={currentPage === 1}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Primeira
@@ -632,7 +632,7 @@ export default function DoutoresPage() {
size="sm"
onClick={() => setCurrentPage((prev) => Math.max(1, prev - 1))}
disabled={currentPage === 1}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Anterior
@@ -644,7 +644,7 @@ export default function DoutoresPage() {
size="sm"
onClick={() => setCurrentPage((prev) => Math.min(totalPages, prev + 1))}
disabled={currentPage === totalPages || totalPages === 0}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Próxima
@@ -653,7 +653,7 @@ export default function DoutoresPage() {
size="sm"
onClick={() => setCurrentPage(totalPages)}
disabled={currentPage === totalPages || totalPages === 0}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Última
diff --git a/susconecta/app/(main-routes)/financeiro/page.tsx b/susconecta/app/(main-routes)/financeiro/page.tsx
index acab08f..190305a 100644
--- a/susconecta/app/(main-routes)/financeiro/page.tsx
+++ b/susconecta/app/(main-routes)/financeiro/page.tsx
@@ -5,8 +5,8 @@ import { useState } from "react";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Calculator, DollarSign } from "lucide-react";
-import HeaderAgenda from "@/components/agenda/HeaderAgenda";
-import FooterAgenda from "@/components/agenda/FooterAgenda";
+import HeaderAgenda from "@/components/features/agenda/HeaderAgenda";
+import FooterAgenda from "@/components/features/agenda/FooterAgenda";
export default function FinanceiroPage() {
const router = useRouter();
diff --git a/susconecta/app/(main-routes)/layout.tsx b/susconecta/app/(main-routes)/layout.tsx
index 6269b21..a673113 100644
--- a/susconecta/app/(main-routes)/layout.tsx
+++ b/susconecta/app/(main-routes)/layout.tsx
@@ -1,8 +1,8 @@
import type React from "react";
-import ProtectedRoute from "@/components/ProtectedRoute";
-import { Sidebar } from "@/components/dashboard/sidebar";
+import ProtectedRoute from "@/components/shared/ProtectedRoute";
+import { Sidebar } from "@/components/layout/sidebar";
import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
-import { PagesHeader } from "@/components/dashboard/header";
+import { PagesHeader } from "@/components/features/dashboard/header";
export default function MainRoutesLayout({
children,
diff --git a/susconecta/app/(main-routes)/pacientes/page.tsx b/susconecta/app/(main-routes)/pacientes/page.tsx
index df77a10..3ebb358 100644
--- a/susconecta/app/(main-routes)/pacientes/page.tsx
+++ b/susconecta/app/(main-routes)/pacientes/page.tsx
@@ -11,8 +11,8 @@ import { Label } from "@/components/ui/label";
import { MoreHorizontal, Plus, Search, Eye, Edit, Trash2, ArrowLeft } from "lucide-react";
import { Paciente, Endereco, listarPacientes, buscarPacientes, buscarPacientePorId, excluirPaciente } from "@/lib/api";
-import { PatientRegistrationForm } from "@/components/forms/patient-registration-form";
-import AssignmentForm from "@/components/admin/AssignmentForm";
+import { PatientRegistrationForm } from "@/components/features/forms/patient-registration-form";
+import AssignmentForm from "@/components/features/admin/AssignmentForm";
function normalizePaciente(p: any): Paciente {
@@ -320,7 +320,7 @@ export default function PacientesPage() {
size="sm"
onClick={() => setCurrentPage(1)}
disabled={currentPage === 1}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Primeira
@@ -329,7 +329,7 @@ export default function PacientesPage() {
size="sm"
onClick={() => setCurrentPage((prev) => Math.max(1, prev - 1))}
disabled={currentPage === 1}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Anterior
@@ -341,7 +341,7 @@ export default function PacientesPage() {
size="sm"
onClick={() => setCurrentPage((prev) => Math.min(totalPages, prev + 1))}
disabled={currentPage === totalPages || totalPages === 0}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Próxima
@@ -350,7 +350,7 @@ export default function PacientesPage() {
size="sm"
onClick={() => setCurrentPage(totalPages)}
disabled={currentPage === totalPages || totalPages === 0}
- className="hover:!bg-primary hover:!text-white transition-colors"
+ className="hover:bg-primary! hover:text-white! transition-colors"
>
Última
diff --git a/susconecta/app/(main-routes)/procedimento/page.tsx b/susconecta/app/(main-routes)/procedimento/page.tsx
index bccaaba..7edd710 100644
--- a/susconecta/app/(main-routes)/procedimento/page.tsx
+++ b/susconecta/app/(main-routes)/procedimento/page.tsx
@@ -7,8 +7,8 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Search, ChevronDown } from "lucide-react";
import { Plus } from "lucide-react";
-import HeaderAgenda from "@/components/agenda/HeaderAgenda";
-import FooterAgenda from "@/components/agenda/FooterAgenda";
+import HeaderAgenda from "@/components/features/agenda/HeaderAgenda";
+import FooterAgenda from "@/components/features/agenda/FooterAgenda";
export default function ProcedimentoPage() {
const router = useRouter();
diff --git a/susconecta/app/layout.tsx b/susconecta/app/layout.tsx
index b7b71f1..4f6ef6b 100644
--- a/susconecta/app/layout.tsx
+++ b/susconecta/app/layout.tsx
@@ -1,7 +1,7 @@
import type React from "react"
import type { Metadata } from "next"
import { AuthProvider } from "@/hooks/useAuth"
-import { ThemeProvider } from "@/components/theme-provider"
+import { ThemeProvider } from "@/components/providers/theme-provider"
import "./globals.css"
export const metadata: Metadata = {
diff --git a/susconecta/app/paciente/page.tsx b/susconecta/app/paciente/page.tsx
index 5e427d1..697c02f 100644
--- a/susconecta/app/paciente/page.tsx
+++ b/susconecta/app/paciente/page.tsx
@@ -3,6 +3,7 @@
import type { ReactNode } from 'react'
import { useState, useEffect, useMemo } from 'react'
import { useRouter } from 'next/navigation'
+import Image from 'next/image'
import { Button } from '@/components/ui/button'
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
@@ -11,10 +12,10 @@ import { Label } from '@/components/ui/label'
import { Textarea } from '@/components/ui/textarea'
import { Avatar, AvatarFallback } from '@/components/ui/avatar'
import { User, LogOut, Calendar, FileText, MessageCircle, UserCog, Home, Clock, FolderOpen, ChevronLeft, ChevronRight, MapPin, Stethoscope } from 'lucide-react'
-import { SimpleThemeToggle } from '@/components/simple-theme-toggle'
+import { SimpleThemeToggle } from '@/components/ui/simple-theme-toggle'
import { UploadAvatar } from '@/components/ui/upload-avatar'
import Link from 'next/link'
-import ProtectedRoute from '@/components/ProtectedRoute'
+import ProtectedRoute from '@/components/shared/ProtectedRoute'
import { useAuth } from '@/hooks/useAuth'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
import { buscarPacientes, buscarPacientePorUserId, getUserInfo, listarAgendamentos, buscarMedicosPorIds, buscarMedicos, atualizarPaciente, buscarPacientePorId, getDoctorById } from '@/lib/api'
@@ -171,7 +172,6 @@ export default function PacientePage() {
loadProfile()
return () => { mounted = false }
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [user?.id, user?.email])
// Load authoritative patient row for the logged-in user (prefer user_id lookup)
@@ -324,10 +324,84 @@ export default function PacientePage() {
setNextAppt(null)
}
- // Load reports/laudos count
+ // Load reports/laudos and compute count matching the Laudos session rules
const reports = await listarRelatoriosPorPaciente(String(patientId)).catch(() => [])
if (!mounted) return
- setExamsCount(Array.isArray(reports) ? reports.length : 0)
+ let count = 0
+ try {
+ if (!Array.isArray(reports) || reports.length === 0) {
+ count = 0
+ } else {
+ // Use the same robust doctor-resolution strategy as ExamesLaudos so
+ // the card matches the list: try buscarMedicosPorIds, then per-id
+ // getDoctorById and finally a REST fallback by user_id.
+ const ids = Array.from(new Set((reports as any[]).map((r:any) => r.doctor_id || r.created_by || r.doctor).filter(Boolean).map(String)))
+ if (ids.length === 0) {
+ // fallback: count reports that have any direct doctor reference
+ count = (reports as any[]).filter((r:any) => !!(r && (r.doctor_id || r.created_by || r.doctor || r.user_id))).length
+ } else {
+ const docs = await buscarMedicosPorIds(ids).catch(() => [])
+ const map: Record = {}
+ for (const d of docs || []) {
+ if (!d) continue
+ try { if (d.id !== undefined && d.id !== null) map[String(d.id)] = d } catch {}
+ try { if (d.user_id !== undefined && d.user_id !== null) map[String(d.user_id)] = map[String(d.user_id)] || d } catch {}
+ }
+
+ // Try per-id fallback using getDoctorById for any unresolved ids
+ const unresolved = ids.filter(i => !map[i])
+ if (unresolved.length) {
+ for (const u of unresolved) {
+ try {
+ const d = await getDoctorById(String(u)).catch(() => null)
+ if (d) {
+ try { if (d.id !== undefined && d.id !== null) map[String(d.id)] = d } catch {}
+ try { if (d.user_id !== undefined && d.user_id !== null) map[String(d.user_id)] = d } catch {}
+ }
+ } catch (e) {
+ // ignore per-id failure
+ }
+ }
+ }
+
+ // REST fallback: try lookup by user_id for still unresolved ids
+ const stillUnresolved = ids.filter(i => !map[i])
+ if (stillUnresolved.length) {
+ for (const u of stillUnresolved) {
+ try {
+ const token = (typeof window !== 'undefined') ? (localStorage.getItem('auth_token') || localStorage.getItem('token') || sessionStorage.getItem('auth_token') || sessionStorage.getItem('token')) : null
+ const headers: Record = { apikey: ENV_CONFIG.SUPABASE_ANON_KEY, Accept: 'application/json' }
+ if (token) headers.Authorization = `Bearer ${token}`
+ const url = `${ENV_CONFIG.SUPABASE_URL}/rest/v1/doctors?user_id=eq.${encodeURIComponent(String(u))}&limit=1`
+ const res = await fetch(url, { method: 'GET', headers })
+ if (!res || res.status >= 400) continue
+ const rows = await res.json().catch(() => [])
+ if (rows && Array.isArray(rows) && rows.length) {
+ const d = rows[0]
+ if (d) {
+ try { if (d.id !== undefined && d.id !== null) map[String(d.id)] = d } catch {}
+ try { if (d.user_id !== undefined && d.user_id !== null) map[String(d.user_id)] = d } catch {}
+ }
+ }
+ } catch (e) {
+ // ignore network errors
+ }
+ }
+ }
+
+ // Count only reports whose referenced doctor record has user_id
+ count = (reports as any[]).filter((r:any) => {
+ const maybeId = String(r.doctor_id || r.created_by || r.doctor || '')
+ const doc = map[maybeId]
+ return !!(doc && (doc.user_id || (doc as any).user_id))
+ }).length
+ }
+ }
+ } catch (e) {
+ count = Array.isArray(reports) ? reports.length : 0
+ }
+ if (!mounted) return
+ setExamsCount(count)
} catch (e) {
console.warn('[DashboardCards] erro ao carregar dados', e)
if (!mounted) return
@@ -339,7 +413,7 @@ export default function PacientePage() {
}
load()
return () => { mounted = false }
- }, [patientId])
+ }, [])
return (
@@ -353,7 +427,7 @@ export default function PacientePage() {
{strings.proximaConsulta}
- {loading ? '—' : (nextAppt ?? '-')}
+ {loading ? strings.carregando : (nextAppt ?? '-')}
@@ -367,7 +441,7 @@ export default function PacientePage() {
{strings.ultimosExames}
- {loading ? '—' : (examsCount !== null ? String(examsCount) : '-')}
+ {loading ? strings.carregando : (examsCount !== null ? String(examsCount) : '-')}
@@ -547,7 +621,7 @@ export default function PacientePage() {
loadAppointments()
return () => { mounted = false }
- }, [patientId])
+ }, [])
// Monta a URL de resultados com os filtros atuais
const buildResultadosHref = () => {
@@ -557,7 +631,7 @@ export default function PacientePage() {
if (localizacao) qs.set('local', localizacao)
// indicate navigation origin so destination can alter UX (e.g., show modal instead of redirect)
qs.set('origin', 'paciente')
- return `/resultados?${qs.toString()}`
+ return `/paciente/resultados?${qs.toString()}`
}
// derived lists for the page (computed after appointments state is declared)
@@ -567,16 +641,16 @@ export default function PacientePage() {
return (
{/* Hero Section */}
-
+
-
+
-