Merge branch 'release' into 'master'

Release



See merge request !32

.gitignore

@@ -13,6 +13,8 @@
 *.iws
 *.iml
 *.ipr
+*.gitignore
+
 
 /nbproject/private/
 /build/
@@ -73,4 +75,5 @@ crashlytics-build.properties
 fabric.properties
 
 LOG_PATH_IS_UNDEFINED/
-/LOG_PATH_IS_UNDEFINED/
\ No newline at end of file
+/LOG_PATH_IS_UNDEFINED/
+*tomcat-log/*

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.3.1</version>
+    <version>1.0.3.5</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

client/src/main/java/com/pica/cloud/account/account/client/PatHealthPackClient.java

+package com.pica.cloud.account.account.client;
+
+import com.pica.cloud.account.account.common.req.*;
+import com.pica.cloud.account.account.common.resp.AcctPatIdResp;
+import com.pica.cloud.account.account.common.resp.PatBindResp;
+import com.pica.cloud.account.account.common.resp.PatFamilyResp;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@FeignClient(name = "13201-pica-cloud-account")
+public interface PatHealthPackClient {
+
+    @GetMapping(value = "/account/pat-health/acctId/unionId/{unionId}")
+    PicaResponse<Integer> getAcctIdByUnionId(@PathVariable("unionId") String unionId);
+
+    @GetMapping(value = "/account/pat-health/acctId/patId/{patientId}")
+    PicaResponse<Integer> getAcctIdByPatId(@PathVariable("patientId") Integer patientId);
+
+    @GetMapping(value = "/account/pat-health/directPatIds/{patientId}")
+    PicaResponse<List<Integer>> getDirectPatIdsByPatId(@PathVariable("patientId") Integer patientId);
+
+    @GetMapping(value = "/account/pat-health/familyPats/{acctId}/containAcct/{containAcct}")
+    PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId, @PathVariable("containAcct") Integer containAcct);
+
+    @PostMapping(value = "/account/pat-health/acct")
+    PicaResponse<Integer> saveAcct(@RequestBody AcctPatInfoReq patInfoReq);
+
+    @PostMapping(value = "/account/pat-health/acct/bindUnion")
+    PicaResponse<PatBindResp> bindUnion(@RequestBody AcctPatInfoReq patInfoReq);
+
+    @PostMapping(value = "/account/pat-health/family/member")
+    PicaResponse<PatFamilyResp> saveMember(@RequestBody AcctPatFamilyReq familyReqReq);
+
+    @GetMapping(value = "/account/pat-health/familyAcct/patId/{patId}")
+    PicaResponse<Integer> getFamilyAcctPatId(@PathVariable("patId") Integer patId);
+
+    @PostMapping(value = "/account/pat-health/familyAcct/patIds")
+    PicaResponse<AcctPatIdResp> getFamilyAcctPatIds(@RequestBody AcctPatIdReq acctPatIdReq);
+
+    @PostMapping(value = "/account/pat-health/init/accts")
+    PicaResponse initAccts(@RequestBody List<InitAcctReq> initAcctReqList);
+
+    @PostMapping(value = "/account/pat-health/patIds/query/page")
+    PicaResponse<List<Integer>> queryByPage(@RequestBody AcctPatPageReq patPageReq);
+
+}

common/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-common</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.4</version>
     <name>pica-cloud-account-common</name>
     <packaging>jar</packaging>
 

common/src/main/java/com/pica/cloud/account/account/common/req/AcctPatFamilyDto.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+/**
+ * @ClassName AcctPatFamilyDto
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/14 13:21
+ * @ModifyDate 2020/5/14 13:21
+ * @Version 1.0
+ */
+public class AcctPatFamilyDto {
+
+    private Integer patientId;
+
+    private Integer relation;
+
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+
+    public Integer getRelation() {
+        return relation;
+    }
+
+    public void setRelation(Integer relation) {
+        this.relation = relation;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/AcctPatFamilyReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @ClassName AcctPatFamilyReq
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/14 13:21
+ * @ModifyDate 2020/5/14 13:21
+ * @Version 1.0
+ */
+@ApiModel
+public class AcctPatFamilyReq {
+
+    private Integer acctId;
+
+    private List<AcctPatFamilyDto> memberList;
+
+    public Integer getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(Integer acctId) {
+        this.acctId = acctId;
+    }
+
+    public List<AcctPatFamilyDto> getMemberList() {
+        return memberList;
+    }
+
+    public void setMemberList(List<AcctPatFamilyDto> memberList) {
+        this.memberList = memberList;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/AcctPatIdReq.java

+package com.pica.cloud.account.account.common.req;
+
+import java.util.List;
+
+public class AcctPatIdReq {
+
+    private List<Integer> patIds;
+
+    public List<Integer> getPatIds() {
+        return patIds;
+    }
+
+    public void setPatIds(List<Integer> patIds) {
+        this.patIds = patIds;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/AcctPatInfoReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName AcctPatInfoReq
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/12 16:16
+ * @ModifyDate 2020/5/12 16:16
+ * @Version 1.0
+ */
+@ApiModel
+public class AcctPatInfoReq {
+
+//    @NotNull
+    private String name;
+
+//    @NotNull
+    private String mobile;
+
+    private String unionId;
+
+    private Integer acctId;
+
+    @ApiModelProperty("1.云鹊健康小程序")
+    private Integer type;
+
+    private Integer patientId;
+
+    @ApiModelProperty("1：本人 2：父母 3：子女 4：配偶 5：其他")
+    private Integer memberType;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public Integer getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(Integer acctId) {
+        this.acctId = acctId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+
+    public Integer getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(Integer memberType) {
+        this.memberType = memberType;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/AcctPatPageReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+/**
+ * @ClassName AcctPatPageReq
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/27 13:22
+ * @ModifyDate 2020/5/27 13:22
+ * @Version 1.0
+ */
+public class AcctPatPageReq {
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/InitAcctReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @ClassName InitAcctReq
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/20 10:46
+ * @ModifyDate 2020/5/20 10:46
+ * @Version 1.0
+ */
+@ApiModel
+public class InitAcctReq {
+
+    private Integer patId;
+
+    private String mobile;
+
+    private String encryMobile;
+
+    private String name;
+
+    private String unionId;
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEncryMobile() {
+        return encryMobile;
+    }
+
+    public void setEncryMobile(String encryMobile) {
+        this.encryMobile = encryMobile;
+    }
+
+    public Integer getPatId() {
+        return patId;
+    }
+
+    public void setPatId(Integer patId) {
+        this.patId = patId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/resp/AcctPatId.java

+package com.pica.cloud.account.account.common.resp;
+
+public class AcctPatId {
+
+    private Integer reqPatId;
+
+    private Integer acctPatId;
+
+    public Integer getReqPatId() {
+        return reqPatId;
+    }
+
+    public void setReqPatId(Integer reqPatId) {
+        this.reqPatId = reqPatId;
+    }
+
+    public Integer getAcctPatId() {
+        return acctPatId;
+    }
+
+    public void setAcctPatId(Integer acctPatId) {
+        this.acctPatId = acctPatId;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/resp/AcctPatIdResp.java

+package com.pica.cloud.account.account.common.resp;
+
+import io.swagger.annotations.ApiModel;
+
+import java.util.Map;
+
+/**
+ *
+ */
+@ApiModel(description = "建立微信与账号关联关系-resp")
+public class AcctPatIdResp {
+
+    private Map<Integer, Integer> patFamId;
+
+    public Map<Integer, Integer> getPatFamId() {
+        return patFamId;
+    }
+
+    public void setPatFamId(Map<Integer, Integer> patFamId) {
+        this.patFamId = patFamId;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/resp/PatBindResp.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.resp;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @ClassName PatBindResp
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/13 13:24
+ * @ModifyDate 2020/5/13 13:24
+ * @Version 1.0
+ */
+@ApiModel(description = "建立微信与账号关联关系-resp")
+public class PatBindResp {
+
+    private boolean bindStatus;
+
+    private String msg;
+
+    public boolean isBindStatus() {
+        return bindStatus;
+    }
+
+    public void setBindStatus(boolean bindStatus) {
+        this.bindStatus = bindStatus;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+}

common/src/main/java/com/pica/cloud/account/account/common/resp/PatFamilyResp.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.resp;
+
+import com.pica.cloud.account.account.common.req.AcctPatFamilyDto;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+
+@ApiModel(description = "建立家庭服务关系-resp")
+public class PatFamilyResp {
+
+    private boolean successFlag;
+
+    private List<AcctPatFamilyDto> failMemberList;
+
+    private List<AcctPatFamilyDto> memberList;
+
+    private List<Integer> memberPatIds;
+
+    private String failMsg;
+
+    public List<AcctPatFamilyDto> getMemberList() {
+        return memberList;
+    }
+
+    public void setMemberList(List<AcctPatFamilyDto> memberList) {
+        this.memberList = memberList;
+    }
+
+    public String getFailMsg() {
+        return failMsg;
+    }
+
+    public void setFailMsg(String failMsg) {
+        this.failMsg = failMsg;
+    }
+
+    public boolean isSuccessFlag() {
+        return successFlag;
+    }
+
+    public void setSuccessFlag(boolean successFlag) {
+        this.successFlag = successFlag;
+    }
+
+    public List<AcctPatFamilyDto> getFailMemberList() {
+        return failMemberList;
+    }
+
+    public void setFailMemberList(List<AcctPatFamilyDto> failMemberList) {
+        this.failMemberList = failMemberList;
+    }
+
+    public List<Integer> getMemberPatIds() {
+        return memberPatIds;
+    }
+
+    public void setMemberPatIds(List<Integer> memberPatIds) {
+        this.memberPatIds = memberPatIds;
+    }
+}

server/pom.xml

@@ -77,6 +77,28 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.pica.cloud.foundation</groupId>
+            <artifactId>pica-cloud-completeness-client</artifactId>
+            <version>1.0.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                    <artifactId>pica-cloud-service-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.8.0</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.8.0</version>-->
+        <!--</dependency>-->
+
         <!--<dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -112,19 +134,11 @@
         </dependency>
 
         <!--zipkin dependencies begin-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1.4</version>
         </dependency>
 
         <dependency>
@@ -195,6 +209,7 @@
             <scope>test</scope>
         </dependency>
 
+
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-proof-client</artifactId>

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

@@ -8,7 +8,9 @@ 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.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
+import com.pica.cloud.account.account.server.util.IntactUtil;
 import com.pica.cloud.account.account.server.util.PICAPSendMsgModel;
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
@@ -44,6 +46,9 @@ public abstract class AccountBaseController extends BaseController {
     @Autowired
     private PropertiesConfiguration configuration;
 
+    @Autowired
+    private IntactUtil intactUtil;
+
     //从token获取医生ID
     public long getDoctorIdByToken() {
         try {
@@ -111,6 +116,9 @@ public abstract class AccountBaseController extends BaseController {
 
     //发送手机短信
     public void sendMobileMessage(String mobile, String content, long senderId) {
+        //接入新旭事务一致性
+        String batchNo = IntactUtils.getUUID();
+        intactUtil.sendIntact(batchNo,"sendMobileMessage",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"mobile:"+mobile+",content:"+content+",senderId:"+senderId);
         String sysCodeStr = super.getSysCode();
         int sysCode = 10; //默认移动端
         if (StringUtils.isNotBlank(sysCodeStr)) {
@@ -146,6 +154,8 @@ public abstract class AccountBaseController extends BaseController {
         logger.info("sendMobileTo-mobile:{}, senderId-{}",mobile, senderId);
         long start = System.currentTimeMillis();
         String jsonObj = HttpClientUtil.httpExecute(messageUrl, postData);
+        intactUtil.sendIntact(batchNo,"sendMobileMessage",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"jsonObj:"+jsonObj);
+
         long end1 = System.currentTimeMillis();
         logger.info("sendMobileMessage-send message used {} million seconds", end1-start);
         logger.info("sendMobileTo-{}", jsonObj);
@@ -218,7 +228,8 @@ public abstract class AccountBaseController extends BaseController {
     }
 
     /**
-     * 终端来源 sourceType:1.android  2.ios  3.web  4.wechat(例如微信小程序) 5.h5
+     * 终端来源 sourceType:1.android  2.ios  3.web
+     * 4.wechat(例如微信小程序)、H5 5.admin
      *
      * @return
      */

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

 package com.pica.cloud.account.account.server.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.configuration.PropertiesConfiguration;
 import com.pica.cloud.account.account.server.constants.Constants;
@@ -13,6 +14,7 @@ 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.*;
 import com.pica.cloud.account.account.server.util.*;
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
@@ -56,6 +58,9 @@ public class AutoCodeController extends AccountBaseController {
     @Autowired
     private PropertiesConfiguration propertiesConfiguration;
 
+    @Autowired
+    private IntactUtil intactUtil;
+
 
     /*@GetMapping("/ip")
     public PicaResponse getIp(HttpServletRequest request) {
@@ -104,7 +109,6 @@ public class AutoCodeController extends AccountBaseController {
         //  验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机
         //  4重置密码 5忘记密码 7患者招募提交问卷(效验) 8Appe登录绑定手机
 
-        //added by joy begin
         EncryptEntity entity = new EncryptEntity();
         if(StringUtils.isEmpty(authCodeReq.getKey()) && StringUtils.isEmpty(authCodeReq.getContent())){
             //明文时处理
@@ -125,10 +129,10 @@ public class AutoCodeController extends AccountBaseController {
             entity.setContent(authCodeReq.getContent());
         }
 
-        //added by joy end
-
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setSourceType(super.getSourceType());
+        logger.info("authCode/getAuthCode:{}",JSONObject.toJSONString(request));
+
         AccountUtils.checkMobilePhone(request.getMobile());
 
         if (request.getBizType() != null && request.getBizType().equals(1)) {
@@ -235,6 +239,7 @@ public class AutoCodeController extends AccountBaseController {
             processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();
         }
+
         throw new AccountException(AccountExceptionEnum.PICA_UNBIND_MOBILE);
     }
 
@@ -278,6 +283,9 @@ public class AutoCodeController extends AccountBaseController {
      * @param authCodeKeySecure
      */
     private void processSendAuthCode(String mobilePhone, Integer flag, String authCodeKeySecure) {
+        //接入新旭事务一致性
+        String batchNo = IntactUtils.getUUID();
+        intactUtil.sendIntact(batchNo,"processSendAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"mobilePhone:"+mobilePhone+",flag:"+flag+",authCodeKeySecure:"+authCodeKeySecure);
         long start = System.currentTimeMillis();
         String authCode = CommonUtil.createValidateCode();
         String message = "您的验证码是" + authCode + ",在10分钟内有效。如非本人操作，请忽略本短信！";
@@ -296,6 +304,8 @@ public class AutoCodeController extends AccountBaseController {
         super.sendMobileMessage(mobilePhone, message, senderId);
         long end2 = System.currentTimeMillis();
         logger.info("processSendAuthCode-2 used {} million seconds", end2-start);
+        intactUtil.sendIntact(batchNo,"processSendAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"mobilePhone:"+mobilePhone+",flag:"+flag+",authCodeKeySecure:"+authCodeKeySecure);
+
     }
 
     //获取验证码redis key

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

@@ -4,16 +4,20 @@ 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.req.RevertAcctsReq;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Created on 2019/9/10 18:51
  * author:crs
@@ -78,4 +82,21 @@ public class DoctorController extends AccountBaseController {
         doctorService.deleteDoctorInfo(id,super.getDoctorIdByToken());
         return PicaResponse.toResponse();
     }
+
+    /**
+     * @Description 恢复客服系统误删除医生
+     * @Author peijun.zhao
+     * @Date 2020/6/3 17:39
+     * @ModifyDate 2020/6/3 17:39
+     * @Params [doctorIds]
+     * @Return com.pica.cloud.foundation.entity.PicaResponse
+     */
+    @PostMapping(value = "/revert")
+    @EnabledLoginValidate
+    public PicaResponse revertDoctor(@RequestBody RevertAcctsReq revertAcctsReq) {
+        if("revertAccts".equals(revertAcctsReq.getType())){
+            doctorService.revertAccts(revertAcctsReq.getDoctorIds());
+        }
+        return PicaResponse.toResponse();
+    }
 }

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

@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.spring.web.json.Json;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -58,7 +59,7 @@ public class LoginController extends AccountBaseController {
     private String cache_prifix = "cache-";
 
     /**
-     * 密码登录接口
+     * 密码登录接口（app、H5）
      *
      * @param authCodeReq
      * @return
@@ -139,6 +140,7 @@ public class LoginController extends AccountBaseController {
         }
         //added by joy end
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("login-register:{}",JSONObject.toJSONString(request));
         request.setProductType(super.getProductType());
         Integer sourceType = super.getSourceType();
         request.setSourceType(sourceType == null ? 0 : sourceType);
@@ -173,6 +175,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("loginByWeChatStep:{}",JSONObject.toJSONString(request));
         LoginResult result = loginService.loginByWeChatStep(request);
         return PicaResponse.toResponse(result);
     }
@@ -188,6 +191,7 @@ public class LoginController extends AccountBaseController {
     @PostMapping("/login/wechat/bind")
     public PicaResponse bindWeChat(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("bindWeChat:{}",JSONObject.toJSONString(request));
         request.setUserTokenTourist(super.getUserTokenTourist());
         Long result = cacheClient.setnx(cache_prifix + request.getWeChatCode(), request.getWeChatCode());
         if (result == 1) {
@@ -292,6 +296,7 @@ public class LoginController extends AccountBaseController {
 
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setSourceType(super.getSourceType());
+        logger.info("unifiedVerification:{}",JSONObject.toJSONString(request));
         loginService.preLoginValidate(request);
         return PicaResponse.toResponse();
     }
@@ -304,6 +309,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("appleAuth:{}", JSONObject.toJSONString(request));
         return PicaResponse.toResponse(loginService.loginByApple(request));
     }
 
@@ -315,6 +321,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("appleAuthBind:{}",JSONObject.toJSONString(request));
         return PicaResponse.toResponse(loginService.loginByAppleStep(request));
     }
 
@@ -351,6 +358,7 @@ public class LoginController extends AccountBaseController {
         req.setSourceType(super.getSourceType());
         req.setLoginIp(super.getIpAddr());
         req.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("one-click req:{}",JSONObject.toJSONString(req));
         LoginResult oneClickLoginResultVo = loginService.oneClickLogin(req);
         return PicaResponse.toResponse(oneClickLoginResultVo);
     }

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

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.controller;
+
+import com.pica.cloud.account.account.common.req.*;
+import com.pica.cloud.account.account.common.resp.AcctPatIdResp;
+import com.pica.cloud.account.account.common.resp.PatBindResp;
+import com.pica.cloud.account.account.common.resp.PatFamilyResp;
+import com.pica.cloud.account.account.server.service.PatHealthPackService;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/12 15:55
+ * @ModifyDate 2020/5/12 15:55
+ * @Params
+ * @Return
+ */
+@Api(description = "健康包")
+@RestController
+@RequestMapping("/pat-health")
+public class PatHealthPackController {
+
+    @Autowired
+    private PatHealthPackService packService;
+
+    @ApiOperation("获取主账户ID-根据unionId")
+    @GetMapping(value = "/acctId/unionId/{unionId}")
+    public PicaResponse<Integer> getAcctIdByUnionId(@PathVariable("unionId") String unionId) throws Exception {
+        return PicaResponse.toResponse(packService.getAcctIdByUnionId(unionId));
+    }
+
+    @ApiOperation("获取主账户ID-作为监护人自身patientId")
+    @GetMapping(value = "/acctId/patId/{patientId}")
+    public PicaResponse<Integer> getAcctIdByPatId(@PathVariable("patientId") Integer patientId) throws Exception {
+        return PicaResponse.toResponse(packService.getAcctIdByPatId(patientId));
+    }
+
+    @ApiOperation("所在家庭组的监护人 + 同级家庭成员 + 下级所有成员 patientId list，去除自身、去重；")
+    @GetMapping(value = "/directPatIds/{patientId}")
+    public PicaResponse<List<Integer>> getDirectPatIdsByPatId(@PathVariable("patientId") Integer patientId) throws Exception {
+        return PicaResponse.toResponse(packService.getDirectPatIdsByPatId(patientId));
+    }
+
+    @ApiOperation("根据accid获取自身家庭成员List;containAcct:0 包含自身 1 不包含自身")
+    @GetMapping(value = "/familyPats/{acctId}/containAcct/{containAcct}")
+    public PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId,@PathVariable("containAcct") Integer containAcct) throws Exception {
+        return PicaResponse.toResponse(packService.getFamilyPatsByAcctId(acctId,containAcct));
+    }
+
+    @ApiOperation("保存主账户")
+    @PostMapping(value = "/acct")
+    public PicaResponse<Integer> saveAcct(@RequestBody AcctPatInfoReq patInfoReq) throws Exception {
+        return PicaResponse.toResponse(packService.saveAcct(patInfoReq));
+    }
+
+    @ApiOperation("建立微信与账号关联关系")
+    @PostMapping(value = "/acct/bindUnion")
+    public PicaResponse<PatBindResp> bindUnion(@RequestBody AcctPatInfoReq patInfoReq) throws Exception {
+        return PicaResponse.toResponse(packService.bindUnion(patInfoReq));
+    }
+
+    @ApiOperation("建立家庭服务关系")
+    @PostMapping(value = "/family/member")
+    public PicaResponse<PatFamilyResp> saveMember(@RequestBody AcctPatFamilyReq familyReqReq) throws Exception {
+        return PicaResponse.toResponse(packService.saveMember(familyReqReq));
+    }
+
+
+    @ApiOperation("根据patientId获取监护人-本人监护人（自身patId），本人成员（监护人patId）")
+    @GetMapping(value = "/familyAcct/patId/{patId}")
+    public PicaResponse<Integer> getFamilyAcctPatId(@PathVariable("patId") Integer patId) throws Exception {
+        return PicaResponse.toResponse(packService.getFamilyAcctPatId(patId));
+    }
+
+    @ApiOperation("根据patientIds 获取监护人-本人监护人（自身patId），本人成员（监护人patId）")
+    @PostMapping(value = "/familyAcct/patIds")
+    public PicaResponse<AcctPatIdResp> getFamilyAcctPatIds(@RequestBody AcctPatIdReq acctPatIdReq) throws Exception {
+        return PicaResponse.toResponse(packService.getFamilyAcctPatIds(acctPatIdReq));
+    }
+
+    @ApiOperation("初始主账户数据")
+    @PostMapping(value = "/init/accts")
+    public PicaResponse initAccts(@RequestBody List<InitAcctReq> initAcctReqList) throws Exception {
+        return PicaResponse.toResponse(packService.initAccts(initAcctReqList));
+    }
+
+    @ApiOperation("分页查询patIds")
+    @PostMapping(value = "/patIds/query/page")
+    public PicaResponse<List<Integer>> queryByPage(@RequestBody AcctPatPageReq patPageReq) throws Exception {
+        return PicaResponse.toResponse(packService.queryByPage(patPageReq));
+    }
+
+}

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

 package com.pica.cloud.account.account.server.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
@@ -12,6 +13,8 @@ import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+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.web.bind.annotation.PostMapping;
@@ -33,10 +36,13 @@ public class RegisterController extends AccountBaseController {
     @Autowired
     private ICacheClient redisClient;
 
+    private Logger logger = LoggerFactory.getLogger(RegisterController.class);
+
     @ApiOperation("PC端，移动端注册接口")
     @PostMapping(value = "")
     public PicaResponse<LoginResult> register(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("register:{}", JSONObject.toJSONString(request));
         String mobile = request.getMobile();
         //接口幂等性处理(redis中没有就进行注册逻辑，如果已经存在，就不处理)
         String authCode = request.getAuthCode();

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

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class AcctPatFamily {
+    private Integer id;
+
+    private Integer acctId;
+
+    private Integer patientId;
+
+    private Integer relation;
+
+    private Integer deleteFlag;
+
+    private Integer createdId;
+
+    private Date createdTime;
+
+    private Integer modifiedId;
+
+    private Date modifiedTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(Integer acctId) {
+        this.acctId = acctId;
+    }
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+
+    public Integer getRelation() {
+        return relation;
+    }
+
+    public void setRelation(Integer relation) {
+        this.relation = relation;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class AcctPatInfo {
+    private Integer id;
+
+    private String name;
+
+    private String mobilePhone;
+
+    private String password;
+
+    private Integer registerProduct;
+
+    private Integer registerSource;
+
+    private Date birthday;
+
+    private Integer age;
+
+    private Byte sex;
+
+    private String idCard;
+
+    private Date regTime;
+
+    private Integer deleteFlag;
+
+    private Integer createdId;
+
+    private Date createdTime;
+
+    private Integer modifiedId;
+
+    private Date modifiedTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone == null ? null : mobilePhone.trim();
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password == null ? null : password.trim();
+    }
+
+    public Integer getRegisterProduct() {
+        return registerProduct;
+    }
+
+    public void setRegisterProduct(Integer registerProduct) {
+        this.registerProduct = registerProduct;
+    }
+
+    public Integer getRegisterSource() {
+        return registerSource;
+    }
+
+    public void setRegisterSource(Integer registerSource) {
+        this.registerSource = registerSource;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public Byte getSex() {
+        return sex;
+    }
+
+    public void setSex(Byte sex) {
+        this.sex = sex;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard == null ? null : idCard.trim();
+    }
+
+    public Date getRegTime() {
+        return regTime;
+    }
+
+    public void setRegTime(Date regTime) {
+        this.regTime = regTime;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class AcctPatUnion {
+    private Integer id;
+
+    private Integer acctId;
+
+    private Integer unionType;
+
+    private String unionId;
+
+    private Integer deleteFlag;
+
+    private Integer createdId;
+
+    private Date createdTime;
+
+    private Integer modifiedId;
+
+    private Date modifiedTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(Integer acctId) {
+        this.acctId = acctId;
+    }
+
+    public Integer getUnionType() {
+        return unionType;
+    }
+
+    public void setUnionType(Integer unionType) {
+        this.unionType = unionType;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId == null ? null : unionId.trim();
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class DoctorEducation {
+    private Integer id;
+
+    private Integer doctorId;
+
+    private String schoolName;
+
+    private Integer majorId;
+
+    private String majorName;
+
+    private String educationId;
+
+    private String educationName;
+
+    private String year;
+
+    private Integer deleteFlag;
+
+    private Integer creatId;
+
+    private Date creatTime;
+
+    private Integer modifyId;
+
+    private Date modifyTime;
+
+    private String graduatedYear;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Integer doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName == null ? null : schoolName.trim();
+    }
+
+    public Integer getMajorId() {
+        return majorId;
+    }
+
+    public void setMajorId(Integer majorId) {
+        this.majorId = majorId;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName == null ? null : majorName.trim();
+    }
+
+    public String getEducationId() {
+        return educationId;
+    }
+
+    public void setEducationId(String educationId) {
+        this.educationId = educationId == null ? null : educationId.trim();
+    }
+
+    public String getEducationName() {
+        return educationName;
+    }
+
+    public void setEducationName(String educationName) {
+        this.educationName = educationName == null ? null : educationName.trim();
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year == null ? null : year.trim();
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatId() {
+        return creatId;
+    }
+
+    public void setCreatId(Integer creatId) {
+        this.creatId = creatId;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Integer getModifyId() {
+        return modifyId;
+    }
+
+    public void setModifyId(Integer modifyId) {
+        this.modifyId = modifyId;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getGraduatedYear() {
+        return graduatedYear;
+    }
+
+    public void setGraduatedYear(String graduatedYear) {
+        this.graduatedYear = graduatedYear == null ? null : graduatedYear.trim();
+    }
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class DoctorHospital {
+    private Long id;
+
+    private Long doctorId;
+
+    private Long hospitalId;
+
+    private Integer status;
+
+    private Integer sysCode;
+
+    private String memo;
+
+    private Integer deleteFlag;
+
+    private Long createdId;
+
+    private Date createdTime;
+
+    private Long modifiedId;
+
+    private Date modifiedTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSysCode() {
+        return sysCode;
+    }
+
+    public void setSysCode(Integer sysCode) {
+        this.sysCode = sysCode;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Long createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Long getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Long modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

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

@@ -56,6 +56,15 @@ public enum AccountExceptionEnum {
     PICA_MOBILE_NOT_SETED_PASSWORD_H5("216548", "该手机号尚未设置密码，设置密码请前往云鹊医APP，或使用其他方式登录。"),
     PICA_PWD_MISMATCH_5_H5("216549", "该账号密码错误次数已达上限请24小时后再试，或请使用其他登录方式"),
 
+    PAT_ACCT_HAS_EXIST("216550","账号已存在"),
+    PAT_ACCT_HAS_MORE("216551","主账号存在多条"),
+    PAT_MEMBER_HAS_MORE("216552","该成员已被其他人添加为家庭成员"),
+    PAT_SAVE_PARAM_ERROR("216553","保存主账户参数错误"),
+    PAT_UNIONID_BINDED_ERROR("216554","该unionid已被其他手机号绑定"),
+    PAT_MOBILE_BINDED_WECHAT_ERROR("216555","该手机已绑定其他微信"),
+    PAT_MEMBER_HAS_BINDED_SELF("216556","该成员已被账户绑定为家庭成员，不需要再次绑定"),
+    PAT_HAS_CREATE_ACCT("216557","初始居民已存在主账户"),
+    PAT_QUERY_MAX("216558","查询参数过多"),
 
     xxx_xxx("","");
 

server/src/main/java/com/pica/cloud/account/account/server/enums/SourceTypeEnum.java

@@ -14,6 +14,7 @@ public enum SourceTypeEnum {
     SAAS(3, "saas"),
     H5(4, "h5"),
     ADMIN(5, "admin"),
+    INIT(6, "初始生成-居民账户"),
 
     XXX(10, "xxxxxx");
 

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

@@ -2,7 +2,9 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.AccountAppleInfo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface AccountAppleInfoMapper {
     int insert(AccountAppleInfo record);
 

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

@@ -3,9 +3,12 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 
+@Component
 public interface AccountInfoDetailMapper {
     /**
      * 通过电话号码查询账号信息
@@ -65,4 +68,6 @@ public interface AccountInfoDetailMapper {
 
     void processAccountRepeatData();
 
+    int updateRevertByAcctIds(List<Integer> list);
+
 }

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

@@ -2,7 +2,9 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.AccountPatientInfoEntity;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface AccountPatientInfoMapper {
 
 

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

@@ -2,9 +2,10 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.AccountUnionEntity;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
-
+@Component
 public interface AccountUnionMapper {
 
     /**

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

 package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.AccountWeChatInfoEntity;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface AccountWeChatInfoMapper {
 
     /**

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

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.common.req.AcctPatPageReq;
+import com.pica.cloud.account.account.server.entity.AcctPatFamily;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AcctPatFamilyMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(AcctPatFamily record);
+
+    int insertSelective(AcctPatFamily record);
+
+    AcctPatFamily selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(AcctPatFamily record);
+
+    int updateByPrimaryKey(AcctPatFamily record);
+
+    /** 获取居民id是本人的家庭组记录- 作为家庭主账户、本人居民id，单条ok 多条异常数据 */
+    AcctPatFamily getByPatIdSelf(Integer patId);
+
+    /** list查询 波子1000条调用 */
+    List<AcctPatFamily> getListByPatIdSelfs(List<Integer> list);
+
+    /** 查询居民id所在家庭组监护人- 作为家庭成员、非主账户本人居民id，单条ok 多条异常数据 */
+    AcctPatFamily getByPatIdNotSelf(Integer patId);
+
+    List<AcctPatFamily> getListByPatIdNotSelfs(List<Integer> list);
+
+    /** 获取主账户下所有家庭成员 */
+    List<AcctPatFamily> getListByAcctId(Integer acctId);
+
+    /** 根据账户id 获取主账户居民 */
+    AcctPatFamily getSelfByAcctId(Integer acctId);
+
+    List<AcctPatFamily> getSelfListByAcctIds(List<Integer> list);
+
+    List<AcctPatFamily> getListByPatIds(List<Integer> patIds);
+
+    List<AcctPatFamily> getByPatIdSelfList(List<Integer> patIds);
+
+    int initBatch(List<AcctPatFamily> list);
+
+    List<AcctPatFamily> getMemberListByPatIds(List<Integer> patIds);
+
+    List<Integer> queryPatIdByPage(Map map);
+
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.common.req.InitAcctReq;
+import com.pica.cloud.account.account.server.entity.AcctPatInfo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AcctPatInfoMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(AcctPatInfo record);
+
+    int insertSelective(AcctPatInfo record);
+
+    AcctPatInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(AcctPatInfo record);
+
+    int updateByPrimaryKey(AcctPatInfo record);
+
+    List<AcctPatInfo> selectByCondition(AcctPatInfo record);
+
+    int initBatch(List<AcctPatInfo> list);
+
+    List<AcctPatInfo> getListByMobiles(List<String> mobile);
+
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.server.entity.AcctPatUnion;
+
+import java.util.List;
+
+public interface AcctPatUnionMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(AcctPatUnion record);
+
+    int insertSelective(AcctPatUnion record);
+
+    AcctPatUnion selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(AcctPatUnion record);
+
+    int updateByPrimaryKey(AcctPatUnion record);
+
+    AcctPatUnion selectByUnionId(String unionId);
+
+    AcctPatUnion selectByAcctId(Integer acctId);
+
+    int initBatch(List<AcctPatUnion> list);
+}
\ No newline at end of file

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

@@ -3,7 +3,9 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.AgreementLogEntity;
 import com.pica.cloud.account.account.server.entity.PProtocolLog;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface AgreementLogEntityMapper {
     int deleteByPrimaryKey(Long id);
 

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

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.server.entity.DoctorEducation;
+
+import java.util.List;
+
+public interface DoctorEducationMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DoctorEducation record);
+
+    int insertSelective(DoctorEducation record);
+
+    DoctorEducation selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DoctorEducation record);
+
+    int updateByPrimaryKey(DoctorEducation record);
+
+    int updateRevertByDocIds(List<Integer> list);
+}
\ No newline at end of file

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

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.server.entity.DoctorHospital;
+
+import java.util.List;
+
+public interface DoctorHospitalMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(DoctorHospital record);
+
+    int insertSelective(DoctorHospital record);
+
+    DoctorHospital selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(DoctorHospital record);
+
+    int updateByPrimaryKey(DoctorHospital record);
+
+    int updateRevertByDocIds(List<Integer> list);
+}
\ No newline at end of file

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

@@ -5,9 +5,12 @@ 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 org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 
+@Component
 public interface DoctorMapper {
     /**
      * 获取医生信息
@@ -98,6 +101,9 @@ public interface DoctorMapper {
 
     Integer getAcctIdByDoctorId(long id);
 
+    List<Doctor> getRevertListByDoctorIds(List<Integer> list);
+
+    int updateRevertByIdList(List<Integer> list);
 
     /**
      * 更新p_doctor表的修改记录

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

 package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.LogLoginAes;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface LogLoginAesMapper {
     int deleteByPrimaryKey(Integer id);
 

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

 package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.LogLoginOnekey;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface LogLoginOnekeyMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -2,7 +2,9 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.PUserRole;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface PUserRoleMapper {
     int deleteByPrimaryKey(Integer id);
 

server/src/main/java/com/pica/cloud/account/account/server/model/OneClickProcessor.java

 package com.pica.cloud.account.account.server.model;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.entity.LogLoginOnekey;
 import com.pica.cloud.account.account.server.entity.MobileDataEntity;
 import com.pica.cloud.account.account.server.entity.QueryMobileEntity;
 import com.pica.cloud.account.account.server.mapper.LogLoginOnekeyMapper;
-import com.pica.cloud.account.account.server.util.AESUtil;
-import com.pica.cloud.account.account.server.util.HttpUtil;
-import com.pica.cloud.account.account.server.util.MD5;
-import com.pica.cloud.account.account.server.util.RSAUtil;
-import com.pica.cloud.account.account.server.util.SignUtils;
+import com.pica.cloud.account.account.server.util.*;
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +28,8 @@ import java.util.Map;
  */
 @Component
 public class OneClickProcessor {
+    @Autowired
+    private IntactUtil intactUtil;
     private static final String DEFAULT_ENCRYPT_TYPE = "0";
 
     private Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -84,7 +84,12 @@ public class OneClickProcessor {
             params.put(APPID, appId);
             params.put(ENCRYPT_TYPE, encryptType);//可以不传，不传则解密直接使用AES解密
             params.put(SIGN, SignUtils.getSign(params, appKey));
+            //接入新旭事务一致性
+            String batchNo = IntactUtils.getUUID();
+            intactUtil.sendIntact(batchNo,"tokenExchangeMobile.postForm(mobileQueryUrl, params, QueryMobileEntity.class)",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"token:"+token+",appId:"+appId+",SIGN:"+SignUtils.getSign(params, appKey) );
             queryMobileEntity = HttpUtil.postForm(mobileQueryUrl, params, QueryMobileEntity.class);
+            intactUtil.sendIntact(batchNo,"tokenExchangeMobile.postForm(mobileQueryUrl, params, QueryMobileEntity.class)",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"queryMobileEntity:"+JSON.toJSONString(queryMobileEntity) );
+
             if (null != queryMobileEntity) {
                 logger.info("一键登录token换取手机号结果：{}", queryMobileEntity);
                 String code = queryMobileEntity.getCode();     //返回码 200000为成功
@@ -101,7 +106,7 @@ public class OneClickProcessor {
                 }
             }
         } catch (Exception e) {
-            logger.error(e.getMessage());
+            logger.error("one-click req tokenExchangeMobile:{}",e.getMessage());
         }
         return queryMobileEntity;
     }

server/src/main/java/com/pica/cloud/account/account/server/req/RevertAcctsReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.req;
+
+import java.util.List;
+
+/**
+ * @ClassName RevertAcctsReq
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/6/3 17:43
+ * @ModifyDate 2020/6/3 17:43
+ * @Version 1.0
+ */
+public class RevertAcctsReq {
+
+    private List<Integer> doctorIds;
+
+    private String type;
+
+    public List<Integer> getDoctorIds() {
+        return doctorIds;
+    }
+
+    public void setDoctorIds(List<Integer> doctorIds) {
+        this.doctorIds = doctorIds;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

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

@@ -2,6 +2,8 @@ package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.entity.Doctor;
 
+import java.util.List;
+
 /**
  * Created on 2019/9/11 11:01
  * author:crs
@@ -50,4 +52,6 @@ public interface DoctorService {
      * @param acctId
      */
     void unbindWeChat(int acctId);
+
+    void revertAccts(List<Integer> doctorIds);
 }

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

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.service;
+
+import com.pica.cloud.account.account.common.req.*;
+import com.pica.cloud.account.account.common.resp.AcctPatIdResp;
+import com.pica.cloud.account.account.common.resp.PatBindResp;
+import com.pica.cloud.account.account.common.resp.PatFamilyResp;
+
+import java.util.List;
+
+/**
+ * @ClassName PatHealthPackService
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/5/14 18:30
+ * @ModifyDate 2020/5/14 18:30
+ * @Version 1.0
+ */
+public interface PatHealthPackService {
+
+    Integer getAcctIdByUnionId(String unionId);
+
+    Integer getAcctIdByPatId(Integer patientId);
+
+    List<Integer> getDirectPatIdsByPatId(Integer patientId);
+
+    PatFamilyResp getFamilyPatsByAcctId(Integer acctId,Integer containAcct);
+
+    Integer saveAcct(AcctPatInfoReq patInfoReq);
+
+    PatBindResp bindUnion(AcctPatInfoReq patInfoReq);
+
+    PatFamilyResp saveMember(AcctPatFamilyReq familyReqReq);
+
+    Integer getFamilyAcctPatId(Integer patId);
+
+    AcctPatIdResp getFamilyAcctPatIds(AcctPatIdReq acctPatIdReq);
+
+    Integer initAccts(List<InitAcctReq> list);
+
+    List<Integer> queryByPage(AcctPatPageReq patPageReq);
+
+}

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.alibaba.fastjson.JSONObject;
 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;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
+import com.pica.cloud.account.account.server.mapper.DoctorEducationMapper;
+import com.pica.cloud.account.account.server.mapper.DoctorHospitalMapper;
 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.foundation.utils.entity.PicaDoctor;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +26,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created on 2019/9/11 11:02
@@ -35,11 +43,19 @@ public class DoctorServiceImpl implements DoctorService {
     @Autowired
     private AccountInfoDetailMapper accountInfoDetailMapper;
 
+    @Autowired
+    private DoctorEducationMapper doctorEducationMapper;
+
+    @Autowired
+    private DoctorHospitalMapper doctorHospitalMapper;
+
     @Override
     public Doctor getDoctorInfo(Integer id) {
         return doctorMapper.selectByPrimaryKey(id);
     }
 
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Transactional
     @Override
     public void modifyDoctorInfo(Doctor doctor,Long doctorId) {
@@ -148,4 +164,35 @@ public class DoctorServiceImpl implements DoctorService {
     public void unbindWeChat(int acctId) {
         doctorMapper.unbindWeChat(acctId);
     }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void revertAccts(List<Integer> doctorIds) {
+        logger.info("revertAccts:{}", JSONObject.toJSONString(doctorIds));
+        if(doctorIds.size() == 0){
+            return;
+        }
+
+        //check docIds 是否都是已经删除了
+        List<Doctor> docList = doctorMapper.getRevertListByDoctorIds(doctorIds);
+        if(docList.size() != doctorIds.size()){
+            logger.error("revertAccts: 入参中存在未删除的医生id");
+            return;
+        }
+
+        //revert doctor数据
+        doctorMapper.updateRevertByIdList(doctorIds);
+
+        //revert account数据
+        List<Integer> acctIds = docList.stream().map(obj -> obj.getAcctId()).collect(Collectors.toList());
+        accountInfoDetailMapper.updateRevertByAcctIds(acctIds);
+
+        //revert doctor 教育信息
+        doctorEducationMapper.updateRevertByDocIds(doctorIds);
+
+        //revert 医生机构
+        doctorHospitalMapper.updateRevertByDocIds(doctorIds);
+        logger.info("revertAccts:end");
+    }
 }

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

 package com.pica.cloud.account.account.server.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.*;
@@ -11,10 +12,8 @@ import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
 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.AESUtil;
-import com.pica.cloud.account.account.server.util.AccountUtils;
-import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
-import com.pica.cloud.account.account.server.util.TokenUtils;
+import com.pica.cloud.account.account.server.util.*;
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.redis.ICacheClient;
@@ -58,6 +57,9 @@ public class RegisterServiceImpl implements RegisterService {
 
     private ICacheClient redisClient;
 
+    @Autowired
+    private IntactUtil intactUtil;
+
     /**
      * 1)注册功能：默认未完善信息；
      * 2)注册成功后发送mq消息，让别的服务初始化数据；
@@ -74,6 +76,9 @@ public class RegisterServiceImpl implements RegisterService {
 
     @Override
     public LoginResult register(BaseRequest baseRequest,QueryMobileEntity queryMobileEntity) {
+        //接入新旭事务一致性
+        String batchNo = IntactUtils.getUUID();
+        intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"baseRequest:"+ JSON.toJSONString(baseRequest)+",queryMobileEntity:"+JSON.toJSONString(queryMobileEntity));
         String mobile = baseRequest.getMobile();
         //对注册接口做幂等性处理：注册成功，删除缓存，注册失败提示用户
         String nxKey = Constants.REPEAT_REGISTER_PREFIX + mobile;
@@ -147,14 +152,20 @@ public class RegisterServiceImpl implements RegisterService {
                     processAgreement(userId);
                     processRoleMap(userId);
                     redisClient.del(nxKey);
+                    intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"baseRequest:"+ JSON.toJSONString(baseRequest)+",queryMobileEntity:"+JSON.toJSONString(queryMobileEntity));
+
                     return result;
                 } else {
                     logger.info("register-account is exists");
+                    intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"该手机号已注册，请直接登录");
+
                     throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
                 }
             } catch (Exception e) {
                 //向上抛出异常，让异常处理框架捕获到
                 logger.error("registerException-" + e.getMessage(), e);
+                intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"注册失败");
+
                 throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
             } finally {
                 //如果在注册过程中抛出异常，就删除redis中的注册标记
@@ -163,6 +174,8 @@ public class RegisterServiceImpl implements RegisterService {
             }
         } else {
             logger.info("register-nxKey is exists");
+            intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"该手机号已注册，请直接登录");
+
             throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
         }
     }

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

+package com.pica.cloud.account.account.server.util;
+
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
+import com.pica.cloud.foundation.completeness.contract.req.LogParamsReq;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * @param <T>
+ * @author jiao.yu
+ * @version V1.0
+ * @Description:
+ * @date 2020/5/22 16:04
+ */
+@Service
+public class IntactUtil {
+    private final static Logger logger = LoggerFactory.getLogger(IntactUtil.class);
+
+    /**
+     * 对接新旭事务一致性
+     * @param batchNo
+     * @param methodName
+     * @param status
+     * @param params
+     */
+    public void sendIntact(String batchNo,String methodName,Integer status,String params){
+        logger.info("开始事务一致性，参数为：batchNo:"+batchNo+",methodName:"+methodName+",status:"+status+",params:"+params);
+        LogParamsReq req = new LogParamsReq();
+        req.setBatchNo(batchNo);
+        req.setMethodName(methodName);
+        req.setStatus(status);
+        req.setParams(params);
+        IntactUtils.sendIntact(req);
+        logger.info("结束事务一致性");
+
+    }
+}

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

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.util;
+
+/**
+ * @ClassName TestSet
+ * @Description TODO
+ * @Author peijun.zhao
+ * @Date 2020/4/13 9:05
+ * @ModifyDate 2020/4/13 9:05
+ * @Version 1.0
+ */
+public class TestSet {
+
+    int i = 0;
+    byte b = 0;
+    short s = 0;
+    long l = 0;
+    float f = 0;
+    double  d = 0;
+    char c = 0;
+    boolean bl = false;
+
+
+    public int getI() {
+        return i;
+    }
+
+    public void setI(int i) {
+        this.i = i;
+    }
+
+    public byte getB() {
+        return b;
+    }
+
+    public void setB(byte b) {
+        this.b = b;
+    }
+
+    public short getS() {
+        return s;
+    }
+
+    public void setS(short s) {
+        this.s = s;
+    }
+
+    public long getL() {
+        return l;
+    }
+
+    public void setL(long l) {
+        this.l = l;
+    }
+
+    public float getF() {
+        return f;
+    }
+
+    public void setF(float f) {
+        this.f = f;
+    }
+
+    public double getD() {
+        return d;
+    }
+
+    public void setD(double d) {
+        this.d = d;
+    }
+
+    public char getC() {
+        return c;
+    }
+
+    public void setC(char c) {
+        this.c = c;
+    }
+
+    public boolean isBl() {
+        return bl;
+    }
+
+    public void setBl(boolean bl) {
+        this.bl = bl;
+    }
+}

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

 package com.pica.cloud.account.account.server.util;
 
+import com.alibaba.fastjson.JSONObject;
 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.enums.SourceTypeEnum;
@@ -98,6 +99,7 @@ public class TokenUtils {
      * @return
      */
     public String generateToken(Account account) {
+        logger.info("generateToken account:{}",JSONObject.toJSONString(account));
         Integer registerSource = account.getRegisterSource();
         String newToken = "";
         try {

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

@@ -3,6 +3,8 @@ package com.pica.cloud.account.account.server.util;
 import com.alibaba.fastjson.JSON;
 import com.pica.cloud.account.account.server.entity.WeChatEntity;
 import com.pica.cloud.account.account.server.entity.WeChatUserInfoEntity;
+import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
+import com.pica.cloud.foundation.completeness.contract.req.LogParamsReq;
 import com.pica.cloud.foundation.utils.constants.WeChatConstants;
 import com.pica.cloud.foundation.utils.utils.JsonUtil;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
@@ -32,7 +34,11 @@ public class WeChatUtils {
 
     private static Logger logger = LoggerFactory.getLogger(WeChatUtils.class);
 
+
     public static WeChatEntity getAuthorizationInfo(String appId, String appSecret, String code) {
+        //接入新旭事务一致性
+        String batchNo = IntactUtils.getUUID();
+        sendIntact(batchNo,"getAuthorizationInfo",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"appId:"+appId+",appSecret:"+appSecret+",code:"+code);
         logger.info("网页授权获取access_token: code:{}", code);
         String requestUrl = WeChatConstants.AUTH_ACCESS_TOKEN_URL.replace("APPID", appId).replace("SECRET", appSecret).replace("CODE", code);
         JSONObject jsonObject = WeChatToolUtil.httpRequest(requestUrl, "GET", null);
@@ -51,6 +57,8 @@ public class WeChatUtils {
             logger.error("获取token失败 errcode:{} errmsg:{}", jsonObject.getInt("errcode"), jsonObject.getString("errmsg"));
 
         }
+        sendIntact(batchNo,"getAuthorizationInfo",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"appId:"+appId+",appSecret"+appSecret+",code:"+code);
+
         return accessToken;
     }
 
@@ -114,4 +122,23 @@ public class WeChatUtils {
         return user;
     }
 
+    /**
+     * 对接新旭事务一致性
+     * @param batchNo
+     * @param methodName
+     * @param status
+     * @param params
+     */
+    public static void sendIntact(String batchNo,String methodName,Integer status,String params){
+        logger.info("开始事务一致性，参数为：batchNo:"+batchNo+",methodName:"+methodName+",status:"+status+",params:"+params);
+        LogParamsReq req = new LogParamsReq();
+        req.setBatchNo(batchNo);
+        req.setMethodName(methodName);
+        req.setStatus(status);
+        req.setParams(params);
+        IntactUtils.sendIntact(req);
+        logger.info("结束事务一致性");
+
+    }
+
 }

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

@@ -59,7 +59,16 @@
     <!--逻辑删除用户-->
     <update id="updateDeleteByPrimaryKey" >
       update account_info set delete_flag=2,modified_time=now(), modified_id=#{map.modifyId} where id=#{map.acctId}
-  </update>
+    </update>
+
+    <update id="updateRevertByAcctIds" parameterType="java.util.List" >
+        update account_info set
+        delete_flag = 1, modified_time = now(), modified_id = 99999999
+        where delete_flag = 2 and id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
 
     <!--更新用户的手机号-->
     <update id="updateMobileByPrimaryKey"

server/src/main/resources/mybatis/AcctPatFamilyMapper.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.AcctPatFamilyMapper" >
+  <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.AcctPatFamily" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="acct_id" property="acctId" jdbcType="INTEGER" />
+    <result column="patient_id" property="patientId" jdbcType="INTEGER" />
+    <result column="relation" property="relation" jdbcType="INTEGER" />
+    <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
+    <result column="created_id" property="createdId" jdbcType="INTEGER" />
+    <result column="created_time" property="createdTime" jdbcType="TIMESTAMP" />
+    <result column="modified_id" property="modifiedId" jdbcType="INTEGER" />
+    <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, acct_id, patient_id, relation, delete_flag, created_id, created_time, modified_id, 
+    modified_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from account_pat_family
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AcctPatFamily" >
+    insert into account_pat_family (id, acct_id, patient_id, 
+      relation, delete_flag, created_id, 
+      created_time, modified_id, modified_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{acctId,jdbcType=INTEGER}, #{patientId,jdbcType=INTEGER}, 
+      #{relation,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
+      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatFamily" >
+    insert into account_pat_family
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="acctId != null" >
+        acct_id,
+      </if>
+      <if test="patientId != null" >
+        patient_id,
+      </if>
+      <if test="relation != null" >
+        relation,
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag,
+      </if>
+      <if test="createdId != null" >
+        created_id,
+      </if>
+      <if test="createdTime != null" >
+        created_time,
+      </if>
+      <if test="modifiedId != null" >
+        modified_id,
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="acctId != null" >
+        #{acctId,jdbcType=INTEGER},
+      </if>
+      <if test="patientId != null" >
+        #{patientId,jdbcType=INTEGER},
+      </if>
+      <if test="relation != null" >
+        #{relation,jdbcType=INTEGER},
+      </if>
+      <if test="deleteFlag != null" >
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatFamily" >
+    update account_pat_family
+    <set >
+      <if test="acctId != null" >
+        acct_id = #{acctId,jdbcType=INTEGER},
+      </if>
+      <if test="patientId != null" >
+        patient_id = #{patientId,jdbcType=INTEGER},
+      </if>
+      <if test="relation != null" >
+        relation = #{relation,jdbcType=INTEGER},
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        created_id = #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        created_time = #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        modified_id = #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.AcctPatFamily" >
+    update account_pat_family
+    set acct_id = #{acctId,jdbcType=INTEGER},
+      patient_id = #{patientId,jdbcType=INTEGER},
+      relation = #{relation,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      created_id = #{createdId,jdbcType=INTEGER},
+      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      modified_id = #{modifiedId,jdbcType=INTEGER},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getListByAcctId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where acct_id = #{acctId,jdbcType=INTEGER}
+    and delete_flag = 1;
+  </select>
+
+  <select id="getSelfByAcctId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where acct_id = #{acctId,jdbcType=INTEGER} and relation = 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getSelfListByAcctIds" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where acct_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    and relation = 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getByPatIdSelf" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id = #{patientId,jdbcType=INTEGER}
+    and relation = 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getListByPatIdSelfs" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    and relation = 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getByPatIdNotSelf" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id = #{patientId,jdbcType=INTEGER}
+    AND relation != 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getListByPatIdNotSelfs" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    AND relation != 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getListByPatIds" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    and delete_flag = 1;
+  </select>
+
+  <select id="getMemberListByPatIds" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    AND relation != 1
+    and delete_flag = 1;
+  </select>
+
+  <select id="getByPatIdSelfList" parameterType="java.util.List" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_family
+    where patient_id IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+    and relation = 1
+    and delete_flag = 1;
+  </select>
+
+  <insert id="initBatch" parameterType="java.util.List">
+    insert into account_pat_family(
+    acct_id, patient_id,relation,
+    delete_flag, created_id, created_time,
+    modified_id, modified_time
+    )
+    values
+    <foreach collection="list" item="item" index="index" separator=",">
+      (
+      #{item.acctId},#{item.patientId},#{item.relation},
+      1,99999999,now(),
+      99999999,now()
+      )
+    </foreach>
+  </insert>
+
+  <select id="queryPatIdByPage" parameterType="java.util.Map" resultType="java.lang.Integer" >
+    select
+    distinct(patient_id)
+    from account_pat_family
+    where delete_flag = 1
+    order by id asc
+    limit #{begin},#{end}
+  </select>
+
+</mapper>
\ No newline at end of file

server/src/main/resources/mybatis/AcctPatInfoMapper.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.AcctPatInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.AcctPatInfo" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="mobile_phone" property="mobilePhone" jdbcType="VARCHAR" />
+    <result column="password" property="password" jdbcType="VARCHAR" />
+    <result column="register_product" property="registerProduct" jdbcType="INTEGER" />
+    <result column="register_source" property="registerSource" jdbcType="INTEGER" />
+    <result column="birthday" property="birthday" jdbcType="DATE" />
+    <result column="age" property="age" jdbcType="INTEGER" />
+    <result column="sex" property="sex" jdbcType="TINYINT" />
+    <result column="id_card" property="idCard" jdbcType="VARCHAR" />
+    <result column="reg_time" property="regTime" jdbcType="TIMESTAMP" />
+    <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
+    <result column="created_id" property="createdId" jdbcType="INTEGER" />
+    <result column="created_time" property="createdTime" jdbcType="TIMESTAMP" />
+    <result column="modified_id" property="modifiedId" jdbcType="INTEGER" />
+    <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, name, mobile_phone, password, register_product, register_source, birthday, age, 
+    sex, id_card, reg_time, delete_flag, created_id, created_time, modified_id, modified_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from account_pat_info
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from account_pat_info
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AcctPatInfo" useGeneratedKeys="true" keyProperty="id" >
+    insert into account_pat_info (id, name, mobile_phone, 
+      password, register_product, register_source, 
+      birthday, age, sex, id_card, 
+      reg_time, delete_flag, created_id, 
+      created_time, modified_id, modified_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{mobilePhone,jdbcType=VARCHAR}, 
+      #{password,jdbcType=VARCHAR}, #{registerProduct,jdbcType=INTEGER}, #{registerSource,jdbcType=INTEGER}, 
+      #{birthday,jdbcType=DATE}, #{age,jdbcType=INTEGER}, #{sex,jdbcType=TINYINT}, #{idCard,jdbcType=VARCHAR}, 
+      #{regTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
+      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatInfo" >
+    insert into account_pat_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="mobilePhone != null" >
+        mobile_phone,
+      </if>
+      <if test="password != null" >
+        password,
+      </if>
+      <if test="registerProduct != null" >
+        register_product,
+      </if>
+      <if test="registerSource != null" >
+        register_source,
+      </if>
+      <if test="birthday != null" >
+        birthday,
+      </if>
+      <if test="age != null" >
+        age,
+      </if>
+      <if test="sex != null" >
+        sex,
+      </if>
+      <if test="idCard != null" >
+        id_card,
+      </if>
+      <if test="regTime != null" >
+        reg_time,
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag,
+      </if>
+      <if test="createdId != null" >
+        created_id,
+      </if>
+      <if test="createdTime != null" >
+        created_time,
+      </if>
+      <if test="modifiedId != null" >
+        modified_id,
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="mobilePhone != null" >
+        #{mobilePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null" >
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="registerProduct != null" >
+        #{registerProduct,jdbcType=INTEGER},
+      </if>
+      <if test="registerSource != null" >
+        #{registerSource,jdbcType=INTEGER},
+      </if>
+      <if test="birthday != null" >
+        #{birthday,jdbcType=DATE},
+      </if>
+      <if test="age != null" >
+        #{age,jdbcType=INTEGER},
+      </if>
+      <if test="sex != null" >
+        #{sex,jdbcType=TINYINT},
+      </if>
+      <if test="idCard != null" >
+        #{idCard,jdbcType=VARCHAR},
+      </if>
+      <if test="regTime != null" >
+        #{regTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteFlag != null" >
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatInfo" >
+    update account_pat_info
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="mobilePhone != null" >
+        mobile_phone = #{mobilePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null" >
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="registerProduct != null" >
+        register_product = #{registerProduct,jdbcType=INTEGER},
+      </if>
+      <if test="registerSource != null" >
+        register_source = #{registerSource,jdbcType=INTEGER},
+      </if>
+      <if test="birthday != null" >
+        birthday = #{birthday,jdbcType=DATE},
+      </if>
+      <if test="age != null" >
+        age = #{age,jdbcType=INTEGER},
+      </if>
+      <if test="sex != null" >
+        sex = #{sex,jdbcType=TINYINT},
+      </if>
+      <if test="idCard != null" >
+        id_card = #{idCard,jdbcType=VARCHAR},
+      </if>
+      <if test="regTime != null" >
+        reg_time = #{regTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        created_id = #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        created_time = #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        modified_id = #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.AcctPatInfo" >
+    update account_pat_info
+    set name = #{name,jdbcType=VARCHAR},
+      mobile_phone = #{mobilePhone,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      register_product = #{registerProduct,jdbcType=INTEGER},
+      register_source = #{registerSource,jdbcType=INTEGER},
+      birthday = #{birthday,jdbcType=DATE},
+      age = #{age,jdbcType=INTEGER},
+      sex = #{sex,jdbcType=TINYINT},
+      id_card = #{idCard,jdbcType=VARCHAR},
+      reg_time = #{regTime,jdbcType=TIMESTAMP},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      created_id = #{createdId,jdbcType=INTEGER},
+      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      modified_id = #{modifiedId,jdbcType=INTEGER},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.pica.cloud.account.account.server.entity.AcctPatInfo" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_info
+    where delete_flag = 1
+    <if test="mobilePhone != null" >
+      AND mobile_phone = #{mobilePhone,jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <select id="getListByMobiles" resultMap="BaseResultMap" parameterType="java.util.List" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_info
+    where delete_flag = 1
+    and mobile_phone IN
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </select>
+
+
+  <insert id="initBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+    insert into account_pat_info(
+    name, mobile_phone,
+    password, register_product,register_source,
+    birthday, age, sex,id_card,reg_time,
+    delete_flag, created_id, created_time,
+    modified_id, modified_time
+    )
+    values
+    <foreach collection="list" item="item" index="index" separator=",">
+      (
+      #{item.name},#{item.mobilePhone},
+      null,2,6,
+      null,null,null,null,now(),
+      1,99999999,now(),
+      99999999,now()
+      )
+    </foreach>
+  </insert>
+
+</mapper>
\ No newline at end of file

server/src/main/resources/mybatis/AcctPatUnionMapper.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.AcctPatUnionMapper" >
+  <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.AcctPatUnion" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="acct_id" property="acctId" jdbcType="INTEGER" />
+    <result column="union_type" property="unionType" jdbcType="INTEGER" />
+    <result column="union_id" property="unionId" jdbcType="VARCHAR" />
+    <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
+    <result column="created_id" property="createdId" jdbcType="INTEGER" />
+    <result column="created_time" property="createdTime" jdbcType="TIMESTAMP" />
+    <result column="modified_id" property="modifiedId" jdbcType="INTEGER" />
+    <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, acct_id, union_type, union_id, delete_flag, created_id, created_time, modified_id, 
+    modified_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from account_pat_union
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from account_pat_union
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AcctPatUnion" >
+    insert into account_pat_union (id, acct_id, union_type, 
+      union_id, delete_flag, created_id, 
+      created_time, modified_id, modified_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{acctId,jdbcType=INTEGER}, #{unionType,jdbcType=INTEGER}, 
+      #{unionId,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
+      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatUnion" >
+    insert into account_pat_union
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="acctId != null" >
+        acct_id,
+      </if>
+      <if test="unionType != null" >
+        union_type,
+      </if>
+      <if test="unionId != null" >
+        union_id,
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag,
+      </if>
+      <if test="createdId != null" >
+        created_id,
+      </if>
+      <if test="createdTime != null" >
+        created_time,
+      </if>
+      <if test="modifiedId != null" >
+        modified_id,
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="acctId != null" >
+        #{acctId,jdbcType=INTEGER},
+      </if>
+      <if test="unionType != null" >
+        #{unionType,jdbcType=INTEGER},
+      </if>
+      <if test="unionId != null" >
+        #{unionId,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.AcctPatUnion" >
+    update account_pat_union
+    <set >
+      <if test="acctId != null" >
+        acct_id = #{acctId,jdbcType=INTEGER},
+      </if>
+      <if test="unionType != null" >
+        union_type = #{unionType,jdbcType=INTEGER},
+      </if>
+      <if test="unionId != null" >
+        union_id = #{unionId,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        created_id = #{createdId,jdbcType=INTEGER},
+      </if>
+      <if test="createdTime != null" >
+        created_time = #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        modified_id = #{modifiedId,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.AcctPatUnion" >
+    update account_pat_union
+    set acct_id = #{acctId,jdbcType=INTEGER},
+      union_type = #{unionType,jdbcType=INTEGER},
+      union_id = #{unionId,jdbcType=VARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      created_id = #{createdId,jdbcType=INTEGER},
+      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      modified_id = #{modifiedId,jdbcType=INTEGER},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByUnionId" parameterType="java.lang.String" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_union
+    where union_id = #{unionId,jdbcType=VARCHAR}
+    and delete_flag = 1;
+  </select>
+
+  <select id="selectByAcctId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from account_pat_union
+    where acct_id = #{acctId,jdbcType=INTEGER}
+    and delete_flag = 1;
+  </select>
+
+  <insert id="initBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+    insert into account_pat_union(
+    acct_id, union_type, union_id,
+    delete_flag, created_id, created_time,
+    modified_id, modified_time
+    )
+    values
+    <foreach collection="list" item="item" index="index" separator=",">
+      (
+      #{item.acctId},#{item.unionType},#{item.unionId},
+      1,99999999,now(),
+      99999999,now()
+      )
+    </foreach>
+  </insert>
+
+</mapper>
\ No newline at end of file

server/src/main/resources/mybatis/DoctorEducationMapper.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.DoctorEducationMapper" >
+  <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.DoctorEducation" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="doctor_id" property="doctorId" jdbcType="INTEGER" />
+    <result column="school_name" property="schoolName" jdbcType="VARCHAR" />
+    <result column="major_id" property="majorId" jdbcType="INTEGER" />
+    <result column="major_name" property="majorName" jdbcType="VARCHAR" />
+    <result column="education_id" property="educationId" jdbcType="VARCHAR" />
+    <result column="education_name" property="educationName" jdbcType="VARCHAR" />
+    <result column="year" property="year" jdbcType="VARCHAR" />
+    <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
+    <result column="creat_id" property="creatId" jdbcType="INTEGER" />
+    <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
+    <result column="modify_id" property="modifyId" jdbcType="INTEGER" />
+    <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP" />
+    <result column="graduated_year" property="graduatedYear" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, doctor_id, school_name, major_id, major_name, education_id, education_name, year, 
+    delete_flag, creat_id, creat_time, modify_id, modify_time, graduated_year
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from p_doctor_education
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from p_doctor_education
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.DoctorEducation" >
+    insert into p_doctor_education (id, doctor_id, school_name, 
+      major_id, major_name, education_id, 
+      education_name, year, delete_flag, 
+      creat_id, creat_time, modify_id, 
+      modify_time, graduated_year)
+    values (#{id,jdbcType=INTEGER}, #{doctorId,jdbcType=INTEGER}, #{schoolName,jdbcType=VARCHAR}, 
+      #{majorId,jdbcType=INTEGER}, #{majorName,jdbcType=VARCHAR}, #{educationId,jdbcType=VARCHAR}, 
+      #{educationName,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, 
+      #{creatId,jdbcType=INTEGER}, #{creatTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER}, 
+      #{modifyTime,jdbcType=TIMESTAMP}, #{graduatedYear,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.DoctorEducation" >
+    insert into p_doctor_education
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="doctorId != null" >
+        doctor_id,
+      </if>
+      <if test="schoolName != null" >
+        school_name,
+      </if>
+      <if test="majorId != null" >
+        major_id,
+      </if>
+      <if test="majorName != null" >
+        major_name,
+      </if>
+      <if test="educationId != null" >
+        education_id,
+      </if>
+      <if test="educationName != null" >
+        education_name,
+      </if>
+      <if test="year != null" >
+        year,
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag,
+      </if>
+      <if test="creatId != null" >
+        creat_id,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+      <if test="modifyId != null" >
+        modify_id,
+      </if>
+      <if test="modifyTime != null" >
+        modify_time,
+      </if>
+      <if test="graduatedYear != null" >
+        graduated_year,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="doctorId != null" >
+        #{doctorId,jdbcType=INTEGER},
+      </if>
+      <if test="schoolName != null" >
+        #{schoolName,jdbcType=VARCHAR},
+      </if>
+      <if test="majorId != null" >
+        #{majorId,jdbcType=INTEGER},
+      </if>
+      <if test="majorName != null" >
+        #{majorName,jdbcType=VARCHAR},
+      </if>
+      <if test="educationId != null" >
+        #{educationId,jdbcType=VARCHAR},
+      </if>
+      <if test="educationName != null" >
+        #{educationName,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null" >
+        #{year,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="creatId != null" >
+        #{creatId,jdbcType=INTEGER},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyId != null" >
+        #{modifyId,jdbcType=INTEGER},
+      </if>
+      <if test="modifyTime != null" >
+        #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="graduatedYear != null" >
+        #{graduatedYear,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.DoctorEducation" >
+    update p_doctor_education
+    <set >
+      <if test="doctorId != null" >
+        doctor_id = #{doctorId,jdbcType=INTEGER},
+      </if>
+      <if test="schoolName != null" >
+        school_name = #{schoolName,jdbcType=VARCHAR},
+      </if>
+      <if test="majorId != null" >
+        major_id = #{majorId,jdbcType=INTEGER},
+      </if>
+      <if test="majorName != null" >
+        major_name = #{majorName,jdbcType=VARCHAR},
+      </if>
+      <if test="educationId != null" >
+        education_id = #{educationId,jdbcType=VARCHAR},
+      </if>
+      <if test="educationName != null" >
+        education_name = #{educationName,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="creatId != null" >
+        creat_id = #{creatId,jdbcType=INTEGER},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyId != null" >
+        modify_id = #{modifyId,jdbcType=INTEGER},
+      </if>
+      <if test="modifyTime != null" >
+        modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="graduatedYear != null" >
+        graduated_year = #{graduatedYear,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.DoctorEducation" >
+    update p_doctor_education
+    set doctor_id = #{doctorId,jdbcType=INTEGER},
+      school_name = #{schoolName,jdbcType=VARCHAR},
+      major_id = #{majorId,jdbcType=INTEGER},
+      major_name = #{majorName,jdbcType=VARCHAR},
+      education_id = #{educationId,jdbcType=VARCHAR},
+      education_name = #{educationName,jdbcType=VARCHAR},
+      year = #{year,jdbcType=VARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      creat_id = #{creatId,jdbcType=INTEGER},
+      creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      modify_id = #{modifyId,jdbcType=INTEGER},
+      modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+      graduated_year = #{graduatedYear,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <update id="updateRevertByDocIds" parameterType="java.util.List" >
+    update p_doctor_education
+    set
+    delete_flag = 1,
+    modify_id = 99999999,
+    modify_time = now()
+    where delete_flag = 2 and doctor_id in
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </update>
+</mapper>
\ No newline at end of file

server/src/main/resources/mybatis/DoctorHospitalMapper.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.DoctorHospitalMapper" >
+  <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.DoctorHospital" >
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="doctor_id" property="doctorId" jdbcType="BIGINT" />
+    <result column="hospital_id" property="hospitalId" jdbcType="BIGINT" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="sys_code" property="sysCode" jdbcType="INTEGER" />
+    <result column="memo" property="memo" jdbcType="VARCHAR" />
+    <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
+    <result column="created_id" property="createdId" jdbcType="BIGINT" />
+    <result column="created_time" property="createdTime" jdbcType="TIMESTAMP" />
+    <result column="modified_id" property="modifiedId" jdbcType="BIGINT" />
+    <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, doctor_id, hospital_id, status, sys_code, memo, delete_flag, created_id, created_time, 
+    modified_id, modified_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    select 
+    <include refid="Base_Column_List" />
+    from doctor_hospital
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from doctor_hospital
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.DoctorHospital" >
+    insert into doctor_hospital (id, doctor_id, hospital_id, 
+      status, sys_code, memo, 
+      delete_flag, created_id, created_time, 
+      modified_id, modified_time)
+    values (#{id,jdbcType=BIGINT}, #{doctorId,jdbcType=BIGINT}, #{hospitalId,jdbcType=BIGINT}, 
+      #{status,jdbcType=INTEGER}, #{sysCode,jdbcType=INTEGER}, #{memo,jdbcType=VARCHAR}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=BIGINT}, #{createdTime,jdbcType=TIMESTAMP}, 
+      #{modifiedId,jdbcType=BIGINT}, #{modifiedTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.DoctorHospital" >
+    insert into doctor_hospital
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="doctorId != null" >
+        doctor_id,
+      </if>
+      <if test="hospitalId != null" >
+        hospital_id,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="sysCode != null" >
+        sys_code,
+      </if>
+      <if test="memo != null" >
+        memo,
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag,
+      </if>
+      <if test="createdId != null" >
+        created_id,
+      </if>
+      <if test="createdTime != null" >
+        created_time,
+      </if>
+      <if test="modifiedId != null" >
+        modified_id,
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="doctorId != null" >
+        #{doctorId,jdbcType=BIGINT},
+      </if>
+      <if test="hospitalId != null" >
+        #{hospitalId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sysCode != null" >
+        #{sysCode,jdbcType=INTEGER},
+      </if>
+      <if test="memo != null" >
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        #{createdId,jdbcType=BIGINT},
+      </if>
+      <if test="createdTime != null" >
+        #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        #{modifiedId,jdbcType=BIGINT},
+      </if>
+      <if test="modifiedTime != null" >
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.DoctorHospital" >
+    update doctor_hospital
+    <set >
+      <if test="doctorId != null" >
+        doctor_id = #{doctorId,jdbcType=BIGINT},
+      </if>
+      <if test="hospitalId != null" >
+        hospital_id = #{hospitalId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sysCode != null" >
+        sys_code = #{sysCode,jdbcType=INTEGER},
+      </if>
+      <if test="memo != null" >
+        memo = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteFlag != null" >
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createdId != null" >
+        created_id = #{createdId,jdbcType=BIGINT},
+      </if>
+      <if test="createdTime != null" >
+        created_time = #{createdTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedId != null" >
+        modified_id = #{modifiedId,jdbcType=BIGINT},
+      </if>
+      <if test="modifiedTime != null" >
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.DoctorHospital" >
+    update doctor_hospital
+    set doctor_id = #{doctorId,jdbcType=BIGINT},
+      hospital_id = #{hospitalId,jdbcType=BIGINT},
+      status = #{status,jdbcType=INTEGER},
+      sys_code = #{sysCode,jdbcType=INTEGER},
+      memo = #{memo,jdbcType=VARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      created_id = #{createdId,jdbcType=BIGINT},
+      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      modified_id = #{modifiedId,jdbcType=BIGINT},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <update id="updateRevertByDocIds" parameterType="java.util.List" >
+    update doctor_hospital
+    set
+    delete_flag = 1,
+    modified_id = 99999999,
+    modified_time = now()
+    where delete_flag = 2 and doctor_id in
+    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </update>
+</mapper>
\ No newline at end of file

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

@@ -1045,4 +1045,23 @@
     <select id="getAcctIdByDoctorId" resultType="java.lang.Integer" parameterType="java.lang.Long">
       select acct_id from p_doctor where id = #{id}
     </select>
+
+    <select id="getRevertListByDoctorIds" resultMap="BaseResultMap" parameterType="java.util.List">
+        select * from p_doctor where delete_flag = 2
+        and id IN
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <update id="updateRevertByIdList"  parameterType="java.util.List">
+        update p_doctor
+        set delete_flag = 1, modify_time = now(), modify_id = 99999999
+        where delete_flag = 2 and id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+
 </mapper>
\ No newline at end of file