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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -349,12 +349,20 @@ public class WechatController extends WeixinBaseController {
                }
                loginLog.setLoginType("2");
                if (patient == null) {
                    errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                    if(mobile.length()==11){
                        errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                    }else{
                        errorMessage="该身份证号暂未注册帐号，请确认后重新输入！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
                } else if (patient.getStatus() == 0) {
                    errorMessage="该手机号已被禁止使用！";
                    if(mobile.length()==11){
                      errorMessage="该手机号已被禁止使用！";
                    }else{
                      errorMessage="该身份证号已被禁止使用！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1,errorMessage );
@@ -430,12 +438,20 @@ public class WechatController extends WeixinBaseController {
                Patient patient = patientService.findByMobile(mobile);
                loginLog.setLoginType("1");
                if (patient == null) {
                    errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                    if(mobile.length()==11){
                        errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                    }else{
                        errorMessage="该身份证号暂未注册帐号，请确认后重新输入！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
                } else if (patient.getStatus() == 0) {
                    errorMessage="该手机号已被禁止使用！";
                    if(mobile.length()==11){
                        errorMessage="该手机号已被禁止使用！";
                    }else{
                        errorMessage="该身份证号已被禁止使用！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthEduArticleController.java

@@ -192,7 +192,7 @@ public class DoctorHealthEduArticleController extends BaseController {
			// 文章标题
			json.put("title", healthEduArticle.getTitle());
			json.put("url", healthEduArticle.getUrl());
			json.put("url", healthEduArticle.getUrl()==null?"":healthEduArticle.getUrl());
			// 文章内容
			json.put("content", healthEduArticle.getContent());
			// 添加日期