diff --git a/1.sources/MyHealth/docroot/systemAdmin/ListDoctorsByCenter.xhtml b/1.sources/MyHealth/docroot/systemAdmin/ListDoctorsByCenter.xhtml index a3520e8..c615915 100644 --- a/1.sources/MyHealth/docroot/systemAdmin/ListDoctorsByCenter.xhtml +++ b/1.sources/MyHealth/docroot/systemAdmin/ListDoctorsByCenter.xhtml @@ -26,7 +26,8 @@ - + +
@@ -35,24 +36,28 @@ paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40" emptyMessage="No existe ningún doctor para el centro seleccionado."> - + - + - + - + + + + + diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java index 7a8225b..64c5b9c 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java @@ -229,13 +229,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return caps; } - public Long getFamilyDoctorsByCAPCount(int primaryHealthCareCenterId) { - TypedQuery query = entman.createQuery("SELECT count(1) from FamilyDoctorJPA d where d.primaryHealthCareCenter.id=:capId", Long.class); - query.setParameter("capId", primaryHealthCareCenterId); - - return query.getSingleResult(); - } - public List listAllFamilyDoctorsByCAPPaged(int primaryHealthCareCenterId, int pageNumber, int pageSize) { List familyDoctorsByCAP = new ArrayList(); @@ -256,4 +249,11 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return familyDoctorsByCAP; } + + public Long getPatientCount(int familyDoctorId) { + TypedQuery query = entman.createQuery("SELECT count(1) from PatientJPA p where p.familyDoctor.id=:familyDoctorId", Long.class); + query.setParameter("familyDoctorId", familyDoctorId); + + return query.getSingleResult(); + } } diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java index d8f5133..b8a94f6 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java @@ -42,7 +42,7 @@ public interface SystemAdminFacadeRemote { public List listCAPsPaged(int pageNumber, int pageSize); - public Long getFamilyDoctorsByCAPCount(int primaryHealthCareCenterId); - public List listAllFamilyDoctorsByCAPPaged(int primaryHealthCareCenterId, int pageNumber, int pageSize); + + public Long getPatientCount(int primaryHealthCareCenterId); } \ No newline at end of file diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java index 28c209a..e38cab4 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java @@ -82,4 +82,7 @@ public class ListDoctorsByCenterMBean extends ManagedBeanBase implements Seriali this.primaryHealthCareCenter = value; } + public Long getPatientsByDoctor(int familyDoctorId) { + return getRemoteManagerSystemAdmin().getPatientCount(familyDoctorId); + } }