diff --git a/app/routes/automation.py b/app/routes/automation.py index de6881b..8790531 100644 --- a/app/routes/automation.py +++ b/app/routes/automation.py @@ -59,7 +59,7 @@ SELECT r.HORAINICIORECEPCION, r.VALORTOTAL, rel.COD_EXAMEN, - COALESCE(NULLIF(TRIM(it.CUPS_DETALLE), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, + COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, rel.PRECIO, rel.FECHA_REPORTADO, m.COD_ESPECIALIDAD, @@ -68,7 +68,7 @@ SELECT TRIM(m.DOCIDMEDICO) AS DOCIDMEDICO FROM RECEPCION r JOIN RELACION rel ON rel.IDRECEPCION = r.IDRECEPCION -LEFT JOIN ITEM it ON TRIM(it.COD_PROTOCOLO) = TRIM(rel.COD_EXAMEN) +LEFT JOIN EXAMEN ex ON TRIM(ex.CODIGO) = TRIM(rel.COD_EXAMEN) LEFT JOIN MEDICO m ON m.CODIGO = r.COD_MEDICO LEFT JOIN EMPRESA e ON e.NIT = r.NIT_EMPRESA WHERE r.FECHA_RECEPCION BETWEEN :fecha_ini AND :fecha_fin diff --git a/app/routes/test_rda.py b/app/routes/test_rda.py index 5954311..64e10c1 100644 --- a/app/routes/test_rda.py +++ b/app/routes/test_rda.py @@ -21,7 +21,7 @@ SELECT r.IDRECEPCION, r.PREFIJO, r.NUM_FACTURA, r.FECHA_RECEPCION, r.COD_PACIENTE, r.NIT_EMPRESA, r.DIAG_PPAL, r.TIPOUSU, r.TIPOUSUSISPRO, r.AUTORIZACION, r.CLASEPROC, r.HORAINICIORECEPCION, r.VALORTOTAL, rel.COD_EXAMEN, - COALESCE(NULLIF(TRIM(it.CUPS_DETALLE), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, + COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, rel.PRECIO, rel.FECHA_REPORTADO, m.COD_ESPECIALIDAD, COALESCE(NULLIF(TRIM(m.CODIGO), ''), NULLIF(TRIM(r.USUARIO), ''), '') AS profesional, @@ -29,7 +29,7 @@ SELECT TRIM(m.DOCIDMEDICO) AS DOCIDMEDICO FROM RECEPCION r JOIN RELACION rel ON rel.IDRECEPCION = r.IDRECEPCION -LEFT JOIN ITEM it ON TRIM(it.COD_PROTOCOLO) = TRIM(rel.COD_EXAMEN) +LEFT JOIN EXAMEN ex ON TRIM(ex.CODIGO) = TRIM(rel.COD_EXAMEN) LEFT JOIN MEDICO m ON m.CODIGO = r.COD_MEDICO LEFT JOIN EMPRESA e ON e.NIT = r.NIT_EMPRESA WHERE {where}