From e008933a017e8e62efba62ac88958796067e59ed Mon Sep 17 00:00:00 2001
From: kenza <kenza.benhamou@triztech.dz>
Date: Fri, 4 Sep 2026 10:45:31 +0100
Subject: [PATCH] 398 + 400

---
 pom.xml                                       |    6 +-
 .../triz/trizservice/bean/DicomPacsBean.java  |   34 +-
 .../com/triz/trizservice/bean/ExamenBean.java |  961 +++++++++++
 .../trizservice/bean/ExamenDetailBean.java    | 1056 ++++++++++++
 .../triz/trizservice/bean/ParametresBean.java |   18 +-
 .../bean/converter/MachineConverter.java      |   13 +-
 .../bean/converter/MedecinConverter.java      |   68 +
 .../bean/converter/PatientConverter.java      |   69 +
 .../SpecialiteMedicaleConverter.java          |   46 +-
 .../com/triz/trizservice/modeles/Centre.java  |   23 +-
 .../trizservice/modeles/Consultation.java     |   33 +-
 .../com/triz/trizservice/modeles/Examen.java  |   92 +-
 .../trizservice/modeles/FichierExamen.java    |   12 +-
 .../modeles/Filepathrapportdictee.java        |   12 +-
 .../triz/trizservice/modeles/ImageCles.java   |   12 +-
 .../triz/trizservice/modeles/Parametre.java   |   10 +
 .../com/triz/trizservice/modeles/Patient.java |   18 +-
 .../com/triz/trizservice/modeles/Queue.java   |   57 +-
 .../trizservice/modeles/QueueStatusTime.java  |   12 +-
 .../com/triz/trizservice/modeles/Status.java  |   14 +-
 .../triz/trizservice/modeles/TypeExamen.java  |   17 +-
 .../security/impl/PingService.java            |   82 +
 .../triz/trizservice/service/DaoService.java  |   41 +-
 .../service/TransactionService.java           |   19 +
 .../service/impl/DaoServiceImpl.java          |   65 +-
 .../service/impl/TransactionServiceImpl.java  |   49 +-
 .../trizservice/servlet/ImageServlet.java     |   92 +
 src/main/java/com/triz/util/UtilFile.java     |   59 +-
 .../db/migration/V000__main_schema.sql        |   51 +-
 .../resources/langue/message_fr.properties    |  103 +-
 .../webapp/WEB-INF/layout/sections/menu.xhtml |    2 +-
 src/main/webapp/resources/images/Vector.png   |  Bin 0 -> 1077 bytes
 src/main/webapp/views/Dicom/form.xhtml        |   44 +-
 src/main/webapp/views/Examen/form.xhtml       | 1505 +++++++++++++++++
 src/main/webapp/views/Examen/list.xhtml       |  444 +++++
 src/main/webapp/views/parametrage/form.xhtml  |   70 +-
 src/main/webapp/views/patient/form.xhtml      |   11 +
 src/main/webapp/views/patient/list.xhtml      |   11 +
 38 files changed, 5012 insertions(+), 219 deletions(-)
 create mode 100644 src/main/java/com/triz/trizservice/bean/ExamenBean.java
 create mode 100644 src/main/java/com/triz/trizservice/bean/ExamenDetailBean.java
 create mode 100644 src/main/java/com/triz/trizservice/bean/converter/MedecinConverter.java
 create mode 100644 src/main/java/com/triz/trizservice/bean/converter/PatientConverter.java
 create mode 100644 src/main/java/com/triz/trizservice/security/impl/PingService.java
 create mode 100644 src/main/java/com/triz/trizservice/servlet/ImageServlet.java
 create mode 100644 src/main/webapp/resources/images/Vector.png
 create mode 100644 src/main/webapp/views/Examen/form.xhtml
 create mode 100644 src/main/webapp/views/Examen/list.xhtml
 create mode 100644 src/main/webapp/views/patient/form.xhtml
 create mode 100644 src/main/webapp/views/patient/list.xhtml

diff --git a/pom.xml b/pom.xml
index 2136dac..70c3985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,7 +437,11 @@
             <version>2.0</version>
         </dependency>
         
-        
+        <dependency>
+            <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+            <artifactId>owasp-java-html-sanitizer</artifactId>
+            <version>20240325.1</version>
+        </dependency>
                
     </dependencies>
     <!--<repositories>
diff --git a/src/main/java/com/triz/trizservice/bean/DicomPacsBean.java b/src/main/java/com/triz/trizservice/bean/DicomPacsBean.java
index a9cedca..47a1ed1 100644
--- a/src/main/java/com/triz/trizservice/bean/DicomPacsBean.java
+++ b/src/main/java/com/triz/trizservice/bean/DicomPacsBean.java
@@ -4,6 +4,7 @@ import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.Machine;
 import com.triz.trizservice.modeles.ServiceUser;
 import com.triz.trizservice.modeles.TypeMachine;
+import com.triz.trizservice.security.impl.PingService;
 import com.triz.trizservice.service.TransactionService;
 import com.triz.util.UtilContext;
 import java.io.BufferedReader;
@@ -49,6 +50,9 @@ public class DicomPacsBean implements Serializable {
     @Autowired
     public UtilContext context;
 
+    @Autowired
+    private PingService pingService;
+
     @PostConstruct
     public void init() {
         centre = context.getCurrentEtablissement();
@@ -61,7 +65,7 @@ public class DicomPacsBean implements Serializable {
         dernierMajOrthanc = null;
         etatMwlScp = "Actif";
         dernierEtudeRecu = null;
-        ping("localhost");
+        pingService.startPingThread();
     }
 
     public void prepareNew() {
@@ -183,31 +187,7 @@ public class DicomPacsBean implements Serializable {
         }
     }
 
-    public void ping(String host) {
-        System.out.println("ping");
-        System.out.println("host " + host);
-        try {
-
-            Process process = Runtime.getRuntime()
-                    .exec("ping -n 4 " + host);
-
-            BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(
-                            process.getInputStream(),
-                            Charset.forName("CP850")
-                    )
-            );
-
-            String line;
-
-            while ((line = reader.readLine()) != null) {
-                System.out.println(line);
-            }
-
-            process.waitFor();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+     public boolean isActif() {
+        return pingService.isActif();
     }
 }
diff --git a/src/main/java/com/triz/trizservice/bean/ExamenBean.java b/src/main/java/com/triz/trizservice/bean/ExamenBean.java
new file mode 100644
index 0000000..e4951a4
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/bean/ExamenBean.java
@@ -0,0 +1,961 @@
+package com.triz.trizservice.bean;
+
+import com.itextpdf.text.Document;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.FontFactory;
+import com.itextpdf.text.PageSize;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.Phrase;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
+
+import com.triz.trizservice.modeles.AlertesMedicales;
+import com.triz.trizservice.modeles.Centre;
+import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.Examen;
+import com.triz.trizservice.modeles.Machine;
+import com.triz.trizservice.modeles.Medecin;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.Queue;
+import com.triz.trizservice.modeles.ServiceUser;
+import com.triz.trizservice.modeles.SpecialiteMedicale;
+import com.triz.trizservice.modeles.TypeExamen;
+import com.triz.trizservice.service.TransactionService;
+
+import com.triz.util.UtilContext;
+import com.triz.util.UtilFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.Serializable;
+
+import java.text.SimpleDateFormat;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+// Attention : PAS d'import Font ici
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import org.primefaces.PrimeFaces;
+import org.primefaces.model.DefaultStreamedContent;
+import org.primefaces.model.StreamedContent;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+/**
+ * Bean pour la liste des examens (file d'attente / queue).
+ *
+ * TODO : remplacer QueueFacade par le vrai service/DAO utilisé dans le projet
+ * (celui qui alimente medecinBean.allMedecin, ex: medecinFacade.findAll()).
+ */
+@Component("examenBean")
+@Scope("view")
+public class ExamenBean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Autowired
+    private TransactionService service; // TODO : remplacer par le vrai service/DAO
+
+    @Autowired
+    private UtilContext context; // TODO : remplacer par le vrai service/DAO
+
+    private List<Queue> allQueue;
+
+    private Examen selectedExamen;
+
+    private Queue selectedQueue;
+
+    private Centre centre;
+
+    private Date filterDateDebut;
+    private Date filterDateFin;
+    private boolean filterMesExamens;
+    private boolean filterMesBrouillons;
+    private Medecin filterMedecinAssigne;
+    private SpecialiteMedicale filterSpecialiteMedicale;
+    private Machine filterMachine;
+    private Medecin filterManipulateur;
+    private Medecin filterMedecinInterprete;
+    private List<Medecin> medecinList;
+    private List<SpecialiteMedicale> specialiteMedicaleList;
+    private List<Machine> machineList;
+    private List<ServiceUser> manipulateurList;
+    private Patient filterPatient;
+    private List<Patient> patientList;
+
+    @PostConstruct
+    public void init() {
+        centre = context.getCurrentEtablissement();
+        allQueue = service.getQueueByCentre(centre, new Date());
+        medecinList = service.getAllMedecinByCenter(centre);
+        specialiteMedicaleList = service.findAll(SpecialiteMedicale.class);
+        machineList = service.getAllByCentre(Machine.class, centre);
+        patientList = service.getAllByCentre(Patient.class, centre);
+
+    }
+
+    // ---------------------------------------------------------------
+    // Statut affiché : queue.status, avec règle d'archivage automatique
+    // (Signé + date < aujourd'hui => affiché "Archivé" sans écrire en base)
+    // ---------------------------------------------------------------
+    public String getDisplayStatus(Queue q) {
+        if (q == null || q.getStatus() == null) {
+            return "";
+        }
+        if (getExamenByQueue(q) == null) {
+            return "Enregistrer";
+        }
+        if (isAnnule(q)) {
+            return "Annulé";
+        }
+
+        Consultation consultation = service.getConsultationByExamen(getExamenByQueue(q));
+        if (consultation != null) {
+            if (consultation.getFilePathSignature() == null) {
+                return "Préliminaire";
+            } else {
+                return "Signé";
+            }
+        }
+        if (getExamenByQueue(q).getHeureDebut() != null && getExamenByQueue(q).getHeureFin() == null && getExamenByQueue(q).getAnnule() == false) {
+            return "En cours";
+        }
+
+        if (getExamenByQueue(q).getHeureDebut() != null && getExamenByQueue(q).getHeureFin() != null && getExamenByQueue(q).getAnnule() == false) {
+            return "Terminé";
+        }
+
+        return q.getStatus();
+    }
+
+    public String getStatusBadgeClass(Queue q) {
+        String status = getDisplayStatus(q);
+        if (status == null) {
+            return "";
+        }
+        switch (status) {
+            case "Programmé":
+                return "status-programme";
+            case "Enregistré":
+                return "status-enregistre";
+            case "En cours":
+                return "status-encours";
+            case "Terminé":
+                return "status-termine";
+            case "Préliminaire":
+                return "status-preliminaire";
+            case "Signé":
+                return "status-signe";
+            case "Addenda":
+                return "status-addenda";
+
+            case "Annulé":
+                return "status-annule";
+            case "Enregistrer":
+                return "status-enregister";
+            default:
+                return "status-programme";
+        }
+    }
+
+    // MODIF : accès direct via q.getFkExamen() (relation simple Queue -> Examen)
+    private boolean isAnnule(Queue q) {
+        return getExamenByQueue(q) != null && Boolean.TRUE.equals(getExamenByQueue(q).getAnnule());
+    }
+//
+//    private boolean isDateAvantAujourdhui(Date date) {
+//        if (date == null) {
+//            return false;
+//        }
+//        Calendar today = Calendar.getInstance();
+//        today.set(Calendar.HOUR_OF_DAY, 0);
+//        today.set(Calendar.MINUTE, 0);
+//        today.set(Calendar.SECOND, 0);
+//        today.set(Calendar.MILLISECOND, 0);
+//        return date.before(today.getTime());
+//    }
+
+    public String voirExamen(Examen exam) {
+        return "form.xhtml?faces-redirect=true&id=" + exam.getId();
+    }
+
+    public String voirDossierPatient(Patient q) {
+        return "/views/patient/form.xhtml?faces-redirect=true&patient=" + q.getId();
+    }
+
+    public List<Queue> getAllQueue() {
+        return allQueue;
+    }
+
+    public void setAllQueue(List<Queue> allQueue) {
+        this.allQueue = allQueue;
+    }
+
+    public Queue getSelectedQueue() {
+        return selectedQueue;
+    }
+
+    public void setSelectedQueue(Queue selectedQueue) {
+        this.selectedQueue = selectedQueue;
+    }
+
+    public String ajouter() {
+        return "form.xhtml?faces-redirect=true&modifier=true";
+    }
+
+    public Examen getExamenByQueue(Queue queue) {
+
+        List<Examen> examens = service.getExamenByQueue(queue);
+
+        if (examens == null || examens.isEmpty()) {
+            return null;
+        }
+
+        for (Examen examen : examens) {
+            if (Boolean.FALSE.equals(examen.getAnnule())) {
+                return examen;
+            }
+        }
+
+        return examens.get(0);
+    }
+
+    public Examen getSelectedExamen() {
+        return selectedExamen;
+    }
+
+    public void setSelectedExamen(Examen selectedExamen) {
+        this.selectedExamen = selectedExamen;
+    }
+
+    public String alerteMedicaleByPatient(Queue queue) {
+        List<TypeExamen> liste = service.getTypeExamenByPatient(queue.getFkPatient());
+
+        if (liste == null || liste.isEmpty()) {
+
+            return "none";
+        } else {
+            if (!liste.contains(queue.getFkTypeExamen())) {
+
+                return "warning";
+            } else {
+
+                return "danger";
+            }
+        }
+    }
+
+// + listes pour les p:selectOneMenu : medecinList, specialiteMedicaleList, machineList, manipulateurList
+// (à charger dans @PostConstruct ou init())
+    public void applyFilters() {
+        allQueue = service.getQueueByCentre(centre, new Date());
+        String requete = "";
+        List<Queue> filtered = new ArrayList<>(allQueue); // liste source non filtrée
+        System.out.println("filtered " + filtered.size());
+        System.out.println("filterDateDebut " + filterDateDebut + " filterDateFin " + filterDateFin);
+        if (filterDateDebut != null && filterDateFin != null) {
+            requete = " and s.date between '" + filterDateDebut + "' and '" + filterDateFin + "'";
+            System.out.println("requete " + requete);
+            filtered = service.getQueueByCentreByRequete(centre, requete);
+        } else {
+            if (filterDateDebut != null) {
+                requete = " and s.date >= '" + filterDateDebut + "'";
+            }
+            if (filterDateFin != null) {
+                requete = " and s.date <='" + filterDateFin + "'";
+            }
+            filtered = service.getQueueByCentreByRequete(centre, requete);
+        }
+
+        if (filterMesBrouillons) {
+            filtered.removeIf(q -> !hasCurrentUserDraftConsultation(q));
+        }
+        if (filterMedecinInterprete != null) {
+            filtered.removeIf(q -> getExamenByQueue(q) == null
+                    || !Objects.equals(getExamenByQueue(q).getFkInterpreteurAssi(), filterMedecinInterprete));
+        }
+        if (filterSpecialiteMedicale != null) {
+            filtered.removeIf(q -> q.getFkTypeExamen() == null || q.getFkTypeExamen().getSpecialiteMedicale() == null
+                    || !Objects.equals(q.getFkTypeExamen().getSpecialiteMedicale(), filterSpecialiteMedicale));
+        }
+        if (filterMachine != null) {
+            filtered.removeIf(q -> !Objects.equals(q.getFkTypeExamen().getFkMachine(), filterMachine));
+        }
+
+        if (filterMedecinAssigne != null) {
+            filtered.removeIf(q -> {
+                Examen examen = getExamenByQueue(q);
+                if (examen == null || examen.getConsultationList() == null) {
+                    return true;
+                }
+                return examen.getConsultationList().stream()
+                        .noneMatch(c -> Objects.equals(c.getFkMedecin(), filterMedecinAssigne));
+            });
+        }
+        System.out.println("filterManipulateur " + filterManipulateur);
+        if (filterManipulateur != null) {
+            filtered.removeIf(q -> getExamenByQueue(q) == null
+                    || !Objects.equals(getExamenByQueue(q).getManipulateur(), filterManipulateur));
+        }
+
+        if (filterPatient != null) {
+            filtered.removeIf(q
+                    -> q.getFkPatient() == null
+                    || !Objects.equals(q.getFkPatient(), filterPatient));
+        }
+        this.allQueue = filtered;
+        System.out.println("allQueue " + allQueue.size());
+        PrimeFaces.current().ajax().update("form:dataTable");
+    }
+
+    public void resetFilters() {
+        filterDateDebut = null;
+        filterDateFin = null;
+        filterMesBrouillons = false;
+        filterMedecinAssigne = null;
+        filterSpecialiteMedicale = null;
+        filterMachine = null;
+        filterManipulateur = null;
+        filterMedecinInterprete = null;
+        filterPatient = null;
+    }
+
+    private boolean hasCurrentUserDraftConsultation(Queue q) {
+        Examen examen = getExamenByQueue(q);
+        if (examen == null || examen.getConsultationList() == null) {
+            return false;
+        }
+        ServiceUser currentUser = context.getCurrentUser();
+        if (currentUser == null) {
+            return false;
+        }
+        return examen.getConsultationList().stream()
+                .anyMatch(c -> "brouillon".equals(getTypeConsultation(c))
+                && Objects.equals(c.getFkEcritpar(), currentUser));
+    }
+
+    public String getTypeConsultation(Consultation consultation) {
+        if (consultation != null) {
+            if (consultation.getSessionAnnule() == true) {
+                return "annule";
+            }
+            if (consultation.getDefinitive() == null || consultation.getBrouillon() == null) {
+                return "normal";
+            }
+            if (consultation.getDefinitive() == true) {
+                return "definitve";
+            } else {
+                if (consultation.getBrouillon() == true) {
+                    return "brouillon";
+                } else {
+                    return "normal";
+                }
+            }
+        } else {
+            return "";
+        }
+    }
+
+    public Date getFilterDateDebut() {
+        return filterDateDebut;
+    }
+
+    public void setFilterDateDebut(Date filterDateDebut) {
+        this.filterDateDebut = filterDateDebut;
+    }
+
+    public Date getFilterDateFin() {
+        return filterDateFin;
+    }
+
+    public void setFilterDateFin(Date filterDateFin) {
+        this.filterDateFin = filterDateFin;
+    }
+
+    public boolean isFilterMesExamens() {
+        return filterMesExamens;
+    }
+
+    public void setFilterMesExamens(boolean filterMesExamens) {
+        this.filterMesExamens = filterMesExamens;
+    }
+
+    public boolean isFilterMesBrouillons() {
+        return filterMesBrouillons;
+    }
+
+    public void setFilterMesBrouillons(boolean filterMesBrouillons) {
+        this.filterMesBrouillons = filterMesBrouillons;
+    }
+
+    public Medecin getFilterMedecinAssigne() {
+        return filterMedecinAssigne;
+    }
+
+    public void setFilterMedecinAssigne(Medecin filterMedecinAssigne) {
+        this.filterMedecinAssigne = filterMedecinAssigne;
+    }
+
+    public SpecialiteMedicale getFilterSpecialiteMedicale() {
+        return filterSpecialiteMedicale;
+    }
+
+    public void setFilterSpecialiteMedicale(SpecialiteMedicale filterSpecialiteMedicale) {
+        this.filterSpecialiteMedicale = filterSpecialiteMedicale;
+    }
+
+    public Machine getFilterMachine() {
+        return filterMachine;
+    }
+
+    public void setFilterMachine(Machine filterMachine) {
+        this.filterMachine = filterMachine;
+    }
+
+    public Medecin getFilterManipulateur() {
+        return filterManipulateur;
+    }
+
+    public void setFilterManipulateur(Medecin filterManipulateur) {
+        this.filterManipulateur = filterManipulateur;
+    }
+
+    public Medecin getFilterMedecinInterprete() {
+        return filterMedecinInterprete;
+    }
+
+    public void setFilterMedecinInterprete(Medecin filterMedecinInterprete) {
+        this.filterMedecinInterprete = filterMedecinInterprete;
+    }
+
+    public List<Medecin> getMedecinList() {
+        return medecinList;
+    }
+
+    public void setMedecinList(List<Medecin> medecinList) {
+        this.medecinList = medecinList;
+    }
+
+    public List<SpecialiteMedicale> getSpecialiteMedicaleList() {
+        return specialiteMedicaleList;
+    }
+
+    public void setSpecialiteMedicaleList(List<SpecialiteMedicale> specialiteMedicaleList) {
+        this.specialiteMedicaleList = specialiteMedicaleList;
+    }
+
+    public List<Machine> getMachineList() {
+        return machineList;
+    }
+
+    public void setMachineList(List<Machine> machineList) {
+        this.machineList = machineList;
+    }
+
+    public List<ServiceUser> getManipulateurList() {
+        return manipulateurList;
+    }
+
+    public void setManipulateurList(List<ServiceUser> manipulateurList) {
+        this.manipulateurList = manipulateurList;
+    }
+
+    public StreamedContent exportListeExamensPdf() {
+
+        try {
+
+            String fileName = "Liste_Examens_" + System.currentTimeMillis() + ".pdf";
+
+            File file = new File(
+                    UtilFile.getFilePath(
+                            "PDF",
+                            fileName
+                    )
+            );
+
+            file.getParentFile().mkdirs();
+
+            Document document = new Document(PageSize.A4.rotate());
+
+            PdfWriter.getInstance(
+                    document,
+                    new FileOutputStream(file)
+            );
+
+            document.open();
+
+            Font centreFont = FontFactory.getFont(
+                    FontFactory.HELVETICA_BOLD,
+                    16
+            );
+
+            Font titleFont = FontFactory.getFont(
+                    FontFactory.HELVETICA_BOLD,
+                    14,
+                    Font.UNDERLINE
+            );
+
+            Font infoFont = FontFactory.getFont(
+                    FontFactory.HELVETICA,
+                    10
+            );
+
+            Paragraph centreParagraph = new Paragraph(
+                    centre != null ? centre.getName() : "",
+                    centreFont
+            );
+
+            centreParagraph.setAlignment(Element.ALIGN_CENTER);
+
+            document.add(centreParagraph);
+
+            document.add(new Paragraph(" "));
+
+            Paragraph title = new Paragraph(
+                    "Liste des examens",
+                    titleFont
+            );
+
+            title.setAlignment(Element.ALIGN_CENTER);
+
+            document.add(title);
+
+            document.add(new Paragraph(" "));
+
+            Paragraph dateGeneration = new Paragraph(
+                    "Date de génération : "
+                    + new SimpleDateFormat("dd/MM/yyyy HH:mm")
+                            .format(new Date()),
+                    infoFont
+            );
+
+            dateGeneration.setAlignment(Element.ALIGN_RIGHT);
+
+            document.add(dateGeneration);
+
+            document.add(new Paragraph(" "));
+
+            PdfPTable table = new PdfPTable(8);
+
+            table.setWidthPercentage(100);
+
+            table.setWidths(new float[]{
+                15f, // Code
+                25f, // Patient
+                10f, // Sexe
+                15f, // Priorité
+                15f, // Status
+                20f, // Type
+                20f, // Machine
+                20f // Date
+            });
+
+            Font headerFont = FontFactory.getFont(
+                    FontFactory.HELVETICA_BOLD,
+                    10
+            );
+            PdfPCell cell;
+
+            cell = new PdfPCell(new Phrase("Code", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Patient", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Sexe", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Priorité", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Status", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Type examen", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Machine", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            cell = new PdfPCell(new Phrase("Créé le", headerFont));
+            cell.setBorderWidth(1);
+            table.addCell(cell);
+
+            Font rowFont = FontFactory.getFont(
+                    FontFactory.HELVETICA,
+                    9
+            );
+
+            SimpleDateFormat sdfDate = new SimpleDateFormat("dd/MM/yyyy");
+            SimpleDateFormat sdfTime = new SimpleDateFormat("HH:mm:ss");
+
+            for (Queue q : allQueue) {
+
+                table.addCell(new Phrase(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getCodePatient()
+                        : "",
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getNom() + " "
+                        + q.getFkPatient().getPrenom()
+                        : "",
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getSexe()
+                        : "",
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        q.getFkPriority() != null
+                        ? q.getFkPriority().getDesignation()
+                        : "",
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        getDisplayStatus(q),
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        q.getFkTypeExamen() != null
+                        ? q.getFkTypeExamen().getNom()
+                        : "",
+                        rowFont));
+
+                table.addCell(new Phrase(
+                        q.getFkTypeExamen() != null
+                        && q.getFkTypeExamen().getFkMachine() != null
+                        ? q.getFkTypeExamen().getFkMachine().getNom()
+                        : "",
+                        rowFont));
+
+                String dateCreation = "";
+
+                if (q.getDate() != null) {
+
+                    dateCreation
+                            = sdfDate.format(q.getDate());
+
+                    if (q.getCreatedAt() != null) {
+
+                        dateCreation += " "
+                                + sdfTime.format(q.getCreatedAt());
+                    }
+                }
+
+                table.addCell(new Phrase(
+                        dateCreation,
+                        rowFont));
+            }
+
+            document.add(table);
+
+            document.close();
+
+            return DefaultStreamedContent.builder()
+                    .name(fileName)
+                    .contentType("application/pdf")
+                    .stream(() -> {
+                        try {
+                            return new FileInputStream(file);
+                        } catch (FileNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+                    .build();
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public StreamedContent exportListeExamensExcel() {
+
+        try {
+
+            String fileName = "Liste_Examens_" + System.currentTimeMillis() + ".xlsx";
+
+            File file = new File(
+                    UtilFile.getFilePath(
+                            "Excel",
+                            fileName
+                    )
+            );
+
+            file.getParentFile().mkdirs();
+
+            Workbook workbook = new XSSFWorkbook();
+
+            Sheet sheet = workbook.createSheet("Examens");
+
+            sheet.addMergedRegion(
+                    new CellRangeAddress(0, 0, 0, 8));
+
+            sheet.addMergedRegion(
+                    new CellRangeAddress(2, 2, 0, 8));
+
+            sheet.addMergedRegion(
+                    new CellRangeAddress(4, 4, 0, 8));
+
+            /*
+         * STYLE TITRE
+             */
+            CellStyle titleStyle = workbook.createCellStyle();
+
+            org.apache.poi.ss.usermodel.Font titleFont = workbook.createFont();
+            titleFont.setBold(true);
+            titleFont.setUnderline(org.apache.poi.ss.usermodel.Font.U_SINGLE);
+            titleFont.setFontHeightInPoints((short) 14);
+
+            titleStyle.setFont(titleFont);
+            titleStyle.setAlignment(HorizontalAlignment.CENTER);
+            /*
+         * STYLE ENTETE
+             */
+            CellStyle headerStyle = workbook.createCellStyle();
+
+            org.apache.poi.ss.usermodel.Font headerFont = workbook.createFont();
+            headerFont.setBold(true);
+
+            headerStyle.setFont(headerFont);
+
+            headerStyle.setBorderTop(BorderStyle.THIN);
+            headerStyle.setBorderBottom(BorderStyle.THIN);
+            headerStyle.setBorderLeft(BorderStyle.THIN);
+            headerStyle.setBorderRight(BorderStyle.THIN);
+
+            headerStyle.setAlignment(HorizontalAlignment.CENTER);
+
+            /*
+         * STYLE DONNEES
+             */
+            CellStyle dataStyle = workbook.createCellStyle();
+
+            dataStyle.setBorderTop(BorderStyle.THIN);
+            dataStyle.setBorderBottom(BorderStyle.THIN);
+            dataStyle.setBorderLeft(BorderStyle.THIN);
+            dataStyle.setBorderRight(BorderStyle.THIN);
+
+            int rowNum = 0;
+
+            Row centreRow = sheet.createRow(rowNum++);
+            centreRow.setHeightInPoints(25);
+
+            Cell centreCell = centreRow.createCell(0);
+
+            centreCell.setCellValue(
+                    centre != null ? centre.getName() : "");
+
+            centreCell.setCellStyle(titleStyle);
+
+            rowNum++;
+
+            Row titleRow = sheet.createRow(rowNum++);
+            titleRow.setHeightInPoints(25);
+
+            Cell titleCell = titleRow.createCell(0);
+
+            titleCell.setCellValue("Liste des examens");
+
+            titleCell.setCellStyle(titleStyle);
+
+            rowNum++;
+
+            Row dateRow = sheet.createRow(rowNum++);
+
+            Cell dateCell = dateRow.createCell(0);
+
+            dateCell.setCellValue(
+                    "Date de génération : "
+                    + new SimpleDateFormat("dd/MM/yyyy HH:mm")
+                            .format(new Date()));
+
+            rowNum += 2;
+
+            /*
+         * ENTETES
+             */
+            Row header = sheet.createRow(rowNum++);
+
+            String[] headers = {
+                "Code Patient",
+                "Nom Patient",
+                "Sexe",
+                "Priorité",
+                "Status",
+                "Type Examen",
+                "Machine",
+                "Date",
+                "Heure"
+            };
+
+            for (int i = 0; i < headers.length; i++) {
+
+                Cell cell = header.createCell(i);
+
+                cell.setCellValue(headers[i]);
+
+                cell.setCellStyle(headerStyle);
+            }
+
+            SimpleDateFormat sdfDate
+                    = new SimpleDateFormat("dd/MM/yyyy");
+
+            SimpleDateFormat sdfTime
+                    = new SimpleDateFormat("HH:mm:ss");
+
+            /*
+         * DONNEES
+             */
+            for (Queue q : allQueue) {
+
+                Row row = sheet.createRow(rowNum++);
+
+                Cell c0 = row.createCell(0);
+                c0.setCellValue(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getCodePatient()
+                        : "");
+                c0.setCellStyle(dataStyle);
+
+                Cell c1 = row.createCell(1);
+                c1.setCellValue(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getNom() + " "
+                        + q.getFkPatient().getPrenom()
+                        : "");
+                c1.setCellStyle(dataStyle);
+
+                Cell c2 = row.createCell(2);
+                c2.setCellValue(
+                        q.getFkPatient() != null
+                        ? q.getFkPatient().getSexe()
+                        : "");
+                c2.setCellStyle(dataStyle);
+
+                Cell c3 = row.createCell(3);
+                c3.setCellValue(
+                        q.getFkPriority() != null
+                        ? q.getFkPriority().getDesignation()
+                        : "");
+                c3.setCellStyle(dataStyle);
+
+                Cell c4 = row.createCell(4);
+                c4.setCellValue(getDisplayStatus(q));
+                c4.setCellStyle(dataStyle);
+
+                Cell c5 = row.createCell(5);
+                c5.setCellValue(
+                        q.getFkTypeExamen() != null
+                        ? q.getFkTypeExamen().getNom()
+                        : "");
+                c5.setCellStyle(dataStyle);
+
+                Cell c6 = row.createCell(6);
+                c6.setCellValue(
+                        q.getFkTypeExamen() != null
+                        && q.getFkTypeExamen().getFkMachine() != null
+                        ? q.getFkTypeExamen().getFkMachine().getNom()
+                        : "");
+                c6.setCellStyle(dataStyle);
+
+                Cell c7 = row.createCell(7);
+                c7.setCellValue(
+                        q.getDate() != null
+                        ? sdfDate.format(q.getDate())
+                        : "");
+                c7.setCellStyle(dataStyle);
+
+                Cell c8 = row.createCell(8);
+                c8.setCellValue(
+                        q.getCreatedAt() != null
+                        ? sdfTime.format(q.getCreatedAt())
+                        : "");
+                c8.setCellStyle(dataStyle);
+            }
+
+            /*
+         * LARGEUR COLONNES
+             */
+            for (int i = 0; i < headers.length; i++) {
+                sheet.autoSizeColumn(i);
+            }
+
+            FileOutputStream fos = new FileOutputStream(file);
+
+            workbook.write(fos);
+
+            fos.close();
+            workbook.close();
+
+            return DefaultStreamedContent.builder()
+                    .name(fileName)
+                    .contentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+                    .stream(() -> {
+                        try {
+                            return new FileInputStream(file);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+                    .build();
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public Patient getFilterPatient() {
+        return filterPatient;
+    }
+
+    public void setFilterPatient(Patient filterPatient) {
+        this.filterPatient = filterPatient;
+    }
+
+    public List<Patient> getPatientList() {
+        return patientList;
+    }
+
+    public void setPatientList(List<Patient> patientList) {
+        this.patientList = patientList;
+    }
+}
diff --git a/src/main/java/com/triz/trizservice/bean/ExamenDetailBean.java b/src/main/java/com/triz/trizservice/bean/ExamenDetailBean.java
new file mode 100644
index 0000000..ab3ce9b
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/bean/ExamenDetailBean.java
@@ -0,0 +1,1056 @@
+package com.triz.trizservice.bean;
+
+import com.triz.trizservice.modeles.Centre;
+import com.triz.trizservice.modeles.Queue;
+import com.triz.trizservice.modeles.Examen;
+import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.FichierExamen;
+import com.triz.trizservice.modeles.ImageCles;
+import com.triz.trizservice.modeles.Medecin;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.ServiceUser;
+import com.triz.trizservice.service.TransactionService;
+import com.triz.util.UtilContext;
+import com.triz.util.UtilFile;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import org.primefaces.event.FileUploadEvent;
+import org.primefaces.model.DefaultStreamedContent;
+import org.primefaces.model.StreamedContent;
+import org.primefaces.model.file.UploadedFile;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import org.primefaces.model.DefaultStreamedContent;
+import org.primefaces.model.StreamedContent;
+
+/**
+ * TODO : remplacer QueueFacade / ConsultationFacade par les vrais services/DAO
+ * du projet.
+ */
+@Component("examenDetailBean")
+@Scope("session")
+public class ExamenDetailBean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Autowired
+    private TransactionService service; // TODO : remplacer par le vrai service/DAO
+    @Autowired
+    private UtilContext context; // TODO : remplacer par le vrai service/DAO
+
+    private String idExamen; // type Object car Queue.id est en @Lob (UUID stocké tel quel)
+    private Queue queue;
+    private Examen examen;
+    private Consultation consultation;
+    private String modifie;
+    private String nomDossier = "Examen";
+    private ServiceUser user;
+    private List<Medecin> allMedecins;
+    private Centre centre;
+
+    // Ancien mode d'édition global (encore utilisé par Priorité / Interprète assigné /
+    // Type d'examen / Latéralité dans le XHTML, mais plus rien ne le passe à true
+    // depuis que le bouton "Modifier" a été retiré — voir remarque associée).
+    private boolean editMode = false;
+
+    // Édition par champ, déclenchée par le crayon devant Observation / Rapport écrit
+    private boolean editObservation = false;
+    private boolean editRapportEcrit = false;
+
+    public void init() {
+        System.out.println("idExamen " + idExamen);
+        centre = context.getCurrentEtablissement();
+        user = context.getCurrentUser();
+        if (idExamen == null) {
+            return;
+        }
+        examen = service.findById(Examen.class, UUID.fromString(idExamen)); // TODO : adapter à l'appel réel du projet
+        System.out.println("queue " + queue);
+        if (examen != null) {
+            // Accès direct via la relation Queue -> Examen
+            queue = examen.getFkQueue();
+            System.out.println("examen " + examen);
+            if (examen != null && examen.getConsultationList() != null && !examen.getConsultationList().isEmpty()) {
+                consultation = examen.getConsultationList()
+                        .stream()
+                        .filter(Objects::nonNull)
+                        .filter(c -> !Boolean.TRUE.equals(c.getSessionAnnule()))
+                        .findFirst()
+                        .orElse(null);
+            }
+        }
+        allMedecins = service.getAllMedecinByCenter(centre);
+    }
+
+    // ---------------------------------------------------------------
+    // Statut affiché (même logique que sur la liste)
+    // ---------------------------------------------------------------
+    public String getDisplayStatus() {
+        if (queue == null || queue.getStatus() == null) {
+            return "";
+        }
+        if (examen != null && Boolean.TRUE.equals(examen.getAnnule())) {
+            return "Annulé";
+        }
+
+        if (examen == null) {
+            return "Enregistrer";
+        }
+
+        if (consultation != null) {
+            if (consultation.getFilePathSignature() == null) {
+                return "Préliminaire";
+            } else {
+                return "Signé";
+            }
+        }
+
+        if (examen.getHeureDebut() != null && examen.getHeureFin() != null && examen.getAnnule() == false) {
+            return "Terminé";
+        }
+
+        if (examen.getHeureDebut() != null && examen.getHeureFin() == null && examen.getAnnule() == false) {
+            return "En cours";
+        }
+
+        return queue.getStatus();
+    }
+
+    public String getStatusBadgeClass() {
+        String status = getDisplayStatus();
+        if (status == null) {
+            return "";
+        }
+        switch (status) {
+            case "Programmé":
+                return "status-programme";
+            case "Enregistré":
+                return "status-enregistre";
+            case "En cours":
+                return "status-encours";
+            case "Terminé":
+                return "status-termine";
+            case "Préliminaire":
+                return "status-preliminaire";
+            case "Signé":
+                return "status-signe";
+            case "Addenda":
+                return "status-addenda";
+            case "Archivé":
+                return "status-archive";
+            case "Annulé":
+                return "status-annule";
+            default:
+                return "status-programme";
+        }
+    }
+
+    private boolean isDateAvantAujourdhui(Date date) {
+        if (date == null) {
+            return false;
+        }
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+        today.set(Calendar.MILLISECOND, 0);
+        return date.before(today.getTime());
+    }
+
+    // ---------------------------------------------------------------
+    // Observation = aperçu texte brut du rapport écrit (balises HTML retirées)
+    // ---------------------------------------------------------------
+    public String getObservationPreview() {
+        if (consultation == null || consultation.getRapportEcrit() == null) {
+            return "-";
+        }
+        String plain = consultation.getRapportEcrit().replaceAll("<[^>]*>", "").trim();
+        if (plain.isEmpty()) {
+            return "-";
+        }
+        return plain.length() > 60 ? plain.substring(0, 60) + "..." : plain;
+    }
+
+    // ---------------------------------------------------------------
+    // Édition par champ : Observation
+    // ---------------------------------------------------------------
+    public boolean isEditObservation() {
+        return editObservation;
+    }
+
+    // Appelé par le crayon : ouvre l'édition si fermé, sauvegarde et referme si ouvert
+    public void toggleEditObservation() {
+        if (editObservation) {
+            enregistrerObservation();
+        } else {
+            editObservation = true;
+        }
+    }
+
+    public void enregistrerObservation() {
+        if (examen != null) {
+            service.save(examen);
+        }
+        this.editObservation = false;
+    }
+
+    // ---------------------------------------------------------------
+    // Édition par champ : Rapport écrit
+    // ---------------------------------------------------------------
+    public boolean isEditRapportEcrit() {
+        return editRapportEcrit;
+    }
+
+    public void toggleEditRapportEcrit() {
+        if (editRapportEcrit) {
+            enregistrerRapport();
+        } else {
+            editRapportEcrit = true;
+        }
+    }
+
+    // Enregistre le rapport écrit (contenu Quill déjà synchronisé côté JS
+    // dans le textarea caché rapportEcritHidden avant l'appel AJAX)
+    public void enregistrerRapport() {
+        System.out.println("consultation " + consultation);
+        if (consultation != null) {
+            System.out.println("consultation " + consultation.getRapportEcrit());
+            consultation.setFkEcritpar(user);
+            service.save(consultation);
+        }
+        this.editRapportEcrit = false;
+    }
+
+    // ---------------------------------------------------------------
+    // Autres actions
+    // ---------------------------------------------------------------
+    public String retour() {
+        return "list.xhtml?faces-redirect=true";
+    }
+
+    public void ajouterSignature() {
+        // TODO
+    }
+
+    public void visualiser() {
+        // TODO : développement ultérieur (bouton bleu DICOM)
+    }
+
+    public void ouvrirConsultation() {
+        // TODO : développement ultérieur (bouton orange Consultation)
+    }
+
+    public String voirDossierPatient(Patient patient) {
+        return "/views/patient/form.xhtml?faces-redirect=true&patient=" + patient.getId();
+    }
+
+    public String voirMedecin(Medecin medecin) {
+        return "/views/medecin/form.xhtml?faces-redirect=true&medecin=" + medecin.getId();
+    }
+
+    public void voirUtilisateur(ServiceUser user) {
+        // TODO : navigation vers la fiche utilisateur
+    }
+
+    public void uploadRapportDictee(org.primefaces.event.FileUploadEvent event) {
+        // TODO : sauvegarder le fichier reçu (event.getFile()) sur le disque/storage,
+        // créer une entité Filepathrapportdictee(fkConsultation=consultation, date=now, filePath=...)
+        // et l'ajouter à consultation.getFilepathrapportdicteeList()
+    }
+
+    // ---------------------------------------------------------------
+    // Getters / setters
+    // ---------------------------------------------------------------
+    public String getIdExamen() {
+        return idExamen;
+    }
+
+    public void setIdExamen(String idExamen) {
+        this.idExamen = idExamen;
+    }
+
+    public Queue getQueue() {
+        return queue;
+    }
+
+    public void setQueue(Queue queue) {
+        this.queue = queue;
+    }
+
+    public Examen getExamen() {
+        return examen;
+    }
+
+    public void setExamen(Examen examen) {
+        this.examen = examen;
+    }
+
+    public Consultation getConsultation() {
+        return consultation;
+    }
+
+    public void setConsultation(Consultation consultation) {
+        this.consultation = consultation;
+    }
+
+    public boolean isEditMode() {
+        return editMode;
+    }
+
+    public void setEditMode(boolean editMode) {
+        this.editMode = editMode;
+    }
+
+    public String getModifie() {
+        return modifie;
+    }
+
+    public void setModifie(String modifier) {
+        this.modifie = modifier;
+    }
+
+    public String getTypeConsultation() {
+        if (consultation.getSessionAnnule() == true) {
+            return "annule";
+        }
+        if (consultation.getDefinitive() == null || consultation.getBrouillon() == null) {
+            return "normal";
+        }
+        if (consultation.getDefinitive() == true) {
+            return "definitve";
+        } else {
+            if (consultation.getBrouillon() == true) {
+                return "brouillon";
+            } else {
+                return "normal";
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------
+// Fichiers attachés
+// ---------------------------------------------------------------
+// TODO : externaliser ce chemin en configuration (application.properties)
+// plutôt que de le coder en dur — idéalement le même dossier/mécanisme
+// que celui déjà utilisé pour les rapports dictés.
+    private static final List<String> EXTENSIONS_AUTORISEES
+            = Arrays.asList("pdf", "xls", "xlsx", "doc", "docx", "txt", "jpg", "jpeg", "png");
+
+    public void uploadFichierAttache(FileUploadEvent event) {
+
+        UploadedFile uploadedFile = event.getFile();
+
+        if (uploadedFile == null) {
+            return;
+        }
+
+        String nomOriginal = uploadedFile.getFileName();
+        System.out.println("nomOriginal " + nomOriginal);
+        String extension = extraireExtension(nomOriginal).toLowerCase();
+
+        // Revalidation côté serveur : le filtre "allowTypes" du fileUpload est côté
+        // client uniquement, jamais suffisant seul pour la sécurité.
+        if (!EXTENSIONS_AUTORISEES.contains(extension)) {
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            "Type de fichier non autorisé", nomOriginal));
+            return;
+        }
+
+        try {
+
+            File destination = new File(UtilFile.getDirectoryName(nomDossier + "/" + nomOriginal));
+
+            try (InputStream in = uploadedFile.getInputStream()) {
+                Files.copy(in, destination.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+
+            FichierExamen fichier = new FichierExamen();
+            fichier.setDate(new Date());
+            fichier.setHeur(new Date());
+            fichier.setFilePath(destination.getAbsolutePath());
+            fichier.setFkExamen(examen);
+
+            // TODO : adapter à votre couche de persistance réelle (DAO/Service/Repository)
+            // — le même mécanisme que celui utilisé pour sauvegarder l'examen/la consultation.
+            service.save(fichier);
+
+            examen.getFichierExamenList().add(fichier);
+
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_INFO, "Fichier ajouté", nomOriginal));
+
+        } catch (IOException e) {
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            "Erreur lors de l'envoi du fichier", e.getMessage()));
+        }
+    }
+
+    public StreamedContent telechargerFichier(FichierExamen fichier) {
+
+        File source = new File(fichier.getFilePath());
+
+        return DefaultStreamedContent.builder()
+                .name(new File(fichier.getFilePath()).getName())
+                .contentType(determinerContentType(fichier.getFilePath()))
+                .stream(() -> {
+                    try {
+                        return new FileInputStream(source);
+                    } catch (FileNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .build();
+    }
+
+    private String extraireExtension(String nomFichier) {
+        int i = nomFichier.lastIndexOf('.');
+        return (i >= 0 && i < nomFichier.length() - 1) ? nomFichier.substring(i + 1) : "";
+    }
+
+    private String determinerContentType(String nomFichier) {
+        switch (extraireExtension(nomFichier).toLowerCase()) {
+            case "pdf":
+                return "application/pdf";
+            case "xls":
+                return "application/vnd.ms-excel";
+            case "xlsx":
+                return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+            case "doc":
+                return "application/msword";
+            case "docx":
+                return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+            case "txt":
+                return "text/plain";
+            default:
+                return "application/octet-stream";
+        }
+    }
+
+    public String getNomFichier(String filePath) {
+        if (filePath == null || filePath.trim().isEmpty()) {
+            return "";
+        }
+
+        return new File(filePath).getName();
+    }
+
+    public void supprimerFichierExamen(FichierExamen fichier) {
+
+        if (fichier == null) {
+            return;
+        }
+
+        try {
+            File fichierPhysique = new File(fichier.getFilePath());
+            if (fichierPhysique.exists()) {
+                fichierPhysique.delete();
+            }
+
+            // TODO : adapter à votre couche de persistance réelle (DAO/Service/Repository)
+            // — le même mécanisme que celui déjà utilisé pour uploadFichierAttache.
+            service.delete(fichier);
+
+            examen.getFichierExamenList().remove(fichier);
+
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_INFO,
+                            "Fichier supprimé", getNomFichier(fichier.getFilePath())));
+
+        } catch (Exception e) {
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            "Erreur lors de la suppression", e.getMessage()));
+        }
+    }
+
+    public String getTypeConsultation(Consultation consultation) {
+        if (consultation != null) {
+            if (consultation.getSessionAnnule() == true) {
+                return "annule";
+            }
+            if (consultation.getDefinitive() == null || consultation.getBrouillon() == null) {
+                return "normal";
+            }
+            if (consultation.getDefinitive() == true) {
+                return "definitve";
+            } else {
+                if (consultation.getBrouillon() == true) {
+                    return "brouillon";
+                } else {
+                    return "normal";
+                }
+            }
+        } else {
+            return "";
+        }
+    }
+
+    private Consultation selectedConsultation;
+
+    public void selectConsultation(Consultation consultation) {
+        System.out.println("consultation " + consultation);
+        this.selectedConsultation = consultation;
+    }
+
+// getter/setter selectedConsultation
+    public Consultation getSelectedConsultation() {
+        return selectedConsultation;
+    }
+
+    public void setSelectedConsultation(Consultation selectedConsultation) {
+        this.selectedConsultation = selectedConsultation;
+    }
+
+    private boolean editMedecinConsultant;
+    private String selectedMedecinConsultantId;
+    private String selectedMedecinId;
+
+    private boolean editInterpreteurAssigne;
+// selectedMedecinId déjà existant, réutilisé pour l'Interprète Assigné
+
+// ===================== Getters / Setters =====================
+    public boolean isEditMedecinConsultant() {
+        return editMedecinConsultant;
+    }
+
+    public void setEditMedecinConsultant(boolean editMedecinConsultant) {
+        this.editMedecinConsultant = editMedecinConsultant;
+    }
+
+    public String getSelectedMedecinConsultantId() {
+        return selectedMedecinConsultantId;
+    }
+
+    public void setSelectedMedecinConsultantId(String selectedMedecinConsultantId) {
+        this.selectedMedecinConsultantId = selectedMedecinConsultantId;
+    }
+
+    public boolean isEditInterpreteurAssigne() {
+        return editInterpreteurAssigne;
+    }
+
+    public void setEditInterpreteurAssigne(boolean editInterpreteurAssigne) {
+        this.editInterpreteurAssigne = editInterpreteurAssigne;
+    }
+
+// ===================== Médecin consultant (consultation.fkMedecin) =====================
+    public void toggleEditMedecinConsultant() {
+        System.out.println("toggleEditMedecinConsultant");
+        System.out.println("editMedecinConsultant " + editMedecinConsultant);
+        if (editMedecinConsultant) {
+            Medecin medecin = selectedMedecinConsultantId != null
+                    ? service.findById(Medecin.class, UUID.fromString(selectedMedecinConsultantId))
+                    : null;
+            consultation.setFkMedecin(medecin);
+            service.save(consultation);
+        } else {
+            selectedMedecinConsultantId = consultation.getFkMedecin() != null
+                    ? consultation.getFkMedecin().getId().toString()
+                    : null;
+        }
+        editMedecinConsultant = !editMedecinConsultant;
+    }
+
+// ===================== Interprète Assigné (examen.fkInterpreteurAssi) =====================
+    public void toggleEditInterpreteurAssigne() {
+        System.out.println("toggleEditInterpreteurAssigne");
+        System.out.println("editInterpreteurAssigne " + editInterpreteurAssigne);
+        if (editInterpreteurAssigne) {
+            System.out.println("selectedMedecinId " + selectedMedecinId);
+            Medecin medecin = selectedMedecinId != null
+                    ? service.findById(Medecin.class, UUID.fromString(selectedMedecinId))
+                    : null;
+            System.out.println("medecin " + medecin);
+            examen.setFkInterpreteurAssi(medecin);
+            System.out.println(" examen.setFkInterpreteurAssi " + examen.getFkInterpreteurAssi());
+            service.save(examen);
+        } else {
+            selectedMedecinId = examen.getFkInterpreteurAssi() != null
+                    ? examen.getFkInterpreteurAssi().getId().toString()
+                    : null;
+        }
+        editInterpreteurAssigne = !editInterpreteurAssigne;
+    }
+
+// ===================== Split Button Valider / Annuler =====================
+    public void validerConsultation() {
+        if (examen == null) {
+            return;
+        }
+        if (examen.getAnnule() == true) {
+            examen.setAnnule(false);
+        }
+        examen.setHeureFin(new Date());
+
+        Medecin medecinCourant = service.getMedecinByUser(user);
+        examen.setManipulateur(medecinCourant);
+        service.save(examen);
+
+        FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage(FacesMessage.SEVERITY_INFO, "",
+                        getMsg("distribution.message.consultationValidee")));
+    }
+
+    public void annulerConsultation() {
+        if (examen == null) {
+            return;
+        }
+        if (examen.getManipulateur() == null) {
+            Medecin medecinCourant = service.getMedecinByUser(user);
+            examen.setManipulateur(medecinCourant);
+        }
+        examen.setAnnule(true);
+        examen.setHeureFin(new Date());
+        service.save(examen);
+
+        FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage(FacesMessage.SEVERITY_WARN, "",
+                        getMsg("distribution.message.consultationAnnulee")));
+    }
+
+// Petit utilitaire si tu n'as pas déjà un helper équivalent pour lire le bundle de messages
+    private String getMsg(String key) {
+        return FacesContext.getCurrentInstance().getApplication()
+                .getResourceBundle(FacesContext.getCurrentInstance(), "msg")
+                .getString(key);
+    }
+
+    public String getSelectedMedecinId() {
+        return selectedMedecinId;
+    }
+
+    public void setSelectedMedecinId(String selectedMedecinId) {
+        this.selectedMedecinId = selectedMedecinId;
+    }
+
+    public List<Medecin> getAllMedecins() {
+        return allMedecins;
+    }
+
+    public boolean isThumbnailDisponible(FichierExamen f) {
+        if (f == null || f.getFilePath() == null) {
+            return false;
+        }
+        String nom = getNomFichier(f.getFilePath()).toLowerCase();
+        boolean isImage = nom.endsWith(".png") || nom.endsWith(".jpg") || nom.endsWith(".jpeg");
+        if (!isImage) {
+            return false;
+        }
+        return new File(f.getFilePath()).exists();
+    }
+
+    public boolean isAfficherBoutonValider() {
+        String etat = getEtatAction();
+        return "annule".equals(etat) || "encours".equals(etat);
+    }
+
+    public boolean isAfficherBoutonAnnuler() {
+        String etat = getEtatAction();
+        return "valide".equals(etat) || "encours".equals(etat);
+    }
+
+// "annulé" -> Valider seul ; "validé" -> Annuler seul ; "en cours" -> les deux ;
+// tout autre état (examen pas encore démarré, etc.) -> aucun bouton.
+    private String getEtatAction() {
+        if (examen == null || consultation == null) {
+            return "";
+        }
+        boolean annule = Boolean.TRUE.equals(examen.getAnnule());
+        if (annule) {
+            return "annule";
+        }
+        boolean enCours = examen.getHeureDebut() != null && examen.getHeureFin() == null;
+        if (enCours) {
+            return "encours";
+        }
+        boolean valide = examen.getHeureFin() != null;
+        if (valide) {
+            return "valide";
+        }
+        return "";
+    }
+
+    public StreamedContent exportCompteRenduExcel() {
+
+        try {
+
+            String fileName = "Compte_Rendu_"
+                    + System.currentTimeMillis()
+                    + ".xlsx";
+
+            File file = new File(
+                    UtilFile.getFilePath(
+                            "Excel",
+                            fileName
+                    )
+            );
+
+            file.getParentFile().mkdirs();
+
+            Workbook workbook = new XSSFWorkbook();
+
+            Sheet sheet = workbook.createSheet("Compte rendu");
+
+            SimpleDateFormat sdf
+                    = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+
+            /*
+         * STYLES
+             */
+            org.apache.poi.ss.usermodel.Font titleFont
+                    = workbook.createFont();
+
+            titleFont.setBold(true);
+            titleFont.setFontHeightInPoints((short) 16);
+
+            CellStyle titleStyle
+                    = workbook.createCellStyle();
+
+            titleStyle.setFont(titleFont);
+
+            org.apache.poi.ss.usermodel.Font sectionFont
+                    = workbook.createFont();
+
+            sectionFont.setBold(true);
+
+            CellStyle sectionStyle
+                    = workbook.createCellStyle();
+
+            sectionStyle.setFont(sectionFont);
+
+            sectionStyle.setFillForegroundColor(
+                    IndexedColors.GREY_25_PERCENT.getIndex());
+
+            sectionStyle.setFillPattern(
+                    FillPatternType.SOLID_FOREGROUND);
+
+            CellStyle valueStyle
+                    = workbook.createCellStyle();
+
+            valueStyle.setBorderTop(BorderStyle.THIN);
+            valueStyle.setBorderBottom(BorderStyle.THIN);
+            valueStyle.setBorderLeft(BorderStyle.THIN);
+            valueStyle.setBorderRight(BorderStyle.THIN);
+
+            valueStyle.setVerticalAlignment(
+                    VerticalAlignment.TOP);
+
+            valueStyle.setWrapText(true);
+
+            int rowNum = 0;
+
+            /*
+         * TITRE
+             */
+            Row row = sheet.createRow(rowNum++);
+
+            Cell cell = row.createCell(0);
+
+            cell.setCellValue(
+                    centre != null
+                            ? centre.getName()
+                            : "Centre d'imagerie");
+
+            cell.setCellStyle(titleStyle);
+
+            row = sheet.createRow(rowNum++);
+
+            row.createCell(0).setCellValue(
+                    "Compte rendu d'examen");
+
+            row = sheet.createRow(rowNum++);
+
+            row.createCell(0).setCellValue(
+                    "Date édition : "
+                    + sdf.format(new Date()));
+
+            rowNum++;
+
+            /*
+         * PATIENT
+             */
+            row = sheet.createRow(rowNum++);
+            cell = row.createCell(0);
+
+            cell.setCellValue("INFORMATIONS PATIENT");
+            cell.setCellStyle(sectionStyle);
+
+            row = sheet.createRow(rowNum++);
+            row.createCell(0).setCellValue("Code patient");
+            row.createCell(1).setCellValue(
+                    queue.getFkPatient() != null
+                    ? queue.getFkPatient().getCodePatient()
+                    : "");
+
+            row = sheet.createRow(rowNum++);
+            row.createCell(0).setCellValue("Nom complet");
+            row.createCell(1).setCellValue(
+                    queue.getFkPatient() != null
+                    ? queue.getFkPatient().getPrenom()
+                    + " "
+                    + queue.getFkPatient().getNom()
+                    : "");
+
+            row = sheet.createRow(rowNum++);
+            row.createCell(0).setCellValue("Sexe");
+            row.createCell(1).setCellValue(
+                    queue.getFkPatient() != null
+                    ? queue.getFkPatient().getSexe()
+                    : "");
+
+            rowNum++;
+
+            /*
+         * EXAMEN
+             */
+            row = sheet.createRow(rowNum++);
+            cell = row.createCell(0);
+
+            cell.setCellValue("INFORMATIONS EXAMEN");
+            cell.setCellStyle(sectionStyle);
+
+            ajouterLigne(sheet, rowNum++, "Statut",
+                    getDisplayStatus());
+
+            ajouterLigne(sheet, rowNum++, "Priorité",
+                    queue.getFkPriority() != null
+                    ? queue.getFkPriority().getDesignation()
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Type examen",
+                    queue.getFkTypeExamen() != null
+                    ? queue.getFkTypeExamen().getNom()
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Machine",
+                    queue.getFkTypeExamen() != null
+                    && queue.getFkTypeExamen().getFkMachine() != null
+                    ? queue.getFkTypeExamen().getFkMachine().getNom()
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Médecin manipulateur",
+                    examen != null
+                    && examen.getManipulateur() != null
+                    ? examen.getManipulateur().getFkUser().getNom()
+                    + " "
+                    + examen.getManipulateur().getFkUser().getPrenom()
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Interpréteur assigné",
+                    examen != null
+                    && examen.getFkInterpreteurAssi() != null
+                    ? examen.getFkInterpreteurAssi().getFkUser().getNom()
+                    + " "
+                    + examen.getFkInterpreteurAssi().getFkUser().getPrenom()
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Date création",
+                    queue.getDate() != null
+                    ? sdf.format(queue.getDate())
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Date validation",
+                    examen != null
+                    && examen.getHeureFin() != null
+                    ? sdf.format(examen.getHeureFin())
+                    : "");
+
+            ajouterLigne(sheet, rowNum++, "Study Instance UID",
+                    examen != null
+                            ? examen.getStudyInstanceUid()
+                            : "");
+
+            rowNum++;
+
+            /*
+         * CONSULTATION
+             */
+            if (consultation != null) {
+
+                row = sheet.createRow(rowNum++);
+
+                cell = row.createCell(0);
+
+                cell.setCellValue("CONSULTATION");
+                cell.setCellStyle(sectionStyle);
+
+                ajouterLigne(sheet, rowNum++,
+                        "Type consultation",
+                        getTypeConsultation());
+
+                ajouterLigne(sheet, rowNum++,
+                        "Médecin consultant",
+                        consultation.getFkMedecin() != null
+                        ? consultation.getFkMedecin()
+                                .getFkUser().getNom()
+                        + " "
+                        + consultation.getFkMedecin()
+                                .getFkUser().getPrenom()
+                        : "");
+
+                ajouterLigne(sheet, rowNum++,
+                        "Rapport écrit par",
+                        consultation.getFkEcritpar() != null
+                        ? consultation.getFkEcritpar().getNom()
+                        + " "
+                        + consultation.getFkEcritpar().getPrenom()
+                        : "");
+
+                rowNum++;
+
+                row = sheet.createRow(rowNum++);
+
+                cell = row.createCell(0);
+
+                cell.setCellValue("RAPPORT");
+                cell.setCellStyle(sectionStyle);
+
+                row = sheet.createRow(rowNum++);
+
+                Cell rapportCell = row.createCell(0);
+
+                String rapport = consultation.getRapportEcrit();
+
+                if (rapport != null) {
+                    rapport = rapport.replaceAll("<[^>]*>", "");
+                }
+
+                rapportCell.setCellValue(
+                        rapport != null
+                                ? rapport
+                                : "");
+
+                rapportCell.setCellStyle(valueStyle);
+
+                row.setHeightInPoints(200);
+            }
+
+            for (int i = 0; i < 10; i++) {
+                sheet.autoSizeColumn(i);
+            }
+
+            FileOutputStream fos
+                    = new FileOutputStream(file);
+
+            workbook.write(fos);
+
+            fos.close();
+            workbook.close();
+
+            return DefaultStreamedContent.builder()
+                    .name(fileName)
+                    .contentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+                    .stream(() -> {
+                        try {
+                            return new FileInputStream(file);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+                    .build();
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private void ajouterLigne(
+            Sheet sheet,
+            int rowNum,
+            String label,
+            String valeur) {
+
+        Row row = sheet.createRow(rowNum);
+
+        row.createCell(0).setCellValue(label);
+
+        row.createCell(1).setCellValue(
+                valeur != null ? valeur : "");
+    }
+
+    public void uploadSignature(FileUploadEvent event) {
+
+        if (consultation == null) {
+            return;
+        }
+
+        UploadedFile uploadedFile = event.getFile();
+        if (uploadedFile == null) {
+            return;
+        }
+
+        String nomOriginal = uploadedFile.getFileName();
+        String extension = extraireExtension(nomOriginal).toLowerCase();
+
+        if (!extension.equals("png") && !extension.equals("jpg") && !extension.equals("jpeg")) {
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            "Type de fichier non autorisé pour une signature", nomOriginal));
+            return;
+        }
+
+        try {
+            // Stockée dans le dossier virtuel 'images', comme les vignettes des fichiers
+            // attachés et les Images Clés — permet de réutiliser utilFile.getVirtualImageUrl
+            // si vous voulez afficher la signature quelque part plus tard.
+            File destination = new File(UtilFile.getDirectoryName("Examen/" + nomOriginal));
+
+            try (InputStream in = uploadedFile.getInputStream()) {
+                Files.copy(in, destination.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+
+            consultation.setFilePathSignature(destination.getAbsolutePath());
+            service.save(consultation);
+
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_INFO, "Signature ajoutée", nomOriginal));
+
+        } catch (IOException e) {
+            FacesContext.getCurrentInstance().addMessage(null,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            "Erreur lors de l'envoi de la signature", e.getMessage()));
+        }
+    }
+}
diff --git a/src/main/java/com/triz/trizservice/bean/ParametresBean.java b/src/main/java/com/triz/trizservice/bean/ParametresBean.java
index 12c4bae..02e8c33 100644
--- a/src/main/java/com/triz/trizservice/bean/ParametresBean.java
+++ b/src/main/java/com/triz/trizservice/bean/ParametresBean.java
@@ -26,14 +26,18 @@ import com.triz.trizservice.modeles.MedecinSpecialiste;
 import com.triz.util.UtilContext;
 import com.triz.trizservice.modeles.ServiceUser;
 import com.triz.trizservice.modeles.TypealerteTypeexamen;
+import com.triz.trizservice.security.impl.PingService;
 import com.triz.trizservice.service.TransactionService;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import org.primefaces.PrimeFaces;
 
 @Component("parametresBean")
-@Scope("view")
+@Scope("session")
 public class ParametresBean implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -42,6 +46,8 @@ public class ParametresBean implements Serializable {
     private UtilContext utilContext;
     @Autowired
     private TransactionService service;
+    @Autowired
+    private PingService pingService;
 
     // ===================== Paramètres de vue =====================
     private String centre1;      // f:viewParam - id du centre a afficher
@@ -101,6 +107,7 @@ public class ParametresBean implements Serializable {
 
         chargerToutesLesListes();
         resetSelections();
+        pingService.startPingThread();
     }
 
     private void chargerToutesLesListes() {
@@ -231,7 +238,7 @@ public class ParametresBean implements Serializable {
     public void editerTypeExamen(TypeExamen t) {
         System.out.println("modifier dpuis type alerte");
         typeExamenSelected = t;
-         System.out.println("modifier dpuis type alerte "+t.getNom());
+        System.out.println("modifier dpuis type alerte " + t.getNom());
         PrimeFaces.current().ajax().update(":parametresForm:dlgTypeExamenContent");
     }
 
@@ -444,7 +451,7 @@ public class ParametresBean implements Serializable {
 
     public void editerTypeAlerte(TypeAlerteMedical ta) {
         typeAlerteSelected = ta;
-        selectedTypeExamen=service.getTypeExamenByTypeAlerte(ta);
+        selectedTypeExamen = service.getTypeExamenByTypeAlerte(ta);
         PrimeFaces.current().ajax().update(":parametresForm:dlgTypeAlerteContent");
     }
 
@@ -489,7 +496,7 @@ public class ParametresBean implements Serializable {
                     }
                 }
                 System.out.println("EXAMEN ID = " + type.getId());
-                System.out.println("EXAMEN NOM = " + type.getNom()) ;// L'association n'existe pas encore
+                System.out.println("EXAMEN NOM = " + type.getNom());// L'association n'existe pas encore
                 if (!existe) {
                     TypealerteTypeexamen types = new TypealerteTypeexamen();
                     types.setFkAlerte(typeAlerteSelected);
@@ -761,4 +768,7 @@ public class ParametresBean implements Serializable {
         return examns.size();
     }
 
+    public boolean isActif() {
+        return pingService.isActif();
+    }
 }
diff --git a/src/main/java/com/triz/trizservice/bean/converter/MachineConverter.java b/src/main/java/com/triz/trizservice/bean/converter/MachineConverter.java
index bebaebe..8b39dac 100644
--- a/src/main/java/com/triz/trizservice/bean/converter/MachineConverter.java
+++ b/src/main/java/com/triz/trizservice/bean/converter/MachineConverter.java
@@ -9,13 +9,22 @@ import javax.faces.convert.Converter;
 import javax.faces.convert.FacesConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
 @FacesConverter("machineConverter")
 @Component
 public class MachineConverter implements Converter {
 
     @Autowired
-    protected transient TransactionService service;
+    public TransactionService service;
+
+    public MachineConverter() {
+        // JSF instancie ce convertisseur lui-même (new MachineConverter()),
+        // donc @Autowired ne se déclenche jamais tout seul.
+        // Cet appel va chercher le WebApplicationContext Spring actif
+        // et injecte manuellement les champs @Autowired de cette instance.
+        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+    }
 
     @Override
     public Object getAsObject(FacesContext fc, UIComponent uic, String value) {
@@ -45,4 +54,4 @@ public class MachineConverter implements Converter {
         }
         return "";
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/triz/trizservice/bean/converter/MedecinConverter.java b/src/main/java/com/triz/trizservice/bean/converter/MedecinConverter.java
new file mode 100644
index 0000000..6078b25
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/bean/converter/MedecinConverter.java
@@ -0,0 +1,68 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.triz.trizservice.bean.converter;
+
+import com.triz.trizservice.modeles.Medecin;
+import com.triz.trizservice.modeles.SpecialiteMedicale;
+import com.triz.trizservice.service.TransactionService;
+import java.util.UUID;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
+
+/**
+ *
+ * @author FORCE TECH
+ */
+@FacesConverter("medecinConverter")
+@Component
+public class MedecinConverter implements Converter {
+
+    @Autowired
+    protected transient TransactionService service;
+
+    public MedecinConverter() {
+        // JSF instancie ce convertisseur lui-même (new MachineConverter()),
+        // donc @Autowired ne se déclenche jamais tout seul.
+        // Cet appel va chercher le WebApplicationContext Spring actif
+        // et injecte manuellement les champs @Autowired de cette instance.
+        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+    }
+
+    @Override
+    public Object getAsObject(FacesContext fc, UIComponent uic, String value) {
+
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            return service.findById(Medecin.class, UUID.fromString(value));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public String getAsString(FacesContext fc, UIComponent uic, Object object) {
+        if (object == null) {
+            return "";
+        }
+        if (object instanceof Medecin) {
+            Medecin machine = (Medecin) object;
+            if (machine.getId() == null) {
+                return "";
+            }
+            return machine.getId().toString();
+        }
+        return "";
+    }
+
+}
diff --git a/src/main/java/com/triz/trizservice/bean/converter/PatientConverter.java b/src/main/java/com/triz/trizservice/bean/converter/PatientConverter.java
new file mode 100644
index 0000000..f5931d4
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/bean/converter/PatientConverter.java
@@ -0,0 +1,69 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.triz.trizservice.bean.converter;
+
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.service.TransactionService;
+import java.util.UUID;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
+
+@FacesConverter(value = "patientConverter")
+@Component
+public class PatientConverter implements Converter {
+
+    @Autowired
+    private TransactionService service;
+
+    public PatientConverter() {
+        // JSF instancie ce convertisseur lui-même (new MachineConverter()),
+        // donc @Autowired ne se déclenche jamais tout seul.
+        // Cet appel va chercher le WebApplicationContext Spring actif
+        // et injecte manuellement les champs @Autowired de cette instance.
+        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+    }
+
+    @Override
+    public Object getAsObject(FacesContext fc, UIComponent uic, String value) {
+
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            return service.findById(Patient.class, UUID.fromString(value));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public String getAsString(FacesContext fc, UIComponent uic, Object object) {
+
+        if (object == null) {
+            return "";
+        }
+
+        if (object instanceof String) {
+            return (String) object;
+        }
+
+        if (!(object instanceof Patient)) {
+            return "";
+        }
+
+        Patient patient = (Patient) object;
+
+        return patient.getId() != null
+                ? patient.getId().toString()
+                : "";
+    }
+
+}
diff --git a/src/main/java/com/triz/trizservice/bean/converter/SpecialiteMedicaleConverter.java b/src/main/java/com/triz/trizservice/bean/converter/SpecialiteMedicaleConverter.java
index 59b06a6..5f294a6 100644
--- a/src/main/java/com/triz/trizservice/bean/converter/SpecialiteMedicaleConverter.java
+++ b/src/main/java/com/triz/trizservice/bean/converter/SpecialiteMedicaleConverter.java
@@ -7,6 +7,7 @@ package com.triz.trizservice.bean.converter;
 import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.SpecialiteMedicale;
 import com.triz.trizservice.service.TransactionService;
+import java.util.UUID;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -14,6 +15,7 @@ import javax.faces.convert.Converter;
 import javax.faces.convert.FacesConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
 /**
  *
@@ -22,27 +24,45 @@ import org.springframework.stereotype.Component;
 @FacesConverter("specialiteMedicaleConverter")
 @Component
 public class SpecialiteMedicaleConverter implements Converter {
-     @Autowired
+
+    @Autowired
     protected transient TransactionService service;
 
+    public SpecialiteMedicaleConverter() {
+        // JSF instancie ce convertisseur lui-même (new MachineConverter()),
+        // donc @Autowired ne se déclenche jamais tout seul.
+        // Cet appel va chercher le WebApplicationContext Spring actif
+        // et injecte manuellement les champs @Autowired de cette instance.
+        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+    }
+
     @Override
     public Object getAsObject(FacesContext fc, UIComponent uic, String value) {
-        try {                
-                return service.findById(SpecialiteMedicale.class, value);
-            } catch (NumberFormatException e) 
-            {
-                new FacesMessage(FacesMessage.SEVERITY_ERROR, "Conversion Error", "Specialite Medicale n'existe pas.");
-            }
-       
-        return null;
+
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            return service.findById(SpecialiteMedicale.class, UUID.fromString(value));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+
     }
 
     @Override
     public String getAsString(FacesContext fc, UIComponent uic, Object object) {
-        if (object != null) {
-            return String.valueOf(((SpecialiteMedicale) object).getName());
-        } else {
-            return null;
+        if (object == null) {
+            return "";
         }
+        if (object instanceof SpecialiteMedicale) {
+            SpecialiteMedicale machine = (SpecialiteMedicale) object;
+            if (machine.getId() == null) {
+                return "";
+            }
+            return machine.getId().toString();
+        }
+        return "";
     }
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Centre.java b/src/main/java/com/triz/trizservice/modeles/Centre.java
index 1b72d4d..6ebcc32 100644
--- a/src/main/java/com/triz/trizservice/modeles/Centre.java
+++ b/src/main/java/com/triz/trizservice/modeles/Centre.java
@@ -84,6 +84,12 @@ public class Centre implements Serializable {
     @OneToMany(mappedBy = "fkCentre")
     private List<SalleDeSoin> salleDeSoinList;
 
+    @Column(name = "telephone")
+    private String telephone;
+
+    @Column(name = "email")
+    private String email;
+
     public Centre() {
     }
 
@@ -104,7 +110,6 @@ public class Centre implements Serializable {
         this.id = id;
     }
 
-
     public Double getLatitude() {
         return latitude;
     }
@@ -268,4 +273,20 @@ public class Centre implements Serializable {
         this.joursFerierList = joursFerierList;
     }
 
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Consultation.java b/src/main/java/com/triz/trizservice/modeles/Consultation.java
index e64ef54..9972d82 100644
--- a/src/main/java/com/triz/trizservice/modeles/Consultation.java
+++ b/src/main/java/com/triz/trizservice/modeles/Consultation.java
@@ -7,10 +7,12 @@ package com.triz.trizservice.modeles;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -63,9 +65,9 @@ public class Consultation implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "session_annule")
     private Boolean sessionAnnule;
     @Column(name = "date")
@@ -86,19 +88,23 @@ public class Consultation implements Serializable {
     @JoinColumn(name = "fk_patient", referencedColumnName = "id")
     @ManyToOne
     private Patient fkPatient;
+    @Column(name = "brouillon")
+    private Boolean brouillon;
+     @Column(name = "definitive")
+    private Boolean definitive;
 
     public Consultation() {
     }
 
-    public Consultation(Object id) {
+    public Consultation(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
@@ -207,7 +213,6 @@ public class Consultation implements Serializable {
         this.fkPatient = fkPatient;
     }
 
-  
     @XmlTransient
     public List<Filepathrapportdictee> getFilepathrapportdicteeList() {
         return filepathrapportdicteeList;
@@ -225,4 +230,20 @@ public class Consultation implements Serializable {
         this.fkEcritpar = fkEcritpar;
     }
 
+    public Boolean getBrouillon() {
+        return brouillon;
+    }
+
+    public void setBrouillon(Boolean brouillon) {
+        this.brouillon = brouillon;
+    }
+
+    public Boolean getDefinitive() {
+        return definitive;
+    }
+
+    public void setDefinitive(Boolean definitive) {
+        this.definitive = definitive;
+    }
+
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Examen.java b/src/main/java/com/triz/trizservice/modeles/Examen.java
index edaa66b..e9d7c62 100644
--- a/src/main/java/com/triz/trizservice/modeles/Examen.java
+++ b/src/main/java/com/triz/trizservice/modeles/Examen.java
@@ -1,15 +1,13 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -25,10 +23,6 @@ import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-/**
- *
- * @author FORCE TECH
- */
 @Entity
 @Table(name = "examen")
 @XmlRootElement
@@ -65,9 +59,9 @@ public class Examen implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "annule")
     private Boolean annule;
     @Column(name = "date")
@@ -83,24 +77,38 @@ public class Examen implements Serializable {
     private List<ImageCles> imageClesList;
     @OneToMany(mappedBy = "fkExamen")
     private List<FichierExamen> fichierExamenList;
-    @JoinColumn(name = "fk_queue", referencedColumnName = "id")
-    @ManyToOne
-    private Queue fkQueue;
     @OneToMany(mappedBy = "fkExamen")
     private List<Consultation> consultationList;
 
+    @ManyToOne
+    @JoinColumn(name = "fk_queue")
+    private Queue fkQueue;
+
+    // MODIF : ajout de l'interprète assigné (le seul champ "médecin" conservé sur Examen)
+    @JoinColumn(name = "fk_interpreteur_assi", referencedColumnName = "id")
+    @ManyToOne
+    private Medecin fkInterpreteurAssi;
+
+    @ManyToOne
+    @JoinColumn(name = "fk_manipulateur")
+    private Medecin manipulateur;
+
+    @Size(max = 2147483647)
+    @Column(name = "observation")
+    private String observation;
+
     public Examen() {
     }
 
-    public Examen(Object id) {
+    public Examen(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
@@ -152,7 +160,6 @@ public class Examen implements Serializable {
         this.regionExaminee = regionExaminee;
     }
 
-
     public String getIndicationClinique() {
         return indicationClinique;
     }
@@ -187,14 +194,6 @@ public class Examen implements Serializable {
         this.fichierExamenList = fichierExamenList;
     }
 
-    public Queue getFkQueue() {
-        return fkQueue;
-    }
-
-    public void setFkQueue(Queue fkQueue) {
-        this.fkQueue = fkQueue;
-    }
-
     @XmlTransient
     public List<Consultation> getConsultationList() {
         return consultationList;
@@ -204,6 +203,14 @@ public class Examen implements Serializable {
         this.consultationList = consultationList;
     }
 
+    public Medecin getFkInterpreteurAssi() {
+        return fkInterpreteurAssi;
+    }
+
+    public void setFkInterpreteurAssi(Medecin fkInterpreteurAssi) {
+        this.fkInterpreteurAssi = fkInterpreteurAssi;
+    }
+
     @Override
     public int hashCode() {
         int hash = 0;
@@ -213,7 +220,6 @@ public class Examen implements Serializable {
 
     @Override
     public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
         if (!(object instanceof Examen)) {
             return false;
         }
@@ -229,4 +235,38 @@ public class Examen implements Serializable {
         return "com.triz.trizservice.modeles.Examen[ id=" + id + " ]";
     }
 
+    public String getLateralite() {
+        return lateralite;
+    }
+
+    public void setLateralite(String lateralite) {
+        this.lateralite = lateralite;
+    }
+
+    public Queue getFkQueue() {
+        return fkQueue;
+    }
+
+    public void setFkQueue(Queue fkQueue) {
+        this.fkQueue = fkQueue;
+    }
+
+    public String getObservation() {
+        return observation;
+    }
+
+    public void setObservation(String observation) {
+        this.observation = observation;
+    }
+
+    public Medecin getManipulateur() {
+        return manipulateur;
+    }
+
+    public void setManipulateur(Medecin manipulateur) {
+        this.manipulateur = manipulateur;
+    }
+    
+    
+
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/FichierExamen.java b/src/main/java/com/triz/trizservice/modeles/FichierExamen.java
index e53b055..c40dee7 100644
--- a/src/main/java/com/triz/trizservice/modeles/FichierExamen.java
+++ b/src/main/java/com/triz/trizservice/modeles/FichierExamen.java
@@ -6,9 +6,11 @@ package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -40,9 +42,9 @@ public class FichierExamen implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "date")
     @Temporal(TemporalType.DATE)
     private Date date;
@@ -59,15 +61,15 @@ public class FichierExamen implements Serializable {
     public FichierExamen() {
     }
 
-    public FichierExamen(Object id) {
+    public FichierExamen(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
diff --git a/src/main/java/com/triz/trizservice/modeles/Filepathrapportdictee.java b/src/main/java/com/triz/trizservice/modeles/Filepathrapportdictee.java
index 0c51805..f9d4c0c 100644
--- a/src/main/java/com/triz/trizservice/modeles/Filepathrapportdictee.java
+++ b/src/main/java/com/triz/trizservice/modeles/Filepathrapportdictee.java
@@ -6,9 +6,11 @@ package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -40,9 +42,9 @@ public class Filepathrapportdictee implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "date")
     @Temporal(TemporalType.DATE)
     private Date date;
@@ -59,15 +61,15 @@ public class Filepathrapportdictee implements Serializable {
     public Filepathrapportdictee() {
     }
 
-    public Filepathrapportdictee(Object id) {
+    public Filepathrapportdictee(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
diff --git a/src/main/java/com/triz/trizservice/modeles/ImageCles.java b/src/main/java/com/triz/trizservice/modeles/ImageCles.java
index 1bb90c3..e5c1181 100644
--- a/src/main/java/com/triz/trizservice/modeles/ImageCles.java
+++ b/src/main/java/com/triz/trizservice/modeles/ImageCles.java
@@ -48,6 +48,9 @@ public class ImageCles implements Serializable {
     @JoinColumn(name = "fk_examen", referencedColumnName = "id")
     @ManyToOne
     private Examen fkExamen;
+    @Size(max = 500)
+    @Column(name = "file_path", length = 500)
+    private String filePath;
 
     public ImageCles() {
     }
@@ -112,5 +115,12 @@ public class ImageCles implements Serializable {
     public String toString() {
         return "com.triz.trizservice.modeles.ImageCles[ uidDesinstancesSop=" + uidDesinstancesSop + " ]";
     }
-    
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Parametre.java b/src/main/java/com/triz/trizservice/modeles/Parametre.java
index 4204c50..e9a60ee 100644
--- a/src/main/java/com/triz/trizservice/modeles/Parametre.java
+++ b/src/main/java/com/triz/trizservice/modeles/Parametre.java
@@ -50,6 +50,8 @@ public class Parametre implements Serializable {
     @JoinColumn(name = "fk_centre", referencedColumnName = "id")
     @ManyToOne
     private Centre fkCentre;
+     @Column(name = "addresse_ip")
+    private String addresse_ip;
 
     public Parametre() {
     }
@@ -114,5 +116,13 @@ public class Parametre implements Serializable {
     public String toString() {
         return "com.triz.trizservice.modeles.Parametre[ id=" + id + " ]";
     }
+
+    public String getAddresse_ip() {
+        return addresse_ip;
+    }
+
+    public void setAddresse_ip(String addresse_ip) {
+        this.addresse_ip = addresse_ip;
+    }
     
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Patient.java b/src/main/java/com/triz/trizservice/modeles/Patient.java
index 8fa5f20..f53b303 100644
--- a/src/main/java/com/triz/trizservice/modeles/Patient.java
+++ b/src/main/java/com/triz/trizservice/modeles/Patient.java
@@ -63,7 +63,7 @@ public class Patient implements Serializable {
     private String telephoneRelative;
     // @Pattern(regexp="[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", message="Invalid email")//if the field contains email address consider using this annotation to enforce field validation
     @Size(max = 2147483647)
-    @Column(name="email")
+    @Column(name = "email")
     private String email;
     @Size(max = 2147483647)
     @Column(name = "sexe")
@@ -106,6 +106,8 @@ public class Patient implements Serializable {
     private List<AlertesMedicales> alertesMedicalesList;
     @OneToMany(mappedBy = "fkPatient")
     private List<Queue> queueList;
+    @Column(name = "code_patient", unique = true, length = 10)
+    private String codePatient;
 
     public Patient() {
     }
@@ -122,7 +124,6 @@ public class Patient implements Serializable {
         this.id = id;
     }
 
-
     public Date getDateNaissance() {
         return dateNaissance;
     }
@@ -131,7 +132,6 @@ public class Patient implements Serializable {
         this.dateNaissance = dateNaissance;
     }
 
-
     public String getTelephoneRelative() {
         return telephoneRelative;
     }
@@ -140,7 +140,6 @@ public class Patient implements Serializable {
         this.telephoneRelative = telephoneRelative;
     }
 
-
     public Date getCreeLe() {
         return creeLe;
     }
@@ -251,7 +250,6 @@ public class Patient implements Serializable {
         this.telephone = telephone;
     }
 
-
     public String getEmail() {
         return email;
     }
@@ -300,5 +298,13 @@ public class Patient implements Serializable {
     public void setConsultationList(List<Consultation> consultationList) {
         this.consultationList = consultationList;
     }
-    
+
+    public String getCodePatient() {
+        return codePatient;
+    }
+
+    public void setCodePatient(String codePatient) {
+        this.codePatient = codePatient;
+    }
+
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/Queue.java b/src/main/java/com/triz/trizservice/modeles/Queue.java
index 3e9a9ab..7250656 100644
--- a/src/main/java/com/triz/trizservice/modeles/Queue.java
+++ b/src/main/java/com/triz/trizservice/modeles/Queue.java
@@ -1,18 +1,15 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
@@ -25,10 +22,6 @@ import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-/**
- *
- * @author FORCE TECH
- */
 @Entity
 @Table(name = "queue")
 @XmlRootElement
@@ -51,19 +44,15 @@ public class Queue implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "date")
-    @Temporal(TemporalType.DATE)
     private Date date;
     @Column(name = "created_at")
-    @Temporal(TemporalType.TIME)
     private Date createdAt;
     @OneToMany(mappedBy = "fkQueue")
     private List<QueueStatusTime> queueStatusTimeList;
-    @OneToMany(mappedBy = "fkQueue")
-    private List<Examen> examenList;
     @JoinColumn(name = "fk_patient", referencedColumnName = "id")
     @ManyToOne
     private Patient fkPatient;
@@ -73,26 +62,26 @@ public class Queue implements Serializable {
     @JoinColumn(name = "fk_queue_tips", referencedColumnName = "id")
     @ManyToOne
     private QueueTips fkQueueTips;
-    @JoinColumn(name = "fk_type_examen", referencedColumnName = "id")
+
     @ManyToOne
+    @JoinColumn(name = "fk_type_examen")
     private TypeExamen fkTypeExamen;
 
     public Queue() {
     }
 
-    public Queue(Object id) {
+    public Queue(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
-
     public Date getDate() {
         return date;
     }
@@ -118,15 +107,6 @@ public class Queue implements Serializable {
         this.queueStatusTimeList = queueStatusTimeList;
     }
 
-    @XmlTransient
-    public List<Examen> getExamenList() {
-        return examenList;
-    }
-
-    public void setExamenList(List<Examen> examenList) {
-        this.examenList = examenList;
-    }
-
     public Patient getFkPatient() {
         return fkPatient;
     }
@@ -151,14 +131,6 @@ public class Queue implements Serializable {
         this.fkQueueTips = fkQueueTips;
     }
 
-    public TypeExamen getFkTypeExamen() {
-        return fkTypeExamen;
-    }
-
-    public void setFkTypeExamen(TypeExamen fkTypeExamen) {
-        this.fkTypeExamen = fkTypeExamen;
-    }
-
     @Override
     public int hashCode() {
         int hash = 0;
@@ -168,7 +140,6 @@ public class Queue implements Serializable {
 
     @Override
     public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
         if (!(object instanceof Queue)) {
             return false;
         }
@@ -199,5 +170,13 @@ public class Queue implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
-    
+
+    public TypeExamen getFkTypeExamen() {
+        return fkTypeExamen;
+    }
+
+    public void setFkTypeExamen(TypeExamen fkTypeExamen) {
+        this.fkTypeExamen = fkTypeExamen;
+    }
+
 }
diff --git a/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java b/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java
index 841c4af..c791e9c 100644
--- a/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java
+++ b/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java
@@ -6,9 +6,11 @@ package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -37,9 +39,9 @@ public class QueueStatusTime implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Column(name = "time")
     @Temporal(TemporalType.TIME)
     private Date time;
@@ -53,15 +55,15 @@ public class QueueStatusTime implements Serializable {
     public QueueStatusTime() {
     }
 
-    public QueueStatusTime(Object id) {
+    public QueueStatusTime(UUID id) {
         this.id = id;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
diff --git a/src/main/java/com/triz/trizservice/modeles/Status.java b/src/main/java/com/triz/trizservice/modeles/Status.java
index 1af8c2a..3a86e73 100644
--- a/src/main/java/com/triz/trizservice/modeles/Status.java
+++ b/src/main/java/com/triz/trizservice/modeles/Status.java
@@ -6,9 +6,11 @@ package com.triz.trizservice.modeles;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.UUID;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
@@ -36,9 +38,9 @@ public class Status implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @Lob
+    @GeneratedValue
     @Column(name = "id")
-    private Object id;
+    private UUID id;
     @Basic(optional = false)
     @NotNull
     @Size(min = 1, max = 2147483647)
@@ -50,20 +52,20 @@ public class Status implements Serializable {
     public Status() {
     }
 
-    public Status(Object id) {
+    public Status(UUID id) {
         this.id = id;
     }
 
-    public Status(Object id, String designation) {
+    public Status(UUID id, String designation) {
         this.id = id;
         this.designation = designation;
     }
 
-    public Object getId() {
+    public UUID getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(UUID id) {
         this.id = id;
     }
 
diff --git a/src/main/java/com/triz/trizservice/modeles/TypeExamen.java b/src/main/java/com/triz/trizservice/modeles/TypeExamen.java
index 2064819..45999d6 100644
--- a/src/main/java/com/triz/trizservice/modeles/TypeExamen.java
+++ b/src/main/java/com/triz/trizservice/modeles/TypeExamen.java
@@ -48,7 +48,7 @@ public class TypeExamen implements Serializable {
     @Size(min = 1, max = 2147483647)
     @Column(name = "nom")
     private String nom;
-  
+
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "fkExamen")
     private List<TypealerteTypeexamen> typealerteTypeexamenList;
 
@@ -70,6 +70,9 @@ public class TypeExamen implements Serializable {
     @JoinColumn(name = "fk_patient", referencedColumnName = "id")
     @ManyToOne
     private Patient fkPatient;
+    @ManyToOne
+    @JoinColumn(name = "fk_specialite_medicale")
+    private SpecialiteMedicale specialiteMedicale;
 
     public TypeExamen() {
     }
@@ -123,8 +126,6 @@ public class TypeExamen implements Serializable {
         this.fkPatient = fkPatient;
     }
 
-    
-
     @Override
     public int hashCode() {
         int hash = 0;
@@ -158,7 +159,6 @@ public class TypeExamen implements Serializable {
         this.nom = nom;
     }
 
-
     @XmlTransient
     public List<TypealerteTypeexamen> getTypealerteTypeexamenList() {
         return typealerteTypeexamenList;
@@ -168,4 +168,13 @@ public class TypeExamen implements Serializable {
         this.typealerteTypeexamenList = typealerteTypeexamenList;
     }
 
+    public SpecialiteMedicale getSpecialiteMedicale() {
+        return specialiteMedicale;
+    }
+
+    public void setSpecialiteMedicale(SpecialiteMedicale specialiteMedicale) {
+        this.specialiteMedicale = specialiteMedicale;
+    }
+    
+
 }
diff --git a/src/main/java/com/triz/trizservice/security/impl/PingService.java b/src/main/java/com/triz/trizservice/security/impl/PingService.java
new file mode 100644
index 0000000..5815bae
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/security/impl/PingService.java
@@ -0,0 +1,82 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.triz.trizservice.security.impl;
+
+import com.triz.trizservice.modeles.Machine;
+import com.triz.trizservice.service.TransactionService;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PingService {
+
+    private volatile boolean actif;
+    private volatile boolean started = false;
+
+    @Autowired
+    private TransactionService service;
+
+    public boolean isActif() {
+        return actif;
+    }
+
+    public synchronized void startPingThread() {
+
+        if (started) {
+            System.out.println("Thread déjà démarré");
+            return;
+        }
+
+        started = true;
+
+        Thread pingThread = new Thread(() -> {
+
+            while (true) {
+
+                try {
+                    ping();
+                    Thread.sleep(10000); // 30 secondes
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+
+        });
+
+        pingThread.setDaemon(true);
+        pingThread.start();
+
+        System.out.println("Thread Ping démarré");
+    }
+
+    private void ping() {
+
+        try {
+
+            List<Machine> machines = service.getMachineMotOrtahnc();
+
+            actif = false;
+
+            for (Machine machine : machines) {
+                System.out.println("machine "+machine.getNom());
+                Process process = Runtime.getRuntime()
+                        .exec("ping -n 1 " + machine.getIp());
+
+                int result = process.waitFor();
+
+                if (result == 0) {
+                    actif = true;
+                    break;
+                }
+            }
+
+        } catch (Exception e) {
+            actif = false;
+        }
+    }
+}
diff --git a/src/main/java/com/triz/trizservice/service/DaoService.java b/src/main/java/com/triz/trizservice/service/DaoService.java
index 4f8c8ee..b73e6ec 100644
--- a/src/main/java/com/triz/trizservice/service/DaoService.java
+++ b/src/main/java/com/triz/trizservice/service/DaoService.java
@@ -5,11 +5,15 @@
  */
 package com.triz.trizservice.service;
 
+import com.triz.trizservice.modeles.AlertesMedicales;
 import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.Examen;
 import com.triz.trizservice.modeles.Machine;
 import com.triz.trizservice.modeles.Medecin;
 import com.triz.trizservice.modeles.MedecinSpecialiste;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.Queue;
 import com.triz.trizservice.modeles.SalleDeSoin;
 import com.triz.trizservice.modeles.ServiceFonctiongroupe;
 import com.triz.trizservice.modeles.ServiceFonctionnaliter;
@@ -27,6 +31,7 @@ import com.triz.trizservice.modeles.TypeExamen;
 import com.triz.trizservice.modeles.TypealerteTypeexamen;
 import com.triz.trizservice.modeles.Wilaya;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -145,17 +150,31 @@ public interface DaoService {
     public MedecinSpecialiste getMedecinSpecialisteByMedcinBySpecialiste(Medecin medecin, SpecialiteMedicale spc);
 
     public List<ServiceUser> getAllUserByCentreNotInMedecin(Centre centre);
-    
-     public <T> List<T> getAllByCentre(Class<T> clazz,  Centre centre);
-     
-     public <T> T getByCentre(Class<T> clazz, Centre centre);
-     
-      public List<Machine> getMachineBySalle(SalleDeSoin salle);
-     
-     public List<TypeExamen> getTypeExamenByTypeAlerte(TypeAlerteMedical type);
-     
-      public List<MedecinSpecialiste> getMedecinSpecialisteBySpecialite(SpecialiteMedicale type);
-    
+
+    public <T> List<T> getAllByCentre(Class<T> clazz, Centre centre);
+
+    public <T> T getByCentre(Class<T> clazz, Centre centre);
+
+    public List<Machine> getMachineBySalle(SalleDeSoin salle);
+
+    public List<TypeExamen> getTypeExamenByTypeAlerte(TypeAlerteMedical type);
+
+    public List<MedecinSpecialiste> getMedecinSpecialisteBySpecialite(SpecialiteMedicale type);
+
     public List<TypealerteTypeexamen> getTypeAlerteExamenByTypeAlerte(TypeAlerteMedical type);
 
+    public List<Machine> getMachineMotOrtahnc();
+    
+    public List<Examen> getExamenByQueue(Queue queue);
+    
+    public List<TypeExamen> getTypeExamenByPatient(Patient patient);
+    
+    public List<Queue> getQueueByCentre(Centre centre,Date date);
+    
+    public Medecin getMedecinByUser(ServiceUser user);
+    
+    public Consultation getConsultationByExamen(Examen examen);
+    
+    public List<Queue> getQueueByCentreByRequete(Centre centre,String requete);
+
 }
diff --git a/src/main/java/com/triz/trizservice/service/TransactionService.java b/src/main/java/com/triz/trizservice/service/TransactionService.java
index 091749c..e47e0d3 100644
--- a/src/main/java/com/triz/trizservice/service/TransactionService.java
+++ b/src/main/java/com/triz/trizservice/service/TransactionService.java
@@ -6,11 +6,15 @@
  */
 package com.triz.trizservice.service;
 
+import com.triz.trizservice.modeles.AlertesMedicales;
 import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.Examen;
 import com.triz.trizservice.modeles.Machine;
 import com.triz.trizservice.modeles.Medecin;
 import com.triz.trizservice.modeles.MedecinSpecialiste;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.Queue;
 import com.triz.trizservice.modeles.SalleDeSoin;
 import com.triz.trizservice.modeles.ServiceFonctiongroupe;
 import com.triz.trizservice.modeles.ServiceFonctionnaliter;
@@ -28,6 +32,7 @@ import com.triz.trizservice.modeles.TypeExamen;
 import com.triz.trizservice.modeles.TypealerteTypeexamen;
 import com.triz.trizservice.modeles.Wilaya;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -158,4 +163,18 @@ public interface TransactionService {
     public List<MedecinSpecialiste> getMedecinSpecialisteBySpecialite(SpecialiteMedicale type);
     
     public List<TypealerteTypeexamen> getTypeAlerteExamenByTypeAlerte(TypeAlerteMedical type);
+    
+    public List<Machine> getMachineMotOrtahnc();
+    
+    public List<Examen> getExamenByQueue(Queue queue);
+    
+    public List<TypeExamen> getTypeExamenByPatient(Patient patient);
+    
+    public List<Queue> getQueueByCentre(Centre centre,Date date);
+    
+     public Medecin getMedecinByUser(ServiceUser user);
+    
+    public Consultation getConsultationByExamen(Examen examen);
+    
+    public List<Queue> getQueueByCentreByRequete(Centre centre,String requete);
 }
diff --git a/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java b/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java
index 594e149..463c166 100644
--- a/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java
+++ b/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java
@@ -5,11 +5,15 @@
  */
 package com.triz.trizservice.service.impl;
 
+import com.triz.trizservice.modeles.AlertesMedicales;
 import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.Examen;
 import com.triz.trizservice.modeles.Machine;
 import com.triz.trizservice.modeles.Medecin;
 import com.triz.trizservice.modeles.MedecinSpecialiste;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.Queue;
 import com.triz.trizservice.modeles.SalleDeSoin;
 import com.triz.trizservice.service.DaoService;
 import com.triz.trizservice.modeles.ServiceFonctiongroupe;
@@ -407,8 +411,8 @@ public class DaoServiceImpl implements DaoService {
 
     @Override
     public List<Machine> getMachineBySalle(SalleDeSoin salle) {
-       return getCurrentSession().createQuery("select s from Machine s where  s.fkSalle =:salle  ").setParameter("salle", salle).list();
-   }
+        return getCurrentSession().createQuery("select s from Machine s where  s.fkSalle =:salle  ").setParameter("salle", salle).list();
+    }
 
     @Override
     public List<TypeExamen> getTypeExamenByTypeAlerte(TypeAlerteMedical type) {
@@ -417,11 +421,66 @@ public class DaoServiceImpl implements DaoService {
 
     @Override
     public List<MedecinSpecialiste> getMedecinSpecialisteBySpecialite(SpecialiteMedicale type) {
-         return getCurrentSession().createQuery("select s from MedecinSpecialiste s where s.fkSpecialite=:type  ").setParameter("type", type).list();
+        return getCurrentSession().createQuery("select s from MedecinSpecialiste s where s.fkSpecialite=:type  ").setParameter("type", type).list();
     }
 
     @Override
     public List<TypealerteTypeexamen> getTypeAlerteExamenByTypeAlerte(TypeAlerteMedical type) {
         return getCurrentSession().createQuery("select s from TypealerteTypeexamen s where s.fkAlerte=:type  ").setParameter("type", type).list();
     }
+
+    @Override
+    public List<Machine> getMachineMotOrtahnc() {
+        String hql = "SELECT m "
+                + "FROM Machine m "
+                + "LEFT JOIN m.fkTypeMachine tm "
+                + "WHERE m.actif = true "
+                + "AND (tm IS NULL OR LOWER(tm.type) NOT LIKE :type)";
+
+        List<Machine> machines = getCurrentSession().createQuery(hql, Machine.class)
+                .setParameter("type", "%orthanc%")
+                .getResultList();
+
+        return machines;
+    }
+
+    @Override
+    public List<Examen> getExamenByQueue(Queue queue) {
+        return  getCurrentSession().createQuery("select s from Examen s where s.fkQueue=:type  ").setParameter("type", queue).list();
+    }
+
+    @Override
+    public List<TypeExamen> getTypeExamenByPatient(Patient patient) {
+        return getCurrentSession().createQuery(
+                "select distinct tte.fkExamen "
+                + "from AlertesMedicales am "
+                + "join am.fkTypeAlerteMedical tam, "
+                + "TypealerteTypeexamen tte "
+                + "where am.fkPatient = :patient "
+                + "and tte.fkAlerte = tam",
+                TypeExamen.class
+        )
+                .setParameter("patient", patient)
+                .getResultList();
+    }
+
+    @Override
+    public List<Queue> getQueueByCentre(Centre centre,Date date) {
+        return getCurrentSession().createQuery("select s from Queue s where s.fkPatient.fkCentre=:centre and s.date=:date  ").setParameter("centre", centre).setParameter("date", date).list();
+    }
+
+    @Override
+    public Medecin getMedecinByUser(ServiceUser user) {
+       return (Medecin) getCurrentSession().createQuery("select s from Medecin s where s.fkUser=:user ").setParameter("user", user).setMaxResults(1).uniqueResult();
+    }
+
+    @Override
+    public Consultation getConsultationByExamen(Examen examen) {
+       return (Consultation) getCurrentSession().createQuery("select s from Consultation s where s.fkExamen=:examen and s.sessionAnnule=false").setParameter("examen", examen).setMaxResults(1).uniqueResult();
+    }
+
+    @Override
+    public List<Queue> getQueueByCentreByRequete(Centre centre, String requete) {
+         return getCurrentSession().createQuery("select s from Queue s where s.fkPatient.fkCentre=:centre"+requete).setParameter("centre", centre).list();
+    }
 }
diff --git a/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java b/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java
index 2fc445e..f836000 100644
--- a/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java
+++ b/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java
@@ -5,11 +5,15 @@
  */
 package com.triz.trizservice.service.impl;
 
+import com.triz.trizservice.modeles.AlertesMedicales;
 import com.triz.trizservice.modeles.Centre;
 import com.triz.trizservice.modeles.Consultation;
+import com.triz.trizservice.modeles.Examen;
 import com.triz.trizservice.modeles.Machine;
 import com.triz.trizservice.modeles.Medecin;
 import com.triz.trizservice.modeles.MedecinSpecialiste;
+import com.triz.trizservice.modeles.Patient;
+import com.triz.trizservice.modeles.Queue;
 import com.triz.trizservice.modeles.SalleDeSoin;
 import com.triz.trizservice.modeles.ServiceFonctiongroupe;
 import com.triz.trizservice.modeles.ServiceFonctionnaliter;
@@ -29,6 +33,7 @@ import com.triz.trizservice.modeles.Wilaya;
 import com.triz.trizservice.service.DaoService;
 import com.triz.trizservice.service.TransactionService;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -406,6 +411,48 @@ public class TransactionServiceImpl implements TransactionService {
     @Transactional("transactionManager")
     @Override
     public List<TypealerteTypeexamen> getTypeAlerteExamenByTypeAlerte(TypeAlerteMedical type) {
-       return daoService.getTypeAlerteExamenByTypeAlerte(type);
+        return daoService.getTypeAlerteExamenByTypeAlerte(type);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public List<Machine> getMachineMotOrtahnc() {
+        return daoService.getMachineMotOrtahnc();
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public List<Examen> getExamenByQueue(Queue queue) {
+        return daoService.getExamenByQueue(queue);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public List<TypeExamen> getTypeExamenByPatient(Patient patient) {
+        return daoService.getTypeExamenByPatient(patient);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public List<Queue> getQueueByCentre(Centre centre,Date date) {
+       return daoService.getQueueByCentre(centre,date);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public Medecin getMedecinByUser(ServiceUser user) {
+       return daoService.getMedecinByUser(user);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public Consultation getConsultationByExamen(Examen examen) {
+       return daoService.getConsultationByExamen(examen);
+    }
+
+    @Transactional("transactionManager")
+    @Override
+    public List<Queue> getQueueByCentreByRequete(Centre centre, String requete) {
+        return daoService.getQueueByCentreByRequete(centre, requete);
     }
 }
diff --git a/src/main/java/com/triz/trizservice/servlet/ImageServlet.java b/src/main/java/com/triz/trizservice/servlet/ImageServlet.java
new file mode 100644
index 0000000..cb1a283
--- /dev/null
+++ b/src/main/java/com/triz/trizservice/servlet/ImageServlet.java
@@ -0,0 +1,92 @@
+package com.triz.trizservice.servlet;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+@WebServlet("/image")
+public class ImageServlet extends HttpServlet {
+
+    // Racine commune à tous les dossiers virtuels servis par ce servlet.
+    private static final String RACINE = "C:\\.trizRis";
+
+    // Whitelist des sous-dossiers autorisés : le client envoie une clé
+    // ("images", "Examen", ...) et non un chemin — ça évite qu'un uid/dossier
+    // arbitraire permette de lire n'importe quel fichier du disque (path traversal).
+    // TODO : ajouter ici toute nouvelle destination de fichiers à l'avenir.
+    private static final Map<String, String> DOSSIERS_AUTORISES = new HashMap<>();
+
+    static {
+        DOSSIERS_AUTORISES.put("images", RACINE + File.separator + "images");
+        DOSSIERS_AUTORISES.put("Examen", RACINE + File.separator + "Examen");
+    }
+    private static final String DOSSIER_PAR_DEFAUT = "images";
+
+    @Override
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response)
+            throws IOException {
+
+        String uid = request.getParameter("uid");
+        String dossierParam = request.getParameter("dossier");
+        String dossierCle = (dossierParam == null || dossierParam.trim().isEmpty())
+                ? DOSSIER_PAR_DEFAUT
+                : dossierParam;
+
+        System.out.println("====================================");
+        System.out.println(">>> ImageServlet APPELE");
+        System.out.println("URI : " + request.getRequestURI());
+        System.out.println("UID : " + uid);
+        System.out.println("DOSSIER : " + dossierCle);
+        System.out.println("====================================");
+
+        if (uid == null || uid.trim().isEmpty()) {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Paramètre uid manquant");
+            return;
+        }
+
+        String dossierPhysique = DOSSIERS_AUTORISES.get(dossierCle);
+        if (dossierPhysique == null) {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Dossier non autorisé");
+            return;
+        }
+
+        // uid doit être un simple nom de fichier (celui renvoyé par getName()) ;
+        // on rejette toute tentative de traversal par précaution.
+        if (uid.contains("..") || uid.contains("/") || uid.contains("\\")) {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "uid invalide");
+            return;
+        }
+
+        File fichier = new File(dossierPhysique, uid);
+        System.out.println("Image demandée : " + fichier.getAbsolutePath());
+
+        if (!fichier.exists() || !fichier.isFile()) {
+            System.out.println("Image introuvable : " + fichier.getAbsolutePath());
+            response.sendError(HttpServletResponse.SC_NOT_FOUND, "Image introuvable");
+            return;
+        }
+
+        String contentType = getServletContext().getMimeType(fichier.getName());
+        if (contentType == null) {
+            contentType = "application/octet-stream";
+        }
+        response.setContentType(contentType);
+        response.setContentLengthLong(fichier.length());
+
+        try (FileInputStream input = new FileInputStream(fichier); OutputStream output = response.getOutputStream()) {
+            byte[] buffer = new byte[8192];
+            int longueur;
+            while ((longueur = input.read(buffer)) != -1) {
+                output.write(buffer, 0, longueur);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/triz/util/UtilFile.java b/src/main/java/com/triz/util/UtilFile.java
index c23eff0..7c2fa72 100644
--- a/src/main/java/com/triz/util/UtilFile.java
+++ b/src/main/java/com/triz/util/UtilFile.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
 public class UtilFile {
 
     public String getVirtualFileUrl(String dossier, String id) {
-        System.out.println(" TestOf Access : "+id);
+        System.out.println(" TestOf Access : " + id);
         if (id != null) {
             if (!(id.endsWith(".png") | id.endsWith(".PNG") | id.endsWith(".jpg") | id.endsWith(".JPG") | id.endsWith(".jpeg") | id.endsWith(".JPEG") | id.endsWith(".jfif") | id.endsWith(".JFIF"))) {
                 id = id + ".png";
@@ -36,11 +36,11 @@ public class UtilFile {
         }
         String imageBaseUrl = getImageApplicationUri();
         String url = imageBaseUrl + "/." + dossier + "/" + id;
-        System.out.println(" TestOf Access2 : "+url);
+        System.out.println(" TestOf Access2 : " + url);
         return url;
 
     }
-    
+
     public String getVirtualFileUrlDoc(String dossier, String id) {
         String racine = new UtilGetParametre().getPropertyByKey(UtilGetParametre.TRIZDISTRIBUTION_DOSSIER_CHEMAIN);
         String imageBaseUrl = getImageApplicationUri();
@@ -48,12 +48,11 @@ public class UtilFile {
         //System.out.println("getVirtualFileUrl :"+imageBaseUrl+"/.trizDistribution" + "/." + dossier + "/" + id);
 //        String url = imageBaseUrl + "/.trizDistribution" + "/." + dossier + "/" + id;
         String url = imageBaseUrl + "/." + dossier + "/" + id;
-        System.out.println("TestOfLink : "+ url);
+        System.out.println("TestOfLink : " + url);
         return url;
 
     }
 
-    
     public String getVirtualFileUrl(String dossier, String repertoire, String id) {
         String imageBaseUrl = getImageApplicationUri();
         //String homeBaseDirectory = getDirectoryName();
@@ -63,17 +62,31 @@ public class UtilFile {
         return url;
     }
 
+    public String getVirtualImageUrl(String dossier, String repertoire, String id) {
+        if (id == null || id.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            String url = "/image?uid=" + java.net.URLEncoder.encode(id, "UTF-8")
+                    + "&dossier=" + java.net.URLEncoder.encode(repertoire, "UTF-8");
+            System.out.println("URL IMAGE = " + url);
+            return url;
+        } catch (java.io.UnsupportedEncodingException e) {
+            return null;
+        }
+    }
+
     public static String getDirectoryHome() {
         String racine = new UtilGetParametre().getPropertyByKey(UtilGetParametre.TRIZDISTRIBUTION_DOSSIER_CHEMAIN);
         if (racine == null) {
             racine = System.getProperty("user.home");
         }
-        File file = new File(racine + File.separator + ".trizDistribution" );
+        File file = new File(racine + File.separator + ".trizRis");
 
         //System.err.println("file :" + file.getPath());
         file.mkdirs();
 
-        return racine + File.separator + ".trizDistribution";
+        return racine + File.separator + ".trizRis";
 
     }
 
@@ -82,26 +95,26 @@ public class UtilFile {
         if (racine == null) {
             racine = System.getProperty("user.home");
         }
-        File file = new File(racine + File.separator + ".trizDistribution" + File.separator + "." + dossier);
+        File file = new File(racine + File.separator + ".trizRis " + File.separator + dossier);
 
         //System.err.println("file :" + file.getPath());
         file.mkdirs();
 
-        return racine + File.separator + ".trizDistribution" + File.separator + "." + dossier;
+        return racine + File.separator + ".trizRis" + File.separator + dossier;
 
     }
 
     public static String getDirectoryMobileName(String dossier, String racine) {
         //String racine = new UtilGetParametre().getPropertyByKey(UtilGetParametre.TRIZDISTRIBUTION_DOSSIER_MOBILE_CHEMAIN);
-        
-        return racine + "/" + ".trizDistribution" + "/" + "." + dossier /*+ "/"*/; 
+
+        return racine + "/" + ".trizRis" + "/" + "." + dossier /*+ "/"*/;
 
     }
 
     public static String getDirectoryMobileNameWithPath(String dossier) {
         String racine = new UtilGetParametre().getPropertyByKey(UtilGetParametre.TRIZDISTRIBUTION_DOSSIER_MOBILE_CHEMAIN);
-        
-        return /*racine + "/" +*/ ".trizDistribution" + "/" + "." + dossier /*+ "/"*/; 
+
+        return /*racine + "/" +*/ ".trizRis" + "/" + "." + dossier /*+ "/"*/;
 
     }
 
@@ -116,7 +129,7 @@ public class UtilFile {
         }
         if (chemain.endsWith(".png") | chemain.endsWith(".PNG")) {
             BufferedImage bufferedImage;
-            newChemain = chemain.substring(0, chemain.length()-4) + "_conv.jpg";
+            newChemain = chemain.substring(0, chemain.length() - 4) + "_conv.jpg";
             try {
 
                 //read image file
@@ -140,7 +153,7 @@ public class UtilFile {
             }
         }
         File imageFile = new File(chemain);
-        newChemain = chemain.substring(0, chemain.length()-(imageFile.getName().length()))+ "red_" + imageFile.getName();
+        newChemain = chemain.substring(0, chemain.length() - (imageFile.getName().length())) + "red_" + imageFile.getName();
         File compressedImageFile = new File(newChemain);
         String file_reselt = imageFile.getName();
         int max = 0;
@@ -244,29 +257,27 @@ public class UtilFile {
             throw new FacesException(e);
         }
     }
-    
+
     public static String getDirectory() {
         String racine = new UtilGetParametre().getPropertyByKey(UtilGetParametre.TRIZDISTRIBUTION_DOSSIER_CHEMAIN);
         if (racine == null) {
             racine = System.getProperty("user.home");
         }
-        File file = new File(racine + File.separator + ".trizDistribution" );
+        File file = new File(racine + File.separator + ".trizRis");
 
         //System.err.println("file :" + file.getPath());
         file.mkdirs();
 
-        return racine + File.separator + ".trizDistribution" ;
+        return racine + File.separator + ".trizRis";
 
     }
-    
-    public static String getURLPath(String ip){
+
+    public static String getURLPath(String ip) {
         FacesContext facesContext = FacesContext.getCurrentInstance();
         HttpServletRequest request = (HttpServletRequest) facesContext.getExternalContext().getRequest();
-        ip = ip+ ":"+request.getLocalPort()+request.getContextPath();
-        System.out.println("getURLPath:"+ip);
+        ip = ip + ":" + request.getLocalPort() + request.getContextPath();
+        System.out.println("getURLPath:" + ip);
         return ip;
     }
-    
-    
 
 }
diff --git a/src/main/resources/db/migration/V000__main_schema.sql b/src/main/resources/db/migration/V000__main_schema.sql
index ce9e958..940e56a 100644
--- a/src/main/resources/db/migration/V000__main_schema.sql
+++ b/src/main/resources/db/migration/V000__main_schema.sql
@@ -885,4 +885,53 @@ SET fk_centre = (SELECT id FROM centre LIMIT 1)
 WHERE nom = 'Orthanc Principal';
 
 ALTER TABLE machine
-ALTER COLUMN last_update TYPE TIMESTAMP USING last_update::timestamp;
\ No newline at end of file
+ALTER COLUMN last_update TYPE TIMESTAMP USING last_update::timestamp;
+
+ALTER TABLE examen ADD COLUMN fk_interpreteur_assi uuid;
+
+ALTER TABLE centre
+ADD COLUMN telephone VARCHAR(50),
+ADD COLUMN email VARCHAR(255);
+
+ALTER TABLE parametre
+ADD COLUMN addresse_ip VARCHAR(50);
+
+ALTER TABLE examen
+ADD COLUMN observation text;
+
+--- Fonctionnalite "consulter examen" ---
+INSERT INTO service_fonctionnaliter (id,nom)
+VALUES ('consult_examen','Consulter examen');
+
+--- Fonctionnalite "consulter examen" ---
+INSERT INTO service_fonctionnaliter (id,nom)
+VALUES ('visu_examen','Visualiser examen');
+
+ALTER TABLE consultation
+ADD COLUMN brouillon boolean;
+
+ALTER TABLE consultation
+ADD COLUMN definitive boolean;
+
+ALTER TABLE image_cles
+ADD COLUMN file_path VARCHAR(500);
+
+ALTER TABLE type_examen
+ADD COLUMN fk_specialite_medicale UUID;
+ALTER TABLE type_examen
+ADD CONSTRAINT fk_type_examen_specialite
+FOREIGN KEY (fk_specialite_medicale)
+REFERENCES specialite_medicale(id);
+
+ALTER TABLE examen
+ADD COLUMN fk_manipulateur UUID;
+ALTER TABLE examen
+ADD CONSTRAINT examen_fk_manipulateur_fkey
+FOREIGN KEY (fk_manipulateur)
+REFERENCES medecin(id);
+
+ALTER TABLE patient
+ADD COLUMN code_patient VARCHAR(10);
+
+ALTER TABLE patient
+ADD CONSTRAINT uk_patient_code UNIQUE (code_patient);
\ No newline at end of file
diff --git a/src/main/resources/langue/message_fr.properties b/src/main/resources/langue/message_fr.properties
index 6932798..51c3d5b 100644
--- a/src/main/resources/langue/message_fr.properties
+++ b/src/main/resources/langue/message_fr.properties
@@ -4318,4 +4318,105 @@ distribution.page.activer=Activer
 distribution.page.medecins.confirmerSuppression=\u00cates-vous s\u00fbr de vouloir supprimer ce m\u00e9decin ?
 distribution.page.medecins.confirmerActivation=\u00cates-vous s\u00fbr de vouloir activer ce m\u00e9decin ?
 distribution.page.oui=Oui
-distribution.page.non=Non
\ No newline at end of file
+distribution.page.non=Non
+
+distribution.page.examen=Examens
+distribution.page.examens.liste=Liste des Examens
+distribution.page.patient.code=Code Patient
+distribution.page.patient.nom=Patient
+distribution.page.patient.sexe=Sexe
+distribution.page.status=Status
+distribution.page.typeExamen=Type d'examen
+distribution.page.machine=Machine
+distribution.page.consulter=Consulter
+distribution.page.examen.liste.message.non=Aucun examen trouv\u00e9
+distribution.page.priorite=Priorit\u00e9
+distribution.page.creeLe=Cr\u00e9\u00e9 le
+
+distribution.page.examen=Examens
+distribution.page.examens.liste=Liste des Examens
+distribution.page.examen.liste.message.non=Aucun examen trouv\u00e9
+distribution.page.patient.code=Code Patient
+distribution.page.patient.nom=Patient
+distribution.page.patient.sexe=Sexe
+distribution.page.priorite=Priorit\u00e9
+distribution.page.status=Status
+distribution.page.typeExamen=Type d'examen
+distribution.page.machine=Machine
+distribution.page.creeLe=Cr\u00e9\u00e9 le
+distribution.page.consulter=Consulter
+
+distribution.page.examen.detail=D\u00e9tail Examen
+distribution.page.retour=Retour
+distribution.page.examen.ajouterSignature=Ajouter Signature
+distribution.page.examen.visualiser=Visualizer
+distribution.page.examen.consultation=Consultation
+distribution.page.modifier=Modifier
+distribution.page.observation=Observation
+distribution.page.interpreteurAssigne=Interpr\u00e9teur Assign\u00e9
+distribution.page.completeLe=Compl\u00e9t\u00e9 le
+distribution.page.consulteLe=Consult\u00e9 le
+distribution.page.rapportCreeLe=Rapport cr\u00e9\u00e9 le
+distribution.page.etudeInstanceId=Etude Instance Id
+distribution.page.lateralite=Lat\u00e9ralit\u00e9
+distribution.page.consultation=Consultation
+distribution.page.fichiers=Fichiers attach\u00e9s
+distribution.page.imagesCles=Images Cl\u00e9s
+distribution.page.historiqueConsultation=Historique Consultation
+distribution.page.typeConsultation=Type Consultation
+distribution.page.preliminaire=Pr\u00e9liminaire
+distribution.page.medecinConsultant=M\u00e9decin Consultant
+distribution.page.rapportEcritPar=Rapport \u00c9crit par
+distribution.page.rapportEcrit=Rapport \u00c9crit
+distribution.page.rapportsDictes=Rapports Dict\u00e9s
+distribution.page.ajouterEnregistrement=Ajouter un enregistrement
+distribution.page.aucuneConsultation=Aucune consultation associ\u00e9e
+distribution.page.enregistrer=Enregistrer
+distribution.page.voirPlus=Voir plus
+distribution.page.voirMoins=Voir Moins
+
+distribution.page.rapport=Rapport
+
+distribution.page.fichiers.ajouter=Ajouter un fichier
+distribution.page.fichiers.aucun= il n'existe aucun fichier 
+distribution.page.fichiers.confirmerSuppression=Voulez-vous vraiment supprimer ce fichier ?
+# Onglet Historique Consultation
+distribution.page.historiqueConsultation=Historique Consultation
+distribution.label.dateHeure=Date et heure
+distribution.label.etat=\u00c9tat
+distribution.label.medecin=M\u00e9decin
+distribution.message.aucuneConsultation=Aucune consultation pour cet examen
+
+# \u00c9tats de consultation (via getTypeConsultation)
+distribution.statut.annule=Annul\u00e9
+distribution.statut.normal=Normal
+distribution.statut.definitve=D\u00e9finitive
+distribution.statut.brouillon=Brouillon
+
+distribution.label.actions=Actions
+distribution.label.rapportConsultation=Rapport de consultation
+distribution.label.fermer=Fermer
+distribution.message.aucuneImageCle=Aucune image cl\u00e9 pour cet examen
+
+distribution.filtre.periode=P\u00e9riode
+distribution.filtre.dateDebut=Date de d\u00e9but
+distribution.filtre.dateFin=Date de fin
+distribution.filtre.rapide=Filtres rapides
+distribution.filtre.mesExamens=Examens qui me sont assign\u00e9s
+distribution.filtre.mesBrouillons=Mes brouillons en cours
+distribution.filtre.criteres=Crit\u00e8res
+distribution.filtre.medecinAssigne=M\u00e9decin assign\u00e9
+distribution.filtre.specialite=Sp\u00e9cialit\u00e9 m\u00e9dicale
+distribution.filtre.typeMachine=Type machine
+distribution.filtre.manipulateur=Manipulateur
+distribution.filtre.medecinInterprete=M\u00e9decin interpr\u00e8te
+distribution.filtre.medecinManipulateur=M\u00e9decin Manipulateur
+distribution.filtre.reinitialiser=R\u00e9initialiser
+distribution.filtre.appliquer=Appliquer
+distribution.page.valider=Valider
+distribution.page.annuler=Annuler
+distribution.message.consultationValidee=Examen valid\u00e9e avec succ\u00e8s
+distribution.message.consultationAnnulee=Examen annul\u00e9e
+distribution.page.selectionner=S\u00e9lectionner
+distribution.page.confirmerValidation=Confirmez-vous la validation de cet examen ?
+distribution.page.confirmerAnnulation=Confirmez-vous l'annulation de cet examen ?
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/layout/sections/menu.xhtml b/src/main/webapp/WEB-INF/layout/sections/menu.xhtml
index 588f2cf..5750e14 100644
--- a/src/main/webapp/WEB-INF/layout/sections/menu.xhtml
+++ b/src/main/webapp/WEB-INF/layout/sections/menu.xhtml
@@ -119,7 +119,7 @@
                         <p:menuitem id="m_examen"
                                     value="Examens"
                                     icon="pi pi-heart"
-                                    url="#{request.contextPath}/views/secteur/list.xhtml?idpage=Suivis_flotte"
+                                    url="#{request.contextPath}/views/Examen/list.xhtml?idpage=Suivis_flotte"
                                     rendered="#{utilControleAccess.isshowPrivilegeAdd('exam')}" />
 
                         <p:menuitem id="m_dossier_patients"
diff --git a/src/main/webapp/resources/images/Vector.png b/src/main/webapp/resources/images/Vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..45b0acf9034da0a153c91850bd1177795c6f5633
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000B9Nkl<ZcmeI3Pg2`36vp3^Bd0TMXVM#_+YY742^yA#DML;G
zJpph6$O$MXXgEO_I)Uy;Pmm0My2ZUgmPr&_ea|64Y&qc6FgW<P3bHKxS=O`k^ci6q
zjdnri<pu(NroT!6x@fM54uanAFE4zD1d+e~Y=Y<QB0vEm{;vk@fQAD#P%WsIov60Z
zSbEYfN{~CKVFO|yv?%sgKKz9wplh(Tyoz&*MyRWvs+k0fV1a#nwkEY~#}&yagfb+A
zrK}Rfgs<7o+o$%?*;??}gi!nBa)*i<(T_?r8lWrt{SG9A>$)v&6JkTdD<>KwEw|h}
zy4;g2a(W}^7@PLTiP}~x<-~+Cve_;H$~}q^MRSd)m~qX}s}5Ed5BcXvs6QU;Q`3ob
zS6kZEwKv0Ir&}%0aEBik*}T|51n#|};c$1*S7jcvzEF8`@xwSKwXO|TKJG#au$$+*
zfVdMZ_XE_Ig>M)c-BKiSOq5va)ptUAvSK*LNt;N9ubGEhuslz50YRg5J$OKCs6k5M
zcoHf@s0dR;Q!5K~NGU@KnxR6CpF}v)nqMKQ!GALZHRz&%7eXd<-pGW`8zQ(u@F(ag
z$DqLx)TOoC3M86VA&_=R!`%*~3H`o5seeWDT}2Dsx3mU)jw_T|7;BQQ+v!b7v1DXq
zWMn)B{_7?8^Spuri!g_1Pdme}A6w|>KegV4Ifi<38|~xEt9$dK>8DF`T^&0spF+A5
zbKSW`>w^~)j36T;BO~Jp8KqJh?V@K{r2(ZKU|!M=jdsDdtjbsuvc&~GZ)}_C(oWhE
zZ89agMgQb9+a-zebnM08xvoG@Z{4X<pwc}^Inwt%+!{_OBe)aVO^Y^0qz8kBLbfF_
zZ)8H}jh7@eyx-3+TSzrwUj_;FLX(4BE*INb`CMSjT(FF{5h-Vczk>(R3cIh;0veoS
zY+M$quj--70F|H(G!2ZdIh@h72C5}Sz8vo$bQa}$(<C-BKaEiDjoqERY3j1;+Gt2d
zM{8YsmToc%njBAfsPR*1sNsmdTDlR+SVw1TR_=d{$*`UHs%NwcncbKSUUjg1*O+`w
zlnwNOunG7*BxMcY4;Uh!vIh{b;Z95#_<%d~s`S%=_!O*sz5)rs9}mpx?e}{!V8ac~
zjNH}5LxF0^7@+PU$&Ux5bmO;0fye5r^7wI`JTwJANU?DlVSO}C%wvM@B5!RZ{ee&Z
v_+pFN-UPE>9!4?4>+oFQHN7UMIcoj^2V$SePR7#c00000NkvXXu0mjf@;l{6

literal 0
HcmV?d00001

diff --git a/src/main/webapp/views/Dicom/form.xhtml b/src/main/webapp/views/Dicom/form.xhtml
index 4760a0a..3fbb647 100644
--- a/src/main/webapp/views/Dicom/form.xhtml
+++ b/src/main/webapp/views/Dicom/form.xhtml
@@ -19,6 +19,7 @@
             .dicom-cards {
                 display: flex;
                 gap: 16px;
+                margin-top: 20px;
                 margin-bottom: 24px;
             }
 
@@ -220,7 +221,19 @@
                 border: 0.5px solid #B4B2A9;
                 border-radius: 6px;
             }
+            .dicom-card-value-actif {
+                color: #0D9488;
+            }
+            .dicom-card-value-actif .pi {
+                color: #0D9488;
+            }
 
+            .dicom-card-value-inactif {
+                color: #EF4444;
+            }
+            .dicom-card-value-inactif .pi {
+                color: #EF4444;
+            }
         </style>
 
         <h:form id="dicomPacsForm">
@@ -240,17 +253,22 @@
                         </h:outputText>
                     </div>
                 </div>
-
-                <div class="dicom-card">
-                    <div class="dicom-card-title">
-                        <span class="pi pi-sync" /> Etat MWL SCP
+                <h:panelGroup id="statusPanel" layout="block" style="flex:1;">
+                    <div class="dicom-card">
+                        <div class="dicom-card-title">
+                            <span class="pi pi-sync" /> Etat MWL SCP
+                        </div>
+                        <div class="dicom-card-value #{dicomPacsBean.actif ? 'dicom-card-value-actif' : 'dicom-card-value-inactif'}">
+                            <span class="#{dicomPacsBean.actif ? 'pi pi-check-circle' : 'pi pi-times-circle'}" />
+                            <h:outputText value="#{dicomPacsBean.actif ? 'Actif' : 'Inactif'}" />
+                        </div>
                     </div>
-                    <div class="dicom-card-value dicom-card-value-actif">
-                        <span class="pi pi-check-circle" />
-                        <h:outputText value="#{dicomPacsBean.etatMwlScp}" />
-                    </div>
-                </div>
-
+                </h:panelGroup>
+                <p:poll widgetVar="pollStatusCentre"
+                        interval="10"
+                        update="statusPanel"
+                         onerror="if (args &amp;&amp; args.status === 'server') { window.location.reload(); }" />
+                        
                 <div class="dicom-card">
                     <div class="dicom-card-title">
                         <span class="pi pi-database" /> Dernier étude Reçu
@@ -282,7 +300,9 @@
                                          rendered="#{utilControleAccess.isshowPrivilegeAdd('pacs')}"
                                          actionListener="#{dicomPacsBean.prepareNew}"
                                          update=":dicomPacsForm:dlgMachine"
-                                         oncomplete="PF('wDlgMachine').show()" />
+                                         onclick="if (PF('pollStatusCentre')) {
+                                             PF('pollStatusCentre').stop();"
+                                         oncomplete ="PF('wDlgMachine').show()" />
                     </div>
                 </div>
 
@@ -346,6 +366,8 @@
                                          rendered="#{utilControleAccess.isshowPrivilegeUpdate('pacs')}"
                                          actionListener="#{dicomPacsBean.prepareEdit(machine)}"
                                          oncomplete="PF('wDlgMachine').show()"
+                                         onclick="if (PF('pollStatusCentre')) {
+                                                     PF('pollStatusCentre').stop();"
                                          process="@this"/>
                     </p:column>
 
diff --git a/src/main/webapp/views/Examen/form.xhtml b/src/main/webapp/views/Examen/form.xhtml
new file mode 100644
index 0000000..d7d3479
--- /dev/null
+++ b/src/main/webapp/views/Examen/form.xhtml
@@ -0,0 +1,1505 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                template="/WEB-INF/layout/template.xhtml">
+    <ui:define name="title">
+        #{msg['distribution.page.examen.detail']}
+    </ui:define>
+
+    <ui:define name="breadcrumb">
+        <f:metadata>
+            <f:viewParam name="id" value="#{examenDetailBean.idExamen}" />
+            <f:viewParam name="modifier" value="#{examenDetailBean.modifie}" />
+        </f:metadata>
+    </ui:define>
+
+    <ui:define name="content">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/2.0.0-dev.3/quill.snow.min.css" />
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/quill/2.0.0-dev.3/quill.min.js"></script>
+        <link rel="stylesheet" href="https://unpkg.com/quill-better-table@1.2.10/dist/quill-better-table.css"/>
+        <script src="https://unpkg.com/quill-better-table@1.2.10/dist/quill-better-table.js"></script>
+        <style>
+            .detail-topbar {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 16px;
+                margin-top: 10px;
+            }
+            .btn-return,
+            .btn-return.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #dee2e6 !important;
+                color: #343a40 !important;
+            }
+            .btn-signature,
+            .btn-signature.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #A9744F !important;
+                color: #A9744F !important;
+            }
+            .btn-visualiser,
+            .btn-visualiser.ui-button {
+                background-color: #29ABE2 !important;
+                border-color: #29ABE2 !important;
+                color: #ffffff !important;
+            }
+            .btn-consultation,
+            .btn-consultation.ui-button {
+                background-color: #F5A623 !important;
+                border-color: #F5A623 !important;
+                color: #ffffff !important;
+            }
+            .btn-modifier,
+            .btn-modifier.ui-button {
+                background-color: #0D9488 !important;
+                border-color: #0D9488 !important;
+                color: #ffffff !important;
+            }
+            .btn-export {
+                background-color: #ffffff !important;
+                border: 1px solid #dee2e6 !important;
+                color: #0D9488 !important;
+            }
+
+            .detail-layout {
+                display: flex;
+                gap: 20px;
+                align-items: stretch;
+            }
+            .detail-card-left {
+                width: 400px;
+                flex-shrink: 0;
+                background: #ffffff;
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                padding: 28px;
+                height: 800px;
+                overflow-y: auto;
+                box-sizing: border-box;
+            }
+            .detail-card-right {
+                flex: 1;
+                background: #ffffff;
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                padding: 24px;
+                min-width: 0;
+                height: 800px;
+                overflow-y: auto;
+                box-sizing: border-box;
+            }
+
+            .patient-avatar {
+                width: 72px;
+                height: 72px;
+                border-radius: 50%;
+                background-color: rgba(13, 148, 136, 0.1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin: 0 auto 24px auto;
+            }
+            .patient-avatar .pi {
+                font-size: 1.8rem;
+                color: #0D9488;
+            }
+            .patient-avatar-icon {
+                width: 32px;
+                height: 32px;
+                object-fit: contain;
+            }
+
+            .info-row {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                padding: 12px 4px;
+                font-size: 0.9rem;
+                gap: 14px;
+            }
+            .info-row.separator {
+                border-bottom: 1px solid #eee;
+                margin-bottom: 6px;
+            }
+            .info-label {
+                display: flex;
+                align-items: center;
+                gap: 8px;
+                color: #0D9488;
+                font-weight: 600;
+                flex-shrink: 0;
+            }
+            .info-value {
+                color: #343a40;
+                text-align: right;
+                max-width: 220px;
+                word-break: break-word;
+            }
+            .info-value a {
+                color: #378ADD;
+                text-decoration: none;
+            }
+            .info-value a:hover {
+                text-decoration: underline;
+            }
+
+            /* Lignes de l'onglet Rapport : valeur rapprochée du libellé (au lieu d'être
+               plaquée à l'extrémité droite de la carte). */
+            .rapport-row-tight {
+                justify-content: flex-start !important;
+            }
+            .rapport-row-tight .info-value {
+                text-align: left;
+                max-width: none;
+            }
+
+            .field-edit-toggle {
+                color: #0D9488;
+                cursor: pointer;
+                font-size: 0.8rem;
+                flex-shrink: 0;
+                display: inline-flex;
+                align-items: center;
+                justify-content: center;
+                width: 26px;
+                height: 26px;
+                border-radius: 6px;
+                border: 1px solid #0D9488;
+                background-color: #ffffff;
+                transition: background-color 0.15s ease, color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;
+            }
+            .field-edit-toggle:hover {
+                background-color: #0D9488;
+                color: #ffffff !important;
+                box-shadow: 0 2px 6px rgba(13, 148, 136, 0.3);
+            }
+            /* État "confirmer" (icône check) : repris du bleu déjà utilisé pour les
+               actions de confirmation (ex. dialog-confirm-btn) afin de le distinguer
+               visuellement de l'action d'édition (teal). */
+            .field-edit-toggle.is-editing {
+                color: #378ADD;
+                border-color: #378ADD;
+                background-color: #ffffff;
+            }
+            .field-edit-toggle.is-editing:hover {
+                background-color: #378ADD;
+                color: #ffffff !important;
+                box-shadow: 0 2px 6px rgba(55, 138, 221, 0.3);
+            }
+
+            .observation-value {
+                color: #343a40;
+                text-align: right;
+                max-width: 220px;
+                word-break: break-word;
+            }
+            .observation-clamped {
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+            }
+            .observation-toggle {
+                display: block;
+                color: #378ADD;
+                font-size: 0.78rem;
+                font-weight: 600;
+                cursor: pointer;
+                margin-top: 2px;
+                text-decoration: none;
+            }
+            .observation-toggle:hover {
+                text-decoration: underline;
+            }
+
+            .status-badge {
+                display: inline-block;
+                padding: 3px 12px;
+                border-radius: 6px;
+                font-size: 11px;
+                font-weight: 600;
+                color: #FFFFFF;
+            }
+            .status-programme    {
+                background-color: #6c757d;
+            }
+            .status-enregistre   {
+                background-color: #F5A623;
+            }
+            .status-encours      {
+                background-color: #29ABE2;
+            }
+            .status-termine      {
+                background-color: #A9744F;
+            }
+            .status-preliminaire {
+                background-color: #0D9488;
+            }
+            .status-signe        {
+                background-color: #378ADD;
+            }
+            .status-addenda      {
+                background-color: #9B59B6;
+            }
+            .status-archive      {
+                background-color: #94A3AA;
+            }
+            .status-annule       {
+                background-color: #F16B77;
+            }
+
+            .consultation-badge {
+                display: inline-block;
+                padding: 4px 14px;
+                border-radius: 6px;
+                font-size: 12px;
+                font-weight: 600;
+                color: #FFFFFF;
+                background-color: #F5A623;
+            }
+
+            .rapport-ecrit-section {
+                margin-top: 16px;
+            }
+            .rapport-ecrit-box {
+                display: block;
+                border: 0.5px solid #B4B2A9;
+                border-radius: 8px;
+                padding: 14px;
+                min-height: 60px;
+                max-height: 300px;
+                overflow-y: auto;
+                overflow-x: auto;
+                margin-top: 8px;
+                margin-bottom: 20px;
+                font-size: 0.9rem;
+                color: #343a40;
+            }
+            .rapport-ecrit-box table {
+                max-width: none;
+            }
+
+            .dictee-item {
+                display: flex;
+                align-items: center;
+                gap: 10px;
+                border: 0.5px solid #B4B2A9;
+                border-radius: 8px;
+                padding: 10px 14px;
+                margin-bottom: 10px;
+            }
+            .dictee-play-btn,
+            .dictee-play-btn.ui-button {
+                background-color: #378ADD !important;
+                border-color: #378ADD !important;
+                border-radius: 50% !important;
+                width: 28px !important;
+                height: 28px !important;
+            }
+            .dictee-waveform {
+                flex: 1;
+                color: #B4B2A9;
+                letter-spacing: 2px;
+            }
+            .dictee-duree {
+                font-size: 0.8rem;
+                color: #666;
+                min-width: 40px;
+                text-align: right;
+            }
+
+            .btn-add-dictee,
+            .btn-add-dictee.ui-button {
+                background-color: #ffffff !important;
+                border: 1px dashed #0D9488 !important;
+                color: #0D9488 !important;
+            }
+
+            .empty-consultation-message {
+                text-align: center;
+                color: #6c757d;
+                padding: 48px 0;
+                font-size: 0.95rem;
+            }
+
+            .detail-tabs.ui-tabs .ui-tabs-nav {
+                display: flex !important;
+                border-bottom: 1px solid #E5E7EB !important;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li {
+                margin: 0 !important;
+                padding: 0 !important;
+                flex: 0 0 auto;
+                border: none !important;
+                background: transparent !important;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li a,
+            .detail-tabs.ui-tabs .ui-tabs-nav li a * {
+                background-color: transparent !important;
+                border: none !important;
+                box-shadow: none !important;
+                outline: none !important;
+                color: inherit;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li a {
+                display: flex !important;
+                align-items: center;
+                justify-content: center;
+                height: 100%;
+                box-sizing: border-box;
+                padding: 14px 24px !important;
+                margin: 0 !important;
+                border-radius: 6px 6px 0 0;
+                border-bottom: 2px solid transparent !important;
+                color: #64748B !important;
+                transition: background-color 0.2s ease, color 0.2s ease;
+                white-space: nowrap;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li:not(.ui-state-active):not(.ui-tabs-selected):hover a {
+                background-color: rgba(13, 148, 136, 0.15) !important;
+                color: #0D9488 !important;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li.ui-state-active,
+            .detail-tabs.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+                border: none !important;
+                background: transparent !important;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-nav li.ui-state-active a,
+            .detail-tabs.ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
+                background-color: rgba(13, 148, 136, 0.15) !important;
+                color: #0D9488 !important;
+                border-bottom: 2px solid #0D9488 !important;
+                font-weight: 600 !important;
+            }
+            .detail-tabs.ui-tabs .ui-tabs-panel {
+                border: none !important;
+                box-shadow: none !important;
+                background: transparent !important;
+                padding-top: 16px;
+            }
+
+            #quillRapportEcrit.ql-container {
+                height: 250px !important;
+                max-height: 250px !important;
+                overflow: hidden !important;
+            }
+            #quillRapportEcrit .ql-editor {
+                height: 100% !important;
+                max-height: 250px !important;
+                overflow-y: auto !important;
+            }
+
+            .table-subheader {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 14px;
+            }
+            .table-subheader-title {
+                font-size: 0.95rem;
+                font-weight: 600;
+                color: #343a40;
+            }
+
+            .fichier-card-table .ui-datatable-data > tr > td {
+                border: none !important;
+                background: transparent !important;
+                padding: 0 0 12px 0 !important;
+            }
+            .fichier-card {
+                display: flex;
+                align-items: center;
+                gap: 14px;
+                border: 0.5px solid #B4B2A9;
+                border-radius: 8px;
+                padding: 10px 15px;
+            }
+            .fichier-icon {
+                font-size: 1.3rem;
+                flex-shrink: 0;
+                width: 36px;
+                height: 36px;
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+            .fichier-icon-pdf {
+                background-color: rgba(241, 107, 119, 0.12);
+                color: #F16B77;
+            }
+            .fichier-icon-excel {
+                background-color: rgba(13, 148, 136, 0.12);
+                color: #0D9488;
+            }
+            .fichier-icon-doc {
+                background-color: rgba(55, 138, 221, 0.12);
+                color: #378ADD;
+            }
+            .fichier-icon-txt,
+            .fichier-icon-default {
+                background-color: rgba(180, 178, 169, 0.2);
+                color: #6c757d;
+            }
+            .fichier-nom {
+                flex: 1;
+                min-width: 0;
+                color: #343a40;
+                font-size: 0.9rem;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+            .btn-row-download,
+            .btn-row-download.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #378ADD !important;
+                color: #378ADD !important;
+                border-radius: 6px !important;
+                flex-shrink: 0;
+            }
+            .btn-row-download:hover,
+            .btn-row-download.ui-button:hover {
+                background-color: rgba(55, 138, 221, 0.1) !important;
+            }
+
+            .fichier-upload-btn {
+                display: inline-block !important;
+                width: auto !important;
+                flex: 0 0 auto !important;
+            }
+            .fichier-upload-btn.ui-fileupload-advanced .ui-fileupload-buttonbar {
+                display: inline-block !important;
+                width: auto !important;
+                background: transparent !important;
+                border: none !important;
+                padding: 0 !important;
+            }
+            .fichier-upload-btn .ui-fileupload-choose,
+            .fichier-upload-btn .ui-fileupload-choose.ui-button {
+                display: inline-flex !important;
+                align-items: center;
+                width: auto !important;
+                background-color: #0D9488 !important;
+                border-color: #0D9488 !important;
+                color: #ffffff !important;
+                border-radius: 8px !important;
+                padding: 0px 5px !important;
+                font-weight: 600;
+            }
+            .fichier-upload-btn .ui-fileupload-choose:hover {
+                background-color: #0b7d73 !important;
+                border-color: #0b7d73 !important;
+            }
+            .fichier-upload-btn .ui-fileupload-content {
+                display: none !important;
+            }
+            .btn-row-delete,
+            .btn-row-delete.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #F16B77 !important;
+                color: #F16B77 !important;
+                border-radius: 6px !important;
+                flex-shrink: 0;
+            }
+            .btn-row-delete:hover,
+            .btn-row-delete.ui-button:hover {
+                background-color: rgba(241, 107, 119, 0.1) !important;
+            }
+
+            .consultation-status-badge {
+                display: inline-block;
+                padding: 3px 10px;
+                border-radius: 8px;
+                font-size: 11px;
+                text-transform: uppercase;
+                font-family: 'DM Sans', sans-serif;
+                font-weight: 600;
+            }
+            .status-annule {
+                background-color: rgba(220, 53, 69, 0.12);
+                color: #DC3545;
+            }
+            .status-normal {
+                background-color: rgba(55, 138, 221, 0.15);
+                color: #378ADD;
+            }
+            .status-definitve {
+                background-color: rgba(13, 148, 136, 0.15);
+                color: #0D9488;
+            }
+            .status-brouillon {
+                background-color: rgba(217, 119, 6, 0.15);
+                color: #D97706;
+            }
+
+            .consultation-rapport-dialog .ui-dialog {
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                font-family: 'DM Sans', sans-serif;
+                overflow: hidden;
+            }
+            .consultation-rapport-dialog .ui-dialog-titlebar {
+                display: none;
+            }
+            .consultation-rapport-dialog-header {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                width: 100%;
+                padding: 16px 24px;
+                border-bottom: 0.5px solid #B4B2A9;
+            }
+            .consultation-rapport-dialog-title {
+                font-size: 11px;
+                text-transform: uppercase;
+                letter-spacing: 0.5px;
+                font-weight: 600;
+                color: #0D1B2E;
+            }
+            .consultation-rapport-dialog-body {
+                padding: 20px 24px;
+            }
+            .consultation-rapport-dialog-meta {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                font-size: 13px;
+                color: #6B6B63;
+                margin-bottom: 16px;
+                padding-bottom: 12px;
+                border-bottom: 0.5px solid #B4B2A9;
+            }
+            .consultation-rapport-dialog-content {
+                font-family: 'DM Sans', sans-serif;
+                font-size: 14px;
+                line-height: 1.6;
+                color: #1A1A1A;
+                max-height: 420px;
+                overflow-y: auto;
+            }
+            .consultation-rapport-dialog-footer {
+                background-color: #F1EFE8;
+                padding: 12px 24px;
+                display: flex;
+                justify-content: flex-end;
+            }
+            .dialog-confirm-btn.ui-button {
+                background-color: #378ADD !important;
+                border-color: #378ADD !important;
+                border-radius: 6px !important;
+                color: #fff !important;
+            }
+            .consultation-view-btn.ui-button {
+                border-radius: 6px !important;
+                background-color: rgba(13, 148, 136, 0.15) !important;
+                border-color: transparent !important;
+                color: #0D9488 !important;
+            }
+            .consultation-view-btn.ui-button:hover {
+                background-color: rgba(13, 148, 136, 0.25) !important;
+            }
+
+            .images-cles-grid {
+                display: grid;
+                grid-template-columns: repeat(3, 1fr);
+                gap: 16px;
+                padding: 8px 4px;
+            }
+            .image-cle-card {
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                overflow: hidden;
+                background-color: #fff;
+                transition: box-shadow 0.15s ease, border-color 0.15s ease;
+                cursor: pointer;
+            }
+            .image-cle-card:hover {
+                border-color: #0D9488;
+                box-shadow: 0 2px 10px rgba(13, 148, 136, 0.15);
+            }
+            .image-cle-thumbnail-wrapper {
+                position: relative;
+                width: 100%;
+                padding-top: 100%;
+            }
+            .image-cle-thumbnail {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                object-fit: cover;
+                display: block;
+            }
+            .images-cles-empty {
+                padding: 40px 0;
+                text-align: center;
+                font-family: 'DM Sans', sans-serif;
+                font-size: 13px;
+                color: #6B6B63;
+            }
+            .image-cles-lightbox {
+                display: none;
+                position: fixed;
+                top: 0;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                background-color: rgba(13, 27, 46, 0.75);
+                z-index: 10000;
+                align-items: center;
+                justify-content: center;
+            }
+            .image-cles-lightbox.active {
+                display: flex;
+            }
+            .image-cles-lightbox-content {
+                position: relative;
+                background-color: #fff;
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                padding: 12px;
+                max-width: 85vw;
+                max-height: 85vh;
+                box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+            }
+            .image-cles-lightbox-content img {
+                display: block;
+                max-width: 100%;
+                max-height: 75vh;
+                border-radius: 4px;
+                object-fit: contain;
+            }
+            .image-cles-lightbox-close {
+                position: absolute;
+                top: -14px;
+                right: -14px;
+                width: 32px;
+                height: 32px;
+                border-radius: 50%;
+                background-color: #fff;
+                border: 0.5px solid #B4B2A9;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                cursor: pointer;
+                color: #6B6B63;
+                transition: color 0.15s ease, border-color 0.15s ease;
+            }
+            .image-cles-lightbox-close:hover {
+                color: #0D9488;
+                border-color: #0D9488;
+            }
+
+            /* ===================== Boutons Valider / Annuler (barre du haut) ===================== */
+            .btn-valider,
+            .btn-valider.ui-button {
+                background-color: #0D9488 !important;
+                border-color: #0D9488 !important;
+                color: #ffffff !important;
+            }
+            .btn-valider:hover,
+            .btn-valider.ui-button:hover {
+                background-color: #0b7d73 !important;
+            }
+
+            .btn-annuler,
+            .btn-annuler.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #F16B77 !important;
+                color: #F16B77 !important;
+            }
+            .btn-annuler:hover,
+            .btn-annuler.ui-button:hover {
+                background-color: rgba(241, 107, 119, 0.1) !important;
+            }
+            .fichier-thumbnail {
+                width: 36px;
+                height: 36px;
+                border-radius: 8px;
+                object-fit: cover;
+                flex-shrink: 0;
+            }
+            .rapport-row-tight .info-label {
+                width: 190px;
+            }
+            .signature-upload-hidden {
+                display: none !important;
+            }
+        </style>
+        <h:form id="buttons">
+            #{examenDetailBean.init()}
+            <div class="detail-topbar">
+                <p:commandButton value="#{msg['distribution.page.retour']}" icon="pi pi-arrow-left"
+                                 styleClass="btn-return" action="#{examenDetailBean.retour()}" ajax="false" />
+
+                <div>
+                    <p:commandButton value="#{msg['distribution.page.examen.ajouterSignature']}" icon="pi pi-pencil"
+                                     styleClass="mr-2 btn-signature"
+                                     type="button"
+                                     rendered="#{utilControleAccess.isshowPrivilegeUpdate('exam') and examenDetailBean.consultation ne null and examenDetailBean.consultation.filePathSignature eq null}"
+                                     onclick="jQuery(PrimeFaces.escapeClientId('buttons:signatureUpload')).find('input[type=file]').trigger('click');" />
+
+                    <p:fileUpload id="signatureUpload"
+                                  mode="advanced"
+                                  auto="true"
+                                  multiple="false"
+                                  fileLimit="1"
+                                  allowTypes="/(\.|\/)(jpg|jpeg|png)$/"
+                                  invalidFileMessage="#{msg['distribution.page.fichiers.typeInvalide']}"
+                                  rendered="#{utilControleAccess.isshowPrivilegeUpdate('exam') and examenDetailBean.consultation ne null}"
+                                  listener="#{examenDetailBean.uploadSignature}"
+                                  update="form :form:growlMessages buttons"
+                                  styleClass="signature-upload-hidden"
+                                  process="@this" />
+
+                    <!-- Visualisation DICOM : développement ultérieur, seul le privilège est géré ici -->
+                    <p:commandButton value="#{msg['distribution.page.examen.visualiser']}" icon="pi pi-eye"
+                                     styleClass="mr-2 btn-visualiser"
+                                     rendered="#{utilControleAccess.isshow1('visu_examen')}"
+                                     action="#{examenDetailBean.visualiser()}" />
+
+                    <!-- Consultation : développement ultérieur, seul le privilège est géré ici -->
+                    <p:commandButton value="#{msg['distribution.page.examen.consultation']}" icon="pi pi-user"
+                                     styleClass="mr-2 btn-consultation"
+                                     rendered="#{utilControleAccess.isshow1('consult_examen')}"
+                                     action="#{examenDetailBean.ouvrirConsultation()}" />
+
+                    <!-- Valider : uniquement si la consultation existe, l'examen n'est pas annulé,
+                         et heureFin n'est pas encore renseignée -->
+                    <p:commandButton value="#{msg['distribution.page.valider']}" icon="pi pi-check"
+                                     styleClass="mr-2 btn-valider"
+                                     rendered="#{examenDetailBean.afficherBoutonValider}"
+                                     action="#{examenDetailBean.validerConsultation}"
+                                     update="form :form:growlMessages buttons">
+                        <p:confirm header="Confirmation"
+                                   message="#{msg['distribution.page.confirmerValidation']}"
+                                   icon="pi pi-exclamation-triangle"/>
+                    </p:commandButton>
+
+                    <p:commandButton value="#{msg['distribution.page.annuler']}" icon="pi pi-times"
+                                     styleClass="mr-2 btn-annuler"
+                                     rendered="#{examenDetailBean.afficherBoutonAnnuler}"
+                                     action="#{examenDetailBean.annulerConsultation}"
+                                     update=":form :form:growlMessages buttons">
+                        <p:confirm header="Confirmation"
+                                   message="#{msg['distribution.page.confirmerAnnulation']}"
+                                   icon="pi pi-exclamation-triangle"/>
+                    </p:commandButton>
+
+                    <!-- Bouton "Modifier" retiré : Observation et Rapport écrit sont maintenant édités
+                         individuellement via le crayon devant leur libellé. -->
+                </div>
+            </div>
+        </h:form>
+        <h:form id="form">
+            <p:growl id="growlMessages" showDetail="true" life="4000" />
+            <div class="detail-layout">
+
+                <!-- ============================ -->
+                <!-- Carte gauche : infos examen / queue -->
+                <!-- ============================ -->
+                <div class="detail-card-left">
+                    <div class="patient-avatar">
+                        <h:graphicImage library="images" name="Vector.png" styleClass="patient-avatar-icon" alt="" />
+                    </div>
+
+                    <div class="info-row separator">
+                        <span class="info-label"><span class="pi pi-user" />#{msg['distribution.page.patient.nom']}</span>
+                        <span class="info-value">
+                            <p:commandLink action="#{examenDetailBean.voirDossierPatient(examenDetailBean.queue.fkPatient)}">
+                                #{examenDetailBean.queue.fkPatient.prenom} #{examenDetailBean.queue.fkPatient.nom}
+                            </p:commandLink>
+                        </span>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><i class="pi pi-circle-off"></i>#{msg['distribution.page.patient.sexe']}</span>
+                        <span class="info-value">#{examenDetailBean.queue.fkPatient.sexe}</span>
+                    </div>
+
+                    <!-- Priorité : toujours liée à l'ancien editMode global (voir remarque) -->
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-flag" />#{msg['distribution.page.priorite']}</span>
+                        <span class="info-value">
+                            <h:outputText value="#{examenDetailBean.queue.fkPriority.designation}" rendered="#{!examenDetailBean.editMode}" />
+                            <p:selectOneMenu value="#{examenDetailBean.selectedPriorityId}" rendered="#{examenDetailBean.editMode}" style="width:160px;">
+                                <f:selectItems value="#{examenDetailBean.allPriorities}" var="pr" itemLabel="#{pr.designation}" itemValue="#{pr.id}" />
+                            </p:selectOneMenu>
+                        </span>
+                    </div>
+                    <div class="info-row">
+                        <span class="info-label"><i class="pi pi-user"></i>#{msg['distribution.label.medecin']}</span>
+                        <span class="info-value">#{examenDetailBean.examen.manipulateur.fkUser.nom} #{examenDetailBean.examen.manipulateur.fkUser.prenom}</span>
+                    </div>
+                    <!-- Observation : édition par champ. Le crayon est maintenant à droite,
+                         juste après la valeur (et non plus collé au libellé à gauche). -->
+                    <div class="info-row">
+                        <h:panelGroup id="observationZone" layout="block" style="display:flex; justify-content:space-between; align-items:center; width:100%; gap:14px;">
+                            <span class="info-label">
+                                <span class="pi pi-file" />#{msg['distribution.page.observation']}
+                            </span>
+                            <span class="info-value" style="display:flex; align-items:center; justify-content:flex-end; gap:8px;">
+                                <h:panelGroup rendered="#{!examenDetailBean.editObservation}" style="text-align:right;">
+                                    <span id="observationText" class="observation-value observation-clamped">
+                                        #{examenDetailBean.examen.observation}
+                                    </span>
+                                    <a class="observation-toggle" id="observationToggle"
+                                       onclick="toggleObservation(); return false;" href="#">
+                                        #{msg['distribution.page.voirPlus']}
+                                    </a>
+                                </h:panelGroup>
+                                <p:inputTextarea rendered="#{examenDetailBean.editObservation}"
+                                                 value="#{examenDetailBean.examen.observation}"
+                                                 rows="3" autoResize="true" style="width:200px;" />
+                                <p:commandLink actionListener="#{examenDetailBean.toggleEditObservation}"
+                                               update=":form:observationZone"
+                                               styleClass="field-edit-toggle #{examenDetailBean.editObservation ? 'is-editing' : ''}">
+                                    <span class="pi #{examenDetailBean.editObservation ? 'pi-check' : 'pi-pencil'}" />
+                                </p:commandLink>
+                            </span>
+                        </h:panelGroup>
+                    </div>
+
+                    <!-- Interprète Assigné : édition par champ (converti depuis l'ancien editMode global) -->
+                    <div class="info-row separator">
+                        <h:panelGroup id="interpreteurZone" layout="block" style="display:flex; justify-content:space-between; align-items:center; width:100%; gap:14px;">
+                            <span class="info-label"><span class="pi pi-user" />#{msg['distribution.page.interpreteurAssigne']}</span>
+                            <span class="info-value" style="display:flex; align-items:center; justify-content:flex-end; gap:8px;">
+                                <h:panelGroup rendered="#{!examenDetailBean.editInterpreteurAssigne}">
+                                    <p:commandLink rendered="#{examenDetailBean.examen.fkInterpreteurAssi ne null}"
+                                                   action="#{examenDetailBean.voirMedecin(examenDetailBean.examen.fkInterpreteurAssi)}">
+                                        #{examenDetailBean.examen.fkInterpreteurAssi.fkUser.nom} #{examenDetailBean.examen.fkInterpreteurAssi.fkUser.prenom}
+                                    </p:commandLink>
+                                    <h:outputText value="-" rendered="#{examenDetailBean.examen.fkInterpreteurAssi eq null}" />
+                                </h:panelGroup>
+                                <p:selectOneMenu id="interpreteurSelect"
+                                                 value="#{examenDetailBean.selectedMedecinId}"
+                                                 rendered="#{examenDetailBean.editInterpreteurAssigne}"
+                                                 style="width:160px;"
+                                                 filter="true"
+                                                 filterMatchMode="contains">
+
+                                    <f:selectItem itemLabel="#{msg['distribution.page.selectionner']}"
+                                                  itemValue="#{null}"
+                                                  noSelectionOption="true" />
+
+                                    <f:selectItems value="#{examenDetailBean.allMedecins}"
+                                                   var="med"
+                                                   itemLabel="#{med.fkUser.nom} #{med.fkUser.prenom}"
+                                                   itemValue="#{med.id}" />
+                                </p:selectOneMenu>
+                                <p:commandLink
+                                    actionListener="#{examenDetailBean.toggleEditInterpreteurAssigne}"
+                                    process="@this interpreteurSelect"
+                                    update=":form:interpreteurZone"
+                                    styleClass="field-edit-toggle #{examenDetailBean.editInterpreteurAssigne ? 'is-editing' : ''}">
+
+                                    <span class="pi #{examenDetailBean.editInterpreteurAssigne ? 'pi-check' : 'pi-pencil'}"/>
+                                </p:commandLink>
+                            </span>
+                        </h:panelGroup>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-check-circle" />#{msg['distribution.page.status']}</span>
+                        <span class="info-value">
+                            <h:panelGroup styleClass="status-badge #{examenDetailBean.statusBadgeClass}">
+                                #{examenDetailBean.displayStatus}
+                            </h:panelGroup>
+                        </span>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-calendar" />#{msg['distribution.page.creeLe']}</span>
+                        <span class="info-value">
+                            <h:outputText value="#{examenDetailBean.queue.date}"><f:convertDateTime pattern="dd/MM/yyyy" /></h:outputText>
+                            <h:outputText value=" à "/>
+                            <h:outputText value="#{examenDetailBean.queue.createdAt}" rendered="#{examenDetailBean.queue.createdAt ne null}">
+                                <f:convertDateTime pattern="HH:mm" />
+                            </h:outputText>
+                        </span>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-clock" />#{msg['distribution.page.completeLe']}</span>
+                        <span class="info-value">-</span>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-clock" />#{msg['distribution.page.consulteLe']}</span>
+                        <span class="info-value">
+                            <h:outputText value="#{examenDetailBean.consultation.date}" rendered="#{examenDetailBean.consultation ne null and examenDetailBean.consultation.date ne null}">
+                                <f:convertDateTime pattern="dd/MM/yyyy" />
+                            </h:outputText>
+                            <h:outputText value="-" rendered="#{examenDetailBean.consultation eq null or examenDetailBean.consultation.date eq null}" />
+                        </span>
+                    </div>
+
+                    <div class="info-row separator">
+                        <span class="info-label"><span class="pi pi-clock" />#{msg['distribution.page.rapportCreeLe']}</span>
+                        <span class="info-value">-</span>
+                    </div>
+
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-arrows-alt" />#{msg['distribution.page.etudeInstanceId']}</span>
+                        <span class="info-value">
+                            #{examenDetailBean.examen.studyInstanceUid}
+                            <span class="pi pi-external-link" style="cursor:pointer;" />
+                        </span>
+                    </div>
+
+                    <!-- Type d'examen : toujours lié à l'ancien editMode global (voir remarque) -->
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-arrows-alt" />#{msg['distribution.page.typeExamen']}</span>
+                        <span class="info-value">
+                            <h:outputText value="#{examenDetailBean.queue.fkTypeExamen.nom}" rendered="#{!examenDetailBean.editMode}" />
+                            <p:selectOneMenu value="#{examenDetailBean.selectedTypeExamenId}" rendered="#{examenDetailBean.editMode}" style="width:160px;">
+                                <f:selectItems value="#{examenDetailBean.allTypeExamens}" var="te" itemLabel="#{te.nom}" itemValue="#{te.id}" />
+                            </p:selectOneMenu>
+                        </span>
+                    </div>
+
+                    <!-- Machine : lecture seule, dérivée du Type d'examen -->
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-desktop" />#{msg['distribution.page.machine']}</span>
+                        <span class="info-value">#{examenDetailBean.queue.fkTypeExamen.fkMachine.nom}</span>
+                    </div>
+
+                    <!-- Latéralité : toujours liée à l'ancien editMode global (voir remarque) -->
+                    <div class="info-row">
+                        <span class="info-label"><span class="pi pi-arrows-h" />#{msg['distribution.page.lateralite']}</span>
+                        <span class="info-value">
+                            <h:outputText value="#{examenDetailBean.examen.lateralite}" rendered="#{!examenDetailBean.editMode}" />
+                            <p:selectOneMenu value="#{examenDetailBean.examen.lateralite}" rendered="#{examenDetailBean.editMode}" style="width:160px;">
+                                <f:selectItem itemLabel="#{msg['distribution.page.selectionner']}" itemValue="" noSelectionOption="true" />
+                                <f:selectItem itemLabel="Gauche" itemValue="Gauche" />
+                                <f:selectItem itemLabel="Droit" itemValue="Droit" />
+                                <f:selectItem itemLabel="Bilatérale" itemValue="Bilatérale" />
+                            </p:selectOneMenu>
+                        </span>
+                    </div>
+                </div>
+
+                <!-- ============================ -->
+                <!-- Carte droite : tabview -->
+                <!-- ============================ -->
+                <div class="detail-card-right">
+                    <div class="flex justify-content-end mb-2">
+                        <p:commandButton id="xlsExport" styleClass="mr-2 mb-2 btn-export"
+                                         icon="pi pi-file-excel" title="Excel" ajax="false">
+
+                            <p:fileDownload
+                                value="#{examenDetailBean.exportCompteRenduExcel()}" />
+
+                        </p:commandButton>
+                        <p:commandButton icon="pi pi-file-pdf" styleClass="btn-export" type="button" title="PDF" />
+                    </div>
+
+                    <p:tabView id="tabDetail" styleClass="detail-tabs">
+
+                        <!-- ============================ -->
+                        <!-- Onglet Consultation -->
+                        <!-- ============================ -->
+                        <p:tab title="#{msg['distribution.page.rapport']}">
+
+                            <h:panelGroup id="consultationPanel" rendered="#{examenDetailBean.consultation ne null}">
+
+                                <!-- TODO : Consultation n'a pas de champ "Definitive" dans l'entité fournie.
+                                     En attendant qu'il soit ajouté, le badge affiche toujours "Préliminaire". -->
+                                <div class="info-row separator rapport-row-tight">
+                                    <span class="info-label"><span class="pi pi-sync" />#{msg['distribution.page.typeConsultation']}</span>
+                                    <span class="info-value">
+                                        <h:panelGroup styleClass="consultation-badge">
+                                            #{examenDetailBean.typeConsultation}
+                                        </h:panelGroup>
+                                    </span>
+                                </div>
+
+                                <!-- Médecin consultant : édition par champ -->
+                                <div class="info-row rapport-row-tight">
+                                    <h:panelGroup id="medecinConsultantZone" layout="block" style="display:flex; justify-content:flex-start; align-items:center; width:100%; gap:14px;">
+                                        <span class="info-label"><span class="pi pi-user" />#{msg['distribution.page.medecinConsultant']}</span>
+                                        <span class="info-value" style="display:flex; align-items:center; justify-content:flex-start; gap:8px;">
+                                            <h:panelGroup id="zone" rendered="#{!examenDetailBean.editMedecinConsultant}">
+                                                <p:commandLink rendered="#{examenDetailBean.consultation.fkMedecin ne null}"
+                                                               action="#{examenDetailBean.voirMedecin(examenDetailBean.consultation.fkMedecin)}">
+                                                    #{examenDetailBean.consultation.fkMedecin.fkUser.nom} #{examenDetailBean.consultation.fkMedecin.fkUser.prenom}
+                                                </p:commandLink>
+                                                <h:outputText value="-" rendered="#{examenDetailBean.consultation.fkMedecin eq null}" />
+                                            </h:panelGroup>
+
+                                            <p:selectOneMenu  id="select"
+                                                              value="#{examenDetailBean.selectedMedecinConsultantId}" rendered="#{examenDetailBean.editMedecinConsultant}"
+                                                              style="width:280px;"
+                                                              filter="true"
+                                                              filterMatchMode="contains">
+
+                                                <f:selectItem itemLabel="#{msg['distribution.page.selectionner']}"
+                                                              itemValue="#{null}"
+                                                              noSelectionOption="true" />
+
+                                                <f:selectItems value="#{examenDetailBean.allMedecins}"
+                                                               var="med"
+                                                               itemLabel="#{med.fkUser.nom} #{med.fkUser.prenom}"
+                                                               itemValue="#{med.id}" />
+                                            </p:selectOneMenu>
+                                            <p:commandLink actionListener="#{examenDetailBean.toggleEditMedecinConsultant}"
+                                                           process="@this select"
+                                                           update="form:tabDetail:medecinConsultantZone"
+                                                           styleClass="field-edit-toggle #{examenDetailBean.editMedecinConsultant ? 'is-editing' : ''}">
+                                                <span class="pi #{examenDetailBean.editMedecinConsultant ? 'pi-check' : 'pi-pencil'}" />
+                                            </p:commandLink>
+                                        </span>
+                                    </h:panelGroup>
+                                </div>
+                                <h:panelGroup id="ecritParZone" layout="block" >
+                                    <div class="info-row separator rapport-row-tight">
+                                        <span class="info-label"><span class="pi pi-pencil" />#{msg['distribution.page.rapportEcritPar']}</span>
+                                        <span class="info-value">
+                                            <p:commandLink rendered="#{examenDetailBean.consultation.fkEcritpar ne null}"
+                                                           action="#{examenDetailBean.voirUtilisateur(examenDetailBean.consultation.fkEcritpar)}">
+                                                #{examenDetailBean.consultation.fkEcritpar.nom} #{examenDetailBean.consultation.fkEcritpar.prenom}
+                                            </p:commandLink>
+                                            <h:outputText value="-" rendered="#{examenDetailBean.consultation.fkEcritpar eq null}" />
+                                        </span>
+                                    </div>
+                                </h:panelGroup>
+
+                                <!-- Rapport écrit : le crayon reste aligné avec le titre "Rapport Écrit"
+                                     (contrairement à Observation, il n'est pas déplacé à droite). -->
+                                <h:panelGroup id="rapportEcritZone" layout="block" styleClass="rapport-ecrit-section">
+                                    <div style="display:flex; align-items:center; gap:6px;">
+                                        <h:outputText value="#{msg['distribution.page.rapportEcrit']}" styleClass="info-label" />
+                                        <p:commandLink actionListener="#{examenDetailBean.toggleEditRapportEcrit}"
+                                                       onclick="syncQuillToHidden();"
+                                                       process="@form"
+                                                       update=":form:tabDetail:rapportEcritZone :form:tabDetail:ecritParZone"
+                                                       oncomplete="initQuillRapportEcrit();"
+                                                       styleClass="field-edit-toggle #{examenDetailBean.editRapportEcrit ? 'is-editing' : ''}">
+                                            <span class="pi #{examenDetailBean.editRapportEcrit ? 'pi-check' : 'pi-pencil'}"/>
+                                        </p:commandLink>
+                                    </div>
+
+                                    <h:panelGroup rendered="#{!examenDetailBean.editRapportEcrit}" styleClass="rapport-ecrit-box" style="display:block;">
+                                        <h:outputText value="#{examenDetailBean.consultation.rapportEcrit}" escape="false" />
+                                    </h:panelGroup>
+
+                                    <h:panelGroup rendered="#{examenDetailBean.editRapportEcrit}" id="rapportEcritEditGroup" style="display:block; margin-top:8px; margin-bottom:20px;">
+                                        <div id="quillRapportEcrit"
+                                             data-placeholder="#{msg['distribution.page.rapportEcrit']}"
+                                             style="height:250px; background:#fff; overflow:hidden;"></div>
+
+                                        <!-- Champ réel envoyé au bean, synchronisé en JS avant soumission.
+      Simple champ caché JSF sans widget JS attaché : l'ancien p:textEditor
+      avait sa propre instance Quill interne qui ré-assainissait le contenu
+      de notre éditeur (et supprimait les tableaux, qu'elle ne connaît pas)
+      avant l'enregistrement. -->
+                                        <h:inputHidden id="rapportEcritHidden" value="#{examenDetailBean.consultation.rapportEcrit}"/>
+                                    </h:panelGroup>
+                                </h:panelGroup>
+
+                                <h:outputText value="#{msg['distribution.page.rapportsDictes']}" styleClass="info-label" style="display:block; margin-top: 12px; margin-bottom: 10px;" />
+
+                                <!-- TODO : entité Filepathrapportdictee non fournie, getters supposés d'après le diagramme
+                                     (id, fkConsultation, date, heur, filePath). Adapter si les vrais noms diffèrent. -->
+                                <ui:repeat value="#{examenDetailBean.consultation.filepathrapportdicteeList}" var="dictee">
+                                    <div class="dictee-item">
+                                        <p:commandButton icon="pi pi-play" styleClass="dictee-play-btn" type="button"
+                                                         onclick="playDictee('#{dictee.filePath}')" />
+                                        <span class="dictee-waveform">▮▮▮▮▮▮▮▮▮▮▮▮</span>
+                                        <span class="dictee-duree" data-audio-src="#{dictee.filePath}">--:--</span>
+                                    </div>
+                                </ui:repeat>
+
+                            </h:panelGroup>
+
+                            <!-- Consultation inexistante : onglet vide, seul le message s'affiche -->
+                            <h:panelGroup rendered="#{examenDetailBean.consultation eq null}"
+                                          layout="block" styleClass="empty-consultation-message">
+                                #{msg['distribution.page.aucuneConsultation']}
+                            </h:panelGroup>
+
+                        </p:tab>
+
+                        <p:tab title="#{msg['distribution.page.fichiers']}">
+                            <h:panelGroup id="tabFichiers">
+                                <div class="table-subheader">
+                                    <span class="table-subheader-title">#{msg['distribution.page.fichiers']}</span>
+
+                                    <!-- TODO : entité FichierAttache non fournie, getters supposés (id, nom, filePath).
+                                         Adapter le nom du champ (examenDetailBean.examen.fichiersAttaches) et de la
+                                         méthode listener/download si les vrais noms diffèrent. -->
+                                    <p:fileUpload id="fichierUpload"
+                                                  mode="advanced"
+                                                  auto="true"
+                                                  multiple="true"
+                                                  fileLimit="10"
+                                                  allowTypes="/(\.|\/)(pdf|xls|xlsx|txt|doc|docx|jpg|jpeg|png)$/"
+                                                  invalidFileMessage="#{msg['distribution.page.fichiers.typeInvalide']}"
+                                                  label="#{msg['stock.page.livraison.charger']}"
+                                                  chooseIcon="pi pi-plus"
+                                                  styleClass="fichier-upload-btn"
+                                                  listener="#{examenDetailBean.uploadFichierAttache}"
+                                                  update=":form:tabDetail:tabFichiers :form:growlMessages"
+                                                  process="@this" />
+                                </div>
+
+                                <p:dataTable id="fichiers"
+                                             var="f"
+                                             value="#{examenDetailBean.examen.fichierExamenList}"
+                                             rows="10"
+                                             paginator="true"
+                                             reflow="true"
+                                             styleClass="fichier-card-table"
+                                             emptyMessage="#{msg['distribution.page.fichiers.aucun']}">
+                                    <p:column>
+                                        <div class="fichier-card">
+
+                                            <ui:fragment rendered="#{examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.pdf')}">
+                                                <span class="fichier-icon fichier-icon-pdf pi pi-file-pdf"/>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.xls') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.xlsx')}">
+                                                <span class="fichier-icon fichier-icon-excel pi pi-file-excel"/>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.doc') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.docx')}">
+                                                <span class="fichier-icon fichier-icon-doc pi pi-file-word"/>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.txt')}">
+                                                <span class="fichier-icon fichier-icon-txt pi pi-align-left"/>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{not (examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.pdf') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.xls') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.xlsx') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.doc') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.docx') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.txt') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.png') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.jpg') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.jpeg'))}">    
+                                                <span class="fichier-icon fichier-icon-default pi pi-file"/>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.png') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.jpg') or examenDetailBean.getNomFichier(f.filePath).toLowerCase().endsWith('.jpeg')}">
+                                                <p:graphicImage value="#{utilFile.getVirtualImageUrl('trizRis', 'Examen', examenDetailBean.getNomFichier(f.filePath))}"
+                                                                styleClass="fichier-thumbnail" cache="true" />
+                                            </ui:fragment>
+
+
+                                            <span class="fichier-nom" title="#{examenDetailBean.getNomFichier(f.filePath)}">#{examenDetailBean.getNomFichier(f.filePath)}</span>
+
+                                            <p:commandButton icon="pi pi-download"
+                                                             styleClass="btn-row-download"
+                                                             ajax="false"
+                                                             process="@this">
+                                                <p:fileDownload value="#{examenDetailBean.telechargerFichier(f)}" />
+                                            </p:commandButton>
+                                            <p:commandButton icon="pi pi-trash"
+                                                             styleClass="btn-row-delete"
+                                                             action="#{examenDetailBean.supprimerFichierExamen(f)}"
+                                                             update=":form:tabDetail:tabFichiers :form:growlMessages"
+                                                             process="@this">
+                                                <p:confirm header="Confirmation"
+                                                           message="#{msg['distribution.page.fichiers.confirmerSuppression']}"
+                                                           icon="pi pi-exclamation-triangle"/>
+                                            </p:commandButton>
+                                        </div>
+                                    </p:column>
+                                </p:dataTable>
+                                <p:confirmDialog global="true" showEffect="fade" hideEffect="fade">
+                                    <p:commandButton value="Non" type="button" styleClass="ui-confirmdialog-no btn-return" icon="pi pi-times" />
+                                    <p:commandButton value="Oui" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check" />
+                                </p:confirmDialog>
+                            </h:panelGroup>
+                        </p:tab>
+
+                        <p:tab title="#{msg['distribution.page.imagesCles']}">
+                            <div class="images-cles-grid">
+                                <ui:repeat value="#{examenDetailBean.examen.imageClesList}" var="image">
+                                    <div class="image-cle-card" onclick="showImageClesPreview(this)">
+                                        <div class="image-cle-thumbnail-wrapper">
+                                            <p:graphicImage width="160" height="160"
+                                                            value="#{utilFile.getVirtualImageUrl('trizRis', 'images', examenDetailBean.getNomFichier(image.filePath))}"
+                                                            styleClass="image-cle-thumbnail" cache="true"/>
+                                        </div>
+                                    </div>
+                                </ui:repeat>
+                            </div>
+
+                            <h:panelGroup rendered="#{empty examenDetailBean.examen.imageClesList}"
+                                          layout="block" styleClass="images-cles-empty">
+                                #{msg['distribution.message.aucuneImageCle']}
+                            </h:panelGroup>
+
+                            <!-- Pop-up d'aperçu grand format -->
+                            <div id="imageClesLightbox" class="image-cles-lightbox" onclick="hideImageClesPreview(event)">
+                                <div class="image-cles-lightbox-content" onclick="event.stopPropagation()">
+                                    <span class="image-cles-lightbox-close" onclick="hideImageClesPreview(event)">
+                                        <i class="pi pi-times"></i>
+                                    </span>
+                                    <img id="imageClesLightboxImg" src="" alt="" />
+                                </div>
+                            </div>
+
+                            <h:outputScript>
+                                function showImageClesPreview(cardEl) {
+                                var img = cardEl.querySelector('img');
+                                if (!img) return;
+                                document.getElementById('imageClesLightboxImg').src = img.src;
+                                document.getElementById('imageClesLightbox').classList.add('active');
+                                }
+
+                                function hideImageClesPreview(event) {
+                                document.getElementById('imageClesLightbox').classList.remove('active');
+                                }
+                            </h:outputScript>
+                        </p:tab>
+                        <p:tab title="#{msg['distribution.page.historiqueConsultation']}">
+                            <p:dataTable value="#{examenDetailBean.examen.consultationList}" var="consultation"
+                                         styleClass="consultation-history-table"
+                                         emptyMessage="#{msg['distribution.message.aucuneConsultation']}"
+                                         sortBy="#{consultation.dateDebut}">
+
+                                <p:column headerText="#{msg['distribution.label.dateHeure']}" style="width: 220px">
+                                    <h:outputText value="#{consultation.date}">
+                                        <f:convertDateTime pattern="dd/MM/yyyy" />
+                                    </h:outputText>
+                                    <h:outputText value=" " rendered="#{consultation.heureDebut != null}" />
+                                    <h:outputText value="#{consultation.heureDebut}" rendered="#{consultation.heureDebut != null}">
+                                        <f:convertDateTime pattern="HH:mm" />
+                                    </h:outputText>
+                                    <h:outputText value=" - " rendered="#{consultation.heureFin != null}" />
+                                    <h:outputText value="#{consultation.heureFin}" rendered="#{consultation.heureFin != null}">
+                                        <f:convertDateTime pattern="HH:mm" />
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="#{msg['distribution.label.etat']}" style="width: 130px">
+                                    <span class="consultation-status-badge status-#{examenDetailBean.getTypeConsultation(consultation)}">
+                                        #{msg['distribution.statut.'.concat(examenDetailBean.getTypeConsultation(consultation))]}
+                                    </span>
+                                </p:column>
+
+                                <p:column headerText="#{msg['distribution.label.medecin']}">
+                                    <h:outputText value="#{consultation.fkMedecin.fkUser.nom} #{consultation.fkMedecin.fkUser.prenom}" />
+                                </p:column>
+                                <p:column headerText="#{msg['distribution.label.actions']}" style="width: 60px; text-align: center">
+                                    <p:commandButton icon="pi pi-eye" styleClass="consultation-view-btn"
+                                                     action="#{examenDetailBean.selectConsultation(consultation)}"
+                                                     update=":form:dlg"
+                                                     oncomplete="PF('rapportConsultationDialog').show()"
+                                                     process="@this" />
+                                </p:column>
+                            </p:dataTable>
+                        </p:tab>
+                    </p:tabView>
+                </div>
+            </div>
+            <p:dialog widgetVar="rapportConsultationDialog" modal="true" resizable="false" id="dlg"
+                      showEffect="fade" hideEffect="fade" closable="true"
+                      styleClass="consultation-rapport-dialog" width="640">
+
+                <f:facet name="header">
+                    <h:panelGroup id="rapportDialogHeader" layout="block" styleClass="consultation-rapport-dialog-header">
+                        <span class="consultation-rapport-dialog-title">#{msg['distribution.label.rapportConsultation']}</span>
+                        <span class="consultation-status-badge status-#{examenDetailBean.getTypeConsultation(examenDetailBean.selectedConsultation)}">
+                            #{msg['distribution.statut.'.concat(examenDetailBean.getTypeConsultation(examenDetailBean.selectedConsultation))]}
+                        </span>
+                    </h:panelGroup>
+                </f:facet>
+
+                <h:panelGroup id="rapportDialogContent" layout="block" styleClass="consultation-rapport-dialog-body">
+                    <div class="consultation-rapport-dialog-meta">
+                        <span class="consultation-rapport-dialog-date">
+                            <h:outputText value="#{examenDetailBean.selectedConsultation.date}">
+                                <f:convertDateTime pattern="dd/MM/yyyy" />
+                            </h:outputText>
+                            &#160;
+                            <h:outputText value="#{examenDetailBean.selectedConsultation.heureDebut}">
+                                <f:convertDateTime pattern="HH:mm" />
+                            </h:outputText>
+                            -
+                            <h:outputText value="#{examenDetailBean.selectedConsultation.heureFin}">
+                                <f:convertDateTime pattern="HH:mm" />
+                            </h:outputText>
+                        </span>
+                        <span class="consultation-rapport-dialog-medecin">
+                            <h:outputText value="#{examenDetailBean.selectedConsultation.fkMedecin.fkUser.nom} #{examenDetailBean.selectedConsultation.fkMedecin.fkUser.prenom}" />
+                        </span>
+                    </div>
+
+                    <div class="consultation-rapport-dialog-content">
+                        <h:outputText value="#{examenDetailBean.selectedConsultation.rapportEcrit}" escape="false" />
+                    </div>
+                </h:panelGroup>
+
+                <f:facet name="footer">
+                    <div class="consultation-rapport-dialog-footer">
+                        <p:commandButton value="#{msg['distribution.label.fermer']}" type="button"
+                                         styleClass="dialog-confirm-btn"
+                                         onclick="PF('rapportConsultationDialog').hide()" />
+                    </div>
+                </f:facet>
+            </p:dialog>
+        </h:form>
+        <script target="body">
+            //<![CDATA[
+
+            var betterTableAvailable = typeof quillBetterTable !== 'undefined';
+
+            if (betterTableAvailable) {
+                Quill.register({
+                    'modules/better-table': quillBetterTable
+                }, true);
+            } else {
+                console.warn('[Quill] quill-better-table indisponible.');
+            }
+
+// ---------------------------------------------------------------
+// Observation : troncature / dépliage
+// ---------------------------------------------------------------
+            function toggleObservation() {
+
+                var text = document.getElementById('observationText');
+                var toggle = document.getElementById('observationToggle');
+
+                if (!text || !toggle) {
+                    return;
+                }
+
+                var expanded = text.classList.toggle('observation-clamped') === false;
+
+                toggle.textContent = expanded
+                        ? '#{msg["distribution.page.voirMoins"]}'
+                        : '#{msg["distribution.page.voirPlus"]}';
+            }
+
+// ---------------------------------------------------------------
+// Quill Rapport
+// ---------------------------------------------------------------
+            var quillRapport = null;
+            var quillBetterTableModule = null;
+
+            var icons = Quill.import('ui/icons');
+
+            icons['customTable'] =
+                    '<svg viewBox="0 0 18 18">' +
+                    '<rect class="ql-stroke" x="3" y="3" width="12" height="12"></rect>' +
+                    '<line class="ql-stroke" x1="3" y1="7" x2="15" y2="7"></line>' +
+                    '<line class="ql-stroke" x1="3" y1="11" x2="15" y2="11"></line>' +
+                    '<line class="ql-stroke" x1="7" y1="3" x2="7" y2="15"></line>' +
+                    '<line class="ql-stroke" x1="11" y1="3" x2="11" y2="15"></line>' +
+                    '</svg>';
+
+            var quillToolbarOptions = [
+                ['bold', 'italic', 'underline'],
+                [{'align': ''}, {'align': 'center'}, {'align': 'right'}],
+                ['image', 'link'],
+                ['customTable']
+            ];
+
+// ---------------------------------------------------------------
+// Insertion d'un vrai tableau (via quill-better-table)
+// ---------------------------------------------------------------
+            function insertTable() {
+
+                if (!quillBetterTableModule) {
+                    return;
+                }
+
+                quillBetterTableModule.insertTable(3, 3);
+
+                syncQuillToHidden();
+            }
+
+// ---------------------------------------------------------------
+// Initialisation de Quill
+// ---------------------------------------------------------------
+            function initQuillRapportEcrit() {
+
+                var container = document.getElementById('quillRapportEcrit');
+
+                if (!container) {
+                    return;
+                }
+
+                if (container.dataset.initialized === 'true') {
+                    return;
+                }
+
+                var moduleOptions = {
+                    toolbar: {
+                        container: quillToolbarOptions,
+                        handlers: {
+                            customTable: function () {
+                                insertTable();
+                            }
+                        }
+                    }
+                };
+
+                if (betterTableAvailable) {
+                    moduleOptions.table = false;
+                    moduleOptions['better-table'] = {
+                        operationMenu: {
+                            color: {
+                                colors: ['#ffffff', '#F5A623', '#0D9488', '#378ADD', '#F16B77'],
+                                text: 'Couleur de fond :'
+                            }
+                        }
+                    };
+                    moduleOptions.keyboard = {
+                        bindings: quillBetterTable.keyboardBindings
+                    };
+                }
+
+                quillRapport = new Quill('#quillRapportEcrit', {
+                    theme: 'snow',
+                    placeholder: container.getAttribute('data-placeholder') || '',
+                    modules: moduleOptions
+                });
+
+                if (betterTableAvailable) {
+                    quillBetterTableModule = quillRapport.getModule('better-table');
+                }
+
+                var hidden = document.querySelector('[id$="rapportEcritHidden"]');
+
+                if (hidden && hidden.value) {
+                    quillRapport.root.innerHTML = hidden.value;
+                }
+
+                quillRapport.on('text-change', function () {
+
+                    var hidden = document.querySelector('[id$="rapportEcritHidden"]');
+
+                    if (hidden) {
+                        hidden.value = quillRapport.root.innerHTML;
+                    }
+                });
+
+                container.dataset.initialized = 'true';
+            }
+
+// ---------------------------------------------------------------
+// Synchronisation vers le champ caché
+// ---------------------------------------------------------------
+            function syncQuillToHidden() {
+
+                if (!quillRapport) {
+                    return true;
+                }
+
+                var hidden = document.querySelector('[id$="rapportEcritHidden"]');
+
+                if (hidden) {
+                    hidden.value = quillRapport.root.innerHTML;
+                }
+
+                return true;
+            }
+
+            document.addEventListener('DOMContentLoaded', function () {
+                initQuillRapportEcrit();
+            });
+
+//]]>
+        </script>
+    </ui:define>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/views/Examen/list.xhtml b/src/main/webapp/views/Examen/list.xhtml
new file mode 100644
index 0000000..5ea469c
--- /dev/null
+++ b/src/main/webapp/views/Examen/list.xhtml
@@ -0,0 +1,444 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                template="/WEB-INF/layout/template.xhtml">
+    <ui:define name="title">
+        #{msg['distribution.page.examen']}
+    </ui:define>
+
+    <ui:define name="breadcrumb">
+        <f:metadata>
+            <f:viewParam name="homeOutcome" value="/favorites/dashboard" />
+            <f:viewParam name="value" value="Examens" />
+
+        </f:metadata>
+    </ui:define>
+
+    <ui:define name="content">
+        <style>
+            .card .ui-datatable-tablewrapper table td,
+            .card .ui-datatable-tablewrapper table th {
+                vertical-align: middle !important;
+            }
+            .card .ui-datatable-tablewrapper table td {
+                padding-top: 14px !important;
+                padding-bottom: 14px !important;
+            }
+
+            .page-center-wrapper {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                min-height: calc(100vh - 160px);
+            }
+            .page-center-wrapper .card {
+                width: 100%;
+            }
+
+            .table-header-title {
+                font-weight: 700;
+                font-size: 1.05rem;
+                color: #343a40;
+            }
+
+            .btn-green-outline,
+            .btn-green-outline.ui-button {
+                background-color: #ffffff !important;
+                border: 1px solid #0D9488 !important;
+                color: #0D9488 !important;
+            }
+            .btn-green-outline:hover {
+                background-color: #e6f5f4 !important;
+            }
+
+            .btn-view-green,
+            .btn-view-green.ui-button {
+                background-color: #0D9488 !important;
+                border-color: #0D9488 !important;
+                color: #ffffff !important;
+            }
+            .btn-view-green:hover {
+                background-color: #0b7d73 !important;
+            }
+
+            .btn-export {
+                background-color: #ffffff !important;
+                border: 1px solid #dee2e6 !important;
+                color: #0D9488 !important;
+            }
+            .btn-export:hover {
+                background-color: #e6f5f4 !important;
+                border-color: #0D9488 !important;
+            }
+
+            .patient-code-link {
+                color: #0D9488;
+                font-weight: 600;
+                text-decoration: none !important;
+            }
+            .patient-code-link:hover {
+                color: #0b7d73;
+            }
+            .patient-code-link .pi {
+                font-size: 0.85rem;
+                margin-left: 4px;
+            }
+
+            .status-badge {
+                display: inline-block;
+                padding: 4px 14px;
+                border-radius: 6px;
+                font-size: 12px;
+                font-weight: 600;
+                color: #FFFFFF;
+                text-align: center;
+                min-width: 100px;
+            }
+
+            .status-programme      {
+                background-color: #6c757d;
+            }
+            .status-enregistre     {
+                background-color: #F5A623;
+            }
+            .status-encours        {
+                background-color: #29ABE2;
+            }
+            .status-termine        {
+                background-color: #A9744F;
+            }
+            .status-preliminaire   {
+                background-color: #0D9488;
+            }
+            .status-signe          {
+                background-color: #378ADD;
+            }
+            .status-addenda        {
+                background-color: #9B59B6;
+            }
+
+            .status-annule         {
+                background-color: #F16B77;
+            }
+            .status-enregister     {
+                background-color: #6366F1;
+            }
+
+            .examen-filter-panel.ui-overlaypanel {
+                border-radius: 8px;
+                border: 0.5px solid #B4B2A9;
+                font-family: 'DM Sans', sans-serif;
+            }
+
+            .examen-filter-grid {
+                display: flex;
+                flex-direction: column;
+                gap: 10px;
+                padding: 4px;
+            }
+
+            .filter-section-title {
+                font-size: 11px;
+                text-transform: uppercase;
+                letter-spacing: 0.5px;
+                font-weight: 600;
+                color: #6B6B63;
+                margin-top: 6px;
+            }
+
+            .filter-date-range {
+                display: flex;
+                gap: 8px;
+            }
+
+            .filter-date-range .ui-calendar {
+                width: 100%;
+            }
+
+            .filter-checkbox-row {
+                display: flex;
+                align-items: center;
+                gap: 8px;
+                font-size: 13px;
+            }
+
+            .filter-select.ui-selectonemenu {
+                width: 100%;
+            }
+
+            .filter-actions {
+                display: flex;
+                justify-content: flex-end;
+                gap: 8px;
+                margin-top: 12px;
+                padding-top: 12px;
+                border-top: 0.5px solid #B4B2A9;
+            }
+            .examen-filter-panel.ui-overlaypanel {
+                width: 440px !important;
+            }
+
+            .examen-filter-grid {
+                padding: 8px 4px;
+            }
+
+            .filter-select.ui-selectonemenu {
+                width: 100%;
+                box-sizing: border-box;
+            }
+
+            /* Bouton de fermeture (le rond avec le X) */
+            .examen-filter-panel .ui-overlaypanel-close {
+                background-color: #0D9488 !important;
+                border-color: #0D9488 !important;
+                color: #ffffff !important;
+            }
+
+            .examen-filter-panel .ui-overlaypanel-close:hover {
+                background-color: #0b7d73 !important;
+                border-color: #0b7d73 !important;
+            }
+
+            /* Selon la version PrimeFaces, l'icône est soit une police d'icônes (pi), soit un sprite ui-icon */
+            .examen-filter-panel .ui-overlaypanel-close .pi,
+            .examen-filter-panel .ui-overlaypanel-close .ui-icon-closethick {
+                color: #ffffff !important;
+            }
+        </style>
+
+        <div class="page-center-wrapper">
+            <h:form id="form">
+                #{examenBean.init()}
+                <div class="card">
+                    <p:dataTable id="dataTable" var="q"
+                                 rows="30" paginator="true" draggableColumns="true"
+                                 value="#{examenBean.allQueue}"
+                                 paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}"
+                                 rowsPerPageTemplate="20,30,40,60,80,100"
+                                 emptyMessage="#{msg['distribution.page.examen.liste.message.non']}"
+                                 selectionMode="single"
+                                 rowKey="#{q.id}">
+
+                        <f:facet name="header">
+                            <div class="flex justify-content-between align-items-center">
+                                <div>
+                                    <span class="table-header-title">#{msg['distribution.page.examens.liste']}</span>
+                                </div>
+                                <div>
+                                    <p:commandButton id="filterToggle" type="button" styleClass="mr-2 mb-2 btn-green-outline"
+                                                     icon="pi pi-filter" value="Filtre" />
+                                    <p:overlayPanel id="filterPanel" for="filterToggle" widgetVar="filterPanelWidget"
+                                                    dismissable="true" showCloseIcon="true" styleClass="examen-filter-panel"
+                                                    style="width:380px">
+
+                                        <div class="examen-filter-grid">
+
+                                            <div class="filter-section-title">#{msg['distribution.filtre.periode']}</div>
+                                            <div class="filter-date-range">
+                                                <p:calendar value="#{examenBean.filterDateDebut}" pattern="dd/MM/yyyy"
+                                                            placeholder="#{msg['distribution.filtre.dateDebut']}"  >
+                                                    <p:ajax event="dateSelect" update="dateFin"/>
+                                                </p:calendar>
+                                                <p:calendar id="dateFin" value="#{examenBean.filterDateFin}" pattern="dd/MM/yyyy"
+                                                            placeholder="#{msg['distribution.filtre.dateFin']}" mindate="#{examenBean.filterDateDebut}" />
+                                            </div>
+
+                                            <div class="filter-section-title">#{msg['distribution.filtre.rapide']}</div>
+                                            <div class="filter-checkbox-row">
+                                                <p:selectBooleanCheckbox value="#{examenBean.filterMesExamens}" />
+                                                <label>#{msg['distribution.filtre.mesExamens']}</label>
+                                            </div>
+                                            <div class="filter-checkbox-row">
+                                                <p:selectBooleanCheckbox value="#{examenBean.filterMesBrouillons}" />
+                                                <label>#{msg['distribution.filtre.mesBrouillons']}</label>
+                                            </div>
+
+                                            <div class="filter-section-title">#{msg['distribution.filtre.criteres']}</div>
+
+                                            <p:selectOneMenu value="#{examenBean.filterMedecinAssigne}" filter="true" filterMatchMode="contains" styleClass="filter-select" converter="medecinConverter">
+                                                <f:converter binding="#{medecinConverter}"  />
+                                                <f:selectItem itemLabel="#{msg['distribution.filtre.medecinAssigne']}"  itemValue="" />  <f:selectItems value="#{examenBean.medecinList}" var="m" itemLabel="#{m.fkUser.nom} #{m.fkUser.prenom}" itemValue="#{m}" />
+                                            </p:selectOneMenu>
+
+                                            <p:selectOneMenu value="#{examenBean.filterSpecialiteMedicale}" filter="true" filterMatchMode="contains" styleClass="filter-select" converter="specialiteMedicaleConverter">
+                                                <f:converter binding="#{specialiteMedicaleConverter}"  />
+                                                <f:selectItem itemLabel="#{msg['distribution.filtre.specialite']}" itemValue="" />
+                                                <f:selectItems value="#{examenBean.specialiteMedicaleList}" var="s" itemLabel="#{s.name}" itemValue="#{s}" />
+                                            </p:selectOneMenu>
+
+                                            <p:selectOneMenu value="#{examenBean.filterMachine}" filter="true" filterMatchMode="contains" styleClass="filter-select" converter="machineConverter">
+                                                <f:converter binding="#{machineConverter}"  />
+                                                <f:selectItem itemLabel="#{msg['distribution.filtre.typeMachine']}" itemValue="" />
+                                                <f:selectItems value="#{examenBean.machineList}" var="mc" itemLabel="#{mc.nom}" itemValue="#{mc}" />
+                                            </p:selectOneMenu>
+
+                                            <p:selectOneMenu value="#{examenBean.filterMedecinInterprete}" filter="true" filterMatchMode="contains" styleClass="filter-select" converter="medecinConverter">
+                                                <f:converter binding="#{medecinConverter}"  />
+                                                <f:selectItem itemLabel="#{msg['distribution.filtre.medecinInterprete']}" itemValue="" />
+                                                <f:selectItems value="#{examenBean.medecinList}" var="mi" itemLabel="#{mi.fkUser.nom} #{mi.fkUser.prenom}" itemValue="#{mi}" />
+                                            </p:selectOneMenu>
+
+                                            <p:selectOneMenu value="#{examenBean.filterManipulateur}" filter="true" filterMatchMode="contains" styleClass="filter-select" converter="medecinConverter">
+                                                <f:converter binding="#{medecinConverter}"  />
+                                                <f:selectItem itemLabel="#{msg['distribution.filtre.medecinManipulateur']}" itemValue="" />
+                                                <f:selectItems value="#{examenBean.medecinList}" var="mi" itemLabel="#{mi.fkUser.nom} #{mi.fkUser.prenom}" itemValue="#{mi}" />
+                                            </p:selectOneMenu>
+
+                                            <p:selectOneMenu value="#{examenBean.filterPatient}"
+                                                             filter="true"
+                                                             filterMatchMode="contains"
+                                                             styleClass="filter-select"
+                                                             converter="patientConverter">
+
+                                                <f:converter binding="#{patientConverter}" />
+
+                                                <f:selectItem itemLabel="Patient" itemValue="" />
+
+                                                <f:selectItems value="#{examenBean.patientList}"
+                                                               var="p"
+                                                               itemLabel="#{p.codePatient} - #{p.nom} #{p.prenom}"
+                                                               itemValue="#{p}" />
+
+                                            </p:selectOneMenu>
+
+                                            <div class="filter-actions">
+                                                <p:commandButton value="#{msg['distribution.filtre.reinitialiser']}" 
+                                                                 styleClass="btn-green-outline"
+                                                                 actionListener="#{examenBean.resetFilters}"
+                                                                 action="#{examenBean.applyFilters}"
+                                                                 update="dataTable" />
+                                                <p:commandButton value="#{msg['distribution.filtre.appliquer']}"
+                                                                 styleClass="btn-view-green"
+                                                                 action="#{examenBean.applyFilters}"
+                                                                 process="@form"
+                                                                 update="dataTable"
+                                                                 oncomplete="PF('filterPanelWidget').hide()" />
+                                            </div>
+
+                                        </div>
+                                    </p:overlayPanel>
+                                    <p:commandButton id="xlsExport" styleClass="mr-2 mb-2 btn-export"
+                                                     icon="pi pi-file-excel" title="Excel" ajax="false">
+
+                                        <p:fileDownload
+                                            value="#{examenBean.exportListeExamensExcel()}" />
+
+                                    </p:commandButton>
+
+                                    <p:commandButton id="pdfExport" styleClass="mr-2 mb-2 btn-export"
+                                                     ajax="false" icon="pi pi-file-pdf" title="PDF">
+                                        <p:fileDownload
+                                            value="#{examenBean.exportListeExamensPdf()}" />
+                                    </p:commandButton>
+
+                                    <p:commandButton id="toggler" styleClass="mr-2 mb-2 btn-green-outline"
+                                                     type="button" value="Columns" icon="pi pi-align-justify"/>
+                                    <p:columnToggler datasource="dataTable" trigger="toggler" />
+
+                                </div>
+                            </div>
+                        </f:facet>
+                        <p:column headerText="Alerte" style="width:60px;text-align:center;">
+                            <h:panelGroup rendered="#{examenBean.alerteMedicaleByPatient(q) eq 'none'}">
+                                <i class="pi pi-shield"
+                                   style="color:#22C55E;font-size:1.3rem"></i>
+                            </h:panelGroup>
+
+                            <h:panelGroup rendered="#{examenBean.alerteMedicaleByPatient(q) eq 'warning'}">
+                                <i class="pi pi-exclamation-triangle"
+                                   style="color:#F59E0B;font-size:1.3rem"></i>
+                            </h:panelGroup>
+
+                            <h:panelGroup rendered="#{examenBean.alerteMedicaleByPatient(q) eq 'danger'}">
+                                <i class="pi pi-ban"
+                                   style="color:#EF4444;font-size:1.3rem"></i>
+                            </h:panelGroup>
+
+
+                        </p:column>
+
+                        <!-- Code patient (NIN) -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.patient.code']}"
+                                  filterBy="#{q.fkPatient.codePatient}" filterMatchMode="contains" sortBy="#{q.fkPatient.codePatient}">
+                            <h:outputText value="#{q.fkPatient.codePatient}" />
+                        </p:column>
+
+
+                        <!-- Nom patient -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.patient.nom']}"
+                                  filterBy="#{q.fkPatient.nom} #{q.fkPatient.prenom}" filterMatchMode="contains" sortBy="#{q.fkPatient.nom} #{q.fkPatient.prenom}">
+                            <p:commandLink styleClass="patient-code-link" process="@this"
+                                           action="#{examenBean.voirDossierPatient(q)}">
+                                <h:outputText value="#{q.fkPatient.nom} #{q.fkPatient.prenom}" />
+                                <span class="pi pi-external-link" />
+                            </p:commandLink>
+                        </p:column>
+
+                        <!-- Sexe -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.patient.sexe']}"
+                                  filterBy="#{q.fkPatient.sexe}" filterMatchMode="contains" sortBy="#{q.fkPatient.sexe}">
+                            <h:outputText value="#{q.fkPatient.sexe}" />
+                        </p:column>
+
+                        <!-- Priorité -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.priorite']}"
+                                  filterBy="#{q.fkPriority.designation}" filterMatchMode="contains" sortBy="#{q.fkPriority.poids}">
+                            <h:outputText value="#{q.fkPriority.designation}" />
+                        </p:column>
+
+                        <!-- Status (calculé, badge coloré) -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.status']}"
+                                  filterBy="#{examenBean.getDisplayStatus(q)}" filterMatchMode="contains">
+                            <h:panelGroup styleClass="status-badge #{examenBean.getStatusBadgeClass(q)}">
+                                <h:outputText value="#{examenBean.getDisplayStatus(q)}" />
+                            </h:panelGroup>
+                        </p:column>
+
+                        <!-- Type d'examen : via q.fkExamen.fkTypeExamen -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.typeExamen']}"
+                                  filterBy="#{q.fkTypeExamen.nom}" filterMatchMode="contains" sortBy="#{q.fkTypeExamen.nom}">
+                            <h:outputText value="#{q.fkTypeExamen.nom}" />
+                        </p:column>
+
+                        <!-- Machine : via q.fkExamen.fkTypeExamen.fkMachine -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.machine']}"
+                                  filterBy="#{q.fkTypeExamen.fkMachine.nom}" filterMatchMode="contains" sortBy="#{q.fkTypeExamen.fkMachine.nom}">
+                            <h:outputText value="#{q.fkTypeExamen.fkMachine.nom}" />
+                        </p:column>
+
+                        <!-- Créé le -->
+                        <p:column style="text-align: center;" headerText="#{msg['distribution.page.creeLe']}"
+                                  sortBy="#{q.date}">
+                            <h:outputText value="#{q.date}">
+                                <f:convertDateTime pattern="dd/MM/yyyy" timeZone="Africa/Algiers"/>
+                            </h:outputText>
+                            <h:outputText value=" a "/>
+                            <h:outputText value="#{q.createdAt}">
+                                <f:convertDateTime pattern="HH:mm:ss" timeZone="GMT+1"/>
+                            </h:outputText>
+                        </p:column>
+
+                        <!-- Action -->
+                        <p:column style="width:100px; text-align: center;" exportable="false"
+                                  draggable="false" toggleable="false" headerText="Action">
+                            <p:commandButton id="buttonSelect" styleClass="btn-view-green"
+                                             style="height:30px; text-align: center"
+                                             action="#{examenBean.voirExamen(examenBean.getExamenByQueue(q))}"
+                                             rendered="#{examenBean.getExamenByQueue(q) ne null and examenBean.getExamenByQueue(q).annule ne true}"
+                                             icon="pi pi-search" title="#{msg['distribution.page.consulter']}"
+                                             >
+                            </p:commandButton>
+                        </p:column>
+
+                    </p:dataTable>
+
+
+                </div>
+            </h:form>
+        </div>
+    </ui:define>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/views/parametrage/form.xhtml b/src/main/webapp/views/parametrage/form.xhtml
index 746116f..b4c5776 100644
--- a/src/main/webapp/views/parametrage/form.xhtml
+++ b/src/main/webapp/views/parametrage/form.xhtml
@@ -530,17 +530,26 @@
                                                  update="parametresForm"
                                                  action="#{parametresBean.annuler()}" 
                                                  immediate="true"
+                                                 onclick="if (PF('pollStatusCentre')) {
+                                                             PF('pollStatusCentre').stop();
+                                                         }"
                                                  styleClass="btn-outline-gray" />
                             </div>
                             <div style="text-align: right; display: flex; gap: 8px;">
-                                <p:commandButton value="Supprimer" icon="pi pi-trash"
+                                <p:commandButton value="Desactiver" icon="pi pi-trash"
                                                  process="@this"
                                                  action="#{parametresBean.deleteCentre()}"
+                                                 onclick="if (PF('pollStatusCentre')) {
+                                                             PF('pollStatusCentre').stop();
+                                                         }"
                                                  rendered="#{parametresBean.canEdit and utilControleAccess.isshowPrivilegeRemove('param')}"
                                                  styleClass="btn-red-pill" />
                                 <p:commandButton value="Enregistrer" icon="pi pi-save"
                                                  rendered="#{parametresBean.canEdit}"
                                                  action="#{parametresBean.saveCentre()}"
+                                                 onclick="if (PF('pollStatusCentre')) {
+                                                             PF('pollStatusCentre').stop();
+                                                         }"
                                                  update="@form"
                                                  process="@this"
                                                  styleClass="btn-teal-pill" />
@@ -549,6 +558,9 @@
                                                  rendered="#{!parametresBean.canEdit and utilControleAccess.isshowPrivilegeUpdate('param')}"
                                                  action="#{parametresBean.editCentre()}"
                                                  update="@form"
+                                                 onclick="if (PF('pollStatusCentre')) {
+                                                             PF('pollStatusCentre').stop();
+                                                         }"
                                                  styleClass="btn-teal-pill" />
                             </div>
                         </div>
@@ -563,6 +575,16 @@
                                     <span class="info-value"><h:outputText value="#{parametresBean.centreSelected.name}" /></span>
                                 </div>
 
+                                <div class="info-row">
+                                    <span class="info-label"><i class="pi pi-building"></i>Téléphone</span>
+                                    <span class="info-value"><h:outputText value="#{parametresBean.centreSelected.telephone}" /></span>
+                                </div>
+
+                                <div class="info-row">
+                                    <span class="info-label"><i class="pi pi-building"></i>Email</span>
+                                    <span class="info-value"><h:outputText value="#{parametresBean.centreSelected.email}" /></span>
+                                </div>
+
                                 <div class="info-row">
                                     <span class="info-label"><i class="pi pi-map-marker"></i>Wilaya</span>
                                     <span class="info-value"><h:outputText value="#{parametresBean.centreSelected.fkWilaya.name}" /></span>
@@ -601,11 +623,11 @@
                             </div>
                             <div class="edit-field-row">
                                 <span class="edit-field-label"><i class="pi pi-phone"></i>Téléphone</span>
-                                <div class="edit-field-input"><p:inputText ><p:ajax event="change"/></p:inputText></div>
+                                <div class="edit-field-input"><p:inputText value="#{parametresBean.centreSelected.telephone}" ><p:ajax event="change"/></p:inputText></div>
                             </div>
                             <div class="edit-field-row">
                                 <span class="edit-field-label"><i class="pi pi-envelope"></i>Email</span>
-                                <div class="edit-field-input"><p:inputText  ><p:ajax event="change"/></p:inputText></div>
+                                <div class="edit-field-input"><p:inputText value="#{parametresBean.centreSelected.email}" ><p:ajax event="change"/></p:inputText></div>
                             </div>
                             <div class="edit-field-row">
                                 <span class="edit-field-label"><i class="pi pi-map-marker"></i>Wilaya</span>
@@ -660,17 +682,30 @@
                                         <!-- MODIF : adresse_ip absente de la table parametre, cf. explication -->
                                         <div class="info-row">
                                             <span class="info-label">Adresse IP</span>
-                                            <span class="info-value"><h:outputText  /></span>
+                                            <span class="info-value"><h:outputText value="#{parametresBean.parametre.addresse_ip}"  /></span>
                                         </div>
                                         <div class="info-row">
                                             <span class="info-label">Port</span>
                                             <span class="info-value"><h:outputText value="#{parametresBean.parametre.mwlScpPort}" /></span>
                                         </div>
-                                        <div class="info-row">
-                                            <span class="info-label">Status</span>
-                                            <span class="info-value"><h:outputText value="#{parametresBean.parametre.mwlScpPort}" /></span>
-                                        </div>
+                                        <h:panelGroup id="statusPanel">
+
+                                            <div class="info-row">
+                                                <span class="info-label">Status</span>
+                                                <span class="info-value">
+                                                    <h:outputText
+                                                        value="#{parametresBean.actif ? 'Actif' : 'Inactif'}"
+                                                        style="font-weight:bold;color:#{parametresBean.actif ? 'green' : 'red'};" />
+                                                </span>
+                                            </div>
+
+                                        </h:panelGroup>`
                                     </div>
+                                    <p:poll widgetVar="pollStatusCentre"
+                                            interval="10"
+                                            update="statusPanel"
+                                            rendered="#{!parametresBean.canEdit}" 
+                                            onerror="if (args &amp;&amp; args.status === 'server') { window.location.reload(); }" />
                                 </h:panelGroup>
                                 <h:panelGroup rendered="#{parametresBean.canEdit}">
                                     <div class="edit-field-row">
@@ -679,16 +714,13 @@
                                     </div>
                                     <div class="edit-field-row">
                                         <span class="edit-field-label">Adresse IP *</span>
-                                        <div class="edit-field-input"><p:inputText   ><p:ajax event="change"/></p:inputText></div>
+                                        <div class="edit-field-input"><p:inputText value="#{parametresBean.parametre.addresse_ip}"  ><p:ajax event="change"/></p:inputText></div>
                                     </div>
                                     <div class="edit-field-row">
                                         <span class="edit-field-label">Port *</span>
                                         <div class="edit-field-input"><p:inputText value="#{parametresBean.parametre.mwlScpPort}"  ><p:ajax event="change"/></p:inputText></div>
                                     </div>
-                                    <div class="info-row">
-                                        <span class="info-label">Status</span>
-                                        <span class="info-value"><p:inputText value="#{parametresBean.parametre.mwlScpPort}"  ><p:ajax event="change"/></p:inputText></span>
-                                    </div>
+
                                 </h:panelGroup>
                             </p:tab>
 
@@ -964,6 +996,14 @@
                             <p:ajax event="change"/>
                         </p:selectOneMenu>
                     </div>
+                    <div class="crud-field-row">
+                        <label>Spécialités médicales </label>
+                        <p:selectOneMenu value="#{parametresBean.typeExamenSelected.specialiteMedicale}" converter="specialiteMedicaleConverter">
+                            <f:converter binding="#{specialiteMedicaleConverter}"  />
+                            <f:selectItems value="#{parametresBean.listeSpecialites}" var="m" itemLabel="#{m.name}" itemValue="#{m}" />
+                            <p:ajax event="change"/>
+                        </p:selectOneMenu>
+                    </div>
                     <div style="text-align:right; padding-top:12px; border-top:0.5px solid #B4B2A9; background-color:#F1EFE8; margin:16px -20px -20px -20px; padding:12px 20px;">
                         <p:commandButton value="Annuler" styleClass="btn-dialog-cancel" onclick="PF('dlgTypeExamen').hide()" type="button" process="@this"/>
                         <p:commandButton value="Enregistrer" styleClass="btn-dialog-confirm" action="#{parametresBean.saveTypeExamen()}" oncomplete="PF('dlgTypeExamen').hide()" update=":parametresForm:tabViewParametres:tabExamen parametresForm:growlMessages" process="@parent"/>
@@ -1119,7 +1159,7 @@
                 </h:panelGroup>
             </p:dialog>
             <h:outputScript target="body">
-                
+
                 document.addEventListener('keydown', function(e) {
 
                 if (e.key !== 'Enter') {
@@ -1146,7 +1186,7 @@
                 }, true);
                 console.log(saveBtn);
                 console.log(saveBtn.attr('id'));
-                
+
             </h:outputScript>
         </h:form>
     </ui:define>
diff --git a/src/main/webapp/views/patient/form.xhtml b/src/main/webapp/views/patient/form.xhtml
new file mode 100644
index 0000000..2f6b0f8
--- /dev/null
+++ b/src/main/webapp/views/patient/form.xhtml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html">
+    <h:head>
+        <title>Facelet Title</title>
+    </h:head>
+    <h:body>
+        Hello from Facelets
+    </h:body>
+</html>
diff --git a/src/main/webapp/views/patient/list.xhtml b/src/main/webapp/views/patient/list.xhtml
new file mode 100644
index 0000000..2f6b0f8
--- /dev/null
+++ b/src/main/webapp/views/patient/list.xhtml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html">
+    <h:head>
+        <title>Facelet Title</title>
+    </h:head>
+    <h:body>
+        Hello from Facelets
+    </h:body>
+</html>