Update database.py

database.py

@@ -439,6 +439,51 @@ class DatabaseManager:
         finally:
             conn.close()
 
+    def get_consultation_by_id(self, consultation_id: int, user_id: int, role: str) -> Optional[Dict]:
+        """Devuelve una consulta completa con datos del paciente y factores de riesgo.
+        Los doctores solo pueden ver sus propias consultas."""
+        conn = self.get_connection()
+        try:
+            query = """
+                SELECT
+                    c.consultationID, c.patientID, c.createdByUserID,
+                    c.diabeticRetinopathy, c.notes, c.consultationDate,
+                    c.imagePath, c.confidence, c.rawOutput,
+                    p.name        AS patientName,
+                    p.birthDate   AS birthDate,
+                    p.gender      AS gender,
+                    p.diabetesType AS diabetesType,
+                    u.username    AS doctorName
+                FROM Consultations c
+                JOIN Patients p ON c.patientID = p.patientID
+                JOIN Users    u ON c.createdByUserID = u.userID
+                WHERE c.consultationID = ?
+            """
+            params = [consultation_id]
+            if role != "Admin":
+                query += " AND c.createdByUserID = ?"
+                params.append(user_id)
+
+            row = conn.execute(query, params).fetchone()
+            if not row:
+                return None
+
+            result = self._serialize(row)
+
+            # Cargar factores de riesgo del paciente
+            rf_rows = conn.execute(
+                """SELECT rf.riskFactorID, rf.name, rf.description
+                   FROM RiskFactors rf
+                   JOIN PatientsRiskFactors prf ON rf.riskFactorID = prf.riskFactorID
+                   WHERE prf.patientID = ?""",
+                (result["patientID"],)
+            ).fetchall()
+            result["riskFactors"] = [self._serialize(r) for r in rf_rows]
+
+            return result
+        finally:
+            conn.close()
+
     def get_patient_consultations(self, patient_id: int) -> List[Dict]:
         conn = self.get_connection()
         try:
@@ -484,7 +529,12 @@ class DatabaseManager:
             offset = (page - 1) * per_page
 
             rows = conn.execute(
-                f"""SELECT c.*, p.name as patientName, u.username as doctorName
+                f"""SELECT c.*,
+                           p.name        AS patientName,
+                           p.birthDate   AS birthDate,
+                           p.gender      AS gender,
+                           p.diabetesType AS diabetesType,
+                           u.username    AS doctorName
                     {base} {where}
                     ORDER BY c.consultationDate DESC
                     LIMIT ? OFFSET ?""",