|
@ -258,10 +258,12 @@ public class DoctorController extends BaseController {
|
|
@RequestParam(required = true) int page,
|
|
@RequestParam(required = true) int page,
|
|
@RequestParam(required = true) int pagesize) {
|
|
@RequestParam(required = true) int pagesize) {
|
|
try {
|
|
try {
|
|
if (type != 1 || type != 2) {
|
|
|
|
|
|
if (type != 1 && type != 2) {
|
|
return error(-1, "医院类型错误");
|
|
return error(-1, "医院类型错误");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
page = page > 1 ? page - 1 : 0;
|
|
|
|
|
|
List<Hospital> hos = hospitalService.getHospitals(type, province, city, town, key, page, pagesize);
|
|
List<Hospital> hos = hospitalService.getHospitals(type, province, city, town, key, page, pagesize);
|
|
|
|
|
|
return write(200, "查询成功", "data", hos);
|
|
return write(200, "查询成功", "data", hos);
|
|
@ -290,6 +292,7 @@ public class DoctorController extends BaseController {
|
|
if (StringUtils.isEmpty(hospital)) {
|
|
if (StringUtils.isEmpty(hospital)) {
|
|
return error(-1, "医院不能为空");
|
|
return error(-1, "医院不能为空");
|
|
}
|
|
}
|
|
|
|
page = page > 1 ? page - 1 : 0;
|
|
List<HospitalDept> dept = deptService.getHospitalDept(hospital, key, page, pagesize);
|
|
List<HospitalDept> dept = deptService.getHospitalDept(hospital, key, page, pagesize);
|
|
|
|
|
|
return write(200, "查询成功", "data", dept);
|
|
return write(200, "查询成功", "data", dept);
|
|
@ -320,7 +323,7 @@ public class DoctorController extends BaseController {
|
|
@RequestParam(required = false, defaultValue = "-1") int page,
|
|
@RequestParam(required = false, defaultValue = "-1") int page,
|
|
@RequestParam(required = false, defaultValue = "15") int pagesize) {
|
|
@RequestParam(required = false, defaultValue = "15") int pagesize) {
|
|
try {
|
|
try {
|
|
if(page > 1){
|
|
|
|
|
|
if (page > 1) {
|
|
page = page - 1;
|
|
page = page - 1;
|
|
}
|
|
}
|
|
JSONArray doctors = doctorInfoService.findWorkingDoctorListByDept(dept, hospital, level, key, page, pagesize);
|
|
JSONArray doctors = doctorInfoService.findWorkingDoctorListByDept(dept, hospital, level, key, page, pagesize);
|