chore: bump version marker in json_generator

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/routes/automation.py

@@ -58,9 +58,11 @@ SELECT
     r.CLASEPROC,
     r.HORAINICIORECEPCION,
     r.VALORTOTAL,
+    r.VALORDESC,
     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,
+    COALESCE(t.VALOR, rel.PRECIO) AS PRECIO_TARIFA,
     rel.FECHA_REPORTADO,
     m.COD_ESPECIALIDAD,
     COALESCE(NULLIF(TRIM(m.CODIGO), ''), NULLIF(TRIM(r.USUARIO), ''), '') AS profesional,
@@ -68,9 +70,10 @@ 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
+LEFT JOIN TARIFA t ON TRIM(t.COD_EXAMEN) = TRIM(rel.COD_EXAMEN) AND t.TARIFA = e.TARIFA
 WHERE r.FECHA_RECEPCION BETWEEN :fecha_ini AND :fecha_fin
   AND r.NUM_FACTURA > 0
   {filtro_contrato_rda}

app/routes/debug_fb.py

@@ -21,23 +21,39 @@ async def find_cups(request: Request, user: dict = Depends(get_current_user)):
 
         results = {}
 
-        # 1. Buscar todas las tablas que tengan campo con "CUP" en nombre
-        ok0, _, rows0 = fb.execute_query(
-            "SELECT TRIM(f.RDB$RELATION_NAME) AS t, TRIM(f.RDB$FIELD_NAME) AS c "
-            "FROM RDB$RELATION_FIELDS f WHERE f.RDB$FIELD_NAME LIKE '%CUP%' "
-            "AND f.RDB$SYSTEM_FLAG = 0 ORDER BY 1,2"
-        )
-        results["todos_campos_cup"] = list(rows0) if ok0 else []
+        BUSCAR = "903967"
 
-        # 2. Tabla PROTOCOLO - primera fila
-        ok1, err1, rows1 = fb.execute_query("SELECT FIRST 1 p.* FROM PROTOCOLO p")
-        results["protocolo_fila"] = rows1[0] if (ok1 and rows1) else f"error: {err1}"
+        # Tablas y sus campos de texto para buscar
+        tablas_candidatas = [
+            ("PROTOCOLO", ["CODIGO", "NOMBRE"]),
+            ("ITEM", ["COD_PROTOCOLO", "CUPS_DETALLE", "CODITEMINTERFACE"]),
+            ("RELACION", ["COD_EXAMEN"]),
+            ("RELACION_HIMS", ["CUPS_REF"]),
+            ("ARTICULO", ["CODIGO", "CUPS"]),
+            ("SERVICIO", ["CODIGO", "CUPS", "COD_CUPS"]),
+            ("PROCEDIMIENTO", ["CODIGO", "CUPS"]),
+        ]
 
-        # 3. PROTOCOLO para CH4
-        ok2, err2, rows2 = fb.execute_query(
-            "SELECT FIRST 1 p.* FROM PROTOCOLO p WHERE TRIM(p.CODIGO) = 'CH4'"
-        )
-        results["protocolo_ch4"] = rows2[0] if (ok2 and rows2) else f"error: {err2}"
+        encontrado = {}
+        for tabla, campos in tablas_candidatas:
+            for campo in campos:
+                ok_t, _, rows_t = fb.execute_query(
+                    f"SELECT FIRST 3 t.* FROM {tabla} t "
+                    f"WHERE TRIM(t.{campo}) = '{BUSCAR}'"
+                )
+                if ok_t and rows_t:
+                    encontrado[f"{tabla}.{campo}"] = list(rows_t)
+
+        results["valor_903967_encontrado_en"] = encontrado if encontrado else "no encontrado en tablas comunes"
+
+        # Buscar en campos de tipo char/varchar de PROTOCOLO e ITEM que no conocemos
+        for tabla in ["PROTOCOLO", "ITEM"]:
+            ok_c, _, rows_c = fb.execute_query(
+                f"SELECT TRIM(f.RDB$FIELD_NAME) AS c FROM RDB$RELATION_FIELDS f "
+                f"WHERE TRIM(f.RDB$RELATION_NAME)='{tabla}' ORDER BY f.RDB$FIELD_POSITION"
+            )
+            if ok_c:
+                results[f"columnas_{tabla.lower()}"] = [r["c"] for r in rows_c]
 
         fb.disconnect()
         return JSONResponse(results)

app/routes/logs.py

@@ -1,10 +1,21 @@
+import json as json_lib
 from fastapi import APIRouter, Request, Depends
 from fastapi.responses import JSONResponse
 from app.database import get_connection
 from app.auth import get_current_user
+from app.services.json_generator import _clean_times
 
 router = APIRouter(prefix="/logs", tags=["logs"])
 
+
+def _limpiar_json_enviado(raw: str) -> str:
+    if not raw:
+        return raw
+    try:
+        return json_lib.dumps(_clean_times(json_lib.loads(raw)), ensure_ascii=False, indent=2)
+    except Exception:
+        return raw
+
 PAGE_SIZE = 50
 
 
@@ -95,7 +106,7 @@ async def detalle_envio(envio_id: int, request: Request, user: dict = Depends(ge
         "status": row["status"],
         "mensaje_tns": row["mensaje_tns"],
         "respuesta_api": row["respuesta_api"],
-        "json_enviado": row["json_enviado"],
+        "json_enviado": _limpiar_json_enviado(row["json_enviado"]),
         "fecha_inicio": row["fecha_inicio"],
         "fecha_fin": row["fecha_fin"],
         "created_at": row["created_at"],

app/routes/queries.py

@@ -47,8 +47,11 @@ WHERE p.DOCIDENT = :doc_num""",
     r.CLASEPROC,
     r.HORAINICIORECEPCION,
     r.VALORTOTAL,
+    r.VALORDESC,
     rel.COD_EXAMEN,
+    COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS,
     rel.PRECIO,
+    COALESCE(t.VALOR, rel.PRECIO) AS PRECIO_TARIFA,
     rel.FECHA_REPORTADO,
     m.COD_ESPECIALIDAD,
     COALESCE(NULLIF(TRIM(m.CODIGO), ''), NULLIF(TRIM(r.USUARIO), ''), '') AS profesional,
@@ -56,8 +59,10 @@ 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
+LEFT JOIN TARIFA t ON TRIM(t.COD_EXAMEN) = TRIM(rel.COD_EXAMEN) AND t.TARIFA = e.TARIFA
 WHERE r.NUM_FACTURA = :num_factura""",
         "description": "Servicios de una recepción por número de factura"
     },
@@ -78,8 +83,11 @@ WHERE r.NUM_FACTURA = :num_factura""",
     r.CLASEPROC,
     r.HORAINICIORECEPCION,
     r.VALORTOTAL,
+    r.VALORDESC,
     rel.COD_EXAMEN,
+    COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS,
     rel.PRECIO,
+    COALESCE(t.VALOR, rel.PRECIO) AS PRECIO_TARIFA,
     rel.FECHA_REPORTADO,
     m.COD_ESPECIALIDAD,
     COALESCE(NULLIF(TRIM(m.CODIGO), ''), NULLIF(TRIM(r.USUARIO), ''), '') AS profesional,
@@ -87,8 +95,10 @@ 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
+LEFT JOIN TARIFA t ON TRIM(t.COD_EXAMEN) = TRIM(rel.COD_EXAMEN) AND t.TARIFA = e.TARIFA
 WHERE r.FECHA_RECEPCION BETWEEN :fecha_ini AND :fecha_fin
 ORDER BY r.IDRECEPCION""",
         "description": "Servicios en un rango de fechas (para RdaPaciente/Insertar)"

app/routes/test_rda.py

@@ -20,18 +20,20 @@ _SQL_RDA_BY_WHERE = """
 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,
-    rel.PRECIO, rel.FECHA_REPORTADO,
+    r.HORAINICIORECEPCION, r.VALORTOTAL, r.VALORDESC, rel.COD_EXAMEN,
+    COALESCE(NULLIF(TRIM(ex.NUM_ISS), ''), TRIM(rel.COD_EXAMEN)) AS CUPS,
+    rel.PRECIO, COALESCE(t.VALOR, rel.PRECIO) AS PRECIO_TARIFA,
+    rel.FECHA_REPORTADO,
     m.COD_ESPECIALIDAD,
     COALESCE(NULLIF(TRIM(m.CODIGO), ''), NULLIF(TRIM(r.USUARIO), ''), '') AS profesional,
     e.CODCONTRATO,
     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
+LEFT JOIN TARIFA t ON TRIM(t.COD_EXAMEN) = TRIM(rel.COD_EXAMEN) AND t.TARIFA = e.TARIFA
 WHERE {where}
   AND r.NUM_FACTURA > 0
   AND e.CODCONTRATO IS NOT NULL

app/services/json_generator.py

@@ -2,6 +2,7 @@ import re as _re
 from collections import defaultdict
 from datetime import datetime, date
 from typing import Optional
+# v1.4.0
 
 
 # ── helpers de formato de fecha ──────────────────────────────────────────────
@@ -123,6 +124,14 @@ def agrupar_por_recepcion(rows: list) -> dict:
     return grupos
 
 
+def _calcular_descuento_pct(rows: list) -> int:
+    total_cobrado = sum(float(r.get("PRECIO") or 0) for r in rows)
+    total_tarifa = sum(float(r.get("PRECIO_TARIFA") or r.get("PRECIO") or 0) for r in rows)
+    if total_tarifa > 0 and total_tarifa > total_cobrado:
+        return round((total_tarifa - total_cobrado) / total_tarifa * 100)
+    return 0
+
+
 def generar_rda_paciente(rows: list, default_profesional: str = "", default_especialidad: str = "",
                          default_remisionante: str = "00", default_prefijo: str = "00",
                          numero_override: str = "") -> dict:
@@ -220,6 +229,7 @@ def generar_rda_paciente(rows: list, default_profesional: str = "", default_espe
         "numeroAutorizacion": autorizacion,
         "fechaAutorizacion": date.today().strftime("%d/%m/%Y"),
         "vigenciaAutorizacion": vigencia,
+        "descuento": _calcular_descuento_pct(rows),
         "detallePedido": detalle_pedido,
         "detalleFormaPago": [{
             "codigoFormaPago": cod_forma_pago,

app/templates/logs.html

@@ -266,8 +266,8 @@ function syntaxHighlight(obj) {
     return json
         .replace(/("(?:[^"\\]|\\.)*")(?=\s*:)/g,'<span class="text-blue-600">$1</span>')
         .replace(/:(\s*)("(?:[^"\\]|\\.)*")/g,': $1<span class="text-green-700">$2</span>')
-        .replace(/:(\s*)(\d+(?:\.\d+)?)/g,': $1<span class="text-orange-600">$2</span>')
-        .replace(/:(\s*)(null|true|false)/g,': $1<span class="text-purple-600">$2</span>');
+        .replace(/: (\d+(?:\.\d+)?)/g,': <span class="text-orange-600">$1</span>')
+        .replace(/: (null|true|false)/g,': <span class="text-purple-600">$1</span>');
 }
 </script>
 {% endblock %}

app/templates/terceros.html

@@ -123,8 +123,8 @@ function syntaxHighlight(obj) {
     json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
     return json.replace(/("(?:[^"\\]|\\.)*")(?=\s*:)/g, '<span class="text-blue-600">$1</span>')
                .replace(/:(\s*)("(?:[^"\\]|\\.)*")/g, ': $1<span class="text-green-600">$2</span>')
-               .replace(/:(\s*)(\d+)/g, ': $1<span class="text-orange-600">$2</span>')
-               .replace(/:(\s*)(null|true|false)/g, ': $1<span class="text-purple-600">$2</span>');
+               .replace(/: (\d+)/g, ': <span class="text-orange-600">$1</span>')
+               .replace(/: (null|true|false)/g, ': <span class="text-purple-600">$1</span>');
 }
 </script>
 {% endblock %}

app/templates/transaccion.html

@@ -360,8 +360,8 @@ function syntaxHighlight(obj) {
     return json
         .replace(/("(?:[^"\\]|\\.)*")(?=\s*:)/g,'<span class="text-blue-600">$1</span>')
         .replace(/:(\s*)("(?:[^"\\]|\\.)*")/g,': $1<span class="text-green-700">$2</span>')
-        .replace(/:(\s*)(\d+(?:\.\d+)?)/g,': $1<span class="text-orange-600">$2</span>')
-        .replace(/:(\s*)(null|true|false)/g,': $1<span class="text-purple-600">$2</span>');
+        .replace(/: (\d+(?:\.\d+)?)/g,': <span class="text-orange-600">$1</span>')
+        .replace(/: (null|true|false)/g,': <span class="text-purple-600">$1</span>');
 }
 </script>
 {% endblock %}

fix_queries.py

@@ -0,0 +1,67 @@
+import sqlite3
+
+Q5 = """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(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,
+    e.CODCONTRATO,
+    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"""
+
+Q6 = """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(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,
+    e.CODCONTRATO,
+    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
+ORDER BY r.IDRECEPCION"""
+
+conn = sqlite3.connect("rips_manager.db")
+conn.execute("UPDATE queries SET query_text=? WHERE id=5", (Q5,))
+conn.execute("UPDATE queries SET query_text=? WHERE id=6", (Q6,))
+conn.commit()
+conn.close()
+print("Queries actualizados OK")