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

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

@@ -161,13 +161,13 @@ public class LoginController extends BaseController {
                password=StringUtils.reverse(password);
                Doctor doctor=doctorService.findDoctorByMobile(mobile);
                loginLog.setLoginType("2");
                loginLog.setUserCode(doctor.getCode());
                if(doctor==null){
                    errorMessage="该身份证未注册！";
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1,errorMessage);
                }
                loginLog.setUserCode(doctor.getCode());
                String loginPassword= MD5.GetMD5Code(password+doctor.getSalt());
                if(loginPassword.equals(doctor.getPassword())){
                    // 用户校验通过，生成token

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

@@ -202,6 +202,7 @@ public class DoctorConsultController extends WeixinBaseController {
                if(wlyyTalkGroups!=null&&wlyyTalkGroups.size()>0)
                for(WlyyTalkGroup wlyyTalkGroup:wlyyTalkGroups){
                    json.put("group"+wlyyTalkGroup.getType(),wlyyTalkGroup.getCode());
                    json.put("group"+wlyyTalkGroup.getType()+"Name",wlyyTalkGroup.getName());
                }
                jsonArray.put(json);
            }