usite-sas-bic/whatsapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cambios

Browse Source
This commit is contained in:
Lizandro Guarnizo
2026-05-27 20:40:17 -05:00
parent b8de9ee666
commit 2f72d87c3b
9 changed files with 208 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/lab/Domicilio.php
+34 -2
View File
@@ -88,7 +88,23 @@ class Domicilio {
e.telefono AS enfermera_telefono,
a.enfermera_id AS enfermera_lab_id,
a.id AS asignacion_id,
a.estado AS asignacion_estado
a.estado AS asignacion_estado,
CASE
WHEN a.enfermera_id IS NULL OR d.hora_llegada IS NULL THEN NULL
ELSE TIMESTAMPDIFF(
MINUTE,
(
SELECT MAX(CONCAT(d2.fecha_programada, ' ', d2.hora_salida))
FROM lab_domicilios d2
JOIN lab_asignaciones a2 ON a2.domicilio_id = d2.id
WHERE a2.enfermera_id = a.enfermera_id
AND d2.hora_salida IS NOT NULL
AND d2.id <> d.id
AND CONCAT(d2.fecha_programada, ' ', d2.hora_salida) < CONCAT(d.fecha_programada, ' ', d.hora_llegada)
),
CONCAT(d.fecha_programada, ' ', d.hora_llegada)
)
END AS tiempo_recorrido_min
FROM lab_domicilios d
JOIN lab_pacientes p ON p.id = d.paciente_id
LEFT JOIN lab_asignaciones a ON a.domicilio_id = d.id
@@ -129,7 +145,23 @@ class Domicilio {
a.enfermera_id AS enfermera_lab_id,
a.id AS asignacion_id,
a.estado AS asignacion_estado,
adm.full_name AS creado_por_nombre
adm.full_name AS creado_por_nombre,
CASE
WHEN a.enfermera_id IS NULL OR d.hora_llegada IS NULL THEN NULL
ELSE TIMESTAMPDIFF(
MINUTE,
(
SELECT MAX(CONCAT(d2.fecha_programada, ' ', d2.hora_salida))
FROM lab_domicilios d2
JOIN lab_asignaciones a2 ON a2.domicilio_id = d2.id
WHERE a2.enfermera_id = a.enfermera_id
AND d2.hora_salida IS NOT NULL
AND d2.id <> d.id
AND CONCAT(d2.fecha_programada, ' ', d2.hora_salida) < CONCAT(d.fecha_programada, ' ', d.hora_llegada)
),
CONCAT(d.fecha_programada, ' ', d.hora_llegada)
)
END AS tiempo_recorrido_min
FROM lab_domicilios d
JOIN lab_pacientes p ON p.id = d.paciente_id
LEFT JOIN lab_ordenes_medicas o ON o.id = d.orden_id
classes/lab/Enfermera.php
+2 -1
View File
@@ -146,7 +146,8 @@ class Enfermera {
LIMIT 1)
) AS orden_id_display,
a.estado AS asignacion_estado,
a.id AS asignacion_id
a.id AS asignacion_id,
d.creado_por
FROM lab_asignaciones a
JOIN lab_domicilios d ON d.id = a.domicilio_id
JOIN lab_pacientes p ON p.id = d.paciente_id