diff --git a/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml b/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml index 56e0972..1ab2a88 100644 --- a/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml @@ -43,7 +43,6 @@
- #{dd.name} #{dd.surname} <#{dd.email}> diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java index 372fe6b..b88abf7 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java @@ -126,44 +126,24 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { return pendingQuestions; } - public Long getPendingQuestionsCount(int familyDoctorId) { - TypedQuery query = entman.createQuery( - "SELECT count(1) from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId", Long.class); - query.setParameter("status", QuestionStatus.PENDING); - query.setParameter("docId", familyDoctorId); - - return query.getSingleResult(); - } - - public List listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize) { - TypedQuery query = entman.createQuery( - "SELECT q from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId order by q.title", - QuestionJPA.class); - query.setParameter("status", QuestionStatus.PENDING); - query.setParameter("docId", familyDoctorId); - - if (pageSize > 0) { - query.setFirstResult(pageNumber * pageSize); - query.setMaxResults(pageSize); - } - - List allJPA = query.getResultList(); - List pendingQuestions = new ArrayList(); - - for (QuestionJPA item : allJPA) { - pendingQuestions.add(commonServices.getPOJOforQuestionJPA(item, 1)); - } - - return pendingQuestions; - } - /** - * Recuperar una pregunta por su String + * Recuperar una pregunta por su identificador * * @param question */ @Override - public void getQuestion(String question) { + public QuestionTO getQuestion(int idQuestion) { + QuestionTO resp = new QuestionTO(); + + TypedQuery query = entman.createQuery( + "SELECT q from QuestionJPA q where q.id=:idquestion", + QuestionJPA.class); + + query.setParameter("idquestion", idQuestion); + + resp = commonServices.getPOJOforQuestionJPA(query.getSingleResult(),1); + + return resp; } // ********************************************************************* diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java index 876b9c4..e1c67de 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java @@ -53,17 +53,13 @@ public interface MedicalTestFacadeRemote { * Recuperar las preguntas hechas por un paciente */ public List listAllMyQuestions(int userId); - - public Long getPendingQuestionsCount(int familyDoctorId); - - public List listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize); /** * Recuperar una pregunta por su String * * @param question */ - public void getQuestion(String question); + public QuestionTO getQuestion(int idQuestion); // ********************************************************************* MEDICAL // TEST