droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corregido error en la lista de pacientes con pruebas médicas (Se

Browse Source 
mostraban pacientes sin prueba médica).
Arreglos menores en la interfaz.
This commit is contained in:
Marcos Garcia Nuñez
2019-12-30 17:55:35 +01:00
parent 875f664586
commit 893431851b
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
View File

@@ -116,8 +116,8 @@
<p:panel rendered="#{mt.viewCreate}" id="createPanel" header="Añadir una nueva prueba médica">
<div class="ui-g ui-fluid">
<div class="ui-g-3">Paciente:</div>
<div class="ui-g-9">
<div class="ui-g-2">Paciente:</div>
<div class="ui-g-10">
<p:autoComplete id="addTestPatient" dropdown="true" value="#{mt.patSelected}" completeMethod="#{mt.completePatient}" var="p" itemLabel="#{p.displayName}" itemValue="#{p}"
forceSelection="true" placeholder="Seleccione un paciente o teclee para buscar..." required="true"
requiredMessage="Por favor, seleccione un paciente al cual aádir la prueba.">
@@ -134,33 +134,46 @@
</p:autoComplete>
</div>
<div class="ui-g-3">Fecha:</div>
<div class="ui-g-9">
<div class="ui-g-2">Fecha:</div>
<div class="ui-g-3">
<p:datePicker id="fecha" value="#{mt.testDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
requiredMessage="Especifique la fecha de la prueba médica">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" timeStyle="short" />
</p:datePicker>
</div>
<div class="ui-g-1" />
<div class="ui-g-6">
<p:message for="fecha" />
</div>
<div class="ui-g-3">Hora:</div>
<div class="ui-g-9">
<div class="ui-g-2">Hora:</div>
<div class="ui-g-3">
<p:datePicker id="hora" value="#{mt.testTime}" timeOnly="true" pattern="HH:mm" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
requiredMessage="Especifique la hora de la prueba médica">
<f:convertDateTime type="localTime" pattern="HH:mm" />
</p:datePicker>
</div>
<div class="ui-g-1" />
<div class="ui-g-6">
<p:message for="hora" />
</div>
<div class="ui-g-3">Observaciones:</div>
<div class="ui-g-9">
<div class="ui-g-2">Observaciones:</div>
<div class="ui-g-10">
<p:textEditor value="#{mt.testObservations}" required="true" requiredMessage="Debe indicar las observaciones de la prueba" />
</div>
<div class="ui-g-3">Tipo de prueba:</div>
<div class="ui-g-9">
<div class="ui-g-2">Tipo de prueba:</div>
<div class="ui-g-5">
<p:selectOneMenu id="selUsertype" value="#{mt.testType}" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de prueba médica">
<f:selectItems value="#{mt.medicalTestTypes}" var="item" itemLabel="#{item.testTypeName}" />
</p:selectOneMenu>
</div>
<div class="ui-g-1" />
<div class="ui-g-4">
<p:message for="selUsertype" />
</div>
<div class="ui-g-4 ui-md-5" />
<div class="ui-g-4 ui-md-2">
<p:commandButton value="Guardar" action="#{mt.save}" icon="pi pi-save" update="frmMT,frmImage,frmNEW" />

2
1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
View File

@@ -35,7 +35,7 @@
<div class="ui-g-6">
<p:button value="Ir a la página principal" outcome="/home" icon="pi pi-home" />
</div>
<div class="ui-g-3"></div>
<div class="ui-g-3" />
</div>
</p:panel>

4
1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
View File

@@ -345,7 +345,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
searchTerm = Utils.normalizeTerm(searchTerm);
if (searchTerm.length() > 0) {
strFilter = "and lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm";
strFilter = "and (lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm)";
}
TypedQuery<PatientJPA> query = entman.createQuery(String.format(strQuery, strFilter), PatientJPA.class);
@@ -380,7 +380,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
searchTerm = Utils.normalizeTerm(searchTerm);
if (searchTerm.length() > 0) {
strFilter = "and lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm";
strFilter = "and (lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm)";
}
TypedQuery<PatientJPA> query = entman.createQuery(String.format(strQuery, strFilter), PatientJPA.class);