diff --git a/app/routes/queries.py b/app/routes/queries.py index b06716c..d2992ec 100644 --- a/app/routes/queries.py +++ b/app/routes/queries.py @@ -48,6 +48,7 @@ WHERE p.DOCIDENT = :doc_num""", r.HORAINICIORECEPCION, r.VALORTOTAL, rel.COD_EXAMEN, + COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, rel.PRECIO, rel.FECHA_REPORTADO, m.COD_ESPECIALIDAD, @@ -56,6 +57,7 @@ WHERE p.DOCIDENT = :doc_num""", TRIM(m.DOCIDMEDICO) AS DOCIDMEDICO FROM RECEPCION r JOIN RELACION rel ON rel.IDRECEPCION = r.IDRECEPCION +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.NUM_FACTURA = :num_factura""", @@ -79,6 +81,7 @@ WHERE r.NUM_FACTURA = :num_factura""", r.HORAINICIORECEPCION, r.VALORTOTAL, rel.COD_EXAMEN, + COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS, rel.PRECIO, rel.FECHA_REPORTADO, m.COD_ESPECIALIDAD, @@ -87,6 +90,7 @@ WHERE r.NUM_FACTURA = :num_factura""", TRIM(m.DOCIDMEDICO) AS DOCIDMEDICO FROM RECEPCION r JOIN RELACION rel ON rel.IDRECEPCION = r.IDRECEPCION +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