Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/DoctorService.java

@@ -83,9 +83,9 @@ public class DoctorService extends TokenService {
		if (StringUtils.isNoneEmpty(name)) {
			name="%"+name+"%";
			return doctorDao.famousDoctorList(sdf.format(new Date()),name);
			return doctorDao.doctorFamousDoctorList(name);
		}else{
			return doctorDao.famousDoctorList(sdf.format(new Date()));
			return doctorDao.doctorFamousDoctorList(sdf.format(new Date()));
		}
	}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -327,7 +327,7 @@ public class ConsultController extends WeixinBaseController {
            // 推送消息给医生
            PushMsgTask.getInstance().put(consult.getDoctor(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM.D_CT_01.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM.指定咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM.您有新的指定咨询.name(), consult.getConsult());
            return write(200, "提交成功","data",consult);
            return write(200, "提交成功", "data", consult);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, "提交失败！");
@@ -430,6 +430,10 @@ public class ConsultController extends WeixinBaseController {
                        continue;
                    }
                    if (doctorWorkTimeService.getDoctorConsultTimesRemain(doctor.getCode()) < 1) {
                        continue;
                    }
                    JSONObject json = new JSONObject();
                    json.put("id", doctor.getId());
                    // 医生标识