Commit 5600b674 by roxy

Merge branch 'desarrollo'

parents eee559b5 d36a5825
......@@ -647,7 +647,7 @@ function MostrarDatosGenerales($idsolicitud,$iddetalle,$lugar)
$con = new ConexionBD;
if($con->conectar()==true)
{
echo $query =" WITH tbl_servicio as (SELECT mnt_3.id, CASE WHEN id_servicio_externo_estab IS NOT NULL
$query =" WITH tbl_servicio as (SELECT mnt_3.id, CASE WHEN id_servicio_externo_estab IS NOT NULL
THEN mnt_ser.abreviatura ||' - ' || a.nombre
ELSE cmo.nombre ||' - ' || a.nombre
END as procedencia,
......
......@@ -304,6 +304,7 @@ $fecharecepcion=$_GET['fecharecepcion'];
<table width="100%" border="0" align="center" cellpadding="0%" cellspacing="0%" >
<tr>
<td colspan="1" class="Estilo5" width="18%" align="justify"><strong>Estab Solicitante:</strong></td>
<td colspan="3" class="Estilo6" width="41%" align="justify"> <?php echo $row_estabExt['nombre']?></td>
<td colspan="1" class='Estilo5' width="17%" align="justify"><strong>Fecha Consulta:</strong></td>
<td colspan="1" class='Estilo6' width="24%" align="justify"><?php echo $f_consulta ?></td>
......
......@@ -197,7 +197,7 @@ switch ($opcion) {
fn_calcular_edad(t07.id, 'completa') as edad,
t19.nombre as nomsexo,
t08.administrativa,
t03.fecharecepcion as frecep,
to_char(t03.fecharecepcion,'YYYY-MM-DD') as frecep,
(select CASE WHEN count(id)=0 THEN 'false' ELSE 'true' end from lab_datosfijosresultado where id_conf_examen_estab = t04.id and (fechafin is null or fechafin < current_date) and (rangofin is not null or rangoinicio is not null)) as datosfijos
FROM sec_detallesolicitudestudios t01
......@@ -229,7 +229,7 @@ switch ($opcion) {
true AS referido,TO_CHAR(f_tomamuestra,'dd-mm-YYYY HH12:MI') AS f_tomamuestra, (SELECT tipomuestra FROM lab_tipomuestra WHERE id=t01.idtipomuestra) AS tipomuestra,
t17.idtiposolicitud,t08.id as idarea,t18.idestandar as estandar, (select origenmuestra FROM mnt_origenmuestra where id=t01.idorigenmuestra) as origenmuestra,
fn_calcular_edad_referido(t07.id, 'completa') as edad,
t19.nombre as nomsexo,t08.administrativa,t03.fecharecepcion as frecep,
t19.nombre as nomsexo,t08.administrativa,to_char(t03.fecharecepcion,'YYYY-MM-DD') as frecep,
(select CASE WHEN count(id)=0 THEN 'false' ELSE 'true' end from lab_datosfijosresultado where id_conf_examen_estab = t04.id and (fechafin is null or fechafin < current_date) and (rangofin is not null or rangoinicio is not null)) as datosfijos
FROM sec_detallesolicitudestudios t01
INNER JOIN sec_solicitudestudios t02 ON (t02.id = t01.idsolicitudestudio)
......@@ -249,7 +249,7 @@ switch ($opcion) {
INNER JOIN tbl_servicio t20 ON (t20.id = t09.id_aten_area_mod_estab AND t20.servicio IS NOT NULL)
LEFT JOIN mnt_origenmuestra t21 ON (t21.id = t01.idorigenmuestra)
WHERE t16.idestado = 'PM' AND t02.id_establecimiento = $var2
ORDER BY frecep DESC, numeromuestra ";
ORDER BY frecep desc,numeromuestra";
//ECHO $query;
$consulta = $objdatos->ListadoSolicitudesPorArea($query);
......@@ -265,9 +265,9 @@ switch ($opcion) {
echo "<div class='table-responsive' style='width:100%;'>
<table width='97%' border='1' align='center' id='dataresultados' data-table-enabled='true' class='table table-hover table-bordered table-condensed table-white'>
<thead><tr>
<th>Corr</th>
<th>Fecha Recepcion</th>
<th></th>
<th>Muestra </th>
<th>Fecha Recepcion</th>
<th>NEC </th>
<th>Paciente </th>
<th>Id Examen</th>
......@@ -287,9 +287,9 @@ switch ($opcion) {
$timefrecep = strtotime($row['fecharecepcion']);
$datefrecep = date("Y-m-d", $timefrecep);
echo "<tr>
<td width='2px'>" . ($i) . "</td>
<td width='2px' style='color:white;'>" . ($i) . "</td>
<td width='3%'>" . $row['numeromuestra'] . "</td>
<td width='2%'>" . ($row['fecharecepcion']) . "</td>
<td width='3%'>" . $row['numeromuestra'] . "</td>
<td width='3%'><a style ='text-decoration:underline;cursor:pointer;' onclick='MostrarDatos(" . $pos . ");'>" . $row['idnumeroexp'] . "</a></td>" .
"<input name='idsolicitud[" . $pos . "]' id='idsolicitud[" . $pos . "]' type='hidden' size='60' value='" . $row["idsolicitudestudio"] . "' />" .
"<input name='idexpediente[" . $pos . "]' id='idexpediente[" . $pos . "]' type='hidden' size='60' value='" . $row["idnumeroexp"] . "' />" .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment