名医查询bug修改

src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@@ -133,10 +133,11 @@ public class ChangeSignJob implements Job {
        //保存全科医生的改签统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/ConsultJob.java

@@ -133,10 +133,11 @@ public class ConsultJob implements Job {
        //保存全科医生的咨询统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@@ -141,10 +141,11 @@ public class FollowUpJob implements Job {
        //保存全科医生的随访统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/HealthGuideJob.java

@@ -132,10 +132,11 @@ public class HealthGuideJob implements Job {
        //保存全科医生和健康管理师的健康指导统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -1403,10 +1403,11 @@ public class SignJob implements Job {
        //保存全科医生的签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/UnSignJob.java

@@ -131,10 +131,11 @@ public class UnSignJob implements Job {
        //保存全科医生的解约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@@ -133,10 +133,11 @@ public class WaitSignJob implements Job {
        //保存全科医生的待签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -291,9 +291,9 @@ public class BaseController {
			map.put("status", code);
			map.put("msg", msg);
			// 是否为第一页
			map.put("isFirst", list.isFirstPage());
			map.put("isFirst", list.isFirst());
			// 是否为最后一页
			map.put("isLast", list.isLastPage());
			map.put("isLast", list.isLast());
			// 总条数
			map.put("total", list.getTotalElements());
			// 总页数
@@ -308,8 +308,8 @@ public class BaseController {
	/**
	 * 返回接口处理结果
	 * 
	 * 
	 *
	 *
	 * @param code 结果码，成功为200
	 * @param msg 结果提示信息
	 * @param value 结果数据
@@ -321,9 +321,9 @@ public class BaseController {
			json.put("status", code);
			json.put("msg", msg);
			// 是否为第一页
			json.put("isFirst", page.isFirstPage());
			json.put("isFirst", page.isFirst());
			// 是否为最后一页
			json.put("isLast", page.isLastPage());
			json.put("isLast", page.isLast());
			// 总条数
			json.put("total", page.getTotalElements());
			// 总页数

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultMoviController.java

@@ -85,7 +85,7 @@ public class DoctorConsultMoviController extends BaseController {
					}
					jsonArray.put(json);
				}
				return write(200, "查询成功", list.isFirstPage(), list.isLastPage(), list.getTotalElements(), list.getTotalPages(), "list", jsonArray);
				return write(200, "查询成功", list.isFirst(), list.isLast(), list.getTotalElements(), list.getTotalPages(), "list", jsonArray);
			} else {
				return success("查询成功");
			}