“20200108 重构账户中心网络请求

server/pom.xml

@@ -41,6 +41,13 @@
             <artifactId>spring-cloud-starter-eureka</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.pica.cloud.base.doctor</groupId>
+            <artifactId>pica-cloud-doctor-client</artifactId>
+            <version>1.1.0.5-SNAPSHOT</version>
+        </dependency>
+
+
         <!--Third party dependencies begin-->
         <dependency>
             <groupId>mysql</groupId>

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

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.AccountUser;
-import com.pica.cloud.account.account.server.entity.Doctor;
 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.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaResponse;

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

@@ -12,15 +12,15 @@ import com.pica.cloud.account.account.server.service.LoginService;
 import com.pica.cloud.account.account.server.service.TokenService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
+import com.pica.cloud.base.doctor.doctor.common.dto.PICAPDoctor;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
-import com.pica.cloud.foundation.utils.utils.CommonUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 
 import java.util.HashMap;
 import java.util.Map;

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.AccountInfoEntity;
-import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 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.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.server.service.AccountInfoService;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.service.ModifyMobileService;
 import com.pica.cloud.account.account.server.service.impl.AccountServiceImpl;
-import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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.AccountInfoEntity;
-import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
-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.DoctorService;
 import com.pica.cloud.account.account.server.service.PasswordService;
-import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 import com.pica.cloud.foundation.entity.PicaResponse;
-import com.pica.cloud.foundation.utils.entity.PicaUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

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

 package com.pica.cloud.account.account.server.entity;
 
+import com.pica.cloud.base.doctor.doctor.common.dto.PICAPDoctor;
 import io.swagger.annotations.ApiModel;
 
 /**

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

-package com.pica.cloud.account.account.server.entity;
-
-import java.util.Date;
-
-/**
- * @author andong
- * @create 2019/10/16
- */
-public class PICAPDoctor {
-    private Integer id;
-    private Integer sex;
-    private String name;
-    private String mobile_phone;
-    private Integer status;
-    private Integer type;
-    private Integer hospital_id;
-    private Integer department_id;
-    private Integer title_id;
-    private String cert_image_url;
-    private String avatar_image_url;
-    protected Date auth_time;
-    protected Date rejected_time;
-    private String honor;
-    private String skills;
-    private String card;
-    private Integer thumb_up_num;
-    private String email;
-    private String qrcode;
-    private String nickname;
-    private String personal_sign;
-    private Integer praise_num;
-    private String password;
-    private String gaoxueya_password;
-    private String info;
-    private String rank;
-    private Long county;
-    private Long city;
-    private Integer province;
-    private String hospital;
-    private String department;
-    private String title;
-    private String invite_code;
-    private Integer entire_flag;
-    private Integer doctor_project_type;
-    private Integer sms_send_num;
-    private Integer total_sms_send_num;
-    private String province_name;
-    private String city_name;
-    private String county_name;
-    protected Date invite_start_time;
-    private Long town;
-    private String town_name;
-    private Integer register_source;
-    private Integer register_type;
-    private Integer administer_title_id;
-    private String administer_title;
-    protected Date birthday;
-    protected String birthdayStr = "";
-    protected Integer age = 0;
-    protected PICAPDoctorEducation doctorEducation;
-
-    private Integer delete_flag;
-    private Integer creat_id;
-    protected Date creat_time;
-    private Integer modify_id;
-    protected Date modify_time;
-    private Integer create_id;
-    protected Date create_time;
-
-    public Date getBirthday() {
-        return this.birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public Integer getAge() {
-        return this.age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public String getBirthdayStr() {
-        return this.birthdayStr;
-    }
-
-    public void setBirthdayStr(String birthdayStr) {
-        this.birthdayStr = birthdayStr;
-    }
-
-    public String getCard() {
-        return this.card;
-    }
-
-    public void setCard(String card) {
-        this.card = card;
-    }
-
-    public PICAPDoctorEducation getDoctorEducation() {
-        return this.doctorEducation;
-    }
-
-    public void setDoctorEducation(PICAPDoctorEducation doctorEducation) {
-        this.doctorEducation = doctorEducation;
-    }
-
-    public Integer getRegister_type() {
-        return this.register_type;
-    }
-
-    public void setRegister_type(Integer register_type) {
-        this.register_type = register_type;
-    }
-
-    public String getAdminister_title() {
-        return this.administer_title;
-    }
-
-    public void setAdminister_title(String administer_title) {
-        this.administer_title = administer_title;
-    }
-
-    public Integer getAdminister_title_id() {
-        return this.administer_title_id;
-    }
-
-    public void setAdminister_title_id(Integer administer_title_id) {
-        this.administer_title_id = administer_title_id;
-    }
-
-    public Integer getRegister_source() {
-        return this.register_source;
-    }
-
-    public void setRegister_source(Integer register_source) {
-        this.register_source = register_source;
-    }
-
-    public Integer getTotal_sms_send_num() {
-        return this.total_sms_send_num;
-    }
-
-    public void setTotal_sms_send_num(Integer total_sms_send_num) {
-        this.total_sms_send_num = total_sms_send_num;
-    }
-
-    public Integer getSms_send_num() {
-        return this.sms_send_num;
-    }
-
-    public void setSms_send_num(Integer sms_send_num) {
-        this.sms_send_num = sms_send_num;
-    }
-
-    public Integer getDoctor_project_type() {
-        return this.doctor_project_type;
-    }
-
-    public void setDoctor_project_type(Integer doctor_project_type) {
-        this.doctor_project_type = doctor_project_type;
-    }
-
-    public String getGaoxueya_password() {
-        return this.gaoxueya_password;
-    }
-
-    public void setGaoxueya_password(String gaoxueya_password) {
-        this.gaoxueya_password = gaoxueya_password;
-    }
-
-    public String getInvite_code() {
-        return this.invite_code;
-    }
-
-    public void setInvite_code(String invite_code) {
-        this.invite_code = invite_code;
-    }
-
-    public Integer getEntire_flag() {
-        return this.entire_flag;
-    }
-
-    public void setEntire_flag(Integer entire_flag) {
-        this.entire_flag = entire_flag;
-    }
-
-    public Date getAuth_time() {
-        return this.auth_time;
-    }
-
-    public void setAuth_time(Date auth_time) {
-        this.auth_time = auth_time;
-    }
-
-    public Date getRejected_time() {
-        return this.rejected_time;
-    }
-
-    public void setRejected_time(Date rejected_time) {
-        this.rejected_time = rejected_time;
-    }
-
-    public Long getCounty() {
-        return this.county;
-    }
-
-    public void setCounty(Long county) {
-        this.county = county;
-    }
-
-    public Long getCity() {
-        return this.city;
-    }
-
-    public void setCity(Long city) {
-        this.city = city;
-    }
-
-    public Integer getProvince() {
-        return this.province;
-    }
-
-    public void setProvince(Integer province) {
-        this.province = province;
-    }
-
-    public String getHospital() {
-        return this.hospital;
-    }
-
-    public void setHospital(String hospital) {
-        this.hospital = hospital;
-    }
-
-    public String getDepartment() {
-        return this.department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSex() {
-        return this.sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getMobile_phone() {
-        return this.mobile_phone;
-    }
-
-    public void setMobile_phone(String mobile_phone) {
-        this.mobile_phone = mobile_phone;
-    }
-
-    public Integer getStatus() {
-        return this.status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getType() {
-        return this.type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getHospital_id() {
-        return this.hospital_id;
-    }
-
-    public void setHospital_id(Integer hospital_id) {
-        this.hospital_id = hospital_id;
-    }
-
-    public Integer getDepartment_id() {
-        return this.department_id;
-    }
-
-    public void setDepartment_id(Integer department_id) {
-        this.department_id = department_id;
-    }
-
-    public Integer getTitle_id() {
-        return this.title_id;
-    }
-
-    public void setTitle_id(Integer title_id) {
-        this.title_id = title_id;
-    }
-
-    public String getCert_image_url() {
-        return this.cert_image_url;
-    }
-
-    public void setCert_image_url(String cert_image_url) {
-        this.cert_image_url = cert_image_url;
-    }
-
-    public String getAvatar_image_url() {
-        return this.avatar_image_url;
-    }
-
-    public void setAvatar_image_url(String avatar_image_url) {
-        this.avatar_image_url = avatar_image_url;
-    }
-
-    public String getHonor() {
-        return this.honor;
-    }
-
-    public void setHonor(String honor) {
-        this.honor = honor;
-    }
-
-    public String getSkills() {
-        return this.skills;
-    }
-
-    public void setSkills(String skills) {
-        this.skills = skills;
-    }
-
-    public Integer getThumb_up_num() {
-        return this.thumb_up_num;
-    }
-
-    public void setThumb_up_num(Integer thumb_up_num) {
-        this.thumb_up_num = thumb_up_num;
-    }
-
-    public String getEmail() {
-        return this.email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getQrcode() {
-        return this.qrcode;
-    }
-
-    public void setQrcode(String qrcode) {
-        this.qrcode = qrcode;
-    }
-
-    public String getNickname() {
-        return this.nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    public String getPersonal_sign() {
-        return this.personal_sign;
-    }
-
-    public void setPersonal_sign(String personal_sign) {
-        this.personal_sign = personal_sign;
-    }
-
-    public Integer getPraise_num() {
-        return this.praise_num;
-    }
-
-    public void setPraise_num(Integer praise_num) {
-        this.praise_num = praise_num;
-    }
-
-    public String getPassword() {
-        return this.password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getInfo() {
-        return this.info;
-    }
-
-    public void setInfo(String info) {
-        this.info = info;
-    }
-
-    public String getRank() {
-        return this.rank;
-    }
-
-    public void setRank(String rank) {
-        this.rank = rank;
-    }
-
-    public Date getInvite_start_time() {
-        return this.invite_start_time;
-    }
-
-    public void setInvite_start_time(Date invite_start_time) {
-        this.invite_start_time = invite_start_time;
-    }
-
-    public String getProvince_name() {
-        return this.province_name;
-    }
-
-    public void setProvince_name(String province_name) {
-        this.province_name = province_name;
-    }
-
-    public String getCity_name() {
-        return this.city_name;
-    }
-
-    public void setCity_name(String city_name) {
-        this.city_name = city_name;
-    }
-
-    public String getCounty_name() {
-        return this.county_name;
-    }
-
-    public void setCounty_name(String county_name) {
-        this.county_name = county_name;
-    }
-
-    public Long getTown() {
-        return this.town;
-    }
-
-    public void setTown(Long town) {
-        this.town = town;
-    }
-
-    public String getTown_name() {
-        return this.town_name;
-    }
-
-    public void setTown_name(String town_name) {
-        this.town_name = town_name;
-    }
-
-    public Integer getCreate_id() {
-        return this.create_id;
-    }
-
-    public void setCreate_id(Integer create_id) {
-        this.create_id = create_id;
-    }
-
-    public Date getCreate_time() {
-        return this.create_time;
-    }
-
-    public void setCreate_time(Date create_time) {
-        this.create_time = create_time;
-    }
-
-    public Integer getDelete_flag() {
-        return this.delete_flag;
-    }
-
-    public void setDelete_flag(Integer delete_flag) {
-        this.delete_flag = delete_flag;
-    }
-
-    public Integer getCreat_id() {
-        return this.creat_id;
-    }
-
-    public void setCreat_id(Integer creat_id) {
-        this.creat_id = creat_id;
-    }
-
-    public Date getCreat_time() {
-        return this.creat_time;
-    }
-
-    public void setCreat_time(Date creat_time) {
-        this.creat_time = creat_time;
-    }
-
-    public Integer getModify_id() {
-        return this.modify_id;
-    }
-
-    public void setModify_id(Integer modify_id) {
-        this.modify_id = modify_id;
-    }
-
-    public Date getModify_time() {
-        return this.modify_time;
-    }
-
-    public void setModify_time(Date modify_time) {
-        this.modify_time = modify_time;
-    }
-}
+//package com.pica.cloud.account.account.server.entity;
+//
+//import java.util.Date;
+//
+///**
+// * @author andong
+// * @create 2019/10/16
+// */
+//public class PICAPDoctor {
+//    private Integer id;
+//    private Integer sex;
+//    private String name;
+//    private String mobile_phone;
+//    private Integer status;
+//    private Integer type;
+//    private Integer hospital_id;
+//    private Integer department_id;
+//    private Integer title_id;
+//    private String cert_image_url;
+//    private String avatar_image_url;
+//    protected Date auth_time;
+//    protected Date rejected_time;
+//    private String honor;
+//    private String skills;
+//    private String card;
+//    private Integer thumb_up_num;
+//    private String email;
+//    private String qrcode;
+//    private String nickname;
+//    private String personal_sign;
+//    private Integer praise_num;
+//    private String password;
+//    private String gaoxueya_password;
+//    private String info;
+//    private String rank;
+//    private Long county;
+//    private Long city;
+//    private Integer province;
+//    private String hospital;
+//    private String department;
+//    private String title;
+//    private String invite_code;
+//    private Integer entire_flag;
+//    private Integer doctor_project_type;
+//    private Integer sms_send_num;
+//    private Integer total_sms_send_num;
+//    private String province_name;
+//    private String city_name;
+//    private String county_name;
+//    protected Date invite_start_time;
+//    private Long town;
+//    private String town_name;
+//    private Integer register_source;
+//    private Integer register_type;
+//    private Integer administer_title_id;
+//    private String administer_title;
+//    protected Date birthday;
+//    protected String birthdayStr = "";
+//    protected Integer age = 0;
+//    protected PICAPDoctorEducation doctorEducation;
+//
+//    private Integer delete_flag;
+//    private Integer creat_id;
+//    protected Date creat_time;
+//    private Integer modify_id;
+//    protected Date modify_time;
+//    private Integer create_id;
+//    protected Date create_time;
+//
+//    public Date getBirthday() {
+//        return this.birthday;
+//    }
+//
+//    public void setBirthday(Date birthday) {
+//        this.birthday = birthday;
+//    }
+//
+//    public Integer getAge() {
+//        return this.age;
+//    }
+//
+//    public void setAge(Integer age) {
+//        this.age = age;
+//    }
+//
+//    public String getBirthdayStr() {
+//        return this.birthdayStr;
+//    }
+//
+//    public void setBirthdayStr(String birthdayStr) {
+//        this.birthdayStr = birthdayStr;
+//    }
+//
+//    public String getCard() {
+//        return this.card;
+//    }
+//
+//    public void setCard(String card) {
+//        this.card = card;
+//    }
+//
+//    public PICAPDoctorEducation getDoctorEducation() {
+//        return this.doctorEducation;
+//    }
+//
+//    public void setDoctorEducation(PICAPDoctorEducation doctorEducation) {
+//        this.doctorEducation = doctorEducation;
+//    }
+//
+//    public Integer getRegister_type() {
+//        return this.register_type;
+//    }
+//
+//    public void setRegister_type(Integer register_type) {
+//        this.register_type = register_type;
+//    }
+//
+//    public String getAdminister_title() {
+//        return this.administer_title;
+//    }
+//
+//    public void setAdminister_title(String administer_title) {
+//        this.administer_title = administer_title;
+//    }
+//
+//    public Integer getAdminister_title_id() {
+//        return this.administer_title_id;
+//    }
+//
+//    public void setAdminister_title_id(Integer administer_title_id) {
+//        this.administer_title_id = administer_title_id;
+//    }
+//
+//    public Integer getRegister_source() {
+//        return this.register_source;
+//    }
+//
+//    public void setRegister_source(Integer register_source) {
+//        this.register_source = register_source;
+//    }
+//
+//    public Integer getTotal_sms_send_num() {
+//        return this.total_sms_send_num;
+//    }
+//
+//    public void setTotal_sms_send_num(Integer total_sms_send_num) {
+//        this.total_sms_send_num = total_sms_send_num;
+//    }
+//
+//    public Integer getSms_send_num() {
+//        return this.sms_send_num;
+//    }
+//
+//    public void setSms_send_num(Integer sms_send_num) {
+//        this.sms_send_num = sms_send_num;
+//    }
+//
+//    public Integer getDoctor_project_type() {
+//        return this.doctor_project_type;
+//    }
+//
+//    public void setDoctor_project_type(Integer doctor_project_type) {
+//        this.doctor_project_type = doctor_project_type;
+//    }
+//
+//    public String getGaoxueya_password() {
+//        return this.gaoxueya_password;
+//    }
+//
+//    public void setGaoxueya_password(String gaoxueya_password) {
+//        this.gaoxueya_password = gaoxueya_password;
+//    }
+//
+//    public String getInvite_code() {
+//        return this.invite_code;
+//    }
+//
+//    public void setInvite_code(String invite_code) {
+//        this.invite_code = invite_code;
+//    }
+//
+//    public Integer getEntire_flag() {
+//        return this.entire_flag;
+//    }
+//
+//    public void setEntire_flag(Integer entire_flag) {
+//        this.entire_flag = entire_flag;
+//    }
+//
+//    public Date getAuth_time() {
+//        return this.auth_time;
+//    }
+//
+//    public void setAuth_time(Date auth_time) {
+//        this.auth_time = auth_time;
+//    }
+//
+//    public Date getRejected_time() {
+//        return this.rejected_time;
+//    }
+//
+//    public void setRejected_time(Date rejected_time) {
+//        this.rejected_time = rejected_time;
+//    }
+//
+//    public Long getCounty() {
+//        return this.county;
+//    }
+//
+//    public void setCounty(Long county) {
+//        this.county = county;
+//    }
+//
+//    public Long getCity() {
+//        return this.city;
+//    }
+//
+//    public void setCity(Long city) {
+//        this.city = city;
+//    }
+//
+//    public Integer getProvince() {
+//        return this.province;
+//    }
+//
+//    public void setProvince(Integer province) {
+//        this.province = province;
+//    }
+//
+//    public String getHospital() {
+//        return this.hospital;
+//    }
+//
+//    public void setHospital(String hospital) {
+//        this.hospital = hospital;
+//    }
+//
+//    public String getDepartment() {
+//        return this.department;
+//    }
+//
+//    public void setDepartment(String department) {
+//        this.department = department;
+//    }
+//
+//    public String getTitle() {
+//        return this.title;
+//    }
+//
+//    public void setTitle(String title) {
+//        this.title = title;
+//    }
+//
+//    public Integer getId() {
+//        return this.id;
+//    }
+//
+//    public void setId(Integer id) {
+//        this.id = id;
+//    }
+//
+//    public Integer getSex() {
+//        return this.sex;
+//    }
+//
+//    public void setSex(Integer sex) {
+//        this.sex = sex;
+//    }
+//
+//    public String getName() {
+//        return this.name;
+//    }
+//
+//    public void setName(String name) {
+//        this.name = name;
+//    }
+//
+//    public String getMobile_phone() {
+//        return this.mobile_phone;
+//    }
+//
+//    public void setMobile_phone(String mobile_phone) {
+//        this.mobile_phone = mobile_phone;
+//    }
+//
+//    public Integer getStatus() {
+//        return this.status;
+//    }
+//
+//    public void setStatus(Integer status) {
+//        this.status = status;
+//    }
+//
+//    public Integer getType() {
+//        return this.type;
+//    }
+//
+//    public void setType(Integer type) {
+//        this.type = type;
+//    }
+//
+//    public Integer getHospital_id() {
+//        return this.hospital_id;
+//    }
+//
+//    public void setHospital_id(Integer hospital_id) {
+//        this.hospital_id = hospital_id;
+//    }
+//
+//    public Integer getDepartment_id() {
+//        return this.department_id;
+//    }
+//
+//    public void setDepartment_id(Integer department_id) {
+//        this.department_id = department_id;
+//    }
+//
+//    public Integer getTitle_id() {
+//        return this.title_id;
+//    }
+//
+//    public void setTitle_id(Integer title_id) {
+//        this.title_id = title_id;
+//    }
+//
+//    public String getCert_image_url() {
+//        return this.cert_image_url;
+//    }
+//
+//    public void setCert_image_url(String cert_image_url) {
+//        this.cert_image_url = cert_image_url;
+//    }
+//
+//    public String getAvatar_image_url() {
+//        return this.avatar_image_url;
+//    }
+//
+//    public void setAvatar_image_url(String avatar_image_url) {
+//        this.avatar_image_url = avatar_image_url;
+//    }
+//
+//    public String getHonor() {
+//        return this.honor;
+//    }
+//
+//    public void setHonor(String honor) {
+//        this.honor = honor;
+//    }
+//
+//    public String getSkills() {
+//        return this.skills;
+//    }
+//
+//    public void setSkills(String skills) {
+//        this.skills = skills;
+//    }
+//
+//    public Integer getThumb_up_num() {
+//        return this.thumb_up_num;
+//    }
+//
+//    public void setThumb_up_num(Integer thumb_up_num) {
+//        this.thumb_up_num = thumb_up_num;
+//    }
+//
+//    public String getEmail() {
+//        return this.email;
+//    }
+//
+//    public void setEmail(String email) {
+//        this.email = email;
+//    }
+//
+//    public String getQrcode() {
+//        return this.qrcode;
+//    }
+//
+//    public void setQrcode(String qrcode) {
+//        this.qrcode = qrcode;
+//    }
+//
+//    public String getNickname() {
+//        return this.nickname;
+//    }
+//
+//    public void setNickname(String nickname) {
+//        this.nickname = nickname;
+//    }
+//
+//    public String getPersonal_sign() {
+//        return this.personal_sign;
+//    }
+//
+//    public void setPersonal_sign(String personal_sign) {
+//        this.personal_sign = personal_sign;
+//    }
+//
+//    public Integer getPraise_num() {
+//        return this.praise_num;
+//    }
+//
+//    public void setPraise_num(Integer praise_num) {
+//        this.praise_num = praise_num;
+//    }
+//
+//    public String getPassword() {
+//        return this.password;
+//    }
+//
+//    public void setPassword(String password) {
+//        this.password = password;
+//    }
+//
+//    public String getInfo() {
+//        return this.info;
+//    }
+//
+//    public void setInfo(String info) {
+//        this.info = info;
+//    }
+//
+//    public String getRank() {
+//        return this.rank;
+//    }
+//
+//    public void setRank(String rank) {
+//        this.rank = rank;
+//    }
+//
+//    public Date getInvite_start_time() {
+//        return this.invite_start_time;
+//    }
+//
+//    public void setInvite_start_time(Date invite_start_time) {
+//        this.invite_start_time = invite_start_time;
+//    }
+//
+//    public String getProvince_name() {
+//        return this.province_name;
+//    }
+//
+//    public void setProvince_name(String province_name) {
+//        this.province_name = province_name;
+//    }
+//
+//    public String getCity_name() {
+//        return this.city_name;
+//    }
+//
+//    public void setCity_name(String city_name) {
+//        this.city_name = city_name;
+//    }
+//
+//    public String getCounty_name() {
+//        return this.county_name;
+//    }
+//
+//    public void setCounty_name(String county_name) {
+//        this.county_name = county_name;
+//    }
+//
+//    public Long getTown() {
+//        return this.town;
+//    }
+//
+//    public void setTown(Long town) {
+//        this.town = town;
+//    }
+//
+//    public String getTown_name() {
+//        return this.town_name;
+//    }
+//
+//    public void setTown_name(String town_name) {
+//        this.town_name = town_name;
+//    }
+//
+//    public Integer getCreate_id() {
+//        return this.create_id;
+//    }
+//
+//    public void setCreate_id(Integer create_id) {
+//        this.create_id = create_id;
+//    }
+//
+//    public Date getCreate_time() {
+//        return this.create_time;
+//    }
+//
+//    public void setCreate_time(Date create_time) {
+//        this.create_time = create_time;
+//    }
+//
+//    public Integer getDelete_flag() {
+//        return this.delete_flag;
+//    }
+//
+//    public void setDelete_flag(Integer delete_flag) {
+//        this.delete_flag = delete_flag;
+//    }
+//
+//    public Integer getCreat_id() {
+//        return this.creat_id;
+//    }
+//
+//    public void setCreat_id(Integer creat_id) {
+//        this.creat_id = creat_id;
+//    }
+//
+//    public Date getCreat_time() {
+//        return this.creat_time;
+//    }
+//
+//    public void setCreat_time(Date creat_time) {
+//        this.creat_time = creat_time;
+//    }
+//
+//    public Integer getModify_id() {
+//        return this.modify_id;
+//    }
+//
+//    public void setModify_id(Integer modify_id) {
+//        this.modify_id = modify_id;
+//    }
+//
+//    public Date getModify_time() {
+//        return this.modify_time;
+//    }
+//
+//    public void setModify_time(Date modify_time) {
+//        this.modify_time = modify_time;
+//    }
+//}

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

-package com.pica.cloud.account.account.server.entity;
-
-import java.util.Date;
-
-/**
- * @author andong
- * @create 2019/10/16
- */
-public class PICAPDoctorEducation {
-    private static final long serialVersionUID = 1L;
-    private Integer id = 0;
-    private Integer doctor_id = 0;
-    private String school_name = "";
-    private Integer major_id = 0;
-    private String major_name = "";
-    private String education_id = "";
-    private String education_name = "";
-    private String year = "";
-    private Integer delete_flag;
-    private Integer creat_id;
-    protected Date creat_time;
-    private Integer modify_id;
-    protected Date modify_time;
-    private Integer create_id;
-    protected Date create_time;
-
-
-    public String getMajor_name() {
-        return this.major_name;
-    }
-
-    public void setMajor_name(String major_name) {
-        this.major_name = major_name;
-    }
-
-    public String getEducation_name() {
-        return this.education_name;
-    }
-
-    public void setEducation_name(String education_name) {
-        this.education_name = education_name;
-    }
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getDoctor_id() {
-        return this.doctor_id;
-    }
-
-    public void setDoctor_id(Integer doctor_id) {
-        this.doctor_id = doctor_id;
-    }
-
-    public String getSchool_name() {
-        return this.school_name;
-    }
-
-    public void setSchool_name(String school_name) {
-        this.school_name = school_name;
-    }
-
-    public Integer getMajor_id() {
-        return this.major_id;
-    }
-
-    public void setMajor_id(Integer major_id) {
-        this.major_id = major_id;
-    }
-
-    public String getEducation_id() {
-        return this.education_id;
-    }
-
-    public void setEducation_id(String education_id) {
-        this.education_id = education_id;
-    }
-
-    public String getYear() {
-        return this.year;
-    }
-
-    public void setYear(String year) {
-        this.year = year;
-    }
-
-    public Integer getCreate_id() {
-        return this.create_id;
-    }
-
-    public void setCreate_id(Integer create_id) {
-        this.create_id = create_id;
-    }
-
-    public Date getCreate_time() {
-        return this.create_time;
-    }
-
-    public void setCreate_time(Date create_time) {
-        this.create_time = create_time;
-    }
-
-    public Integer getDelete_flag() {
-        return this.delete_flag;
-    }
-
-    public void setDelete_flag(Integer delete_flag) {
-        this.delete_flag = delete_flag;
-    }
-
-    public Integer getCreat_id() {
-        return this.creat_id;
-    }
-
-    public void setCreat_id(Integer creat_id) {
-        this.creat_id = creat_id;
-    }
-
-    public Date getCreat_time() {
-        return this.creat_time;
-    }
-
-    public void setCreat_time(Date creat_time) {
-        this.creat_time = creat_time;
-    }
-
-    public Integer getModify_id() {
-        return this.modify_id;
-    }
-
-    public void setModify_id(Integer modify_id) {
-        this.modify_id = modify_id;
-    }
-
-    public Date getModify_time() {
-        return this.modify_time;
-    }
-
-    public void setModify_time(Date modify_time) {
-        this.modify_time = modify_time;
-    }
-}
+//package com.pica.cloud.account.account.server.entity;
+//
+//import java.util.Date;
+//
+///**
+// * @author andong
+// * @create 2019/10/16
+// */
+//public class PICAPDoctorEducation {
+//    private static final long serialVersionUID = 1L;
+//    private Integer id = 0;
+//    private Integer doctor_id = 0;
+//    private String school_name = "";
+//    private Integer major_id = 0;
+//    private String major_name = "";
+//    private String education_id = "";
+//    private String education_name = "";
+//    private String year = "";
+//    private Integer delete_flag;
+//    private Integer creat_id;
+//    protected Date creat_time;
+//    private Integer modify_id;
+//    protected Date modify_time;
+//    private Integer create_id;
+//    protected Date create_time;
+//
+//
+//    public String getMajor_name() {
+//        return this.major_name;
+//    }
+//
+//    public void setMajor_name(String major_name) {
+//        this.major_name = major_name;
+//    }
+//
+//    public String getEducation_name() {
+//        return this.education_name;
+//    }
+//
+//    public void setEducation_name(String education_name) {
+//        this.education_name = education_name;
+//    }
+//
+//    public Integer getId() {
+//        return this.id;
+//    }
+//
+//    public void setId(Integer id) {
+//        this.id = id;
+//    }
+//
+//    public Integer getDoctor_id() {
+//        return this.doctor_id;
+//    }
+//
+//    public void setDoctor_id(Integer doctor_id) {
+//        this.doctor_id = doctor_id;
+//    }
+//
+//    public String getSchool_name() {
+//        return this.school_name;
+//    }
+//
+//    public void setSchool_name(String school_name) {
+//        this.school_name = school_name;
+//    }
+//
+//    public Integer getMajor_id() {
+//        return this.major_id;
+//    }
+//
+//    public void setMajor_id(Integer major_id) {
+//        this.major_id = major_id;
+//    }
+//
+//    public String getEducation_id() {
+//        return this.education_id;
+//    }
+//
+//    public void setEducation_id(String education_id) {
+//        this.education_id = education_id;
+//    }
+//
+//    public String getYear() {
+//        return this.year;
+//    }
+//
+//    public void setYear(String year) {
+//        this.year = year;
+//    }
+//
+//    public Integer getCreate_id() {
+//        return this.create_id;
+//    }
+//
+//    public void setCreate_id(Integer create_id) {
+//        this.create_id = create_id;
+//    }
+//
+//    public Date getCreate_time() {
+//        return this.create_time;
+//    }
+//
+//    public void setCreate_time(Date create_time) {
+//        this.create_time = create_time;
+//    }
+//
+//    public Integer getDelete_flag() {
+//        return this.delete_flag;
+//    }
+//
+//    public void setDelete_flag(Integer delete_flag) {
+//        this.delete_flag = delete_flag;
+//    }
+//
+//    public Integer getCreat_id() {
+//        return this.creat_id;
+//    }
+//
+//    public void setCreat_id(Integer creat_id) {
+//        this.creat_id = creat_id;
+//    }
+//
+//    public Date getCreat_time() {
+//        return this.creat_time;
+//    }
+//
+//    public void setCreat_time(Date creat_time) {
+//        this.creat_time = creat_time;
+//    }
+//
+//    public Integer getModify_id() {
+//        return this.modify_id;
+//    }
+//
+//    public void setModify_id(Integer modify_id) {
+//        this.modify_id = modify_id;
+//    }
+//
+//    public Date getModify_time() {
+//        return this.modify_time;
+//    }
+//
+//    public void setModify_time(Date modify_time) {
+//        this.modify_time = modify_time;
+//    }
+//}

server/src/main/java/com/pica/cloud/account/account/server/job/AccountRepeatDataJob.java

@@ -25,8 +25,5 @@ public class AccountRepeatDataJob extends IJobHandler {
         accountInfoDetailMapper.processAccountRepeatData();
         XxlJobLogger.log("repeat date-----");
         return SUCCESS;
-
-
-
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/job/DoctorLogHandler.java

 package com.pica.cloud.account.account.server.job;
 
-import com.pica.cloud.account.account.server.mapper.DoctorMapper;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
-import com.xxl.job.core.log.XxlJobLogger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 /**
  * Created on 2019/12/16 17:53
  * author:crs
  * Description:记录doctor修改记录日志
  */
-@JobHandler(value = "DoctorLogHandler")
-@Component
-public class DoctorLogHandler extends IJobHandler {
-
-    @Autowired
-    private DoctorMapper doctorMapper;
-
-    @Override
-    public ReturnT<String> execute(String s) throws Exception {
-        XxlJobLogger.log("doctorLogRecord start-----");
-        Integer rows = doctorMapper.updateDoctorModifyRecord();
-        XxlJobLogger.log("doctorLogRecord end-----"+rows);
-        return SUCCESS;
-    }
-}
+//@JobHandler(value = "DoctorLogHandler")
+//@Component
+//public class DoctorLogHandler extends IJobHandler {
+//
+//    @Autowired
+//    private DoctorMapper doctorMapper;
+//
+//    @Override
+//    public ReturnT<String> execute(String s) throws Exception {
+//        XxlJobLogger.log("doctorLogRecord start-----");
+//        Integer rows = doctorMapper.updateDoctorModifyRecord();
+//        XxlJobLogger.log("doctorLogRecord end-----"+rows);
+//        return SUCCESS;
+//    }
+//}

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

@@ -2,8 +2,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.Doctor;
-import com.pica.cloud.account.account.server.entity.DoctorEntity;
-import com.pica.cloud.account.account.server.entity.PICAPDoctor;
+import com.pica.cloud.base.doctor.doctor.common.dto.PICAPDoctor;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;

server/src/main/java/com/pica/cloud/account/account/server/service/DoctorService.java

 package com.pica.cloud.account.account.server.service;
 
-import com.pica.cloud.account.account.server.entity.Doctor;
+
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 
 /**
  * Created on 2019/9/11 11:01

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

 package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.entity.LoginResult;
-import com.pica.cloud.account.account.server.entity.PICAPDoctor;
 import com.pica.cloud.account.account.server.req.BaseRequest;
+import com.pica.cloud.base.doctor.doctor.common.dto.PICAPDoctor;
 
 public interface LoginService {
     /**

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.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.entity.Doctor;
 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;
@@ -10,13 +9,15 @@ import com.pica.cloud.account.account.server.mapper.DoctorMapper;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
+import com.pica.cloud.base.doctor.doctor.common.dto.DoctorInfoDto;
+import com.pica.cloud.base.doctor.doctor.common.dto.WeChatDto;
+import com.pica.cloud.foundation.entity.PicaResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -29,6 +30,9 @@ import java.util.HashMap;
 @Service
 public class DoctorServiceImpl implements DoctorService {
 
+    @Autowired
+    private DoctorServiceClient doctorServiceClient;
+
     @Autowired
     private DoctorMapper doctorMapper;
 
@@ -37,18 +41,20 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Override
     public Doctor getDoctorInfo(Integer id) {
-        return doctorMapper.selectByPrimaryKey(id);
+        PicaResponse<Doctor> picaResponse = doctorServiceClient.getDoctorInfoById(id);
+        return picaResponse.getData();
     }
 
     @Transactional
     @Override
-    public void modifyDoctorInfo(Doctor doctor,Long doctorId) {
+    public void modifyDoctorInfo(Doctor doctor, Long doctorId) {
         Integer id = doctor.getId();
         if (id == null) {
             throw new AccountException(AccountExceptionEnum.PICA_PARAMS_ERROR);
         }
-        Doctor entity = doctorMapper.selectByPrimaryKey(id);
-        if (entity == null) {
+        PicaResponse<DoctorInfoDto> picaResponse = doctorServiceClient.getBaseInfoById(id);
+        DoctorInfoDto doctorInfoDto = picaResponse.getData();
+        if (doctorInfoDto == null) {
             throw new AccountException(AccountExceptionEnum.PICA_NOT_EXIST);
         }
         String mobilePhone = doctor.getMobilePhone();
@@ -57,8 +63,8 @@ public class DoctorServiceImpl implements DoctorService {
         }
         doctor.setMobilePhone(AESUtil.encryptV0(mobilePhone));
         doctor.setModifyTime(new Date());
-        doctorMapper.updateByPrimaryKeySelective(doctor);
-        Integer acctId = entity.getAcctId();
+        doctorServiceClient.updateDoctorFromAccount(doctor);
+        Integer acctId = doctorInfoDto.getAcctId();
         AccountInfoEntity accountInfoEntity = new AccountInfoEntity();
         accountInfoEntity.setMobilePhone(AESUtil.encryptV0(mobilePhone));
         accountInfoEntity.setId(acctId);
@@ -69,23 +75,25 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Transactional
     @Override
-    public void deleteDoctorInfo(Integer id,Long modifyId) {
+    public void deleteDoctorInfo(Integer id, Long modifyId) {
         //p_doctor表修改记录状态
-        Doctor doctor = doctorMapper.selectByPrimaryKey(id);
+        if (doctorServiceClient.getBaseInfoById(id) != null) {
+            DoctorInfoDto doctor = doctorServiceClient.getBaseInfoById(id).getData();
             if (doctor != null) {
                 Integer acctId = doctor.getAcctId();
                 HashMap<String, Long> map = new HashMap<>();
-            map.put("id",id.longValue());
-            map.put("modifyId",modifyId);
+                map.put("id", id.longValue());
+                map.put("modifyId", modifyId);
                 doctorMapper.updateDeleteByPrimaryKey(map);
                 HashMap<String, Long> acctMap = new HashMap<>();
-            acctMap.put("modifyId",modifyId);
-            acctMap.put("acctId",acctId.longValue());
+                acctMap.put("modifyId", modifyId);
+                acctMap.put("acctId", acctId.longValue());
                 accountInfoDetailMapper.updateDeleteByPrimaryKey(acctMap);
             } else {
                 throw new AccountException(AccountExceptionEnum.PICA_NOT_REGISTER);
             }
         }
+    }
 
     /**
      * 客服管理后台添加医生
@@ -98,7 +106,7 @@ public class DoctorServiceImpl implements DoctorService {
      */
     @Override
     @Transactional
-    public Integer addDoctorInfo(Doctor doctor,Long doctorId) {
+    public Integer addDoctorInfo(Doctor doctor, Long doctorId) {
         String mobilePhone = doctor.getMobilePhone();
         String mobileEncrypt = AESUtil.encryptV0(mobilePhone);
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
@@ -133,19 +141,24 @@ public class DoctorServiceImpl implements DoctorService {
         doctor.setModifyTime(new Date());
         doctor.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_ADMIN.getCode());
         doctor.setDeleteFlag(1);
-        doctorMapper.insertSelective(doctor);
+        doctorServiceClient.insertDoctorFromAccount(doctor);
         return doctor.getId();
     }
 
     @Override
     @Transactional
     public void bindWeChat(int acctId, String unionId) {
-        doctorMapper.bindWeChat(acctId, unionId);
+        WeChatDto weChatDto = new WeChatDto();
+        weChatDto.setAcctId(acctId);
+        weChatDto.setUnionId(unionId);
+        doctorServiceClient.bindWeChatFromAccount(weChatDto);
     }
 
     @Override
     @Transactional
     public void unbindWeChat(int acctId) {
-        doctorMapper.unbindWeChat(acctId);
+        WeChatDto weChatDto = new WeChatDto();
+        weChatDto.setAcctId(acctId);
+        doctorServiceClient.unBindWeChatFromAccount(weChatDto);
     }
 }

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

 package com.pica.cloud.account.account.server.service.impl;
 
-
 import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
@@ -15,18 +14,22 @@ import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.TokenUtils;
 import com.pica.cloud.account.account.server.util.WeChatUtils;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.DoctorInfoDto;
+import com.pica.cloud.base.doctor.doctor.common.dto.PICAPDoctor;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -58,7 +61,7 @@ public class LoginServiceImpl implements LoginService {
     private RegisterService registerService;
 
     @Autowired
-    private DoctorMapper doctorInfoMapper;
+    private DoctorServiceClient doctorServiceClient;
 
     @Autowired
     private AccountUtils accountUtils;
@@ -67,7 +70,6 @@ public class LoginServiceImpl implements LoginService {
     private DoctorService doctorService;
 
     @Autowired
-
     private ICacheClient redisClient;
 
     @Value("${doubleWritingMode}")
@@ -82,6 +84,7 @@ public class LoginServiceImpl implements LoginService {
 
     private static final String DEFAULT_DOCTOR_PICTURE_URL = "/File/doctor_default.png";
     public static Map<String, String> PIC_TYPE_MAP = new HashMap();
+
     static {
         PIC_TYPE_MAP.put("jpg", "FFD8FF");
         PIC_TYPE_MAP.put("jpeg", "FFD8FF");
@@ -107,7 +110,9 @@ public class LoginServiceImpl implements LoginService {
                 Integer acctId = accountInfoEntity.getId();
                 int productType = request.getProductType();
                 int sourceType = request.getSourceType();
-                Doctor doctorInfo=doctorInfoMapper.getDoctorInfoByMobile(encrypt);
+                PicaResponse<com.pica.cloud.base.doctor.doctor.common.dto.Doctor> picaResponse = doctorServiceClient
+                        .getDoctorInfoByMobile(encrypt);
+                com.pica.cloud.base.doctor.doctor.common.dto.Doctor doctorInfo = picaResponse.getData();
                 Integer userId = 0;
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     userId = doctorInfo.getId();
@@ -126,7 +131,7 @@ public class LoginServiceImpl implements LoginService {
                 result.setToken(newToken);
                 result.setUserId(userId.longValue());
                 result.setMobile(mobile);
-                result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
+                result.setDoctorId(EncryptUtils.encryptContent(userId + "", EncryptConstants.ENCRYPT_TYPE_ID));
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
                 }
@@ -176,11 +181,12 @@ public class LoginServiceImpl implements LoginService {
         result.setToken(newToken);
         result.setUserId(userId);
         result.setMobile(baseRequest.getMobile());
-        result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
+        result.setDoctorId(EncryptUtils.encryptContent(userId + "", EncryptConstants.ENCRYPT_TYPE_ID));
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
-            Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
-            result.setEntireFlag(doctorEntity.getEntireFlag());
+            PicaResponse<PICAPDoctor> picaResponse = doctorServiceClient.getDoctorInfoOldById(userId);
+            PICAPDoctor doctor = picaResponse.getData();
+            result.setEntireFlag(doctor.getEntire_flag());
         }
         //记录登录日志
         LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, baseRequest.getProductType(), baseRequest.getSourceType(),
@@ -218,10 +224,11 @@ public class LoginServiceImpl implements LoginService {
             LoginResult result = new LoginResult();
             result.setToken(newToken);
             result.setUserId(userId);
-            result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode()+"");
-            result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
+            result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode() + "");
+            result.setDoctorId(EncryptUtils.encryptContent(userId + "", EncryptConstants.ENCRYPT_TYPE_ID));
             if (request.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
-                PICAPDoctor doctor = doctorInfoMapper.queryDoctor(userId);
+                PicaResponse<PICAPDoctor> picaResponse = doctorServiceClient.getDoctorInfoOldById(userId.longValue());
+                PICAPDoctor doctor = picaResponse.getData();
                 result.setEntireFlag(doctor.getEntire_flag());
                 result.setMobile(AESUtil.decryptV0(doctor.getMobile_phone()));
             }
@@ -233,7 +240,7 @@ public class LoginServiceImpl implements LoginService {
             }
             LoginResult result = new LoginResult();
             result.setUnionId(unionId);
-            result.setBindFlag(AccountTypeEnum.BIND_STATUS_FAILURE.getCode()+"");
+            result.setBindFlag(AccountTypeEnum.BIND_STATUS_FAILURE.getCode() + "");
             return result;
         }
     }
@@ -247,11 +254,11 @@ public class LoginServiceImpl implements LoginService {
             result = registerService.register(request);
             if (doubleWritingMode) {
                 //双写模式下,要在doctor表存储unionId
-                if (result.getUserId()!=null) {
-                    Doctor doctor = new Doctor();
+                if (result.getUserId() != null) {
+                    com.pica.cloud.base.doctor.doctor.common.dto.Doctor doctor = new  com.pica.cloud.base.doctor.doctor.common.dto.Doctor();
                     doctor.setId(result.getUserId().intValue());
                     doctor.setUnionid(request.getUnionId());
-                    doctorInfoMapper.updateByPrimaryKeySelective(doctor);
+                    doctorServiceClient.updateDoctorFromAccount(doctor);
                 }
             }
         } else {
@@ -267,7 +274,9 @@ public class LoginServiceImpl implements LoginService {
     @Override
     @Transactional
     public void unbindWeChat(long doctorId) {
-        Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
+        PicaResponse<DoctorInfoDto> picaResponse = doctorServiceClient.getBaseInfoById(doctorId);
+        DoctorInfoDto data = picaResponse.getData();
+        Integer acctId = data.getAcctId();
         accountUnionMapper.updateUnbindByAcctId(acctId);
         if (doubleWritingMode) {
             doctorService.unbindWeChat(acctId);
@@ -290,7 +299,9 @@ public class LoginServiceImpl implements LoginService {
         } else {
             updateWechatInfoUser(entity, weChatUserInfoEntity);
         }
-        Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
+        PicaResponse<DoctorInfoDto> picaResponse = doctorServiceClient.getBaseInfoById(doctorId);
+        DoctorInfoDto data = picaResponse.getData();
+        Integer acctId = data.getAcctId();
         processAccountUnion(acctId, unionId);
         return weChatUserInfoEntity.getNickname();
     }
@@ -355,7 +366,9 @@ public class LoginServiceImpl implements LoginService {
     }
 
     public PICAPDoctor queryDoctor(long doctorId) {
-        PICAPDoctor doctor = doctorInfoMapper.queryDoctor(doctorId);
+        PicaResponse<PICAPDoctor> picaResponse = doctorServiceClient.getDoctorInfoOldById(doctorId);
+        PICAPDoctor doctor = picaResponse.getData();
+
         if (doctor == null) {
             doctor = new PICAPDoctor();
         }

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.entity.Doctor;
 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.mapper.DoctorMapper;
 import com.pica.cloud.account.account.server.service.ModifyMobileService;
 import com.pica.cloud.account.account.server.util.AESUtil;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,7 +23,7 @@ public class ModifyMobileServiceImpl implements ModifyMobileService {
     private AccountInfoDetailMapper accountInfoDetailMapper;
 
     @Autowired
-    private DoctorMapper doctorMapper;
+    private DoctorServiceClient doctorServiceClient;
 
     @Value("${doubleWritingMode}")
     private boolean doubleWritingMode;
@@ -51,7 +51,7 @@ public class ModifyMobileServiceImpl implements ModifyMobileService {
                 doctor.setModifyTime(currentTime);
                 doctor.setModifyId(acctId);
                 doctor.setMobilePhone(AESUtil.encryptV0(mobile));
-                doctorMapper.updateByAcctId(doctor);
+                doctorServiceClient.updateMobileByAcctId(doctor);
             }
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_NOT_EXIST);

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.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.entity.Doctor;
 import com.pica.cloud.account.account.server.entity.LogPWDModifyEntity;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
@@ -9,10 +8,11 @@ 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.DoctorMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.PasswordService;
 import com.pica.cloud.account.account.server.util.AESUtil;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ public class PasswordServiceImpl implements PasswordService {
     private AccountInfoDetailMapper accountInfoDetailMapper;
 
     @Autowired
-    private DoctorMapper doctorMapper;
+    private DoctorServiceClient doctorServiceClient;
 
     @Autowired
     private AccountLogUtils picaLogUtils;
@@ -103,6 +103,6 @@ public class PasswordServiceImpl implements PasswordService {
         doctor.setMobilePhone(mobile);
         doctor.setModifyTime(currentTime);
         doctor.setModifyId(0);
-        doctorMapper.updateByMobile(doctor);
+        doctorServiceClient.updateByMobile(doctor);
     }
 }

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

@@ -179,27 +179,27 @@ public class AESUtil {
      * 测试
      */
     public static void main(String[] args) throws Exception {
-//        String KEY="zJJ$c5md3$yuuhWW";
-//        System.out.println("-------------加密---------");
-//        String content = "18621903846";
-//
-//
-//        System.out.println("加密前：" + content);
-//        System.out.println("加密密钥和解密密钥：" + KEY);
-//
-//        System.out.println("-------------解密---------");
-//        String encrypt = aesEncrypt(content, KEY);
-//        System.out.println("加密后：" + encrypt);
-//        String decrypt = aesDecrypt("ieE4wN+GkIxm8S8tSVqTow==", KEY);
-//        System.out.println("解密后：" + decrypt);
+        String KEY="zJJ$c5md3$yuuhWW";
+        System.out.println("-------------加密---------");
+        String content = "17521591002";
+
+
+        System.out.println("加密前：" + content);
+        System.out.println("加密密钥和解密密钥：" + KEY);
+
+        System.out.println("-------------解密---------");
+        String encrypt = aesEncrypt(content, KEY);
+        System.out.println("加密后：" + encrypt);
+        String decrypt = aesDecrypt(encrypt, KEY);
+        System.out.println("解密后：" + decrypt);
 
           //请求参数解密处理
-        String key="aPzpkXKhX0xsgwG0L7uOiz47fKQKKW1pzzIyx9wRSoCtm4vux1+ctjKzQ77jb+Vvt4zB/z0wr7U5nszk7kXLKQR4A6nU5nt8O44CHjCHUU0dWbpPyd2TKFdZ58ZyKLsk1+Xc4wJ1HB0FQjxJefWvo5ioFYLasOpxSbKU7oHqXq4=";
-        String decrypt = RSAUtil.decrypt(key,procPrivateKey);
-        System.out.println(decrypt);
-        String content="x/119w4nmos1xMG1DFNzBDeUP7BmyGViwXB66UCCk2HaCoJWhNg6qL1WoDMLGkiMJni8GV8fzEpd+1h9z4LA99wEkn47rbK6+MLaGkMIv+QmXzMLxThpLJNxadb2ltRyKgz5wERoFB/AH/xxgRn8kw==";
-        String result = AESUtil.aesDecrypt(content, decrypt);
-        System.out.println(result);
+//        String key="aPzpkXKhX0xsgwG0L7uOiz47fKQKKW1pzzIyx9wRSoCtm4vux1+ctjKzQ77jb+Vvt4zB/z0wr7U5nszk7kXLKQR4A6nU5nt8O44CHjCHUU0dWbpPyd2TKFdZ58ZyKLsk1+Xc4wJ1HB0FQjxJefWvo5ioFYLasOpxSbKU7oHqXq4=";
+//        String decrypt = RSAUtil.decrypt(key,procPrivateKey);
+//        System.out.println(decrypt);
+//        String content="x/119w4nmos1xMG1DFNzBDeUP7BmyGViwXB66UCCk2HaCoJWhNg6qL1WoDMLGkiMJni8GV8fzEpd+1h9z4LA99wEkn47rbK6+MLaGkMIv+QmXzMLxThpLJNxadb2ltRyKgz5wERoFB/AH/xxgRn8kw==";
+//        String result = AESUtil.aesDecrypt(content, decrypt);
+//        System.out.println(result);
 
 
 //        ArrayList<String> list = new ArrayList<>();

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

@@ -2,12 +2,12 @@ package com.pica.cloud.account.account.server.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.controller.AccountController;
-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.DoctorMapper;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.DoctorInfoDto;
 import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.ValidateUtils;
@@ -15,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 /**
@@ -28,14 +27,14 @@ public class AccountUtils {
 
     private ICacheClient cacheClient;
 
+    @Autowired
+    private DoctorServiceClient doctorServiceClient;
+
     private Logger logger = LoggerFactory.getLogger(AccountController.class);
 
     @Autowired
     private AccountPatientInfoMapper accountPatientInfoMapper;
 
-    @Autowired
-    private DoctorMapper doctorInfoMapper;
-
     private static final String AUTH_CODE_PREFIX = "authCode-";
     private static final String AUTH_CODE_COUNT_PREFIX = "authCode-count-";
 
@@ -89,7 +88,7 @@ public class AccountUtils {
         //验证码3次校验测试不通过，直接删除
         String authCodeCount = AUTH_CODE_COUNT_PREFIX + flag + "-" + AESUtil.encryptV0(mobile);
 
-        logger.info("验证码缓存信息----->："+this.getAuthCodeKey(mobile, flag));
+        logger.info("验证码缓存信息----->：" + this.getAuthCodeKey(mobile, flag));
 
         if (cacheClient.exists(authCodeCount) && Integer.parseInt(cacheClient.get(authCodeCount)) > 2) {
             cacheClient.del(authCodeKey);
@@ -153,14 +152,12 @@ public class AccountUtils {
      * @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;
+        PicaResponse<DoctorInfoDto> picaResponse = doctorServiceClient.getDoctorInfoByAcctId(AcctId.longValue());
+        if (picaResponse != null && picaResponse.getData() != null) {
+            return picaResponse.getData().getAcctId().longValue();
+        } else {
+            return null;
+        }
     }
 
 

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

 package com.pica.cloud.account.account.server.util;
 
 import com.pica.cloud.account.account.server.entity.Account;
-import com.pica.cloud.account.account.server.entity.Doctor;
-import com.pica.cloud.account.account.server.mapper.DoctorMapper;
+import com.pica.cloud.base.doctor.doctor.client.DoctorServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.dto.Doctor;
+import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
@@ -26,11 +26,10 @@ public class TokenUtils {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-
     private ICacheClient cacheClient;
 
     @Autowired
-    private DoctorMapper doctorMapper;
+    private DoctorServiceClient doctorServiceClient;
 
     /**
      * 校验token的状态
@@ -56,10 +55,10 @@ public class TokenUtils {
             //先清除旧token
             String value = "token-doctor-" + account.getId().toString();
             String sourceType = AccountUtils.getSourceType(registerSource);
-            String oldToken = cacheClient.get(value + "-"+sourceType);
+            String oldToken = cacheClient.get(value + "-" + sourceType);
             if (StringUtils.isNotBlank(oldToken)) {
                 Long del = cacheClient.del(oldToken);
-                logger.info("num:---->"+del);
+                logger.info("num:---->" + del);
             }
             // 根据不同的产品线设置token有效期
             int expiredSeconds = 24 * 60 * 60;
@@ -86,7 +85,8 @@ public class TokenUtils {
             data.put("created_time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(account.getCreatTime()));
             data.put("sysCode", sourceType);
             if (account.getId() != null) {
-                Doctor doctor = doctorMapper.selectByPrimaryKey(account.getId().intValue());
+                PicaResponse<Doctor> picaResponse = doctorServiceClient.getDoctorInfoById(account.getId().intValue());
+                Doctor doctor = picaResponse.getData();
                 data.put("town_id", doctor.getTown() + "");
                 data.put("town_name", doctor.getTownName() + "");
                 data.put("county_id", doctor.getCounty() + "");
@@ -102,7 +102,7 @@ public class TokenUtils {
                 data.put("title", doctor.getTitle() + "");
                 data.put("title_id", doctor.getTitleId() + "");
                 data.put("status", doctor.getStatus() + "");
-                if (!StringUtils.isBlank(doctor.getName())){
+                if (!StringUtils.isBlank(doctor.getName())) {
                     data.put("name", doctor.getName() + "");
                 }
             }

server/src/main/resources/mybatis/DoctorMapper.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.DoctorMapper">
-    <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.Doctor">
+    <resultMap id="BaseResultAllMap" type="com.pica.cloud.account.account.server.entity.Doctor">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="sex" property="sex" jdbcType="INTEGER"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
@@ -63,7 +63,7 @@
         <result column="show_flag" property="showFlag" jdbcType="INTEGER"/>
         <result column="acct_id" property="acctId" jdbcType="INTEGER"/>
     </resultMap>
-    <sql id="Base_Column_List">
+    <sql id="Base_Column_all_List">
     id, sex, name, mobile_phone, tel, status, type, hospital_id, department_id, title_id, 
     hospital, department, title, cert_image_url, avatar_image_url, auth_time, honor, 
     skills, thumb_up_num, email, qrcode, nickname, personal_sign, delete_flag, creat_id, 
@@ -74,6 +74,13 @@
     administer_title, register_type, first_login_time, card, birthday, show_flag, acct_id
   </sql>
 
+    <select id="selectAllByPrimaryKey" resultMap="BaseResultAllMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_all_List"/>
+        from p_doctor
+        where id = #{id} and delete_flag=1
+    </select>
+
     <!--通过账户id查询用户信息-->
     <select id="selectUserIdByAcctId" parameterType="java.lang.Integer" resultType="java.lang.Long">
 		SELECT id
@@ -122,12 +129,7 @@
         and delete_flag = 1
     </select>
 
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from p_doctor
-        where id = #{id} and delete_flag=1
-    </select>
+
 
     <!--删除用户-->
     <update id="updateDeleteByPrimaryKey"  parameterType="map">
@@ -1028,19 +1030,19 @@
       where acct_id = #{acctId}
     </update>
 
-    <select id="queryDoctor" resultType="com.pica.cloud.account.account.server.entity.PICAPDoctor"
-            parameterType="java.lang.Long">
-        SELECT aa.id, aa.sex, aa.name, aa.mobile_phone, aa.status,
-        aa.type, aa.hospital_id, aa.department_id, aa.title_id,aa.card,
-        aa.hospital as hospital, aa.department, aa.title, aa.cert_image_url,
-        aa.avatar_image_url, aa.auth_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.invite_code, aa.gaoxueya_password, aa.sms_send_num, aa.total_sms_send_num,
-        aa.entire_flag, aa.doctor_project_type,aa.invite_start_time
-        FROM p_doctor aa
-        where aa.id = #{doctorId} and aa.delete_flag = 1
-    </select>
+    <!--<select id="queryDoctor" resultType="com.pica.cloud.account.account.server.entity.PICAPDoctor"-->
+            <!--parameterType="java.lang.Long">-->
+        <!--SELECT aa.id, aa.sex, aa.name, aa.mobile_phone, aa.status,-->
+        <!--aa.type, aa.hospital_id, aa.department_id, aa.title_id,aa.card,-->
+        <!--aa.hospital as hospital, aa.department, aa.title, aa.cert_image_url,-->
+        <!--aa.avatar_image_url, aa.auth_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.invite_code, aa.gaoxueya_password, aa.sms_send_num, aa.total_sms_send_num,-->
+        <!--aa.entire_flag, aa.doctor_project_type,aa.invite_start_time-->
+        <!--FROM p_doctor aa-->
+        <!--where aa.id = #{doctorId} and aa.delete_flag = 1-->
+    <!--</select>-->
 
     <select id="getAcctIdByDoctorId" resultType="java.lang.Integer" parameterType="java.lang.Long">
       select acct_id from p_doctor where id = #{id}