diff --git a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml index f287fa9..822a366 100644 --- a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml @@ -174,11 +174,11 @@ -
-
+
+
-
+
diff --git a/1.sources/MyHealth/docroot/resources/css/estilos.css b/1.sources/MyHealth/docroot/resources/css/estilos.css index 4652883..3e5e3a9 100644 --- a/1.sources/MyHealth/docroot/resources/css/estilos.css +++ b/1.sources/MyHealth/docroot/resources/css/estilos.css @@ -43,6 +43,6 @@ ul.ui-menu-list { } .ui-orderlist .ui-orderlist-list { - height: 70vh !important; + height: 62vh !important; width: 25vw !important; } \ No newline at end of file diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java index 23fbd40..74ac098 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java @@ -286,17 +286,17 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { } @Override - public List loadMedicalTestForFamilyDoctor(int familyDoctorID, Integer patientID) { + public List loadMedicalTestForFamilyDoctor(int familyDoctorID, int patientID) { List medicalTests = new ArrayList(); String extraQuery = ""; - if (patientID != null) { + if (patientID >= 0) { extraQuery = " and q.patient.id=:patientID"; } TypedQuery query = entman .createQuery("SELECT q from MedicalTestJPA q where q.patient.familyDoctor.id=:familyDoctorID " + extraQuery + " order by q.id desc", MedicalTestJPA.class); - if (patientID != null) { + if (patientID >= 0) { query.setParameter("patientID", patientID); } query.setParameter("familyDoctorID", familyDoctorID); @@ -311,18 +311,18 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { } @Override - public List loadMedicalTestForSpecialistDoctor(int specialistDoctorID, Integer patientID) { + public List loadMedicalTestForSpecialistDoctor(int specialistDoctorID, int patientID) { List medicalTests = new ArrayList(); String extraQuery = ""; - if (patientID != null) { + if (patientID >= 0) { extraQuery = " and q.patient.id=:patientID"; } TypedQuery query = entman .createQuery("SELECT q from MedicalTestJPA q where q.specialistDoctor.id=:specialistDoctorID " + extraQuery + " order by q.id desc", MedicalTestJPA.class); - if (patientID != null) { + if (patientID >= 0) { query.setParameter("patientID", patientID); } query.setParameter("specialistDoctorID", specialistDoctorID); diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java index 58e71fd..8ad42ad 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java @@ -27,7 +27,9 @@ public interface MedicalTestFacadeRemote { /** * Realizar una pregunta al médico por un paciente * - * @param professionalNumber + * @param userID Este parámetro en el enunciado era del doctor, se ha cambiado al del paciente ya que los EJB + * no tienen el contexto de la sesión y de esta forma se puede conseguir el médico al que se realiza la + * pregunta. * @param title * @param message */ @@ -36,7 +38,8 @@ public interface MedicalTestFacadeRemote { /** * El médico responde a una pregunta * - * @param question + * @param questionId Se ha cambiado a questionID ya que es más directa la identificación de la pregunta + * a la que se va a responder * @param response */ public void answerQuestion(int questionId, String response); @@ -52,13 +55,16 @@ public interface MedicalTestFacadeRemote { /** * Recuperar las preguntas hechas por un paciente + * + * NEW */ public List listAllMyQuestions(int userId); /** * Recuperar una pregunta por su String * - * @param question + * @param idQuestion Se ha cambiado al identificador de la pregunta, ya que es más directa + * su identificación. */ public QuestionTO getQuestion(int idQuestion); @@ -71,9 +77,9 @@ public interface MedicalTestFacadeRemote { public List loadMedicalTestForSpecialistDoctor(int specialistDoctorID); - public List loadMedicalTestForFamilyDoctor(int familyDoctorID, Integer patientID); + public List loadMedicalTestForFamilyDoctor(int familyDoctorID, int patientID); - public List loadMedicalTestForSpecialistDoctor(int specialistDoctorID, Integer patientID); + public List loadMedicalTestForSpecialistDoctor(int specialistDoctorID, int patientID); public List loadPatientsForSpecialistDoctor(int specialistDoctorID, String searchTerm, int pageNumber, int pageSize); diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java index aa733e1..fbbddfe 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java @@ -55,6 +55,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void init() { this.userType = SessionUtils.getUserType(); this.userID = Integer.valueOf(SessionUtils.getUserId()); + this.medicalTestTypes = new ArrayList(); this.medicalTestTypes.add(MedicalTestType.BLOOD_TEST); this.medicalTestTypes.add(MedicalTestType.CT_SCAN); @@ -128,7 +129,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { } public void loadMedicalTests() { - Integer patId = null; + Integer patId = -1; if (this.patientFilterSelected != null) patId = this.patientFilterSelected.getId(); diff --git a/3.docs/Diseño de pruebas - Pruebas médicas.xlsx b/3.docs/Diseño de pruebas - Pruebas médicas.xlsx new file mode 100644 index 0000000..0e76621 Binary files /dev/null and b/3.docs/Diseño de pruebas - Pruebas médicas.xlsx differ diff --git a/3.docs/PDS_Practica_4_Grupo2.docx b/3.docs/PDS_Practica_4_Grupo2.docx index 9b5b7e1..affeb0d 100644 Binary files a/3.docs/PDS_Practica_4_Grupo2.docx and b/3.docs/PDS_Practica_4_Grupo2.docx differ diff --git a/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx b/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx index edb215f..b05876b 100644 Binary files a/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx and b/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx differ