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

up

Browse Source
This commit is contained in:
Lizandro Guarnizo
2026-06-01 09:16:03 -05:00
parent b317639258
commit 4e6913c41e
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/lab/Domicilio.php
+4 -20
View File
@@ -90,18 +90,10 @@ class Domicilio {
a.id AS asignacion_id,
a.estado AS asignacion_estado,
CASE
WHEN a.enfermera_id IS NULL OR d.hora_llegada IS NULL THEN NULL
WHEN d.hora_en_camino 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_en_camino),
CONCAT(d.fecha_programada, ' ', d.hora_llegada)
)
END AS tiempo_recorrido_min
@@ -147,18 +139,10 @@ class Domicilio {
a.estado AS asignacion_estado,
adm.full_name AS creado_por_nombre,
CASE
WHEN a.enfermera_id IS NULL OR d.hora_llegada IS NULL THEN NULL
WHEN d.hora_en_camino 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_en_camino),
CONCAT(d.fecha_programada, ' ', d.hora_llegada)
)
END AS tiempo_recorrido_min
classes/lab/Enfermera.php
+1 -1
View File
@@ -154,7 +154,7 @@ class Enfermera {
LEFT JOIN lab_ordenes_medicas om ON om.id = d.orden_id
WHERE a.enfermera_id = ?
AND d.fecha_programada = ?
ORDER BY d.hora_programada ASC
ORDER BY d.hora_programada IS NULL ASC, d.hora_programada ASC
", [$enfermeraId, $fecha]);
// Bulk-load todos los archivos de órdenes vinculados a estos domicilios