diff --git a/Business/Business.csproj b/Business/Business.csproj
index 49f7a4f2..1e4ed3e8 100644
--- a/Business/Business.csproj
+++ b/Business/Business.csproj
@@ -313,6 +313,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="GeneraCodigoQR.cs" />
+    <Compile Include="Helpers\CatalogoCache.cs" />
+    <Compile Include="Helpers\ComboCache.cs" />
     <Compile Include="Moneda.cs" />
     <Compile Include="NHibernateHttpModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Business/Data/Laboratorio/HojaTrabajo.cs b/Business/Data/Laboratorio/HojaTrabajo.cs
index 8df32f87..c05d6b43 100644
--- a/Business/Data/Laboratorio/HojaTrabajo.cs
+++ b/Business/Data/Laboratorio/HojaTrabajo.cs
@@ -538,7 +538,7 @@ public bool IsChanged
 
         public  DataTable GetDataSet_HojaTrabajoPreeliminar()
         {
-
+            //  'XX/XX/XXXX' AS fecha ==> CONVERT(varchar(10), GETDATE(), 103) AS fecha ; para evitar error de la formula 'CDate({ht.fecha})' 
             string m_strSQL = @" with  lineas  as (
  select "+ this.IdHojaTrabajo.ToString()+ @" as idhojatrabajo, '01' as linea, 'p' as pac
  union
@@ -575,7 +575,7 @@ public  DataTable GetDataSet_HojaTrabajoPreeliminar()
 SELECT TOP (100) PERCENT 'A' as letra, linea AS  numero, '' as numeroOrigen,'___' as cantidad, HT.idHojaTrabajo,  
                   CASE WHEN HT.imprimirPrioridad = 1 THEN 'R' ELSE '' END AS prioridad, '0'  as antecedente , 
                                 CASE WHEN HT.imprimirorigen = 1 THEN '-A' ELSE '' END AS origen, CHT.textoImprimir AS item, A.nombre AS area, 
-                                CHT.idDetalleHojaTrabajo AS ORDEN, 'XX/XX/XXXX' AS fecha, HT.responsable, HT.codigo AS codigoHT,  
+                                CHT.idDetalleHojaTrabajo AS ORDEN, CONVERT(varchar(10), GETDATE(), 103) AS fecha, HT.responsable, HT.codigo AS codigoHT,  
                                 CASE WHEN HT.imprimirApellidoNombre = 1 THEN '-Paciente' ELSE '' END +
                                     CASE WHEN HT.imprimirDiagnostico = 1 then '-Diag' else '' end AS paciente,  
                                 CASE WHEN HT.imprimirEdad = 1 THEN '-0' ELSE '' END AS edad, CASE WHEN HT.imprimirSexo = 1 THEN '-F' ELSE '' END AS sexo,  
diff --git a/WebLab/Estadisticas/Grafico.aspx.cs b/WebLab/Estadisticas/Grafico.aspx.cs
index d468e66c..50fb75bb 100644
--- a/WebLab/Estadisticas/Grafico.aspx.cs
+++ b/WebLab/Estadisticas/Grafico.aspx.cs
@@ -5,7 +5,6 @@
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Data;
-using InfoSoftGlobal;
 using System.Web.Script.Serialization;
 
 namespace WebLab.Estadisticas
diff --git a/WebLab/Estadisticas/GraficoChart.ascx b/WebLab/Estadisticas/GraficoChart.ascx
index 5566edec..87acd217 100644
--- a/WebLab/Estadisticas/GraficoChart.ascx
+++ b/WebLab/Estadisticas/GraficoChart.ascx
@@ -1,7 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="GraficoChart.ascx.cs" Inherits="WebLab.Estadisticas.GraficoChart" %>
 <script type="text/javascript" src="../script/chart/chart.js"></script>
-
-<canvas id="miGrafico" runat="server"></canvas>
+<canvas id="miGrafico" runat="server" style="max-height: 420px; width: 100%;"></canvas>
 
 <script type="text/javascript">
     function arrayVacio(arr) {
@@ -10,7 +9,7 @@
     }
 
     var ctx = document.getElementById('<%= miGrafico.ClientID %>');
-    var labels = <%= string.IsNullOrEmpty(LabelsJson) ? "[]" : LabelsJson %>;
+    var labels = <%= string.IsNullOrEmpty(LabelsJsonDecoded) ? "[]" : LabelsJsonDecoded %>;
     var datos = <%= string.IsNullOrEmpty(DatosJson) ? "[]" : DatosJson %>;
     var datosOtros = <%= string.IsNullOrEmpty(DatosStringJson) ? "[]" : DatosStringJson %>;
     var tieneDatos1 = true; tieneDatos2 = true;
@@ -34,6 +33,7 @@
         var valorMinimo =  <%= string.IsNullOrEmpty(minimo) ? "\"\"" : minimo %>;
         var tituloX = <%= string.IsNullOrEmpty(tituloX) ? "\"\"" : tituloX %>;
         var tituloY = <%= string.IsNullOrEmpty(tituloY) ? "\"\"" : tituloY %>;
+        var mostrarLabels = <%= string.IsNullOrEmpty(MostrarLabels) ? "true" : MostrarLabels %>;
 
 
         var colores = [
@@ -45,8 +45,8 @@
         ];
 
         var opciones = {
-           
-             plugins: {
+
+            plugins: {
                 title: {
                     display: true,
                     text: titulo
@@ -72,6 +72,25 @@
                 x: { display: false },
                 y: { display: false }
             };
+            opciones.radius = '85%';
+            opciones.maintainAspectRatio = false;            
+            opciones.aspectRatio = 1.8;
+            opciones.responsive = true;
+        }
+
+        if (tipo === 'pie' || tipo === 'bar') {
+            // % en tooltip
+            opciones.plugins.tooltip = {
+                callbacks: {
+                    label: function(context) {
+                        var label = context.label || '';
+                        var value = context.parsed;
+                        var total = context.dataset.data.reduce(function(a, b) { return a + b; }, 0);
+                        var pct = ((value / total) * 100).toFixed(1);
+                        return label + ': ' + value + ' (' + pct + '%)';
+                    }
+                }
+            };
         }
 
         //Si tiene valor minimo un escala, definimos la escala
@@ -79,7 +98,7 @@
             opciones.scales = {
                 x: {
                     title: {
-                        display: true, text: tituloX 
+                        display: true, text: tituloX
                     }
                 },
                 y: {
@@ -88,12 +107,94 @@
                         callback: function (value) { return Number(value).toFixed(2); } //para que tenga solo dos decimales despues de la coma
                     },
                     title: {
-                        display: true, text: tituloY 
+                        display: true, text: tituloY
                     }
                 }
             };
         }
 
+        if (tipo === 'line') { //Usamos este tipo de grafico para evoluciones de analisis 
+            opciones.plugins.legend = {
+                labels: {
+                    boxWidth: 0,
+                    boxHeight: 0
+                }
+            };
+            opciones.plugins.title.display = false;  // oculta el titulo duplicado
+        }
+
+        if (tipo === 'pie' || tipo === 'bar') {
+           
+            opciones.plugins.legend = {
+                position: 'right',
+                labels: {
+                    generateLabels: function (chart) {
+
+                        var datos = chart.data.datasets[0].data;
+                        var total = datos.reduce(function (a, b) { return a + b; }, 0);
+
+                        return chart.data.labels.map(function (label, i) {
+
+                            var porcentaje = (datos[i] * 100 / total).toFixed(1);
+
+                            return {
+                                text: label + "    " + porcentaje + "%",
+                                fillStyle: chart.data.datasets[0].backgroundColor[i],
+                                strokeStyle: chart.data.datasets[0].backgroundColor[i],
+                                hidden: false,
+                                index: i
+                            };
+                        });
+                    }
+                }
+                
+            }
+        }
+
+        if (tipo === 'line') { //Usamos este tipo de grafico para evoluciones de analisis 
+            opciones.plugins.legend = {
+                labels: {
+                    boxWidth: 0,
+                    boxHeight: 0
+                }
+            };
+            opciones.plugins.title.display = false;  // oculta el titulo duplicado
+        }
+
+        if (tipo === 'pie') {
+            //se agrega en los labels el % , y ademas la opcion que no muestre nada (para graficos con muchos items)
+            if (mostrarLabels === '' || mostrarLabels === true) {
+                opciones.plugins.legend = {
+                position: 'right',
+                labels: {
+                    generateLabels: function (chart) {
+
+                            var datos = chart.data.datasets[0].data;
+                            var total = datos.reduce(function (a, b) { return a + b; }, 0);
+
+                            return chart.data.labels.map(function (label, i) {
+
+                                var porcentaje = (datos[i] * 100 / total).toFixed(1);
+
+                                return {
+                                    text: label + "    " + porcentaje + "%",
+                                    fillStyle: chart.data.datasets[0].backgroundColor[i],
+                                    strokeStyle: chart.data.datasets[0].backgroundColor[i],
+                                    hidden: false,
+                                    index: i
+                                };
+                            });
+                        }
+                    }
+                
+                };
+             } else {
+                opciones.plugins.legend = {
+                    display: false
+                };
+            }
+        }
+
         new Chart(ctx, {
             type: tipo,
             data: {
@@ -109,4 +210,6 @@
             options: opciones
         });
     }
+        
+    
 </script>
diff --git a/WebLab/Estadisticas/GraficoChart.ascx.cs b/WebLab/Estadisticas/GraficoChart.ascx.cs
index 279c022f..f10ea3e3 100644
--- a/WebLab/Estadisticas/GraficoChart.ascx.cs
+++ b/WebLab/Estadisticas/GraficoChart.ascx.cs
@@ -1,4 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Script.Serialization;
 using System.Web.UI;
 
 namespace WebLab.Estadisticas
@@ -41,5 +45,58 @@ public partial class GraficoChart : System.Web.UI.UserControl
         /// 
         /// </summary>
         public string tituloY { get; set; }  //titulo de eje Y
+        /// <summary>
+        /// Controla si se muestran los labels en la leyenda (true por defecto)
+        /// </summary>
+        public string MostrarLabels { get; set; }
+
+        /* 
+         * ASP.NET WebForms está llamando al Render del control dos veces durante 
+         * el ciclo de vida de la página(algo común con master pages, dependiendo 
+         * de cómo se estructura el árbol de controles). *
+         */
+
+        /// <summary>
+        /// Banderas para que se ejecute una sola vez DecodeLabels
+        /// </summary>
+        private string labelsDecodificadas;
+        private bool seDecodificaronLabels;
+
+        /// <summary>
+        /// DecodeLabels: Retorna LabelsJson con entidades HTML decodificadas si MostrarLabels es true
+        /// Ej: Si recibo "Orina, obtenci&#243;n desconocido" lo transformo a "Orina, obtención desconocido"
+        /// </summary>
+        public string LabelsJsonDecoded
+        {
+            get
+            {
+                if (!seDecodificaronLabels)
+                {
+                    labelsDecodificadas = DecodeLabels();
+                    seDecodificaronLabels = true;
+                }
+                return labelsDecodificadas;
+            }
+        }
+
+        private string DecodeLabels()
+        {
+            if (!string.IsNullOrEmpty(LabelsJson))
+            {
+                bool mostrar = string.IsNullOrEmpty(MostrarLabels) ||
+                               MostrarLabels.Equals("true", StringComparison.OrdinalIgnoreCase);
+                if (mostrar)
+                {
+                    var js = new JavaScriptSerializer();
+                    var labels = js.Deserialize<List<string>>(LabelsJson);
+                    if (labels != null)
+                    {
+                        labels = labels.Select(l => HttpUtility.HtmlDecode(l)).ToList();
+                        return js.Serialize(labels);
+                    }
+                }
+            }
+            return LabelsJson;
+        }
     }
 }
diff --git a/WebLab/Estadisticas/Reporte.aspx b/WebLab/Estadisticas/Reporte.aspx
index b719f236..f0f0ffea 100644
--- a/WebLab/Estadisticas/Reporte.aspx
+++ b/WebLab/Estadisticas/Reporte.aspx
@@ -42,14 +42,25 @@
             >Descargar Detalle Por Determinacion</asp:LinkButton>--%>
   
    &nbsp;<asp:Panel ID="pnlGrafico" runat="server">
-   <div style="border: 1px solid #C0C0C0; width: 400px; " >
-      
-        <uc:GraficoChart ID="miGrafico" runat="server" />  &nbsp &nbsp <uc:GraficoChart ID="miGrafico10" runat="server" />
-      
-      
-       <asp:Label ID="lblInforme" runat="server" Text="Label" Visible="False"></asp:Label>
-       <asp:Label ID="lblTipo" runat="server" Text="Label" Visible="False"></asp:Label>
-    </div>
+       <table >
+           <tr>
+               <td  style="border: 1px solid #C0C0C0; vertical-align:auto;">
+                     <div  style=" width: 400px; " >
+                          <uc:GraficoChart ID="miGrafico" runat="server" />
+                        </div>
+                   
+                    <asp:Label ID="lblInforme" runat="server" Text="Label" Visible="False"></asp:Label>
+                     <asp:Label ID="lblTipo" runat="server" Text="Label" Visible="False"></asp:Label>
+               </td>
+               <td>&nbsp;</td>
+               <td style="vertical-align:auto;">
+                    <div style="border: 1px solid #C0C0C0;  width: 600px;" id="divGrafico2" runat="server" >
+                        <uc:GraficoChart ID="miGrafico10" runat="server" />
+                     </div>
+               </td>
+           </tr>
+       </table>
+ 
     </asp:Panel>
     </div>
           <div class="panel-body">	
diff --git a/WebLab/Estadisticas/Reporte.aspx.cs b/WebLab/Estadisticas/Reporte.aspx.cs
index 136f44d1..24c0e631 100644
--- a/WebLab/Estadisticas/Reporte.aspx.cs
+++ b/WebLab/Estadisticas/Reporte.aspx.cs
@@ -14,7 +14,6 @@
 using Business;
 using Business.Data.Laboratorio;
 using CrystalDecisions.Shared;
-using InfoSoftGlobal;
 using System.IO;
 using CrystalDecisions.Web;
 using System.Text;
@@ -165,7 +164,11 @@ private void MostrarReporteGeneral()
             /// Grafico 2
             if (mostrarGrafico2)
             {
-               CreateChart2(s_tituloChart);            
+               CreateChart2(s_tituloChart);
+            }
+            else
+            {
+                divGrafico2.Visible = false;
             }
 
             if (!mostrarGrafico1 && !mostrarGrafico2)
diff --git a/WebLab/Estadisticas/Reporte.aspx.designer.cs b/WebLab/Estadisticas/Reporte.aspx.designer.cs
index 09fa0d81..128a2353 100644
--- a/WebLab/Estadisticas/Reporte.aspx.designer.cs
+++ b/WebLab/Estadisticas/Reporte.aspx.designer.cs
@@ -110,5 +110,13 @@ public partial class Reporte {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkRegresar;
+        /// <summary>
+        /// divGrafico2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divGrafico2;
     }
 }
diff --git a/WebLab/Estadisticas/ReporteForense.aspx.cs b/WebLab/Estadisticas/ReporteForense.aspx.cs
index 78f01631..1287a63e 100644
--- a/WebLab/Estadisticas/ReporteForense.aspx.cs
+++ b/WebLab/Estadisticas/ReporteForense.aspx.cs
@@ -18,7 +18,6 @@
 using Business.Data;
 using CrystalDecisions.Shared;
 using Business.Data.Laboratorio;
-using InfoSoftGlobal;
 
 namespace WebLab.Estadisticas
 {
@@ -287,9 +286,9 @@ private string mostrarGrafico(int p)
             //    Response.Redirect("SinDatos.aspx", false);
 
 
-          
 
-            return FusionCharts.RenderChart(s_tipografico, p.ToString(), strXML, "Sales"+p.ToString(), ancho, "200", false, false);
+
+            return "";// FusionCharts.RenderChart(s_tipografico, p.ToString(), strXML, "Sales"+p.ToString(), ancho, "200", false, false);
         }
 
 
diff --git a/WebLab/Estadisticas/ReporteIncidencias.aspx.cs b/WebLab/Estadisticas/ReporteIncidencias.aspx.cs
index f0322155..4a303e49 100644
--- a/WebLab/Estadisticas/ReporteIncidencias.aspx.cs
+++ b/WebLab/Estadisticas/ReporteIncidencias.aspx.cs
@@ -11,7 +11,6 @@
 using System.Text;
 using System.IO;
 using System.Web.UI.HtmlControls;
-using InfoSoftGlobal;
 using Business.Data.Laboratorio;
 using Business.Data;
 using System.Configuration;
diff --git a/WebLab/Estadisticas/ReporteMicrobiologia.aspx.cs b/WebLab/Estadisticas/ReporteMicrobiologia.aspx.cs
index e73dd6f2..137217b5 100644
--- a/WebLab/Estadisticas/ReporteMicrobiologia.aspx.cs
+++ b/WebLab/Estadisticas/ReporteMicrobiologia.aspx.cs
@@ -19,7 +19,6 @@
 using CrystalDecisions.Shared;
 using Business.Data.Laboratorio;
 using System.Web.Script.Serialization;
-using InfoSoftGlobal;
 using System.Collections.Generic;
 
 namespace WebLab.Estadisticas
diff --git a/WebLab/Estadisticas/ReporteMicrobiologiaNoPaciente.aspx.cs b/WebLab/Estadisticas/ReporteMicrobiologiaNoPaciente.aspx.cs
index 3ccff835..403f7f49 100644
--- a/WebLab/Estadisticas/ReporteMicrobiologiaNoPaciente.aspx.cs
+++ b/WebLab/Estadisticas/ReporteMicrobiologiaNoPaciente.aspx.cs
@@ -18,7 +18,6 @@
 using Business.Data;
 using CrystalDecisions.Shared;
 using Business.Data.Laboratorio;
-using InfoSoftGlobal;
 using System.Web.Script.Serialization;
 using System.Collections.Generic;
 
@@ -310,60 +309,60 @@ private DataTable MostrarDatos(string s_tipo)
 
 
 
-        private string mostrarGrafico(int p)
-        {
-            string s_titulo="";
-            string s_tipo="";
-            string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
-            DataTable dt = new DataTable();
-            //dt = (DataTable)gvTipoMuestra.DataSource;
-            string strXML = "";
-            string ancho = "500";
-            if (p == 0)
-            {
-                //    s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
-                s_titulo = "No Pacientes";
-                s_tipo = "Casos por tipo de muestra";
-                 strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
+        //private string mostrarGrafico(int p)
+        //{
+        //    string s_titulo="";
+        //    string s_tipo="";
+        //    string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
+        //    DataTable dt = new DataTable();
+        //    //dt = (DataTable)gvTipoMuestra.DataSource;
+        //    string strXML = "";
+        //    string ancho = "500";
+        //    if (p == 0)
+        //    {
+        //        //    s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
+        //        s_titulo = "No Pacientes";
+        //        s_tipo = "Casos por tipo de muestra";
+        //         strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
 
-                if (gvTipoMuestra.Rows.Count > 0)
-                {
-                    for (int i = 0; i < gvTipoMuestra.Rows.Count; i++)
-                    {
-                        strXML += "<set name='" + gvTipoMuestra.Rows[i].Cells[0].Text + "' value='" + gvTipoMuestra.Rows[i].Cells[1].Text + "' />";
-                    }
-                }
-                strXML += "</graph>";
-            }
+        //        if (gvTipoMuestra.Rows.Count > 0)
+        //        {
+        //            for (int i = 0; i < gvTipoMuestra.Rows.Count; i++)
+        //            {
+        //                strXML += "<set name='" + gvTipoMuestra.Rows[i].Cells[0].Text + "' value='" + gvTipoMuestra.Rows[i].Cells[1].Text + "' />";
+        //            }
+        //        }
+        //        strXML += "</graph>";
+        //    }
 
-            if (p == 1)
-            {
+        //    if (p == 1)
+        //    {
 
-                ancho = "1000";
+        //        ancho = "1000";
 
-            //    s_tipografico = "../FusionCharts/FCF_Column2D.swf";
+        //    //    s_tipografico = "../FusionCharts/FCF_Column2D.swf";
 
-                ////s_titulo = ddlAnalisis.SelectedItem.Text +" " +  ddlTipoMuestra.SelectedItem.Text;
-                //s_tipo = "Casos por Aislamiento";
-                //strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
+        //        ////s_titulo = ddlAnalisis.SelectedItem.Text +" " +  ddlTipoMuestra.SelectedItem.Text;
+        //        //s_tipo = "Casos por Aislamiento";
+        //        //strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
 
-                //if (gvMicroorganismos.Rows.Count > 0)
-                //{
-                //    for (int i = 0; i < gvMicroorganismos.Rows.Count; i++)
-                //    {
-                //        strXML += "<set name='" + gvMicroorganismos.Rows[i].Cells[0].Text.Substring(0,5) + "' value='" + gvMicroorganismos.Rows[i].Cells[1].Text + "' />";
-                //    }
-                //}
-                //strXML += "</graph>";
-            }
-            //else
-            //    Response.Redirect("SinDatos.aspx", false);
+        //        //if (gvMicroorganismos.Rows.Count > 0)
+        //        //{
+        //        //    for (int i = 0; i < gvMicroorganismos.Rows.Count; i++)
+        //        //    {
+        //        //        strXML += "<set name='" + gvMicroorganismos.Rows[i].Cells[0].Text.Substring(0,5) + "' value='" + gvMicroorganismos.Rows[i].Cells[1].Text + "' />";
+        //        //    }
+        //        //}
+        //        //strXML += "</graph>";
+        //    }
+        //    //else
+        //    //    Response.Redirect("SinDatos.aspx", false);
 
 
           
 
-            return FusionCharts.RenderChart(s_tipografico, p.ToString(), strXML, "Sales"+p.ToString(), ancho, "200", false, false);
-        }
+        //    return FusionCharts.RenderChart(s_tipografico, p.ToString(), strXML, "Sales"+p.ToString(), ancho, "200", false, false);
+        //}
 
 
         protected void lnkExcel_Click1(object sender, EventArgs e)
diff --git a/WebLab/Estadisticas/ReportePesquisa.aspx.cs b/WebLab/Estadisticas/ReportePesquisa.aspx.cs
index a051402f..d61c0552 100644
--- a/WebLab/Estadisticas/ReportePesquisa.aspx.cs
+++ b/WebLab/Estadisticas/ReportePesquisa.aspx.cs
@@ -7,7 +7,6 @@
 using System.Data;
 using System.Data.SqlClient;
 using Business;
-using InfoSoftGlobal;
 using System.Text;
 using System.Web.UI.HtmlControls;
 using System.IO;
@@ -274,8 +273,8 @@ private void MostrarSegunVariables()
                         gv1.DataBind();
                         if (dt1.Rows.Count > 0)
                         {
-                            Literal1.Text = mostrarGrafico("Muestras recibidas");
-                            Literal2.Text = mostrarGrafico1(dt1,"Muestras recibidas por efector");
+                            //Literal1.Text = mostrarGrafico("Muestras recibidas");
+                            //Literal2.Text = mostrarGrafico1(dt1,"Muestras recibidas por efector");
                         }
                     } break;
                 case "Muestras por Patologia":
@@ -312,9 +311,9 @@ private void MostrarSegunVariables()
                         Literal4.Visible = true;
                         Literal5.Visible = true; 
                     
-                    Literal3.Text = mostrarGrafico3(dt3, ddlVariable.SelectedValue);
-                    Literal4.Text = mostrarGrafico4(dt3, ddlVariable.SelectedValue,"220","200");
-                    Literal5.Text = mostrarGrafico5(dt3,"Distribución por Sexo");
+                    //Literal3.Text = mostrarGrafico3(dt3, ddlVariable.SelectedValue);
+                    //Literal4.Text = mostrarGrafico4(dt3, ddlVariable.SelectedValue,"220","200");
+                    //Literal5.Text = mostrarGrafico5(dt3,"Distribución por Sexo");
                     }
             }
             
@@ -332,81 +331,81 @@ private void CargarResultados()
             oUtil = null;       
         }
 
-        private string mostrarGrafico(string s_titulo)// (DataTable dt1)
-        {         
-            string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";                        
-            string strXML =  "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='5'  decimalPrecision='0' showNames='1'>";
-            strXML += "<set name='Primera Muestra' value='" +  grupo1.ToString() + "' />";
-            strXML += "<set name='Repeticion' value='" + grupo2.ToString() + "' />";              
-            strXML += "</graph>";
-            return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisa", "400", "200", false, false);
-        }
-        private string mostrarGrafico1(DataTable dt1, string s_titulo)
-        {
-            string s_tipografico = "../FusionCharts/FCF_Column3D.swf";            
-            string strXML =  "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
-            for (int i = 0; i < dt1.Rows.Count; i++)
-                strXML += "<set name='" + dt1.Rows[i][0].ToString().Substring(2, 4).Replace("\r\n", "") + "' value='" + dt1.Rows[i][3].ToString() + "' />";                                        
-            strXML += "</graph>";
-            return FusionCharts.RenderChart(s_tipografico, "2", strXML, "pesquisa2", "400", "300", false, false);
-        }        
-        private string mostrarGrafico4(DataTable dt1, string s_titulo, string ancho, string alto)
-        {
-            string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
-            string strXML = "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='5'  decimalPrecision='0' showNames='1'>";                       
-            for (int i = 0; i < dt1.Rows.Count; i++)  strXML += "<set name='" + dt1.Rows[i][0].ToString().Replace("\r\n","") + "' value='" + dt1.Rows[i][4].ToString() + "' />";                            
-            strXML += "</graph>";
-            return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisa", ancho,alto, false, false);
-        }   
-        private string mostrarGrafico3(DataTable dt1,  string s_titulo)
-        {                     
-
-            string strXML = "<graph caption='" + s_titulo + "' formatNumberScale='0' decimalPrecision='0'  showPercentageInLabel='1' >";
-            string strCategories = "<categories>";
-
-            string strDataR = "<dataset seriesName='Femenino' color='9D080D'>";
-            string strDataS = "<dataset seriesName='Masculino' color='F6BD0F'>";
-            string strDataI = "<dataset seriesName='Indeterminado' color='AFD8F8'>";
-
-             for (int i = 0; i < dt1.Rows.Count; i++)                
-             {
-                 strCategories = strCategories + "<category name='" + dt1.Rows[i][0].ToString().Replace("\r\n", "") + "' />";
-                if (dt1.Rows[i][1].ToString() == "") strDataR = strDataR + "<set value='0' />";
-                else   strDataR = strDataR + "<set value='" + dt1.Rows[i][1].ToString() + "' />";
-
-                if (dt1.Rows[i][2].ToString() == "")  strDataS = strDataS + "<set value='0' />";
-                else   strDataS = strDataS + "<set value='" + dt1.Rows[i][2].ToString() + "' />";
-
-                if (dt1.Rows[i][3].ToString() == "") strDataI = strDataI + "<set value='0' />";
-                else   strDataI = strDataI + "<set value='" + dt1.Rows[i][3].ToString() + "' />";               
-            }
-
-            //'Close <categories> element
-            strCategories = strCategories + "</categories>";
-
-            //'Close <dataset> elements
-            strDataR = strDataR + "</dataset>";
-            strDataS = strDataS + "</dataset>";
-            strDataI = strDataI + "</dataset>";
-
-            //'Assemble the entire XML now
-            strXML = strXML + strCategories + strDataR + strDataS + strDataI + "</graph>";
-
-            return FusionCharts.RenderChart("../FusionCharts/FCF_MSColumn3D.swf", "", strXML, "productSales", "400", "400", false, false);
-        }
-        private string mostrarGrafico5(DataTable dt1, string p)
-        {
-            string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
-            string strXML =  "<graph caption='" + p + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='8'  decimalPrecision='0' showNames='1'>";
-            if (dt1.Rows.Count > 0)
-            {
-                strXML += "<set name='Fem.' value='" + gv31 + "' />";
-                strXML += "<set name='Mas.' value='" + gv32 + "' />";
-                strXML += "<set name='Ind.' value='" + gv33 + "' />";
-            }
-            strXML += "</graph>";
-            return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisaSexo", "200", "200", false, false);
-        }
+        //private string mostrarGrafico(string s_titulo)// (DataTable dt1)
+        //{         
+        //    string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";                        
+        //    string strXML =  "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='5'  decimalPrecision='0' showNames='1'>";
+        //    strXML += "<set name='Primera Muestra' value='" +  grupo1.ToString() + "' />";
+        //    strXML += "<set name='Repeticion' value='" + grupo2.ToString() + "' />";              
+        //    strXML += "</graph>";
+        //    return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisa", "400", "200", false, false);
+        //}
+        //private string mostrarGrafico1(DataTable dt1, string s_titulo)
+        //{
+        //    string s_tipografico = "../FusionCharts/FCF_Column3D.swf";            
+        //    string strXML =  "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
+        //    for (int i = 0; i < dt1.Rows.Count; i++)
+        //        strXML += "<set name='" + dt1.Rows[i][0].ToString().Substring(2, 4).Replace("\r\n", "") + "' value='" + dt1.Rows[i][3].ToString() + "' />";                                        
+        //    strXML += "</graph>";
+        //    return FusionCharts.RenderChart(s_tipografico, "2", strXML, "pesquisa2", "400", "300", false, false);
+        //}        
+        //private string mostrarGrafico4(DataTable dt1, string s_titulo, string ancho, string alto)
+        //{
+        //    string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
+        //    string strXML = "<graph caption='" + s_titulo + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='5'  decimalPrecision='0' showNames='1'>";                       
+        //    for (int i = 0; i < dt1.Rows.Count; i++)  strXML += "<set name='" + dt1.Rows[i][0].ToString().Replace("\r\n","") + "' value='" + dt1.Rows[i][4].ToString() + "' />";                            
+        //    strXML += "</graph>";
+        //    return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisa", ancho,alto, false, false);
+        //}   
+        //private string mostrarGrafico3(DataTable dt1,  string s_titulo)
+        //{                     
+
+        //    string strXML = "<graph caption='" + s_titulo + "' formatNumberScale='0' decimalPrecision='0'  showPercentageInLabel='1' >";
+        //    string strCategories = "<categories>";
+
+        //    string strDataR = "<dataset seriesName='Femenino' color='9D080D'>";
+        //    string strDataS = "<dataset seriesName='Masculino' color='F6BD0F'>";
+        //    string strDataI = "<dataset seriesName='Indeterminado' color='AFD8F8'>";
+
+        //     for (int i = 0; i < dt1.Rows.Count; i++)                
+        //     {
+        //         strCategories = strCategories + "<category name='" + dt1.Rows[i][0].ToString().Replace("\r\n", "") + "' />";
+        //        if (dt1.Rows[i][1].ToString() == "") strDataR = strDataR + "<set value='0' />";
+        //        else   strDataR = strDataR + "<set value='" + dt1.Rows[i][1].ToString() + "' />";
+
+        //        if (dt1.Rows[i][2].ToString() == "")  strDataS = strDataS + "<set value='0' />";
+        //        else   strDataS = strDataS + "<set value='" + dt1.Rows[i][2].ToString() + "' />";
+
+        //        if (dt1.Rows[i][3].ToString() == "") strDataI = strDataI + "<set value='0' />";
+        //        else   strDataI = strDataI + "<set value='" + dt1.Rows[i][3].ToString() + "' />";               
+        //    }
+
+        //    //'Close <categories> element
+        //    strCategories = strCategories + "</categories>";
+
+        //    //'Close <dataset> elements
+        //    strDataR = strDataR + "</dataset>";
+        //    strDataS = strDataS + "</dataset>";
+        //    strDataI = strDataI + "</dataset>";
+
+        //    //'Assemble the entire XML now
+        //    strXML = strXML + strCategories + strDataR + strDataS + strDataI + "</graph>";
+
+        //    return FusionCharts.RenderChart("../FusionCharts/FCF_MSColumn3D.swf", "", strXML, "productSales", "400", "400", false, false);
+        //}
+        //private string mostrarGrafico5(DataTable dt1, string p)
+        //{
+        //    string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
+        //    string strXML =  "<graph caption='" + p + "' subCaption='' showPercentageInLabel='1' pieSliceDepth='8'  decimalPrecision='0' showNames='1'>";
+        //    if (dt1.Rows.Count > 0)
+        //    {
+        //        strXML += "<set name='Fem.' value='" + gv31 + "' />";
+        //        strXML += "<set name='Mas.' value='" + gv32 + "' />";
+        //        strXML += "<set name='Ind.' value='" + gv33 + "' />";
+        //    }
+        //    strXML += "</graph>";
+        //    return FusionCharts.RenderChart(s_tipografico, "", strXML, "pesquisaSexo", "200", "200", false, false);
+        //}
 
         protected void gv3_RowDataBound(object sender, GridViewRowEventArgs e)
         {
@@ -456,7 +455,7 @@ private void MostrarPorResultado()
                 Literal3.Visible = false;
                 Literal5.Visible = false;
                 Literal4.Visible = true;                
-                Literal4.Text = mostrarGrafico4(dt3, ddlResultado.SelectedValue, "600","400");
+                //Literal4.Text = mostrarGrafico4(dt3, ddlResultado.SelectedValue, "600","400");
                 
             }
         }
diff --git a/WebLab/Estadisticas/Turnos.aspx.cs b/WebLab/Estadisticas/Turnos.aspx.cs
index 7bc53fd0..609cae47 100644
--- a/WebLab/Estadisticas/Turnos.aspx.cs
+++ b/WebLab/Estadisticas/Turnos.aspx.cs
@@ -12,7 +12,6 @@
 using System.Xml.Linq;
 using Business;
 using System.Data.SqlClient;
-using InfoSoftGlobal;
 using Business.Data.Laboratorio;
 using CrystalDecisions.Shared;
 using System.IO;
@@ -161,9 +160,15 @@ protected void CustomValidator1_ServerValidate(object source, ServerValidateEven
         private void MostrarReporte()
         {
             if (ddlEfector.SelectedValue == "0")
+            {
                 imgPdf.Visible = false;
+               //lo agregamos? chartTurnos.MostrarLabels = "false"; //son tantos efectores que no es legible, cuando se pasa el mouse por encima se ve el % y las cant.
+            }
             else
-            imgPdf.Visible = true;
+            {
+                imgPdf.Visible = true;
+               // chartTurnos.MostrarLabels = "true";
+            }
 
             DataTable dt= getDatosEstadisticos("G");
 
@@ -380,6 +385,7 @@ INNER JOIN sys_Efector E (nolock) on E.idEfector=A.idEfectorSolicitante
 
         protected void ddlEfector_SelectedIndexChanged(object sender, EventArgs e)
         {
+            pnlDatos.Visible = false; //al cambiar el efector, tanto el chart como el grid se ocultan hasta que el usuario vuelva a clickear "Generar"
             if (oUser.IdEfector.IdEfector == 227)
             {
                 if (ddlEfector.SelectedIndex != 0)
diff --git a/WebLab/Estadisticas/distribucionServicio.ascx.cs b/WebLab/Estadisticas/distribucionServicio.ascx.cs
index 00f38285..a9b540cd 100644
--- a/WebLab/Estadisticas/distribucionServicio.ascx.cs
+++ b/WebLab/Estadisticas/distribucionServicio.ascx.cs
@@ -4,7 +4,6 @@
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using InfoSoftGlobal;
 using System.Data;
 using System.Data.SqlClient;
 using Business;
@@ -16,59 +15,59 @@ public partial class distribucionServicio : System.Web.UI.UserControl
         protected void Page_Load(object sender, EventArgs e)
         {
             
-            FCLiteral.Text = mostrarGrafico(); ;
+            //FCLiteral.Text = mostrarGrafico(); ;
         }
 
-        private string mostrarGrafico()
-        {
-            string s_titulo = "";
-            string s_tipo = "";
-            string strXML = "";
-            string strDetalle = "";
+        //private string mostrarGrafico()
+        //{
+        //    string s_titulo = "";
+        //    string s_tipo = "";
+        //    string strXML = "";
+        //    string strDetalle = "";
 
-            //s_tipografico = "../FusionCharts/FCF_MSColumn3D.swf";
+        //    //s_tipografico = "../FusionCharts/FCF_MSColumn3D.swf";
 
-            //s_titulo = "";// ddlAnalisis.SelectedItem.Text;
-            //if (p == 0) s_tipo = "Casos por tipo de muestra";
-            //else
-            //{ if (p == 3) s_tipo = "Casos por Resultados Obtenidos"; else        s_tipo = "Aislamientos"; }
+        //    //s_titulo = "";// ddlAnalisis.SelectedItem.Text;
+        //    //if (p == 0) s_tipo = "Casos por tipo de muestra";
+        //    //else
+        //    //{ if (p == 3) s_tipo = "Casos por Resultados Obtenidos"; else        s_tipo = "Aislamientos"; }
 
-            string s_ancho = "700";
-            string s_alto = "400";
+        //    string s_ancho = "700";
+        //    string s_alto = "400";
 
-            DataTable dt = new DataTable();
-            dt = GetDatosEstadistica();
+        //    DataTable dt = new DataTable();
+        //    dt = GetDatosEstadistica();
 
 
 
-        //    string strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
+        //   string strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='10'  decimalPrecision='0' showNames='1'>";
 
-            if (dt.Rows.Count > 0)
-            {
-                for (int i = 0; i < dt.Rows.Count; i++)
-                {
-                    strDetalle += "<set name='" + dt.Rows[i][0].ToString() + "' value='" + dt.Rows[i][1].ToString() + "' />";
-                }
-            }
+        //    if (dt.Rows.Count > 0)
+        //    {
+        //        for (int i = 0; i < dt.Rows.Count; i++)
+        //        {
+        //            strDetalle += "<set name='" + dt.Rows[i][0].ToString() + "' value='" + dt.Rows[i][1].ToString() + "' />";
+        //        }
+        //    }
 
 
-            //string[] arr = Request["valores"].ToString().Split((";").ToCharArray());
-            //foreach (string item in arr)
-            //{
-            //    strDetalle += "<set " + item + " />";
-            //}
+        //    //string[] arr = Request["valores"].ToString().Split((";").ToCharArray());
+        //    //foreach (string item in arr)
+        //    //{
+        //    //    strDetalle += "<set " + item + " />";
+        //    //}
 
-            string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
+        //    string s_tipografico = "../FusionCharts/FCF_Pie3D.swf";
 
         
                
-                    strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='30'  decimalPrecision='0' showNames='1'>";
-                    strXML += strDetalle;
-                    strXML += "</graph>";
+        //            strXML = "<graph caption='" + s_titulo + "' subCaption='" + s_tipo + "' showPercentageInLabel='1' pieSliceDepth='30'  decimalPrecision='0' showNames='1'>";
+        //            strXML += strDetalle;
+        //            strXML += "</graph>";
                 
             
-            return FusionCharts.RenderChart(s_tipografico, "", strXML, "1", s_ancho, s_alto, false, false);
-        }
+        //    //return FusionCharts.RenderChart(s_tipografico, "", strXML, "1", s_ancho, s_alto, false, false);
+        //}
 
         private DataTable GetDatosEstadistica()
         {
diff --git a/WebLab/Informes/HistoriaClinica.aspx b/WebLab/Informes/HistoriaClinica.aspx
index 1a4f1389..db4eb60a 100644
--- a/WebLab/Informes/HistoriaClinica.aspx
+++ b/WebLab/Informes/HistoriaClinica.aspx
@@ -1,9 +1,9 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HistoriaClinica.aspx.cs" Inherits="WebLab.Informes.HistoriaClinica" MasterPageFile="~/Site1.Master" %>
+ <%@ Register Src="~/Estadisticas/GraficoChart.ascx" TagName="GraficoChart" TagPrefix="uc" %>
 
 <asp:Content ID="Content3" runat="server" contentplaceholderid="head">
-<script language="Javascript" type="text/javascript" src="../FusionCharts/FusionCharts.js"></script>
     <link href="StyleSheet.css" rel="stylesheet" type="text/css" />
-    
+   
 <title>LABORATORIO</title> 
 
     <style type="text/css">
@@ -115,7 +115,8 @@
       
     </table>
    <div style="border: 1px solid #C0C0C0">
-       <asp:Literal ID="FCLiteral" runat="server"></asp:Literal>
+       <%--<asp:Literal ID="FCLiteral" runat="server"></asp:Literal>--%>
+        <uc:GraficoChart ID="miGrafico" runat="server" /> 
 </div>
  
                     </div>
diff --git a/WebLab/Informes/HistoriaClinica.aspx.cs b/WebLab/Informes/HistoriaClinica.aspx.cs
index 4eff2ad8..ceb9b1c9 100644
--- a/WebLab/Informes/HistoriaClinica.aspx.cs
+++ b/WebLab/Informes/HistoriaClinica.aspx.cs
@@ -14,10 +14,11 @@
 using Business;
 using Business.Data.Laboratorio;
 using Business.Data;
-using InfoSoftGlobal;
 using CrystalDecisions.Shared;
 using CrystalDecisions.Web;
 using System.IO;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
 
 namespace WebLab.Informes
 {
@@ -59,9 +60,10 @@ protected void Page_Load(object sender, EventArgs e)
                     Item oItem = new Item();
                     oItem = (Item)oItem.Get(typeof(Item), int.Parse(Request["idAnalisis"].ToString()));
                     lblAnalisis.Text = oItem.Codigo + " - " + oItem.Nombre;
-                    if (oItem.IdTipoResultado == 1) 
-                    { if (coincideUnidadMedida(dt))
-                        FCLiteral.Text = CreateChart(dt);
+                    if (oItem.IdTipoResultado == 1 || oItem.IdTipoResultado == 3) ///1 => Numerico || 3 => predefinidos simple
+                    {
+                        if (dt.Rows.Count>1 && coincideUnidadMedida(dt)) // Si hay un solo valor no hacer grafico de evolución
+                            CreateChart(dt);
                     }
                 }
                 else
@@ -96,27 +98,49 @@ private bool coincideUnidadMedida(DataTable dt)
                         
         }
 
-        private string CreateChart(DataTable dt)
+        private void CreateChart(DataTable dt)
         {
 
             Item oItem = new Item();
             oItem = (Item)oItem.Get(typeof(Item), int.Parse(Request["idAnalisis"].ToString()));
 
-            string valorminimo = Math.Round(oItem.ValorMinimo, 0).ToString();
-            string strXML = "<graph caption='" + lblAnalisis.Text + "' subcaption='' xAxisName='Protocolo' yAxisMinValue='" + valorminimo + "' yAxisName='Resultado' decimalPrecision='2' formatNumberScale='1' showNames='1' " +
-                " showValues='0' showAlternateHGridColor='1'  AlternateHGridColor='ff5904' divLineColor='ff5904' divLineAlpha='20' alternateHGridAlpha='5'>";
-
-            if (dt.Rows.Count > 0)
+            decimal valor = Math.Round(oItem.ValorMinimo, 0);
+            string valorminimo = (valor == -1) ? "" : valor.ToString(); //-1 es un valor por defecto pero no se grafica si lo envio, debe ser ""
+            List<string> labels = new List<string>();
+            List<decimal> datos = new List<decimal>();
+           
+            for (int i = 0; i < dt.Rows.Count; i++)
             {
-                for (int i = 0; i < dt.Rows.Count; i++)
+                decimal numero;
+                string valorNum = dt.Rows[i]["resultadoNum"].ToString();
+                labels.Add(dt.Rows[i][2].ToString()); //Numero Protocolo anterior
+                bool res = decimal.TryParse(
+                            valorNum,
+                            System.Globalization.NumberStyles.Any,
+                            System.Globalization.CultureInfo.InvariantCulture,
+                            out numero
+                        );
+                if (res)
+                    datos.Add(numero);
+                else
                 {
-                    strXML += "<set name='" + dt.Rows[i][2].ToString() + "' value='" + dt.Rows[i][4].ToString().Replace(",",".") + "' hoverText='" + dt.Rows[i][2].ToString() + "' />";
+                    datos.Clear(); //reseteo los valores
+                    labels.Clear(); //reseteo los valores
+                    break; //Corto al primer valor que no es numerico porque ya no sirve para graficar
                 }
-            }        
+            }
 
-            strXML += "</graph>";
-            return FusionCharts.RenderChart("../FusionCharts/FCF_Line.swf", "", strXML, "Sales", "600", "250", false, false);
 
+            
+            var js = new JavaScriptSerializer();
+
+            miGrafico.LabelsJson = js.Serialize(labels);
+            miGrafico.DatosJson = js.Serialize(datos);
+            miGrafico.TipoGrafico = js.Serialize("line");
+            miGrafico.TituloJson = js.Serialize("");
+            miGrafico.minimo = js.Serialize(valorminimo);
+            miGrafico.tituloX = js.Serialize("Protocolo");
+            miGrafico.tituloY = js.Serialize("Resultado");
         }
 
         private void MostrarPaciente()
diff --git a/WebLab/Informes/HistoriaClinica.aspx.designer.cs b/WebLab/Informes/HistoriaClinica.aspx.designer.cs
index 53e2255b..da1bc21f 100644
--- a/WebLab/Informes/HistoriaClinica.aspx.designer.cs
+++ b/WebLab/Informes/HistoriaClinica.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebLab.Informes {
-    
-    
-    public partial class HistoriaClinica {
-        
+namespace WebLab.Informes
+{
+
+
+    public partial class HistoriaClinica
+    {
+
         /// <summary>
         /// pnlTitulo control.
         /// </summary>
@@ -20,7 +22,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlTitulo;
-        
+
         /// <summary>
         /// lblNumeroDocumento control.
         /// </summary>
@@ -29,7 +31,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumeroDocumento;
-        
+
         /// <summary>
         /// lblPaciente control.
         /// </summary>
@@ -38,7 +40,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPaciente;
-        
+
         /// <summary>
         /// imgPdf control.
         /// </summary>
@@ -47,7 +49,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ImageButton imgPdf;
-        
+
         /// <summary>
         /// lblSexo control.
         /// </summary>
@@ -56,7 +58,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblSexo;
-        
+
         /// <summary>
         /// lblFechaNacimiento control.
         /// </summary>
@@ -65,7 +67,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblFechaNacimiento;
-        
+
         /// <summary>
         /// lblContacto control.
         /// </summary>
@@ -74,7 +76,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblContacto;
-        
+
         /// <summary>
         /// lblAnalisis control.
         /// </summary>
@@ -83,7 +85,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblAnalisis;
-        
+
         /// <summary>
         /// pnlGrafico control.
         /// </summary>
@@ -92,16 +94,16 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlGrafico;
-        
+
         /// <summary>
-        /// FCLiteral control.
+        /// miGrafico control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal FCLiteral;
-        
+        protected global::WebLab.Estadisticas.GraficoChart miGrafico;
+
         /// <summary>
         /// gvHistorico control.
         /// </summary>
@@ -110,7 +112,7 @@ public partial class HistoriaClinica {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvHistorico;
-        
+
         /// <summary>
         /// lnkRegresar control.
         /// </summary>
diff --git a/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt b/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt
index e4d63f31..3f1383cd 100644
Binary files a/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt and b/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt differ
diff --git a/WebLab/Informes/Informe.aspx b/WebLab/Informes/Informe.aspx
index a6c55f61..92a7c434 100644
--- a/WebLab/Informes/Informe.aspx
+++ b/WebLab/Informes/Informe.aspx
@@ -402,8 +402,8 @@
                                            <asp:Panel ID="pnlHojaTrabajo" runat="server">
                                                        <div class="panel-footer">			
                                                <table style="width:100%;">
-                                                   <tr>
-                                                       <td align="left">
+                                               <%--   <tr>
+                                                        <td align="left">
                                                            Seleccionar: <asp:LinkButton ID="lnkMarcar" runat="server" CssClass="myLink" 
                                                                onclick="lnkMarcar_Click" ValidationGroup="0">Todas</asp:LinkButton> &nbsp;
                                                            <asp:LinkButton ID="lnkDesmarcar" runat="server" CssClass="myLink" 
@@ -414,7 +414,7 @@
                                                                ID="lnkImprimir" runat="server" CssClass="myLittleLink" 
                                                                onclick="lnkImprimir_Click" TabIndex="11" ValidationGroup="0">Imprimir</asp:LinkButton>
                                                        </td>
-                                                   </tr>
+                                                   </tr>--%>
                                                    <tr>
                                                        <td colspan="2">
                                                          
@@ -427,12 +427,12 @@
                                                                Width="100%" OnSelectedIndexChanged="gvLista_SelectedIndexChanged">
                                                             
                                                                <Columns>
-                                                                   <asp:TemplateField HeaderText="Sel.">
+                                                                   <%--<asp:TemplateField HeaderText="Sel.">
                                                                        <ItemTemplate>
                                                                            <asp:CheckBox ID="CheckBox1" runat="server" EnableViewState="true" />
                                                                        </ItemTemplate>
                                                                        <ItemStyle HorizontalAlign="Center" Width="5%" />
-                                                                   </asp:TemplateField>
+                                                                   </asp:TemplateField>--%>
                                                                    <asp:BoundField DataField="servicio" HeaderText="Tipo de Servicio">
                                                                        <HeaderStyle HorizontalAlign="Left" />
                                                                        <ItemStyle Width="20%" />
@@ -452,22 +452,22 @@
                                                                        </ItemTemplate>
                                                                        <ItemStyle Height="20px" HorizontalAlign="Center" Width="20px" />
                                                                    </asp:TemplateField>
-                                                                     <asp:TemplateField >
+                                                                    <%-- <asp:TemplateField >
                                                                        <ItemTemplate>
                                                                            <asp:ImageButton ID="Imprimir" runat="server" CommandName="Imprimir" ToolTip="Envia a impresora seleccionada"
                                                                                ImageUrl="~/App_Themes/default/images/imprimir.jpg" ValidationGroup="0" />
                                                                        </ItemTemplate>
                                                                        <ItemStyle Height="20px" HorizontalAlign="Center" Width="20px" />
                                                                  
-                                                                          </asp:TemplateField>
-                                                                     <asp:TemplateField Visible="false">
+                                                                          </asp:TemplateField>--%>
+                                                                   <%--  <asp:TemplateField Visible="false">
                                                                        <ItemTemplate>
                                                                            <asp:ImageButton ID="Excel" runat="server" CommandName="Imprimir" ToolTip="Envia a impresora seleccionada"
                                                                                ImageUrl="~/App_Themes/default/images/imprimir.jpg" ValidationGroup="0" />
                                                                        </ItemTemplate>
                                                                        <ItemStyle Height="20px" HorizontalAlign="Center" Width="20px" />
                                                                  
-                                                                          </asp:TemplateField>
+                                                                          </asp:TemplateField>--%>
                                                                </Columns>
                                                                <FooterStyle BackColor="#5D7B9D" Font-Bold="True" ForeColor="White" />
                                                                <PagerStyle BackColor="#284775" ForeColor="White" HorizontalAlign="Center" />
diff --git a/WebLab/Informes/Informe.aspx.cs b/WebLab/Informes/Informe.aspx.cs
index 7d6a2c68..4917eb6a 100644
--- a/WebLab/Informes/Informe.aspx.cs
+++ b/WebLab/Informes/Informe.aspx.cs
@@ -245,7 +245,7 @@ private void CargarListas()
                 //if (oCon.esMultiEFector())
                 //{
                     pnlImpresora.Visible = false;
-                    lnkImprimir.Visible = false;
+                    //lnkImprimir.Visible = false;
                     lnkImprimirAnalisisFueraHT.Visible = false;
                     // ddlImpresora.Visible = false;
                     //lnkImprimir.Visible = false;
@@ -490,19 +490,19 @@ protected void gvLista_RowCommand1(object sender, GridViewCommandEventArgs e)
             }
         }
 
-     
 
-        
-        private void MarcarSeleccionados(bool p)
-        {
-            foreach (GridViewRow row in gvLista.Rows)
-            {
-                CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1")));
-                if (a.Checked == !p)
-                    ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))).Checked = p;
-            }
 
-        }
+        //Version del sil1
+        //private void MarcarSeleccionados(bool p)
+        //{
+        //    foreach (GridViewRow row in gvLista.Rows)
+        //    {
+        //        CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1")));
+        //        if (a.Checked == !p)
+        //            ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))).Checked = p;
+        //    }
+
+        //}
         private void VistaPreeliminar(object p, string accion)
         {
             HojaTrabajo oRegistro = new HojaTrabajo();
@@ -1039,26 +1039,27 @@ protected void gvLista_RowDataBound(object sender, GridViewRowEventArgs e)
         {
             if (e.Row.RowType == DataControlRowType.DataRow)
             {               
-                ImageButton CmdPdf = (ImageButton)e.Row.Cells[4].Controls[1];
+                ImageButton CmdPdf = (ImageButton)e.Row.Cells[3].Controls[1];
                 CmdPdf.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString();
                 CmdPdf.CommandName = "Pdf";
                 CmdPdf.ToolTip = "Vista Preeliminar";
+                //Version del sil1
 
-                ImageButton CmdAdicional = (ImageButton)e.Row.Cells[5].Controls[1];
-                CmdAdicional.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString();
-                CmdAdicional.CommandName = "Imprimir";
-                CmdAdicional.ToolTip = "Imprimir";
+                //ImageButton CmdAdicional = (ImageButton)e.Row.Cells[5].Controls[1];
+                //CmdAdicional.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString();
+                //CmdAdicional.CommandName = "Imprimir";
+                //CmdAdicional.ToolTip = "Imprimir";
 
-                ImageButton CmdExcel = (ImageButton)e.Row.Cells[6].Controls[1];
-                CmdExcel.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString();
-                CmdExcel.CommandName = "Excel";
-                CmdExcel.ToolTip = "Excel";
+                //ImageButton CmdExcel = (ImageButton)e.Row.Cells[6].Controls[1];
+                //CmdExcel.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString();
+                //CmdExcel.CommandName = "Excel";
+                //CmdExcel.ToolTip = "Excel";
 
-             
-                if (pnlImpresora.Visible == false)
-                {
-                    CmdAdicional.Visible = false;
-                }
+
+                //if (pnlImpresora.Visible == false)
+                //{
+                //    CmdAdicional.Visible = false;
+                //}
             }
         }
 
@@ -1068,7 +1069,7 @@ private void CargarGrilla()
          
             gvLista.DataSource = LeerDatos();
             gvLista.DataBind();
-            MarcarSeleccionados(false);
+            //MarcarSeleccionados(false);
         }
 
         private object LeerDatos()
@@ -1109,23 +1110,23 @@ protected void lnkPDF_Click(object sender, EventArgs e)
          
         }
 
-        
-        protected void lnkImprimir_Click(object sender, EventArgs e)
-        {
+        //Version del sil1
+        //protected void lnkImprimir_Click(object sender, EventArgs e)
+        //{
             
-            foreach (GridViewRow row in gvLista.Rows)
-            {
+        //    foreach (GridViewRow row in gvLista.Rows)
+        //    {
 
-                CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1")));
-                if (a.Checked == true)
-                {
-                    VistaPreeliminar(gvLista.DataKeys[row.RowIndex].Value.ToString(), "Impresora");                    
-                }
-            }
+        //        CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1")));
+        //        if (a.Checked == true)
+        //        {
+        //            VistaPreeliminar(gvLista.DataKeys[row.RowIndex].Value.ToString(), "Impresora");                    
+        //        }
+        //    }
             
 
          
-        }
+        //}
 
         protected void CustomValidator1_ServerValidate(object source, ServerValidateEventArgs args)
         {
@@ -1146,15 +1147,16 @@ protected void ddlArea_SelectedIndexChanged(object sender, EventArgs e)
           //  gvLista.UpdateAfterCallBack = true;
         }
 
-        protected void lnkMarcar_Click(object sender, EventArgs e)
-        {
-            MarcarSeleccionados(true);
-        }
+        //Version del sil1
+        //protected void lnkMarcar_Click(object sender, EventArgs e)
+        //{
+        //    MarcarSeleccionados(true);
+        //}
 
-        protected void lnkDesmarcar_Click(object sender, EventArgs e)
-        {
-            MarcarSeleccionados(false);
-        }
+        //protected void lnkDesmarcar_Click(object sender, EventArgs e)
+        //{
+        //    MarcarSeleccionados(false);
+        //}
 
         protected void lnkImprimirAnalisisFueraHT_Click(object sender, EventArgs e)
         {
diff --git a/WebLab/Informes/Informe.aspx.designer.cs b/WebLab/Informes/Informe.aspx.designer.cs
index 4d748888..dfd3586d 100644
--- a/WebLab/Informes/Informe.aspx.designer.cs
+++ b/WebLab/Informes/Informe.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebLab.Informes {
-    
-    
-    public partial class Informe {
-        
+namespace WebLab.Informes
+{
+
+
+    public partial class Informe
+    {
+
         /// <summary>
         /// pnlTitulo control.
         /// </summary>
@@ -20,7 +22,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlTitulo;
-        
+
         /// <summary>
         /// lblTitulo control.
         /// </summary>
@@ -29,7 +31,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblTitulo;
-        
+
         /// <summary>
         /// ddlSectorServicio control.
         /// </summary>
@@ -38,7 +40,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlSectorServicio;
-        
+
         /// <summary>
         /// ddlServicio control.
         /// </summary>
@@ -47,7 +49,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlServicio;
-        
+
         /// <summary>
         /// lstSector control.
         /// </summary>
@@ -56,7 +58,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ListBox lstSector;
-        
+
         /// <summary>
         /// lnkMarcarSectores control.
         /// </summary>
@@ -65,7 +67,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkMarcarSectores;
-        
+
         /// <summary>
         /// lnkDesmarcarSectores control.
         /// </summary>
@@ -74,7 +76,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcarSectores;
-        
+
         /// <summary>
         /// ddlArea control.
         /// </summary>
@@ -83,7 +85,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlArea;
-        
+
         /// <summary>
         /// txtFechaDesde control.
         /// </summary>
@@ -92,7 +94,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaDesde;
-        
+
         /// <summary>
         /// cvFechas control.
         /// </summary>
@@ -101,7 +103,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvFechas;
-        
+
         /// <summary>
         /// txtFechaHasta control.
         /// </summary>
@@ -110,7 +112,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaHasta;
-        
+
         /// <summary>
         /// ddlEfector control.
         /// </summary>
@@ -119,7 +121,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlEfector;
-        
+
         /// <summary>
         /// txtProtocoloDesde control.
         /// </summary>
@@ -128,7 +130,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloDesde;
-        
+
         /// <summary>
         /// txtProtocoloHasta control.
         /// </summary>
@@ -137,7 +139,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloHasta;
-        
+
         /// <summary>
         /// cvNumeroDesde control.
         /// </summary>
@@ -146,7 +148,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvNumeroDesde;
-        
+
         /// <summary>
         /// lblLoteDesde control.
         /// </summary>
@@ -155,7 +157,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblLoteDesde;
-        
+
         /// <summary>
         /// txtLoteDesde control.
         /// </summary>
@@ -164,7 +166,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtLoteDesde;
-        
+
         /// <summary>
         /// lblLoteHasta control.
         /// </summary>
@@ -173,7 +175,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblLoteHasta;
-        
+
         /// <summary>
         /// txtLoteHasta control.
         /// </summary>
@@ -182,7 +184,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtLoteHasta;
-        
+
         /// <summary>
         /// chkDesdeUltimoListado control.
         /// </summary>
@@ -191,7 +193,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkDesdeUltimoListado;
-        
+
         /// <summary>
         /// ddlOrigen control.
         /// </summary>
@@ -200,7 +202,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlOrigen;
-        
+
         /// <summary>
         /// ddlPrioridad control.
         /// </summary>
@@ -209,7 +211,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlPrioridad;
-        
+
         /// <summary>
         /// tituloEstado control.
         /// </summary>
@@ -218,7 +220,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl tituloEstado;
-        
+
         /// <summary>
         /// rdbEstadoAnalisis control.
         /// </summary>
@@ -227,7 +229,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList rdbEstadoAnalisis;
-        
+
         /// <summary>
         /// pnlHojaTrabajoResultado control.
         /// </summary>
@@ -236,7 +238,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlHojaTrabajoResultado;
-        
+
         /// <summary>
         /// rdbHojaConResultados control.
         /// </summary>
@@ -245,7 +247,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList rdbHojaConResultados;
-        
+
         /// <summary>
         /// lblCaracterCovid control.
         /// </summary>
@@ -254,7 +256,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblCaracterCovid;
-        
+
         /// <summary>
         /// chkCaracterCovid control.
         /// </summary>
@@ -263,7 +265,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList chkCaracterCovid;
-        
+
         /// <summary>
         /// btnSeleccionarTipoMuestra control.
         /// </summary>
@@ -272,7 +274,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.LinkButton btnSeleccionarTipoMuestra;
-        
+
         /// <summary>
         /// lstMuestra control.
         /// </summary>
@@ -281,7 +283,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.ListBox lstMuestra;
-        
+
         /// <summary>
         /// pnlEtiquetaCodigoBarras control.
         /// </summary>
@@ -290,7 +292,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlEtiquetaCodigoBarras;
-        
+
         /// <summary>
         /// ddlEfectorDestino control.
         /// </summary>
@@ -299,7 +301,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlEfectorDestino;
-        
+
         /// <summary>
         /// ddlImpresoraCB control.
         /// </summary>
@@ -308,7 +310,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlImpresoraCB;
-        
+
         /// <summary>
         /// RangeValidator1 control.
         /// </summary>
@@ -317,7 +319,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RangeValidator RangeValidator1;
-        
+
         /// <summary>
         /// btnImprimirEtiqueta control.
         /// </summary>
@@ -326,7 +328,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnImprimirEtiqueta;
-        
+
         /// <summary>
         /// pnlAnalisisFueraHT control.
         /// </summary>
@@ -335,7 +337,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlAnalisisFueraHT;
-        
+
         /// <summary>
         /// lnkMarcarAnalisis control.
         /// </summary>
@@ -344,7 +346,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkMarcarAnalisis;
-        
+
         /// <summary>
         /// lnkDesmarcarAnalisis control.
         /// </summary>
@@ -353,7 +355,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcarAnalisis;
-        
+
         /// <summary>
         /// rfvAnalisis control.
         /// </summary>
@@ -362,7 +364,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvAnalisis;
-        
+
         /// <summary>
         /// lstAnalisis control.
         /// </summary>
@@ -371,7 +373,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ListBox lstAnalisis;
-        
+
         /// <summary>
         /// lnkPDFAnalisisFueraHT control.
         /// </summary>
@@ -380,7 +382,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkPDFAnalisisFueraHT;
-        
+
         /// <summary>
         /// lnkImprimirAnalisisFueraHT control.
         /// </summary>
@@ -389,7 +391,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkImprimirAnalisisFueraHT;
-        
+
         /// <summary>
         /// pnlHojaTrabajo control.
         /// </summary>
@@ -398,34 +400,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlHojaTrabajo;
-        
-        /// <summary>
-        /// lnkMarcar control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lnkMarcar;
-        
-        /// <summary>
-        /// lnkDesmarcar control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcar;
-        
-        /// <summary>
-        /// lnkImprimir control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lnkImprimir;
-        
+
         /// <summary>
         /// gvLista control.
         /// </summary>
@@ -434,7 +409,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvLista;
-        
+
         /// <summary>
         /// lblMensaje control.
         /// </summary>
@@ -443,7 +418,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblMensaje;
-        
+
         /// <summary>
         /// ValidationSummary1 control.
         /// </summary>
@@ -452,7 +427,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
-        
+
         /// <summary>
         /// pnlImpresora control.
         /// </summary>
@@ -461,7 +436,7 @@ public partial class Informe {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlImpresora;
-        
+
         /// <summary>
         /// ddlImpresora control.
         /// </summary>
diff --git a/WebLab/Items/ItemEdit2.aspx b/WebLab/Items/ItemEdit2.aspx
index 02a55287..934dcbe3 100644
--- a/WebLab/Items/ItemEdit2.aspx
+++ b/WebLab/Items/ItemEdit2.aspx
@@ -22,10 +22,10 @@
 <script type="text/javascript">
   $(function() {
 
-                 $("#tabContainer").tabs();
-                        var currTab = $("#<%= HFCurrTabIndex.ClientID %>").val();
-                      
-                        $("#tabContainer").tabs({ selected: currTab });
+    $("#tabContainer").tabs();
+    var currTab = $("#<%= HFCurrTabIndex.ClientID %>").val();
+    $("#tabContainer").tabs('select', parseInt(currTab)); // Cuando usamos jQuery UI 1.8.1 tenemos que usar el metodo 'select'
+
              });
     function confirmarLimiteTurnos() {
         var idEfector = $("#<%= HFEfector.ClientID %>").val();
@@ -34,7 +34,7 @@
             else {  return false; }
         } else { return true; }
     }
-</script>
+    </script>
    
   
    
@@ -683,7 +683,7 @@
                                     Font-Size="10pt" ForeColor="#333333" GridLines="Horizontal" 
                                    
                                     TabIndex="9" Width="100%"  
-                                       UpdateAfterCallBack="True" OnRowDataBound="gvMuestraItem_RowDataBound" OnRowCommand="gvMuestraItem_RowCommand">
+                                        UpdateAfterCallBack="True" OnRowDataBound="gvMuestraItem_RowDataBound" OnRowCommand="gvMuestraItem_RowCommand">
                                     <RowStyle BackColor="#F7F6F3" ForeColor="#333333" />
                                     <Columns>                                        
                                         <asp:BoundField DataField="muestra" HeaderText="Muestra">                                        
diff --git a/WebLab/Items/ItemEdit2.aspx.cs b/WebLab/Items/ItemEdit2.aspx.cs
index 19bfb1d4..e04f9a04 100644
--- a/WebLab/Items/ItemEdit2.aspx.cs
+++ b/WebLab/Items/ItemEdit2.aspx.cs
@@ -31,17 +31,19 @@ public partial class ItemEdit2 : System.Web.UI.Page
         Configuracion oC = new Configuracion();
         Usuario oUser = new Usuario();
         //   Item oItem = new Item();
-        private enum TabIndex
-        {
-            DEFAULT = 0,
-            ONE = 1,
-            TWO = 2,
-            THREE = 3,
-            CUARTO = 4,
-            QUINTO = 5,
-            SECTO = 6,
-            SEPTIMO = 7, OCTAVO = 8
-            // you can as many as you want here
+        private enum TabIndex //Los nombres (ONE, TWO, OCTAVO) no coinciden con la posición real de las tabs porque el HTML las tiene en desorden
+        {
+            DatosGenerales  = 0,  // tab1
+            Presentaciones  = 1, // tab7
+            ValoresReferencia  = 2,  // tab2
+            Diagrama  = 3,  // tab3
+            ResultadosPredefinidos  = 4, //tab4
+            Recomendaciones  = 5,  // tab5
+            Muestras  = 6, //tab8
+            MasOpciones  = 7, //tab6
+            Turnos  = 8 ,//tab9
+            AutoAnalizadores = 9,        // tab10
+            ObservacionesResultados = 10 // tab11
         }
         private void SetSelectedTab(TabIndex tabIndex)
         {
@@ -1090,7 +1092,7 @@ protected void gvListaVR_RowCommand1(object sender, GridViewCommandEventArgs e)
             {
                 EliminarItemVR(int.Parse(e.CommandArgument.ToString()));
                 CargarGrillaVR();
-                //SetSelectedTab(TabIndex.TWO);
+                SetSelectedTab(TabIndex.ValoresReferencia);
             }
         }
 
@@ -2094,7 +2096,7 @@ protected void btnGuardarVR_Click(object sender, EventArgs e)
                     CargarGrillaVR_NoPac();
                 }
 
-                SetSelectedTab(TabIndex.TWO);
+                SetSelectedTab(TabIndex.ValoresReferencia );
 
             }
         }
@@ -3008,7 +3010,7 @@ protected void gvListaVRNP_RowCommand(object sender, GridViewCommandEventArgs e)
             {
                 EliminarItemVR_NP(int.Parse(e.CommandArgument.ToString()));
                 CargarGrillaVR_NoPac();
-                SetSelectedTab(TabIndex.TWO);
+                SetSelectedTab(TabIndex.ValoresReferencia );
             }
         }
 
@@ -3351,7 +3353,7 @@ protected void gvMuestraItem_RowCommand(object sender, GridViewCommandEventArgs
             {
                 EliminarItemMuestra(int.Parse(e.CommandArgument.ToString()));
                 CargarGrillaMuestras();
-                SetSelectedTab(TabIndex.OCTAVO);
+                SetSelectedTab(TabIndex.Muestras );
             }
         }
 
diff --git a/WebLab/Resultados/AnalisisMetodoEdit.aspx.cs b/WebLab/Resultados/AnalisisMetodoEdit.aspx.cs
index 676c474d..71249606 100644
--- a/WebLab/Resultados/AnalisisMetodoEdit.aspx.cs
+++ b/WebLab/Resultados/AnalisisMetodoEdit.aspx.cs
@@ -9,7 +9,6 @@
 using System.Data;
 using System.Data.SqlClient;
 using CrystalDecisions.Web;
-using InfoSoftGlobal;
 using Business.Data;
 using CrystalDecisions.Shared;
 using System.IO;
diff --git a/WebLab/Resultados/AntecedentesAnalisisView.aspx.cs b/WebLab/Resultados/AntecedentesAnalisisView.aspx.cs
index 72a41510..889ff52f 100644
--- a/WebLab/Resultados/AntecedentesAnalisisView.aspx.cs
+++ b/WebLab/Resultados/AntecedentesAnalisisView.aspx.cs
@@ -9,7 +9,6 @@
 using System.Data;
 using System.Data.SqlClient;
 using CrystalDecisions.Web;
-using InfoSoftGlobal;
 using Business.Data;
 using CrystalDecisions.Shared;
 using System.IO;
@@ -63,15 +62,16 @@ protected void Page_Load(object sender, EventArgs e)
                     if (oItem != null)
                     {
                         lblItem.Text = oItem.Nombre;
-                        if (oItem.IdTipoResultado == 1)
+                        if (oItem.IdTipoResultado == 1 || oItem.IdTipoResultado == 3) ///1 => Numerico || 3 => predefinidos simple
                         {
-                            if (coincideUnidadMedida(dt))
+                            if(dt.Rows.Count > 1 && coincideUnidadMedida(dt)) //Si hay un solo valor no hacer grafico de evolución
                             {
                                 decimal valor = Math.Round(oItem.ValorMinimo, 0);
                                 string valorminimo = (valor == -1) ? "" : valor.ToString(); //-1 es un valor por defecto pero no se grafica si lo envio, debe ser ""
-                                 CreateChart(dt, oItem.Nombre, oItem.Nombre + " [" + oItem.Codigo + "]", valorminimo);
+                                CreateChart(dt, oItem.Nombre, oItem.Nombre + " [" + oItem.Codigo + "]", valorminimo);
                             }
                         }
+                       
                     }
 
                     Paciente oPaciente = new Paciente();
@@ -211,36 +211,32 @@ private void CreateChart(DataTable dt, string analisis,string titulo, string val
         {
             List<string> labels = new List<string>();
             List<decimal> datos = new List<decimal>();
-            List<string> datosString = new List<string>();
-            if (dt.Rows.Count > 0)
+            
+            for (int i = 0; i < dt.Rows.Count; i++)
             {
-                for (int i = 0; i < dt.Rows.Count; i++)
+                decimal numero;
+                string valorNum = dt.Rows[i]["resultadoNum"].ToString();
+                labels.Add(dt.Rows[i][2].ToString()); //Numero Protocolo anterior
+                bool res = decimal.TryParse(
+                            valorNum,
+                            System.Globalization.NumberStyles.Any,
+                            System.Globalization.CultureInfo.InvariantCulture,
+                            out numero
+                        );
+                if (res)
+                    datos.Add(numero);
+                else
                 {
-                    decimal numero;
-                    labels.Add(dt.Rows[i][2].ToString()); //Numero Protocolo anterior
-                    if (int.Parse(dt.Rows[i][9].ToString()) == 1) //Valor del analisis en formato decimal
-                    {
-                        decimal.TryParse(
-                                dt.Rows[i][4].ToString(),
-                                System.Globalization.NumberStyles.Any,
-                                System.Globalization.CultureInfo.InvariantCulture,
-                                out numero
-                            );
-                        datos.Add(numero);
-                    }
-                    else
-                        datosString.Add(dt.Rows[i][4].ToString());
+                    datos.Clear(); //reseteo los valores
+                    labels.Clear(); //reseteo los valores
+                    break; //Corto si no es numerico porque ya no sirve para graficar
                 }
-            }
+            }  
          
-
-
-
             var js = new JavaScriptSerializer();
 
             miGrafico.LabelsJson = js.Serialize(labels);
             miGrafico.DatosJson = js.Serialize(datos);
-            miGrafico.DatosStringJson = js.Serialize(datosString);
             miGrafico.TipoGrafico = js.Serialize("line");
             miGrafico.TituloJson = js.Serialize(titulo);
             miGrafico.minimo = js.Serialize(valorminino);
diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx b/WebLab/Resultados/ResultadoBusqueda.aspx
index 4bb0fd69..ce7ee084 100644
--- a/WebLab/Resultados/ResultadoBusqueda.aspx
+++ b/WebLab/Resultados/ResultadoBusqueda.aspx
@@ -77,7 +77,7 @@
 					<tr>
 						<td  valign="top" rowspan="12" >
                            
-                            <div class="panel panel-default" runat="server" id="Div1">
+                            <div class="panel panel-default" runat="server" id="pnlCargaResultados">
                     <div class="panel-heading">
     <asp:Label ID="lblFormaCarga" runat="server" 
                                 Text="Forma de Carga" ></asp:Label>
diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx.cs b/WebLab/Resultados/ResultadoBusqueda.aspx.cs
index 746d3c0a..b520725f 100644
--- a/WebLab/Resultados/ResultadoBusqueda.aspx.cs
+++ b/WebLab/Resultados/ResultadoBusqueda.aspx.cs
@@ -184,6 +184,7 @@ private void CargarPagina()
                 lblMensaje.Visible = false;
                 IniciarValores();
                 //IniciarValoresControl();
+                pnlCargaResultados.Visible = false;
             }
             if (Request["modo"].ToString() == "Urgencia")
                 ddlPrioridad.SelectedValue = "2";
diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs b/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs
index 392f6088..0ff54720 100644
--- a/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs
+++ b/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebLab.Resultados {
-    
-    
-    public partial class ResultadoBusqueda {
-        
+namespace WebLab.Resultados
+{
+
+
+    public partial class ResultadoBusqueda
+    {
+
         /// <summary>
         /// pnlTitulo control.
         /// </summary>
@@ -20,7 +22,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlTitulo;
-        
+
         /// <summary>
         /// lblTitulo control.
         /// </summary>
@@ -29,7 +31,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblTitulo;
-        
+
         /// <summary>
         /// imgUrgencia control.
         /// </summary>
@@ -38,16 +40,16 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Image imgUrgencia;
-        
+
         /// <summary>
-        /// Div1 control.
+        /// pnlCargaResultados control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div1;
-        
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlCargaResultados;
+
         /// <summary>
         /// lblFormaCarga control.
         /// </summary>
@@ -56,7 +58,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblFormaCarga;
-        
+
         /// <summary>
         /// rdbCargaResultados control.
         /// </summary>
@@ -65,7 +67,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RadioButtonList rdbCargaResultados;
-        
+
         /// <summary>
         /// Div2 control.
         /// </summary>
@@ -74,7 +76,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div2;
-        
+
         /// <summary>
         /// rdbEstado control.
         /// </summary>
@@ -83,7 +85,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList rdbEstado;
-        
+
         /// <summary>
         /// divValidacion control.
         /// </summary>
@@ -92,7 +94,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divValidacion;
-        
+
         /// <summary>
         /// lblUsuarioValida control.
         /// </summary>
@@ -101,7 +103,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblUsuarioValida;
-        
+
         /// <summary>
         /// hplCambiarContrasenia control.
         /// </summary>
@@ -110,7 +112,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hplCambiarContrasenia;
-        
+
         /// <summary>
         /// lblMensaje control.
         /// </summary>
@@ -119,7 +121,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.Label lblMensaje;
-        
+
         /// <summary>
         /// lblServicio control.
         /// </summary>
@@ -128,7 +130,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblServicio;
-        
+
         /// <summary>
         /// lblModoPreValidacion control.
         /// </summary>
@@ -137,7 +139,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblModoPreValidacion;
-        
+
         /// <summary>
         /// ddlServicio control.
         /// </summary>
@@ -146,7 +148,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlServicio;
-        
+
         /// <summary>
         /// rvArea control.
         /// </summary>
@@ -155,7 +157,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RangeValidator rvArea;
-        
+
         /// <summary>
         /// ddlArea control.
         /// </summary>
@@ -164,7 +166,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlArea;
-        
+
         /// <summary>
         /// ddlHojaTrabajo control.
         /// </summary>
@@ -173,7 +175,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlHojaTrabajo;
-        
+
         /// <summary>
         /// rvHojaTrabajo control.
         /// </summary>
@@ -182,7 +184,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RangeValidator rvHojaTrabajo;
-        
+
         /// <summary>
         /// imgAgregarArea control.
         /// </summary>
@@ -191,7 +193,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.Image imgAgregarArea;
-        
+
         /// <summary>
         /// ddlArea2 control.
         /// </summary>
@@ -200,7 +202,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlArea2;
-        
+
         /// <summary>
         /// lblAnalisis control.
         /// </summary>
@@ -209,7 +211,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblAnalisis;
-        
+
         /// <summary>
         /// txtCodigo control.
         /// </summary>
@@ -218,7 +220,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.TextBox txtCodigo;
-        
+
         /// <summary>
         /// ddlAnalisis control.
         /// </summary>
@@ -227,7 +229,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlAnalisis;
-        
+
         /// <summary>
         /// rvAnalisis control.
         /// </summary>
@@ -236,7 +238,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RangeValidator rvAnalisis;
-        
+
         /// <summary>
         /// txtFechaDesde control.
         /// </summary>
@@ -245,7 +247,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaDesde;
-        
+
         /// <summary>
         /// cvFechas control.
         /// </summary>
@@ -254,7 +256,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvFechas;
-        
+
         /// <summary>
         /// txtFechaHasta control.
         /// </summary>
@@ -263,7 +265,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaHasta;
-        
+
         /// <summary>
         /// txtProtocoloDesde control.
         /// </summary>
@@ -272,7 +274,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloDesde;
-        
+
         /// <summary>
         /// cvNumeroDesde control.
         /// </summary>
@@ -281,7 +283,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvNumeroDesde;
-        
+
         /// <summary>
         /// txtProtocoloHasta control.
         /// </summary>
@@ -290,7 +292,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloHasta;
-        
+
         /// <summary>
         /// cvNumeroHasta control.
         /// </summary>
@@ -299,7 +301,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvNumeroHasta;
-        
+
         /// <summary>
         /// txtNroOrigen control.
         /// </summary>
@@ -308,7 +310,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtNroOrigen;
-        
+
         /// <summary>
         /// lblPrioridad control.
         /// </summary>
@@ -317,7 +319,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPrioridad;
-        
+
         /// <summary>
         /// ddlPrioridad control.
         /// </summary>
@@ -326,7 +328,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlPrioridad;
-        
+
         /// <summary>
         /// ddlEfector control.
         /// </summary>
@@ -335,7 +337,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlEfector;
-        
+
         /// <summary>
         /// lblOrigen control.
         /// </summary>
@@ -344,7 +346,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOrigen;
-        
+
         /// <summary>
         /// ddlOrigen control.
         /// </summary>
@@ -353,7 +355,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlOrigen;
-        
+
         /// <summary>
         /// lblDniPaciente control.
         /// </summary>
@@ -362,7 +364,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblDniPaciente;
-        
+
         /// <summary>
         /// txtDNI control.
         /// </summary>
@@ -371,7 +373,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtDNI;
-        
+
         /// <summary>
         /// cvtxtDNI control.
         /// </summary>
@@ -380,7 +382,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CompareValidator cvtxtDNI;
-        
+
         /// <summary>
         /// chkFactura control.
         /// </summary>
@@ -389,7 +391,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkFactura;
-        
+
         /// <summary>
         /// lblCaracterSisa control.
         /// </summary>
@@ -398,7 +400,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblCaracterSisa;
-        
+
         /// <summary>
         /// chkCaracterCovid control.
         /// </summary>
@@ -407,7 +409,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList chkCaracterCovid;
-        
+
         /// <summary>
         /// Div3 control.
         /// </summary>
@@ -416,7 +418,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div3;
-        
+
         /// <summary>
         /// lstSector control.
         /// </summary>
@@ -425,7 +427,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ListBox lstSector;
-        
+
         /// <summary>
         /// lnkMarcar control.
         /// </summary>
@@ -434,7 +436,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkMarcar;
-        
+
         /// <summary>
         /// lnkDesmarcar control.
         /// </summary>
@@ -443,7 +445,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcar;
-        
+
         /// <summary>
         /// chkRecordarFiltro control.
         /// </summary>
@@ -452,7 +454,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkRecordarFiltro;
-        
+
         /// <summary>
         /// lnkLimpiar control.
         /// </summary>
@@ -461,7 +463,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkLimpiar;
-        
+
         /// <summary>
         /// lnkBuscar control.
         /// </summary>
@@ -470,7 +472,7 @@ public partial class ResultadoBusqueda {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkBuscar;
-        
+
         /// <summary>
         /// ValidationSummary1 control.
         /// </summary>
diff --git a/WebLab/Resultados/ResultadoEdit2.aspx b/WebLab/Resultados/ResultadoEdit2.aspx
index 1c217e07..4a1d69c1 100644
--- a/WebLab/Resultados/ResultadoEdit2.aspx
+++ b/WebLab/Resultados/ResultadoEdit2.aspx
@@ -457,7 +457,7 @@
     <%--<li id="tituloCalidad" runat="server"><a  href="#tab6">Incidencia<img alt="tiene incidencias" runat="server" id="inci" visible="false" style="border:none;" src="~/App_Themes/default/images/red_pin.gif" /></a></li>--%>
     <li id="tituloMicroOrganismo" runat="server"><a href="#tab5"><b>Aislamientos&nbsp;<img alt="tiene antibiogramas" runat="server" id="aisl" visible="false" style="border:none;" src="~/App_Themes/default/images/red_pin.gif" /></b></a></li>          
     <li id="tituloAntibiograma" runat="server"><a href="#tab4"><b>Antibiogramas&nbsp;<img alt="tiene antibiogramas" runat="server" id="anti" visible="false" style="border:none;" src="~/App_Themes/default/images/red_pin.gif" /></b></a></li>          
-    <li id="tituloObservaciones" runat="server"><a href="#tab2" >Observaciones</a></li>
+    <li id="tituloObservaciones" runat="server"><a href="#tab2" >Observaciones&nbsp;<img alt="tiene observaciones" runat="server" id="obs" visible="false" style="border:none;" src="~/App_Themes/default/images/red_pin.gif" /></a></li>
       <li id="tituloAntecedente" runat="server"><a href="#tab3" id="tabAntecedente" runat="server">Más opciones</a></li>
     
                                                 
diff --git a/WebLab/Resultados/ResultadoEdit2.aspx.cs b/WebLab/Resultados/ResultadoEdit2.aspx.cs
index fa68f293..ed30baf4 100644
--- a/WebLab/Resultados/ResultadoEdit2.aspx.cs
+++ b/WebLab/Resultados/ResultadoEdit2.aspx.cs
@@ -1047,7 +1047,8 @@ private void MuestraDatos(string p)
             {
                 if (oRegistro.ObservacionResultado != "")
                 {
-                    txtObservacion.Text = oRegistro.ObservacionResultado;            
+                    txtObservacion.Text = oRegistro.ObservacionResultado;
+                    obs.Visible = true;
                 }
                 else
                 {
@@ -4780,6 +4781,7 @@ protected void btnGuardarObsCodificadaGral_Click(object sender, EventArgs e)
 
                 oProtocolo.GrabarAuditoriaDetalleProtocolo(Request["Operacion"].ToString(), int.Parse(oUser.IdUsuario.ToString()), "OBSERVACION RESULTADO", txtObservacion.Text);
                 lblObservacionResultado.Text = txtObservacion.Text;
+                if (txtObservacion.Text != "") obs.Visible = true; else obs.Visible = false;
                 SetSelectedTab(TabIndex.ONE);
             }
             else Response.Redirect("../FinSesion.aspx", false);      
@@ -4792,7 +4794,7 @@ protected void btnBorrarObsCodificadaGral_Click(object sender, EventArgs e)
         }
 
 
-        
+
         protected void btnAgregarObsCodificadaGral_Click(object sender, EventArgs e)
         {
             if (ddlObsCodificadaGeneral.Text != "")
diff --git a/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs b/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs
index aec54709..5156eb5f 100644
--- a/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs
+++ b/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs
@@ -597,6 +597,16 @@ public partial class ResultadoEdit2 {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl tituloObservaciones;
         
+        /// <summary>
+        /// obs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlImage obs;
+
+       
         /// <summary>
         /// tituloAntecedente control.
         /// </summary>
diff --git a/WebLab/WebLab.csproj b/WebLab/WebLab.csproj
index 905e8dd4..f2b60cfd 100644
--- a/WebLab/WebLab.csproj
+++ b/WebLab/WebLab.csproj
@@ -124,10 +124,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\SAP BusinessObjects\Crystal Reports for .NET Framework 4.0\Common\SAP BusinessObjects Enterprise XI 4.0\win32_x86\dotnet\FlashControlV71.dll</HintPath>
     </Reference>
-    <Reference Include="FusionCharts, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Referencias\FusionCharts.dll</HintPath>
-    </Reference>
     <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Referencias\Iesi.Collections.dll</HintPath>
@@ -263,7 +259,6 @@
     <Content Include="bin\CrystalDecisions.Web.dll" />
     <Content Include="bin\EasyListBox.dll" />
     <Content Include="bin\fastJSON.dll" />
-    <Content Include="bin\FusionCharts.dll" />
     <Content Include="bin\Iesi.Collections.dll" />
     <Content Include="bin\Interop.CRDESIGNERLib.dll" />
     <Content Include="bin\Interop.CRQUERYENGINE.dll" />
@@ -304,19 +299,6 @@
     <Content Include="bootstrap\3.3.7\bootstrap.min.js" />
     <Content Include="bootstrap\3.3.7\font-awesome.min.css" />
     <Content Include="bootstrap\3.3.7\jquery.min.js" />
-    <Content Include="bootstrap\css\bootstrap-datepicker.min.css" />
-    <Content Include="bootstrap\css\bootstrap-datepicker3.min.css" />
-    <Content Include="bootstrap\css\bootstrap-datetimepicker.min.css" />
-    <Content Include="bootstrap\css\bootstrap-table.min.css" />
-    <Content Include="bootstrap\css\bootstrap.css" />
-    <Content Include="bootstrap\css\bootstrap.min.css" />
-    <Content Include="bootstrap\css\fonts\font-awesome.min.css" />
-    <Content Include="bootstrap\css\fonts\fontawesome-webfont.svg" />
-    <Content Include="bootstrap\css\formValidation.css" />
-    <Content Include="bootstrap\css\intlTelInput.css" />
-    <Content Include="bootstrap\css\jquery-clockpicker.min.css" />
-    <Content Include="bootstrap\css\jquery-ui.css" />
-    <Content Include="bootstrap\css\select2.min.css" />
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\attribution.js" />
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\css\all.css" />
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\css\all.min.css" />
@@ -1965,27 +1947,6 @@
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\webfonts\fa-brands-400.svg" />
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\webfonts\fa-regular-400.svg" />
     <Content Include="bootstrap\fontawesome-free-5.15.1-web\webfonts\fa-solid-900.svg" />
-    <Content Include="bootstrap\fonts\glyphicons-halflings-regular.svg" />
-    <Content Include="bootstrap\img\flags%402x.png" />
-    <Content Include="bootstrap\img\flags.png" />
-    <Content Include="bootstrap\js\bootstrap-datepicker.es.min.js" />
-    <Content Include="bootstrap\js\bootstrap-datepicker.min.js" />
-    <Content Include="bootstrap\js\bootstrap-datetimepicker.min.js" />
-    <Content Include="bootstrap\js\bootstrap-table-locale-all.min.js" />
-    <Content Include="bootstrap\js\bootstrap-table.min.js" />
-    <Content Include="bootstrap\js\bootstrap.js" />
-    <Content Include="bootstrap\js\bootstrap.min.js" />
-    <Content Include="bootstrap\js\bootstrap3-typeahead.js" />
-    <Content Include="bootstrap\js\intlTelInput.js" />
-    <Content Include="bootstrap\js\jquery-1.12.0.js" />
-    <Content Include="bootstrap\js\jquery-clockpicker.min.js" />
-    <Content Include="bootstrap\js\jquery-ui.js" />
-    <Content Include="bootstrap\js\moment.min.js" />
-    <Content Include="bootstrap\js\pulsate.min.js" />
-    <Content Include="bootstrap\js\select2.full.min.js" />
-    <Content Include="bootstrap\js\utils.js" />
-    <Content Include="bootstrap\js\validar\bootstrap.js" />
-    <Content Include="bootstrap\js\validar\formValidation.js" />
     <Content Include="Calidad\IncidenciaEdit.ascx" />
     <Content Include="Calidad\IncidenciaRecepcionEdit.aspx" />
     <Content Include="Calidad\IncidenciaRecepcionList.aspx" />
@@ -6287,15 +6248,6 @@
     <Content Include="App_Themes\default\images\arrow-up.gif" />
     <Content Include="App_Themes\default\images\block.png" />
     <Content Include="App_Themes\default\images\CUADRO.jpg" />
-    <Content Include="bootstrap\css\fonts\fontawesome-webfont.eot" />
-    <Content Include="bootstrap\css\fonts\fontawesome-webfont.ttf" />
-    <Content Include="bootstrap\css\fonts\fontawesome-webfont.woff" />
-    <Content Include="bootstrap\css\fonts\fontawesome-webfont.woff2" />
-    <Content Include="bootstrap\css\fonts\FontAwesome.otf" />
-    <Content Include="bootstrap\fonts\glyphicons-halflings-regular.eot" />
-    <Content Include="bootstrap\fonts\glyphicons-halflings-regular.ttf" />
-    <Content Include="bootstrap\fonts\glyphicons-halflings-regular.woff" />
-    <Content Include="bootstrap\fonts\glyphicons-halflings-regular.woff2" />
     <Content Include="bin\WebLab.dll.config" />
     <Content Include="bootstrap-3.3.7-dist\css\bootstrap-theme.css.map" />
     <Content Include="bootstrap-3.3.7-dist\css\bootstrap-theme.min.css.map" />