Skip to content

Mantenimiento Julio2026_3 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrimada merged 1 commit into from
Aug 4, 2026
Merged

Mantenimiento Julio2026_3 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Business/Data/Laboratorio/DetalleProtocolo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,9 @@ AND p.Estado > 0
AND p.IdPaciente = @idPaciente
AND p.IdProtocolo < @idProtocoloActual
AND dp.IdUsuarioValida > 0
ORDER BY dp.IdDetalleProtocolo DESC";
AND DP.conresultado=1
-- ORDER BY dp.IdDetalleProtocolo DESC---no es necesario ordenar
";

Utility util = new Utility();

Expand Down
14 changes: 7 additions & 7 deletions Business/Data/Laboratorio/HojaTrabajo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ public sealed class HojaTrabajo: Business.BaseDataAccess
private bool m_mequiereTodasLasDeterminaciones;
#endregion

#region Default ( Empty ) Class Constuctor
/// <summary>
/// default constructor
/// </summary>
public HojaTrabajo()
#region Default ( Empty ) Class Constuctor
/// <summary>
/// default constructor
/// </summary>
public HojaTrabajo()
{
m_idhojatrabajo = 0;
m_idefector = new Efector();
Expand Down Expand Up @@ -536,7 +536,7 @@ public bool IsChanged
{
get { return m_isChanged; }
}

public bool RequiereTodasLasDeterminaciones
{
get
Expand All @@ -549,7 +549,7 @@ public bool RequiereTodasLasDeterminaciones
m_mequiereTodasLasDeterminaciones = value;
}
}
#endregion
#endregion



Expand Down
1 change: 1 addition & 0 deletions Business/Data/Laboratorio/Protocolo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ INNER JOIN LAB_Protocolo p2 with (nolock)
AND p2.Estado > 0
AND p2.IdProtocolo < @idProtocoloActual
AND dp2.IdUsuarioValida > 0
and dp2.conResultado=1
---agrego que solo traiga los antecedentes de las determinaciones del protocolo actual
AND dp2.IdSubItem IN (
SELECT DISTINCT IdSubItem
Expand Down
17 changes: 14 additions & 3 deletions WebLab/Derivaciones/Derivados2.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,33 @@ private void CargarListas()
Usuario oUser = new Usuario();
oUser = (Usuario)oUser.Get(typeof(Usuario), int.Parse(Session["idUsuario"].ToString()));
//oCon = (Configuracion)oCon.Get(typeof(Configuracion), "IdConfiguracion", 1, "IdEfector", oUser.IdEfector);
string connReady = ConfigurationManager.ConnectionStrings["SIL_ReadOnly"].ConnectionString; ///Performance: conexion de solo lectura
string cacheKey = "";

Utility oUtil = new Utility();
///Carga de combos de tipos de servicios
string m_ssql = "select idTipoServicio, nombre from Lab_TipoServicio WHERE (baja = 0)";
oUtil.CargarCombo(ddlServicio, m_ssql, "idTipoServicio", "nombre");
cacheKey = "CAT_TipoServicio";
Business.Helpers.ComboCache.CargarCombo(ddlServicio, cacheKey, m_ssql, "idTipoServicio", "nombre", connReady);

//oUtil.CargarCombo(ddlServicio, m_ssql, "idTipoServicio", "nombre");
ddlServicio.Items.Insert(0, new ListItem("Todos", "0"));
CargarArea();

///Carga de combos de Origen
m_ssql = "SELECT idOrigen, nombre FROM LAB_Origen WHERE (baja = 0)";
oUtil.CargarCombo(ddlOrigen, m_ssql, "idOrigen", "nombre");
cacheKey = "CAT_Origen";
Business.Helpers.ComboCache.CargarCombo(ddlOrigen, cacheKey, m_ssql, "idOrigen", "nombre", connReady);

//oUtil.CargarCombo(ddlOrigen, m_ssql, "idOrigen", "nombre");
ddlOrigen.Items.Insert(0, new ListItem("Todos", "0"));

///Carga de combos de Prioridad
m_ssql = "SELECT idPrioridad, nombre FROM LAB_Prioridad WHERE (baja = 0)";
oUtil.CargarCombo(ddlPrioridad, m_ssql, "idPrioridad", "nombre");
cacheKey = "CAT_Prioridad";
Business.Helpers.ComboCache.CargarCombo(ddlPrioridad, cacheKey, m_ssql, "idPrioridad", "nombre", connReady);

//oUtil.CargarCombo(ddlPrioridad, m_ssql, "idPrioridad", "nombre");
ddlPrioridad.Items.Insert(0, new ListItem("Todos", "0"));


Expand Down
29 changes: 3 additions & 26 deletions WebLab/Derivaciones/LoteList.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected void Page_Load(object sender, EventArgs e)
VerificaPermisos("Lista de Lotes");
lblTitulo.Text = "LISTA DE LOTES";
habilitaOrdenarEfector();
CargarFiltros();
CargarListas();
}
}
else
Expand Down Expand Up @@ -166,7 +166,7 @@ INNER JOIN LAB_LoteDerivacion l (nolock) on l.idEfectorDestino = E.idEfector
}


private void CargarFiltros()
private void CargarListas()
{
if (Session["idUsuario"] != null)
{
Expand Down Expand Up @@ -471,30 +471,7 @@ protected void lnkExcel_Click(object sender, EventArgs e)

Utility oUtil = new Utility();
Utility.ExportDataTableToXlsx(tabla, oUtil.CompletarNombrePDF("Lotes"));
//StringBuilder sb = new StringBuilder();
//StringWriter sw = new StringWriter(sb);
//HtmlTextWriter htw = new HtmlTextWriter(sw);
//HtmlForm form = new HtmlForm();
//GridView dg = new GridView();
//dg.EnableViewState = false;
//dg.DataSource = tabla;
//dg.DataBind();
//Page pagina = new Page();
//pagina.EnableEventValidation = false;
//pagina.DesignerInitialize();
//pagina.Controls.Add(form);
//form.Controls.Add(dg);
//pagina.RenderControl(htw);
//Utility oUtil = new Utility();
//string nombrXLS = oUtil.CompletarNombrePDF("Lotes");
//Response.Clear();
//Response.Buffer = true;
//Response.ContentType = "application/vnd.ms-excel";
//Response.AddHeader("Content-Disposition", "attachment;filename=" + nombrXLS + ".xls");
//Response.Charset = "UTF-8";
//Response.ContentEncoding = Encoding.Default;
//Response.Write(sb.ToString());
//Response.End();

}
else
{
Expand Down
1 change: 1 addition & 0 deletions WebLab/Estadisticas/ReporteIncidencias.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Text;
using System.IO;
using System.Web.UI.HtmlControls;

using Business.Data.Laboratorio;
using Business.Data;
using System.Configuration;
Expand Down
3 changes: 1 addition & 2 deletions WebLab/HojasTrabajo/HTList.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ private void Imprimir(object p)
{
nombre_reporte = "../Informes/HojasdeTrabajo/HTrabajoProtocolo5";
} break;

}
}
}
//if (oRegistro.Formato == 1)
//{
Expand Down
8 changes: 4 additions & 4 deletions WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo4Horizontal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// </auto-generated>
//------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo4Microbiologia.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// </auto-generated>
//------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo4MicrobiologiaHorizontal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// </auto-generated>
//------------------------------------------------------------------------------

Expand Down
Binary file modified WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo5Horizontal.rpt
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions WebLab/Informes/Informe.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,12 @@
<td colspan="2">
<hr /></td>
</tr>
<tr>
<%-- <tr>
<td>
&nbsp;</td>
<td>
&nbsp;</td>
</tr>
</tr>--%>
</table>
</div>
</div>
Expand All @@ -400,7 +400,7 @@
<td colspan="4" >

<asp:Panel ID="pnlHojaTrabajo" runat="server">
<div class="panel-footer">
<%-- <div class="panel-footer"> --%>
<table style="width:100%;">
<%-- <tr>
<td align="left">
Expand Down Expand Up @@ -480,7 +480,7 @@
</td>
</tr>
</table>
</div>
<%-- </div>--%>
</asp:Panel>

</td>
Expand Down
32 changes: 17 additions & 15 deletions WebLab/Informes/Informe.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,15 @@ private void CargarListas()
ddlPrioridad.Items.Insert(0, new ListItem("-- Todos --", "0"));


m_ssql = "SELECT idImpresora, nombre FROM LAB_Impresora with (nolock) where idEfector=" + oUser.IdEfector.IdEfector.ToString() + " order by nombre"; //MultiEfector

oUtil.CargarCombo(ddlImpresoraCB, m_ssql, "nombre", "nombre", connReady);

ddlImpresora.Items.Insert(0, new ListItem("Seleccione impresora", "0"));
if (Request["Tipo"].ToString() == "CodigoBarras")
{
m_ssql = "SELECT idImpresora, nombre FROM LAB_Impresora with (nolock) where idEfector=" + oUser.IdEfector.IdEfector.ToString() + " order by nombre"; //MultiEfector
cacheKey = $"CAT_ImpresoraEtiqueta_{oUser.IdEfector.IdEfector}";
Business.Helpers.ComboCache.CargarCombo(ddlImpresoraCB, cacheKey, m_ssql, "nombre", "nombre", connReady);
// oUtil.CargarCombo(ddlImpresoraCB, m_ssql, "nombre", "nombre", connReady);

ddlImpresoraCB.Items.Insert(0, new ListItem("Seleccione impresora", "0"));
}

if (Request["Tipo"].ToString() == "HojaTrabajo") ddlPrioridad.SelectedValue = "1";//rutina

Expand Down Expand Up @@ -596,7 +599,6 @@ private void VistaPreeliminar(object p, string accion)
nombre_reporte = "../Informes/HojasdeTrabajo/HTrabajoProtocolo5";
}
break;

}
}
if (ddlServicio.SelectedValue == "3") //microbiolgoia
Expand Down Expand Up @@ -689,28 +691,28 @@ private void ExportarExcel(DataTable dt, string nom)
Response.End();

}







private DataTable GetDataSet_HojaTrabajo(object p)
{

string s_store = "LAB_GeneraHT";
DataSet Ds = new DataSet();
SqlConnection conn = (SqlConnection)NHibernateHttpModule.CurrentSession.Connection;
// SqlConnection conn = new SqlConnection(ConfigurationManager.ConnectionStrings["SIL_ReadOnly"].ConnectionString); ///Performance: conexion de solo lectura
SqlConnection conn = (SqlConnection)NHibernateHttpModule.CurrentSession.Connection;
// SqlConnection conn = new SqlConnection(ConfigurationManager.ConnectionStrings["SIL_ReadOnly"].ConnectionString); ///Performance: conexion de solo lectura
SqlCommand cmd = new SqlCommand();
cmd.CommandType = CommandType.StoredProcedure;

// Configuracion oCon = new Configuracion(); oCon = (Configuracion)oCon.Get(typeof(Configuracion), 1);
if (rdbHojaConResultados.SelectedValue == "0")
s_store = "LAB_GeneraHT";
else
s_store = "LAB_GeneraHTconResultados";


s_store = "LAB_GeneraHT";
else
s_store = "LAB_GeneraHTconResultados";
if (ddlServicio.SelectedValue=="3") s_store = s_store + "Microbiologia";
if (ddlServicio.SelectedValue=="4") s_store = s_store + "Pesquisa";

Expand Down
2 changes: 1 addition & 1 deletion WebLab/Items/ItemEdit2.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<li><a href="#tab6">Mas opciones</a></li>
<li><a href="#tab9">Turnos</a></li>
<li><a href="#tab10">AutoAnalizadores</a></li>
<li><a href="#tab11">Observaciones Resultados</a></li>
<%-- <li><a href="#tab11">Observaciones Resultados</a></li>--%>
</ul>

<div id="tab1" class="tab_content" style="border: 1px solid #C0C0C0">
Expand Down
2 changes: 2 additions & 0 deletions WebLab/Principal.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
</div>

</div>



<div class="row" >

Expand Down
4 changes: 3 additions & 1 deletion WebLab/Principal.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected void Page_Load(object sender, EventArgs e)
// int i = calcularComodinDifProtocolo();
// Actualizarcomodin(i);
//}

// MostrarInfoLogin(oUser);
if (oCon != null)
{
lblProximoProtocolo1.Visible = false;
Expand Down Expand Up @@ -225,6 +225,8 @@ protected void Page_Load(object sender, EventArgs e)

}



private void CargarGrillaSISA()
{
DataSet Ds = new DataSet();
Expand Down
Loading
Loading