|
@ -676,9 +676,14 @@ public class DoctorInfoService extends BaseService {
|
|
List<Doctor> doctors = doctorDao.findAll(spec, sort);
|
|
List<Doctor> doctors = doctorDao.findAll(spec, sort);
|
|
List<Doctor> workingDoctor = new ArrayList<>();
|
|
List<Doctor> workingDoctor = new ArrayList<>();
|
|
List<Doctor> returnList = new ArrayList<>();
|
|
List<Doctor> returnList = new ArrayList<>();
|
|
|
|
int start = (page - 1) * pageSize;
|
|
|
|
int end = start + pageSize;
|
|
|
|
|
|
if (doctors.size() > 0) {
|
|
if (doctors.size() > 0) {
|
|
for (Doctor doc : doctors) {
|
|
for (Doctor doc : doctors) {
|
|
|
|
if(workingDoctor.size() > end){
|
|
|
|
break;
|
|
|
|
}
|
|
if (type != 1) {
|
|
if (type != 1) {
|
|
if (doc.getIsFamous() != null && doc.getIsFamous() == 1) {
|
|
if (doc.getIsFamous() != null && doc.getIsFamous() == 1) {
|
|
continue;
|
|
continue;
|
|
@ -690,9 +695,6 @@ public class DoctorInfoService extends BaseService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
int start = (page - 1) * pageSize;
|
|
|
|
int end = start + pageSize;
|
|
|
|
|
|
|
|
if (end > workingDoctor.size()) {
|
|
if (end > workingDoctor.size()) {
|
|
end = workingDoctor.size();
|
|
end = workingDoctor.size();
|
|
}
|
|
}
|