20190911 区分医生和患者信息分别存储

server/src/main/java/com/pica/cloud/account/account/server/constants/Constants.java

@@ -24,19 +24,25 @@ public class Constants {
     public static final String BIND_FLAG = "bindFlag";
     //联合登录id
     public static final String UNION_ID = "unionId";
+    //用户是否完善过信息
+    public static final String USER_ENTIRE_FLAG = "entireFlag";
 
-    /** 请求头信息*/
-    public static final String HEADER_MOBILE="mobile";
-    public static final String HEADER_USER_TYPE="游客";
-    public static final String HEADER_BROWSER="browser";
-    public static final String HEADER_OPERATOR_SYSTEM="os";
-    public static final String HEADER_TERMINAL_TYPE="terminalType";
-    public static final String HEADER_SYS_CODE="sysCode";
-    public static final String HEADER_SYS_SOURCE="app";
-    public static final String HEADER_GUEST_ID="guest_id";
-    public static final String HEADER_IP="ip";
-
-    /** 时间格式化*/
-    public static final String TIME_FORMAT="yyyy-MM-dd HH:mm:ss";
+    /**
+     * 请求头信息
+     */
+    public static final String HEADER_MOBILE = "mobile";
+    public static final String HEADER_USER_TYPE = "游客";
+    public static final String HEADER_BROWSER = "browser";
+    public static final String HEADER_OPERATOR_SYSTEM = "os";
+    public static final String HEADER_TERMINAL_TYPE = "terminalType";
+    public static final String HEADER_SYS_CODE = "sysCode";
+    public static final String HEADER_SYS_SOURCE = "app";
+    public static final String HEADER_GUEST_ID = "guest_id";
+    public static final String HEADER_IP = "ip";
+
+    /**
+     * 时间格式化
+     */
+    public static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountBaseController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.configuration.PropertiesConfiguration;
 import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.AccountUser;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.util.PICAPSendMsgModel;
 import com.pica.cloud.foundation.entity.PicaException;
@@ -159,7 +159,7 @@ public abstract class AccountBaseController extends BaseController {
             return accountUser.getAcctId();
         } catch (Exception e) {
             e.printStackTrace();
-            throw new AccountException(AccountExceptionType.PICA_LOGIN_AGAIN);
+            throw new AccountException(AccountExceptionEnum.PICA_LOGIN_AGAIN);
         }
     }
 

server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorInfoController.java

+package com.pica.cloud.account.account.server.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created on 2019/9/10 18:51
+ * author:crs
+ * Description:云鹊医 获取用户信息资源
+ */
+@Api(description = "云鹊医用户信息信息资源")
+@RestController
+public class DoctorInfoController {
+
+    //获取用户信息接口
+    //修改用户信息接口
+
+
+}

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -3,7 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LogLoginEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.req.BaseRequest;
@@ -39,7 +39,6 @@ public class LoginController extends AccountBaseController {
     @Autowired
     private AccountUtils accountUtils;
 
-
     /**
      * 密码登录接口
      *
@@ -57,7 +56,6 @@ public class LoginController extends AccountBaseController {
         AccountUtils.checkMobilePhone(request.getMobile());
         AccountUtils.checkPassword(request.getPassword());
         String result = loginService.login(request);
-        //todo：查询是否完善过信息
         return PicaResponse.toResponse(result);
     }
 
@@ -73,7 +71,7 @@ public class LoginController extends AccountBaseController {
     public PicaResponse loginAndRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         accountUtils.checkMobilePhone(request.getMobile());
-        accountUtils.getAuthCodeKey(request.getMobile(), AccountEnumType.SYSCODE_TYPE_LOGIN.getCode() + "");
+        accountUtils.getAuthCodeKey(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "");
         request.setProductType(super.getProductType());
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
@@ -97,7 +95,7 @@ public class LoginController extends AccountBaseController {
     public PicaResponse loginByWeChatStep(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         accountUtils.checkMobilePhone(request.getMobile());
-        accountUtils.checkAuthCode(request.getMobile(), AccountEnumType.SYSCODE_TYPE_WE_CHAT.getCode() + "", request.getSysCode());
+        accountUtils.checkAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_WE_CHAT.getCode() + "", request.getSysCode());
         request.setProductType(super.getProductType());
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
@@ -144,7 +142,7 @@ public class LoginController extends AccountBaseController {
             Integer id = super.getAcctId();
             //记录登录日志
             LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(id, super.getProductType(), super.getSourceType(),
-                    AccountEnumType.LOGIN_OUT.getCode(), super.getIpAddr(), AccountEnumType.LOGIN_STATUS_SUCCESS.getCode(), AccountEnumType.LOG_TYPE_LOGIN.getCode());
+                    AccountTypeEnum.LOGIN_OUT.getCode(), super.getIpAddr(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
             picaLogUtils.info(entity);
             if (redisClient.deleteToken(token)) {
                 return PicaResponse.toResponse();

server/src/main/java/com/pica/cloud/account/account/server/controller/ModifyMobileController.java

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.ModifyMobileService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -31,7 +31,7 @@ public class ModifyMobileController extends AccountBaseController {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         String mobile = request.getMobile();
         accountUtils.checkMobilePhone(mobile);
-        accountUtils.checkAuthCode(mobile, AccountEnumType.SYSCODE_TYPE_MODIFY_MOBILE.getCode() + "", request.getSysCode());
+        accountUtils.checkAuthCode(mobile, AccountTypeEnum.SYSCODE_TYPE_MODIFY_MOBILE.getCode() + "", request.getSysCode());
         modifyMobileService.modify(acctId, mobile);
         return PicaResponse.toResponse();
     }

server/src/main/java/com/pica/cloud/account/account/server/controller/PasswordController.java

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.PasswordService;
@@ -46,10 +46,10 @@ public class PasswordController extends AccountBaseController {
                 passwordService.modifyPassword(acctId, oldPwd, password);
                 return PicaResponse.toResponse();
             } else {
-                throw new AccountException(AccountExceptionType.PICA_PASSWORD_EQUAL);
+                throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_EQUAL);
             }
         } else {
-            throw new AccountException(AccountExceptionType.PICA_PASSWORD_NULL);
+            throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_NULL);
         }
     }
 
@@ -63,9 +63,9 @@ public class PasswordController extends AccountBaseController {
     public PicaResponse forgetPassword(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         accountUtils.checkMobilePhone(request.getMobile());
-        accountUtils.checkAuthCode(request.getMobile(), AccountEnumType.SYSCODE_TYPE_RESET_PASSWORD.getCode() + "", request.getSysCode());
+        accountUtils.checkAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_RESET_PASSWORD.getCode() + "", request.getSysCode());
         if (StringUtils.isEmpty(request.getPassword())) {
-            throw new AccountException(AccountExceptionType.PICA_PASSWORD_ERROR);
+            throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_ERROR);
         }
         passwordService.forgetPassword(request);
         return PicaResponse.toResponse();

server/src/main/java/com/pica/cloud/account/account/server/controller/UserInfoController.java → server/src/main/java/com/pica/cloud/account/account/server/controller/PatientInfoController.java

 package com.pica.cloud.account.account.server.controller;
 
+import com.aliyun.oss.common.utils.DateUtil;
 import com.pica.cloud.account.account.server.entity.AccountUser;
-import com.pica.cloud.account.account.server.entity.AccountUserInfoEntity;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.req.PatientReq;
-import com.pica.cloud.account.account.server.service.UserInfoService;
+import com.pica.cloud.account.account.server.service.PatientInfoService;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.utils.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
 
-@Api(description = "用户信息资源")
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+
+@Api(description = "云鹊健康用户信息信息资源")
 @RestController
-public class UserInfoController extends AccountBaseController {
+public class PatientInfoController extends AccountBaseController {
 
     @Autowired
-    private UserInfoService userInfoService;
+    private PatientInfoService patientInfoService;
+
+
 
     /**
      * 获取用户信息接口
@@ -33,7 +40,7 @@ public class UserInfoController extends AccountBaseController {
     public PicaResponse getUserInfo() {
         AccountUser accountUser = super.getAccountUser();
         Integer userId = accountUser.getId();
-        AccountUserInfoEntity userInfo = userInfoService.getUserInfo(userId);
+        AccountPatientInfoEntity userInfo = patientInfoService.getUserInfo(userId);
         return PicaResponse.toResponse(userInfo);
     }
 
@@ -49,9 +56,9 @@ public class UserInfoController extends AccountBaseController {
         PatientReq request = CryptoUtil.decrypt(entity, PatientReq.class);
         request.setId(id);
         request.setAcctId(super.getAcctId());
-        AccountUserInfoEntity accountUserInfoEntity = new AccountUserInfoEntity();
-        BeanUtils.copyProperties(accountUserInfoEntity, request);
-        userInfoService.updateUserInfo(accountUserInfoEntity);
+        AccountPatientInfoEntity accountPatientInfoEntity = new AccountPatientInfoEntity();
+        BeanUtils.copyProperties(accountPatientInfoEntity, request);
+        patientInfoService.updateUserInfo(accountPatientInfoEntity);
         return PicaResponse.toResponse();
     }
 

server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -28,9 +28,9 @@ public class RegisterController extends AccountBaseController {
     public PicaResponse<String> register(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         AccountUtils.checkMobilePhone(request.getMobile());
-        AccountUtils.getAuthCodeKey(request.getSysCode(), AccountEnumType.SYSCODE_TYPE_REGISTER.getCode() + "");
+        AccountUtils.getAuthCodeKey(request.getSysCode(), AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode() + "");
         AccountUtils.checkPassword(request.getPassword());
-        request.setFlag(AccountEnumType.SYSCODE_TYPE_REGISTER.getCode());
+        request.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
         request.setProductType(super.getProductType());
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());

server/src/main/java/com/pica/cloud/account/account/server/controller/SysCodeController.java

@@ -3,15 +3,14 @@ package com.pica.cloud.account.account.server.controller;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 import com.pica.cloud.account.account.server.entity.AccountUnionEntity;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.AccountUnionService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
-import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.CommonUtil;
@@ -63,14 +62,14 @@ public class SysCodeController extends AccountBaseController {
     @PostMapping(value = "/authCode/wechat")
     public PicaResponse getWChatSysCode(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        request.setFlag(AccountEnumType.SYSCODE_TYPE_WE_CHAT.getCode());
+        request.setFlag(AccountTypeEnum.SYSCODE_TYPE_WE_CHAT.getCode());
         AccountUtils.checkMobilePhone(request.getMobile());
         AccountUnionEntity accountUnionEntity = accountUnionService.selectInfoByUnionId(request.getUnionId());
         if (accountUnionEntity != null) {
             processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();
         }
-        throw new AccountException(AccountExceptionType.PICA_UNBIND_MOBILE);
+        throw new AccountException(AccountExceptionEnum.PICA_UNBIND_MOBILE);
     }
 
 

server/src/main/java/com/pica/cloud/account/account/server/controller/TokenController.java

@@ -5,6 +5,8 @@ import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.CommonUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.util.CollectionUtils;
@@ -22,6 +24,7 @@ import static com.pica.cloud.foundation.utils.utils.json.Object2Map.objectToMapS
  * author:crs
  * Description:获取随机token
  */
+@Api(description = "获取游客token")
 @RestController
 public class TokenController extends AccountBaseController {
 
@@ -29,6 +32,7 @@ public class TokenController extends AccountBaseController {
     @Qualifier("cacheMigrateClient")
     private ICacheClient redisClient;
 
+    @ApiOperation(value = "获取token接口")
     @GetMapping(value = "/token")
     public PicaResponse<String> getRandomToken() {
         Map<String, Object> headersMap = super.getHeaders();

server/src/main/java/com/pica/cloud/account/account/server/entity/AccountUserInfoEntity.java → server/src/main/java/com/pica/cloud/account/account/server/entity/AccountPatientInfoEntity.java

@@ -2,7 +2,7 @@ package com.pica.cloud.account.account.server.entity;
 
 import java.util.Date;
 
-public class AccountUserInfoEntity {
+public class AccountPatientInfoEntity {
     private Integer id;
 
     private Integer acctId;

server/src/main/java/com/pica/cloud/account/account/server/entity/EncryptEntity.java

@@ -5,10 +5,10 @@ package com.pica.cloud.account.account.server.entity;
  */
 public class EncryptEntity {
 
-//    /**
-//     * 加密后的密文
-//     */
-//    private String key;
+    /**
+     * 加密后的密文
+     */
+    private String key;
     /**
      * 加密后的数据
      */

server/src/main/java/com/pica/cloud/account/account/server/enums/AccountExceptionType.java → server/src/main/java/com/pica/cloud/account/account/server/enums/AccountExceptionEnum.java

@@ -5,7 +5,7 @@ package com.pica.cloud.account.account.server.enums;
  * author:crs
  * Description:账户常用异常类型定义
  */
-public enum AccountExceptionType {
+public enum AccountExceptionEnum {
 
     PICA_NOT_EMPTY("216501", "字段非空提示信息"),
     PICA_MOBILE_ERROR("216502", "请输入正确的手机号"),
@@ -27,7 +27,7 @@ public enum AccountExceptionType {
     private String code;
     private String message;
 
-    AccountExceptionType(String code, String message) {
+    AccountExceptionEnum(String code, String message) {
         this.code = code;
         this.message = message;
     }

server/src/main/java/com/pica/cloud/account/account/server/enums/AccountEnumType.java → server/src/main/java/com/pica/cloud/account/account/server/enums/AccountTypeEnum.java

@@ -5,7 +5,7 @@ package com.pica.cloud.account.account.server.enums;
  * author:crs
  * Description:账户常用枚举类型
  */
-public enum AccountEnumType {
+public enum AccountTypeEnum {
 
     //登录类型枚举（记录登录日志时使用）
     LOGIN_CODE(1, "验证码登录"),
@@ -53,7 +53,7 @@ public enum AccountEnumType {
     private int code;
     private String type;
 
-    AccountEnumType(int code, String type) {
+    AccountTypeEnum(int code, String type) {
         this.code = code;
         this.type = type;
     }

server/src/main/java/com/pica/cloud/account/account/server/exception/AccountException.java

 package com.pica.cloud.account.account.server.exception;
 
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 
@@ -19,7 +19,7 @@ public class AccountException extends PicaException {
         super(picaResultCode);
     }
 
-    public AccountException(AccountExceptionType exceptionType) {
+    public AccountException(AccountExceptionEnum exceptionType) {
         super(exceptionType.getCode(), exceptionType.getMessage());
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/log/AccountLogTask.java

@@ -4,7 +4,7 @@ package com.pica.cloud.account.account.server.log;
 import com.pica.cloud.account.account.server.entity.LogLoginEntity;
 import com.pica.cloud.account.account.server.entity.LogPWDModifyEntity;
 import com.pica.cloud.account.account.server.entity.LogUserInfoEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 
 import com.pica.cloud.account.account.server.mapper.LogLoginMapper;
 import com.pica.cloud.account.account.server.mapper.LogPWDModifyMapper;
@@ -44,11 +44,11 @@ public class AccountLogTask implements Runnable {
 
     @Override
     public void run() {
-        if (type == AccountEnumType.LOG_TYPE_LOGIN.getCode()) {
+        if (type == AccountTypeEnum.LOG_TYPE_LOGIN.getCode()) {
             loginLogMapper.insertSelective((LogLoginEntity) picaLogEntity);
-        } else if (type == AccountEnumType.LOG_TYPE_PASSWORD.getCode()) {
+        } else if (type == AccountTypeEnum.LOG_TYPE_PASSWORD.getCode()) {
             logPWDModifyMapper.insert((LogPWDModifyEntity) picaLogEntity);
-        } else if (type == AccountEnumType.LOG_TYPE_USER_INFO.getCode()) {
+        } else if (type == AccountTypeEnum.LOG_TYPE_USER_INFO.getCode()) {
             logUserInfoMapper.insertSelective((LogUserInfoEntity) picaLogEntity);
         }
     }

server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountUserInfoMapper.java → server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountPatientInfoMapper.java

 package com.pica.cloud.account.account.server.mapper;
 
 
-import com.pica.cloud.account.account.server.entity.AccountUserInfoEntity;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
+
+public interface AccountPatientInfoMapper {
 
-public interface AccountUserInfoMapper {
 
     /**
      * 通过userId查询居民信息
@@ -11,7 +12,7 @@ public interface AccountUserInfoMapper {
      * @param id userId
      * @return
      */
-    AccountUserInfoEntity selectByPrimaryKey(Integer id);
+    AccountPatientInfoEntity selectByPrimaryKey(Integer id);
 
     /**
      * 通过用户id查询居民信息
@@ -19,7 +20,7 @@ public interface AccountUserInfoMapper {
      * @param id 用户id
      * @return
      */
-    AccountUserInfoEntity selectByUserId(Integer id);
+    AccountPatientInfoEntity selectByUserId(Integer id);
 
 
     /**
@@ -28,7 +29,7 @@ public interface AccountUserInfoMapper {
      * @param acctId
      * @return
      */
-    AccountUserInfoEntity selectByAcctId(Integer acctId);
+    AccountPatientInfoEntity selectByAcctId(Integer acctId);
 
     /**
      * 更新居民信息接口
@@ -36,15 +37,15 @@ public interface AccountUserInfoMapper {
      * @param record 居民信息模型
      * @return
      */
-    int updateByPrimaryKeySelective(AccountUserInfoEntity record);
+    int updateByPrimaryKeySelective(AccountPatientInfoEntity record);
 
 
-    int insertSelective(AccountUserInfoEntity record);
+    int insertSelective(AccountPatientInfoEntity record);
 
-    int updateByPrimaryKey(AccountUserInfoEntity record);
+    int updateByPrimaryKey(AccountPatientInfoEntity record);
 
     int deleteByPrimaryKey(Integer id);
 
-    int insert(AccountUserInfoEntity record);
+    int insert(AccountPatientInfoEntity record);
 
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorInfoMapper.java

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.server.entity.DoctorEntity;
+
+/**
+ * Created on 2019/9/10 17:48
+ * author:crs
+ * Description:查询医生信息
+ */
+public interface DoctorInfoMapper {
+
+    /**
+     * 获取医生信息
+     *
+     * @param mobile 手机号
+     * @return
+     */
+    DoctorEntity getDoctorInfoByMobile(String mobile);
+
+
+    /**
+     * 通过账户信息查询用户id
+     *
+     * @param acctId
+     * @return
+     */
+    Long selectUserIdByAcctId(Integer acctId);
+
+
+}

server/src/main/java/com/pica/cloud/account/account/server/service/UserInfoService.java → server/src/main/java/com/pica/cloud/account/account/server/service/PatientInfoService.java

 package com.pica.cloud.account.account.server.service;
 
-import com.pica.cloud.account.account.server.entity.AccountUserInfoEntity;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
 
-public interface UserInfoService {
+public interface PatientInfoService {
 
 
     /**
      * 更新用户信息接口
      *
-     * @param accountUserInfoEntity 更新信息
+     * @param accountPatientInfoEntity 更新信息
      */
-    void updateUserInfo(AccountUserInfoEntity accountUserInfoEntity);
+    void updateUserInfo(AccountPatientInfoEntity accountPatientInfoEntity);
 
 
     /**
@@ -19,7 +19,7 @@ public interface UserInfoService {
      * @param userId 用户id
      * @return
      */
-    AccountUserInfoEntity getUserInfo(Integer userId);
+    AccountPatientInfoEntity getUserInfo(Integer userId);
 
     /**
      * 获取用户信息接口
@@ -27,5 +27,5 @@ public interface UserInfoService {
      * @param acctId 账户id
      * @return
      */
-    AccountUserInfoEntity getUserInfoByAcctId(Integer acctId);
+    AccountPatientInfoEntity getUserInfoByAcctId(Integer acctId);
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/ModifyMobileServiceImpl.java

 package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.service.ModifyMobileService;
@@ -23,7 +23,7 @@ public class ModifyMobileServiceImpl implements ModifyMobileService {
         AccountInfoEntity entity = accountInfoDetailMapper.selectByPrimaryKey(acctId);
         String mobilePhone = entity.getMobilePhone();
         if (StringUtils.isNotEmpty(mobilePhone) && EncryptCreateUtil.dencrypt(mobilePhone).equals(mobile)) {
-            throw new AccountException(AccountExceptionType.PICA_MOBILE_SAME);
+            throw new AccountException(AccountExceptionEnum.PICA_MOBILE_SAME);
         }
         AccountInfoEntity accountInfoEntity = new AccountInfoEntity();
         accountInfoEntity.setId(acctId);

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.java

@@ -2,8 +2,8 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 import com.pica.cloud.account.account.server.entity.LogPWDModifyEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
@@ -37,10 +37,10 @@ public class PasswordServiceImpl implements PasswordService {
             accountInfoDetailMapper.updatePasswordByPrimaryKey(accountInfoEntity);
             //密码修改日志
             LogPWDModifyEntity logPWDModifyEntity = AccountLogEntityUtils.getLogPWDModifyEntity(acctId, entity.getMobilePhone(),
-                    EncryptCreateUtil.encrypt(oldPwd), EncryptCreateUtil.encrypt(pwd), AccountEnumType.LOG_TYPE_PASSWORD.getCode());
+                    EncryptCreateUtil.encrypt(oldPwd), EncryptCreateUtil.encrypt(pwd), AccountTypeEnum.LOG_TYPE_PASSWORD.getCode());
             picaLogUtils.info(logPWDModifyEntity);
         } else {
-            throw new AccountException(AccountExceptionType.PICA_PASSWORD_ERROR);
+            throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_ERROR);
         }
     }
 
@@ -58,11 +58,11 @@ public class PasswordServiceImpl implements PasswordService {
 
             //密码修改日志
             LogPWDModifyEntity logPWDModifyEntity = AccountLogEntityUtils.getLogPWDModifyEntity(accId, entity.getMobilePhone(),
-                    "", EncryptCreateUtil.encrypt(request.getPassword()), AccountEnumType.LOG_TYPE_PASSWORD.getCode());
+                    "", EncryptCreateUtil.encrypt(request.getPassword()), AccountTypeEnum.LOG_TYPE_PASSWORD.getCode());
             picaLogUtils.info(logPWDModifyEntity);
         } else {
             //未注册，请先注册
-            throw new AccountException(AccountExceptionType.PICA_NOT_REGISTER);
+            throw new AccountException(AccountExceptionEnum.PICA_NOT_REGISTER);
         }
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/UserInfoServerImpl.java → server/src/main/java/com/pica/cloud/account/account/server/service/impl/PatientInfoServerImpl.java

 package com.pica.cloud.account.account.server.service.impl;
 
-import com.pica.cloud.account.account.server.entity.AccountUserInfoEntity;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
 import com.pica.cloud.account.account.server.entity.LogUserInfoEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
-import com.pica.cloud.account.account.server.mapper.AccountUserInfoMapper;
-import com.pica.cloud.account.account.server.service.UserInfoService;
+import com.pica.cloud.account.account.server.mapper.AccountPatientInfoMapper;
+import com.pica.cloud.account.account.server.service.PatientInfoService;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,29 +14,31 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 
 @Service
-public class UserInfoServerImpl implements UserInfoService {
+public class PatientInfoServerImpl implements PatientInfoService {
 
     @Autowired
-    private AccountUserInfoMapper accountUserInfoMapper;
+    private AccountPatientInfoMapper accountPatientInfoMapper;
 
     @Autowired
     private AccountLogUtils accountLogUtils;
 
     @Override
-    public void updateUserInfo(AccountUserInfoEntity accountUserInfoEntity) {
-        accountUserInfoEntity.setModifyTime(new Date());
-        accountUserInfoEntity.setModifyId(accountUserInfoEntity.getAcctId());
-        accountUserInfoMapper.updateByPrimaryKeySelective(accountUserInfoEntity);
+    public void updateUserInfo(AccountPatientInfoEntity accountPatientInfoEntity) {
+        accountPatientInfoEntity.setModifyTime(new Date());
+        accountPatientInfoEntity.setModifyId(accountPatientInfoEntity.getAcctId());
+
+        accountPatientInfoMapper.updateByPrimaryKeySelective(accountPatientInfoEntity);
+
         //用户信息更新日志
-        Integer userId = accountUserInfoEntity.getId();
-        AccountUserInfoEntity userInfo = getUserInfo(userId);
+        Integer userId = accountPatientInfoEntity.getId();
+        AccountPatientInfoEntity userInfo = getUserInfo(userId);
         LogUserInfoEntity logUserInfoEntity = new LogUserInfoEntity();
         try {
             BeanUtils.copyProperties(logUserInfoEntity, userInfo);
             Date currentTime = new Date();
             logUserInfoEntity.setCreateTime(currentTime);
             logUserInfoEntity.setModifyTime(currentTime);
-            logUserInfoEntity.setLogType(AccountEnumType.LOG_TYPE_USER_INFO.getCode());
+            logUserInfoEntity.setLogType(AccountTypeEnum.LOG_TYPE_USER_INFO.getCode());
             accountLogUtils.info(logUserInfoEntity);
 
         } catch (IllegalAccessException e) {
@@ -47,12 +49,12 @@ public class UserInfoServerImpl implements UserInfoService {
     }
 
     @Override
-    public AccountUserInfoEntity getUserInfo(Integer userId) {
-        return accountUserInfoMapper.selectByUserId(userId);
+    public AccountPatientInfoEntity getUserInfo(Integer userId) {
+        return accountPatientInfoMapper.selectByUserId(userId);
     }
 
     @Override
-    public AccountUserInfoEntity getUserInfoByAcctId(Integer acctId) {
-        return accountUserInfoMapper.selectByAcctId(acctId);
+    public AccountPatientInfoEntity getUserInfoByAcctId(Integer acctId) {
+        return accountPatientInfoMapper.selectByAcctId(acctId);
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -4,15 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
-import com.pica.cloud.account.account.server.entity.AccountUserInfoEntity;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
 import com.pica.cloud.account.account.server.entity.LogLoginEntity;
-import com.pica.cloud.account.account.server.enums.AccountEnumType;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
-import com.pica.cloud.account.account.server.mapper.AccountUserInfoMapper;
+import com.pica.cloud.account.account.server.mapper.AccountMapper;
+import com.pica.cloud.account.account.server.mapper.AccountPatientInfoMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -37,7 +38,10 @@ public class RegisterServiceImpl implements RegisterService {
     private AccountInfoDetailMapper accountInfoDetailMapper;
 
     @Autowired
-    private AccountUserInfoMapper accountUserInfoMapper;
+    private AccountPatientInfoMapper accountUserInfoMapper;
+
+    @Autowired
+    private AccountMapper accountMapper;
 
     @Autowired
     @Qualifier("cacheMigrateClient")
@@ -46,6 +50,9 @@ public class RegisterServiceImpl implements RegisterService {
     @Autowired
     private AccountLogUtils picaLogUtils;
 
+    @Autowired
+    private AccountUtils accountUtils;
+
     @Override
     public String register(BaseRequest baseRequest) {
         String mobile = EncryptCreateUtil.encrypt(baseRequest.getMobile());
@@ -74,17 +81,31 @@ public class RegisterServiceImpl implements RegisterService {
             accountInfoDetailMapper.insertSelective(accountInfo);
             Integer acctId = accountInfo.getId();
             accountInfoDetailMapper.updateCreateInfo(acctId);
-            AccountUserInfoEntity accountUserInfoEntity = new AccountUserInfoEntity();
-            accountUserInfoEntity.setAcctId(acctId);
-            accountUserInfoEntity.setDeleteFlag(1);
-            accountUserInfoEntity.setCreateId(acctId);
-            accountUserInfoEntity.setModifyId(acctId);
-            accountUserInfoEntity.setCreateTime(currentTime);
-            accountUserInfoEntity.setModifyTime(currentTime);
-            accountUserInfoMapper.insertSelective(accountUserInfoEntity);
-            Integer userId = accountUserInfoEntity.getId();
+            if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
+                AccountPatientInfoEntity accountPatientInfoEntity = new AccountPatientInfoEntity();
+                accountPatientInfoEntity.setAcctId(acctId);
+                accountPatientInfoEntity.setDeleteFlag(1);
+                accountPatientInfoEntity.setCreateId(acctId);
+                accountPatientInfoEntity.setModifyId(acctId);
+                accountPatientInfoEntity.setCreateTime(currentTime);
+                accountPatientInfoEntity.setModifyTime(currentTime);
+                accountUserInfoMapper.insertSelective(accountPatientInfoEntity);
+            } else {
+                Account account = new Account();
+                account.setAcctId(acctId);
+                account.setMobilePhone(EncryptCreateUtil.encrypt(account.getMobilePhone()));  //手机号加密
+                account.setDeleteFlag(1);
+                account.setCreatId(0L);
+                account.setModifyId(0L);
+                account.setCreatTime(currentTime);
+                account.setModifyTime(currentTime);
+                account.setFirstLoginTime(currentTime);
+                account.setLastLoginTime(currentTime);
+                accountMapper.insertSelective(account);
+            }
+            Long userId = accountUtils.getUserIdByAcctId(productType, acctId);
             Account account = new Account();
-            account.setId(userId.longValue());
+            account.setId(userId);
             account.setAcctId(acctId);
             account.setCreatTime(currentTime);
             account.setMobilePhone(mobile);
@@ -95,12 +116,12 @@ public class RegisterServiceImpl implements RegisterService {
             jsonObject.put(Constants.USER_ID, userId);
             //记录登录日志
             LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, baseRequest.getSourceType(),
-                    AccountEnumType.LOGIN_REGISTER.getCode(), baseRequest.getLoginIp(), AccountEnumType.LOGIN_STATUS_SUCCESS.getCode(),
-                    AccountEnumType.LOG_TYPE_LOGIN.getCode());
+                    AccountTypeEnum.LOGIN_REGISTER.getCode(), baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
+                    AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
             picaLogUtils.info(entity);
             return jsonObject.toJSONString();
         } else {
-            throw new AccountException(AccountExceptionType.PICA_ALREADY_REGISTER);
+            throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
         }
     }
 

server/src/main/java/com/pica/cloud/account/account/server/util/AccountUtils.java

 package com.pica.cloud.account.account.server.util;
 
 import com.alibaba.fastjson.JSONObject;
-import com.pica.cloud.account.account.server.enums.AccountExceptionType;
+import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.mapper.AccountPatientInfoMapper;
+import com.pica.cloud.account.account.server.mapper.DoctorInfoMapper;
+import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.redis.ICacheClient;
@@ -22,6 +27,12 @@ public class AccountUtils {
     @Qualifier("cacheMigrateClient")
     private ICacheClient cacheClient;
 
+    @Autowired
+    private AccountPatientInfoMapper accountPatientInfoMapper;
+
+    @Autowired
+    private DoctorInfoMapper doctorInfoMapper;
+
     private static final String AUTH_CODE_PREFIX = "authCode-";
 
     //手机格式校验
@@ -34,7 +45,7 @@ public class AccountUtils {
     //手机格式校验
     public static void checkPassword(String password) {
         if (StringUtils.isBlank(password)) {
-            throw new PicaException(AccountExceptionType.PICA_NOT_EMPTY.getCode(), AccountExceptionType.PICA_NOT_EMPTY.getMessage());
+            throw new PicaException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), AccountExceptionEnum.PICA_NOT_EMPTY.getMessage());
         }
     }
 
@@ -114,6 +125,25 @@ public class AccountUtils {
         return sourceType;
     }
 
+    /**
+     * 通过产品线类型获取用户id
+     *
+     * @param productType
+     * @param AcctId
+     * @return
+     */
+    public Long getUserIdByAcctId(Integer productType, Integer AcctId) {
+        Long userId = null;
+        if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
+            userId = doctorInfoMapper.selectUserIdByAcctId(AcctId);
+        } else if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
+            AccountPatientInfoEntity accountPatientInfoEntity = accountPatientInfoMapper.selectByAcctId(AcctId);
+            userId = accountPatientInfoEntity.getId().longValue();
+        }
+        return userId;
+    }
+
+
     /**
      * 校验手机号是否注册过
      *

server/src/main/java/com/pica/cloud/account/account/server/util/CryptoUtil.java

@@ -56,7 +56,7 @@ public class CryptoUtil {
      * @throws Exception
      */
     public static <T> T decrypt(EncryptEntity encryptEntity, Class<T> zClass) throws Exception {
-        // TODO: 2019/8/27 ： 暂时不处理这一块的逻辑
+        // TODO: 2019/8/27
         //获取解密密钥
         //String decryptKey = RSAUtil.decrypt(encryptEntity.getKey());
         //解密数据

server/src/main/resources/mybatis/AccountMapper.xml

@@ -60,6 +60,9 @@
       <if test="avatarImageUrl != null">
         avatar_image_url,
       </if>
+      <if test="acctId != null">
+        acct_id,
+      </if>
       <if test="email != null">
         email,
       </if>

server/src/main/resources/mybatis/AccountUserInfoEntityMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pica.cloud.account.account.server.mapper.AccountUserInfoMapper">
-    <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.AccountUserInfoEntity">
+<mapper namespace="com.pica.cloud.account.account.server.mapper.AccountPatientInfoMapper">
+    <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="acct_id" property="acctId" jdbcType="INTEGER"/>
         <result column="village_name" property="villageName" jdbcType="VARCHAR"/>
@@ -65,7 +65,7 @@
     delete from p_patient
     where id = #{id,jdbcType=INTEGER}
   </delete>
-    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AccountUserInfoEntity">
+    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity">
     insert into p_patient (id, acct_id, village_name, 
       village_id, town_name, town_id, 
       county_name, county_id, city_name, 
@@ -87,7 +87,7 @@
       #{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=TINYINT})
   </insert>
-    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.AccountUserInfoEntity"
+    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity"
             useGeneratedKeys="true" keyProperty="id">
         insert into p_patient
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -270,7 +270,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective"
-            parameterType="com.pica.cloud.account.account.server.entity.AccountUserInfoEntity">
+            parameterType="com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity">
         update p_patient
         <set>
             <if test="acctId != null">
@@ -360,7 +360,7 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.AccountUserInfoEntity">
+    <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity">
     update p_patient
     set acct_id = #{acctId,jdbcType=INTEGER},
       village_name = #{villageName,jdbcType=VARCHAR},

server/src/main/resources/mybatis/DoctorInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pica.cloud.account.account.server.mapper.DoctorInfoMapper">
+
+
+    <!--根据手机号获取数据-->
+    <select id="getDoctorInfoByMobile" resultType="com.pica.cloud.account.account.server.entity.DoctorEntity"
+            parameterType="java.lang.String">
+		SELECT aa.id, aa.sex, aa.unionid, aa.name, aa.mobile_phone, aa.status, aa.type, aa.hospital_id, aa.department_id,
+		aa.title_id, ifnull(bb.name,aa.hospital) as hospital,
+		ifnull(pde.name,aa.department) as department, ifnull(pt.name,aa.title) as title, aa.cert_image_url,
+		aa.avatar_image_url, aa.auth_time, aa.invite_start_time, aa.honor, aa.skills, aa.thumb_up_num, aa.email,
+		aa.qrcode, aa.nickname, aa.personal_sign, aa.delete_flag, aa.creat_id, aa.creat_time, aa.modify_id,
+		aa.modify_time, aa.praise_num, aa.password, aa.info, aa.rank, aa.province, aa.city, aa.county,
+		aa.province_name, aa.city_name, aa.county_name,
+		aa.invite_code, aa.gaoxueya_password, aa.sms_send_num, aa.total_sms_send_num, aa.entire_flag, aa.doctor_project_type,
+		aa.administer_title_id, aa.administer_title,
+		pded.school_name, pded.major_id, pded.major_name, pded.education_id, pded.education_name, pded.year
+		FROM
+		p_doctor aa
+		left join
+		p_hospital bb
+		on aa.hospital_id = bb.id and bb.delete_flag=1
+		left join
+		p_title pt
+		on aa.title_id = pt.title_id
+		left join
+		p_department pde
+		on aa.department_id = pde.id
+		left join
+		p_doctor_education pded
+		on pded.doctor_id = aa.id
+       	where aa.mobile_phone = #{mobile}
+      	and aa.delete_flag = 1
+		limit 0,1
+    </select>
+
+
+    <!--通过账户id查询用户信息-->
+    <select id="selectUserIdByAcctId" parameterType="java.lang.Integer">
+		SELECT id
+		FROM p_doctor
+       	where acct_id = #{acctId}
+      	and delete_flag = 1
+    </select>
+
+
+</mapper>
\ No newline at end of file