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

src/main/java/com/yihu/wlyy/web/doctor/message/DoctorMessageController.java

@@ -52,7 +52,7 @@ public class DoctorMessageController extends BaseController {
	@ResponseBody
	public String messages() {
		try {
			JSONObject json = messageService.findDoctorAllMessage("6c0cfe5065e011e69f7c005056850d66");
			JSONObject json = messageService.findDoctorAllMessage(getUID());
			if (json == null) {
				return error(-1, "获取消息总数失败！");
			} else {