From 68b3e990b9914522f2126fc1d163ba524feb965e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Thu, 2 Jan 2020 16:28:53 +0100 Subject: [PATCH] =?UTF-8?q?Las=20comprobaciones=20del=20nombre=20de=20CAPs?= =?UTF-8?q?=20y=20especialidades=20m=C3=A9dicas=20existentes=20se=20realiz?= =?UTF-8?q?an=20en=20minusculas.=20Se=20comprueba=20que=20no=20existan=20e?= =?UTF-8?q?speicalistas=20asigandos=20a=20la=20especialidad=20m=C3=A9dica?= =?UTF-8?q?=20antes=20de=20poder=20eliminarla.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ejb/systemAdmin/SystemAdminFacadeBean.java | 4 ++-- .../managedbean/systemAdmin/ManageSpecialitiesMBean.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java index 730ea65..2b276de 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java @@ -134,7 +134,7 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { } public MedicalSpecialtyTO findSpecialtyByName(String searchedName) { - TypedQuery query = entman.createQuery("from MedicalSpecialtyJPA ms where ms.name=:name", MedicalSpecialtyJPA.class); + TypedQuery query = entman.createQuery("from MedicalSpecialtyJPA ms where LOWER(ms.name)=LOWER(:name)", MedicalSpecialtyJPA.class); query.setMaxResults(1); query.setParameter("name", searchedName); @@ -178,7 +178,7 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { } public PrimaryHealthCareCenterTO findHealthCareCenterByName(String searchedName) { - TypedQuery query = entman.createQuery("from PrimaryHealthCareCenterJPA cap where cap.name=:name", PrimaryHealthCareCenterJPA.class); + TypedQuery query = entman.createQuery("from PrimaryHealthCareCenterJPA cap where LOWER(cap.name)=LOWER(:name)", PrimaryHealthCareCenterJPA.class); query.setMaxResults(1); query.setParameter("name", searchedName); diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java index b738690..bf4c02d 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java @@ -117,7 +117,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ if (error == 0) { try { - this.getRemoteManagerSystemAdmin().updateSpecialty(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(),this.medicalSpecialty.getDescription()); + this.getRemoteManagerSystemAdmin().updateSpecialty(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription()); this.showSpecialtyData(null); this.refreshFormData(); @@ -139,6 +139,11 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción."); error++; } + if (this.getRemoteManagerMedicalTest().getSpecialistDoctorByMedicalSpecialtyCount(this.medicalSpecialty.getId()) > 0) { + this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "No se puede eliminar esta especialidad", + "Existen especialistas que tienen asignada esta especialidad médica, por lo cual no puede ser eliminada. Asigne los especialista a otra especialidad para proceder a eliminar la especialidad a continuación."); + error++; + } if (error == 0) { try {