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

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

@@ -85,7 +85,7 @@ public class DoctorService extends TokenService {
			name="%"+name+"%";
			return doctorDao.doctorFamousDoctorList(name);
		}else{
			return doctorDao.doctorFamousDoctorList(sdf.format(new Date()));
			return doctorDao.doctorFamousDoctorList();
		}
	}