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

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

@@ -124,7 +124,7 @@ public class DoctorConsultController extends WeixinBaseController {
			int pagesize) {
		try {
			JSONArray array = new JSONArray();
			Page<Doctor>list = doctorService.getDoctorFamousDoctorList(name, page, pagesize);
			Page<Doctor> list = doctorService.getDoctorFamousDoctorList(name, page, pagesize);
			if (list != null) {
				for (Doctor doctor : list) {
					if (doctor == null) {