Commit 5125d422 by Julio Castillo

agregar hora y minutos en el calendario para la recepción de muestras laboratorio

parent 9531f771
......@@ -102,13 +102,18 @@ $_SESSION["lugar"] = $lugar;
// var id_solicitud=null;
</script>
<script language="javascript" src="./ajax.js"></script>
<style>
table.dataTable tbody th, table.dataTable tbody td {
padding: 0px 0px;
}
</style>
</head>
<body>
<div class="panel panel-primary">
<table cellspacing="1" cellpadding="2" border="1" align="justify" width="100%" class="table table-bordered table-condensed table-white no-v-border" id="tabla_examenes">
<table cellspacing="0" cellpadding="0" border="0" align="justify" width="100%" class="table table-condensed table-white no-v-border" id="tabla_examenes">
<thead><tr>
<!--<td colspan='7'color='white' nowrap><strong><font color="white">P R U E B A S &nbsp;&nbsp;&nbsp; I N D I V I D U A L E S </font></strong>-->
......@@ -210,12 +215,12 @@ $_SESSION["lugar"] = $lugar;
//Primera Columna
echo "<tr>
<td style='width:3%'>
<td style='width:20%'>
<div class=''><label>
<input type='checkbox' name='Examenes' Id='Examenes" . $i . "' value='" . $ResultadoExamenes['idconf'] . "' onclick=\"MostrarLista2(" . $ResultadoExamenes['idconf'] . ",$i)\" /><b>" . $ResultadoExamenes['nombre_examen'] . "</b>
</label></div><input type='hidden' id='Nombre" . $ResultadoExamenes['idconf'] . "' value='" . $ResultadoExamenes['nombre_examen'] . "'></td>";
echo "<td style='width:26%'><div id='" . $ResultadoExamenes['idconf'] . "'>";
echo "<td style='width:15%'><div id='" . $ResultadoExamenes['idconf'] . "'>";
/* if ($ResultadoExamenes['urgente']==1){
echo '<div class="onoffswitch" style="width:100px"><strong><font color="#428bca">Urgente :&nbsp;&nbsp;&nbsp;&nbsp; </font></strong>
<input type="checkbox" id="tiposolgen'.$ResultadoExamenes['idconf'].'" name="tiposolgen" data-switch-enabled="true" class="form height">
......@@ -229,11 +234,11 @@ $_SESSION["lugar"] = $lugar;
$i++;
// SEGUNDA COLUMNA
if ($ResultadoExamenes = pg_fetch_array($examen)) {
echo "<td colspan='2' style='width:23%; vertical-align: top;' >
echo "<td colspan='2' style='width:20%; vertical-align: top;' >
<div class='checkbox'><label>
<input type='checkbox' name='Examenes' Id='Examenes" . $i . "' value='" . $ResultadoExamenes['idconf'] . "' onclick=\"MostrarLista2(" . $ResultadoExamenes['idconf'] . ",$i)\" /><b>" . $ResultadoExamenes['nombre_examen'] . "</b></label></div><input type='hidden' id='Nombre" . $ResultadoExamenes['idconf'] . "' value='" . $ResultadoExamenes['nombre_examen'] . "'></td>";
echo "<td style='width:23%'><div id='" . $ResultadoExamenes['idconf'] . "'></div>";
echo "<td style='width:15%'><div id='" . $ResultadoExamenes['idconf'] . "'></div>";
echo "<div id='O" . $ResultadoExamenes['idconf'] . "'></div>";
echo "</td></tr>";
$i++;
......
......@@ -1073,7 +1073,7 @@ function handle(e){
<td class="th-info" align="center">Fecha de Recepción:</td>
<td class="td-blue" colspan="2">
<?php
echo "<input type='text' class='date form-control height' id='txtfrecepcion' name='txtconsulta' value='". date('Y-m-d')."' onchange=\"valfechasolicita(this.value, 'txtconsulta');\" style='width:150px' />";
echo "<input type='text' class='datepicker form-control height' id='txtfrecepcion' name='txtconsulta' value='". date('Y-m-d H:i')."' onchange=\"valfechasolicita(this.value, 'txtconsulta');\" style='width:150px' />";
?>
......
......@@ -1789,7 +1789,7 @@ function obtenerDatosGenerales($idHistorialClinico, $idDatoReferencia, $idEstabl
t22.tipo as tipoempleado
FROM sec_solicitudestudios t01
INNER JOIN ctl_establecimiento t02 ON (t02.id = t01.id_establecimiento_externo)
-- Historial Clinico
/* Historial Clinico */
LEFT JOIN sec_historial_clinico t03 ON (t03.id = t01.id_historial_clinico)
LEFT JOIN mnt_expediente t04 ON (t04.id = t03.id_numero_expediente)
LEFT JOIN mnt_paciente t05 ON (t05.id = t04.id_paciente)
......@@ -1799,7 +1799,7 @@ function obtenerDatosGenerales($idHistorialClinico, $idDatoReferencia, $idEstabl
LEFT JOIN mnt_area_mod_estab t09 ON (t09.id = t07.id_area_mod_estab)
LEFT JOIN ctl_area_atencion t10 ON (t10.id = t09.id_area_atencion)
LEFT JOIN mnt_empleado t11 ON (t11.id = t03.id_empleado)
-- Paciente Referido
/* Paciente Referido */
LEFT JOIN mnt_dato_referencia t12 ON (t12.id = t01.id_dato_referencia)
LEFT JOIN mnt_expediente_referido t13 ON (t13.id = t12.id_expediente_referido)
LEFT JOIN mnt_paciente_referido t14 ON (t14.id = t13.id_referido)
......
......@@ -304,7 +304,11 @@ var $HREF;
foreach($rm as $examen) {
$this->SetX(7);
$this->Cell(108,5,utf8_decode($examen['nombre']),0,0,'L', true);
$this->Cell(80,5,utf8_decode($examen['motivo_rechazo']),0,1,'L', true);
if ($examen['motivo_rechazo']!=null){
$this->Cell(80,5,utf8_decode($examen['motivo_rechazo']),0,1,'L', true);
} else {
$this->Cell(80,5,utf8_decode($examen['nombre_observacion_rechazo']),0,1,'L', true);
}
$this->Ln(1);
}
}
......
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