Merge remote-tracking branch 'origin/dev-hospital-0412' into dev-testall-0407

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/service/HospitalSaasUserService.java

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.8</version>
+    <version>1.1.2</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.8</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

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

@@ -2,8 +2,10 @@ package com.pica.cloud.account.account.client;
 
 import com.pica.cloud.account.account.common.dto.AccountWeChatInfoDto;
 import com.pica.cloud.account.account.common.req.AccountInfoReq;
+import com.pica.cloud.account.account.common.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
 import com.pica.cloud.foundation.entity.PicaResponse;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,5 +45,9 @@ public interface AccountInfoClient {
     @GetMapping(value = "/account/info/doctor/openid")
     PicaResponse<Integer> getDoctorByOpenid( @RequestParam(value = "openid") String openid);
 
+    @ApiOperation("机构saas平台人员数量")
+    @PostMapping(value = "/account/saas/hospital/count")
+    PicaResponse<Integer> getSaasUserCount(@RequestBody HospitalSaasUserListReq req);
+
 
 }

common/pom.xml

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

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserListReq.java → common/src/main/java/com/pica/cloud/account/account/common/req/HospitalSaasUserListReq.java

 // Copyright 2016-2101 Pica.
-package com.pica.cloud.account.account.server.req;
+package com.pica.cloud.account.account.common.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 /**
  * @Author qinwh
  * @Date 2022/3/1 16:22
  */
 @ApiModel
-@Data
 public class HospitalSaasUserListReq {
 
     @ApiModelProperty("机构id")
@@ -34,4 +32,59 @@ public class HospitalSaasUserListReq {
     @ApiModelProperty("登录来源  0:运营平台 1:saas")
     private Integer loginFlag = 0;
 
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    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 Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getLoginFlag() {
+        return loginFlag;
+    }
+
+    public void setLoginFlag(Integer loginFlag) {
+        this.loginFlag = loginFlag;
+    }
 }

server/pom.xml

@@ -167,7 +167,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.2</version>
         </dependency>
 
         <dependency>

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

@@ -2,7 +2,7 @@
 package com.pica.cloud.account.account.server.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
+import com.pica.cloud.account.account.common.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDetailResp;
@@ -58,6 +58,13 @@ public class HospitalSaasUserController extends AccountBaseController {
         return PicaResponse.toResponse(hospitalSaasUserService.listByPage(req));
     }
 
+    @ApiOperation("机构saas平台人员数量")
+    @PostMapping(value = "/hospital/count")
+    public PicaResponse<Integer> count(@RequestBody HospitalSaasUserListReq req) {
+        logger.info("list: url:/saas/hospital/count. start: {}", JSON.toJSONString(req));
+        return PicaResponse.toResponse(hospitalSaasUserService.count(req));
+    }
+
     @ApiOperation("机构saas平台人员详情更改查询")
     @GetMapping(value = "/hospital/edit/{id}")
     @EnabledLoginValidate

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

@@ -2,6 +2,7 @@
 package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
+import com.pica.cloud.account.account.common.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDetailResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserEditResp;
@@ -20,6 +21,10 @@ public interface HospitalSaasUserService {
 
     int upsert(HospitalSaasUserReq req, PicaUser picaUser);
 
+    int upsert(HospitalSaasUserReq req, Long doctorId);
+
+    Integer count(HospitalSaasUserListReq req);
+
     int delete(Long id);
 
     HospitalSaasUserDetailResp userDetail(PicaUser user);

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

@@ -8,7 +8,7 @@ import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.enums.SaasRoleEnum;
 import com.pica.cloud.account.account.server.mapper.*;
-import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
+import com.pica.cloud.account.account.common.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.*;
 import com.pica.cloud.account.account.server.service.AccountService;
@@ -16,7 +16,6 @@ import com.pica.cloud.account.account.server.service.HospitalSaasUserService;
 import com.pica.cloud.account.account.server.service.PasswordService;
 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.ExecutorServiceUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
@@ -184,14 +183,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
 
     @Override
     public HospitalSaasUserResp listByPage(HospitalSaasUserListReq req) {
-        Map<String, Object> map = new HashMap<>(5);
-        map.put("hospitalId", req.getHospitalId());
-        map.put("name", req.getName());
-        if (StringUtils.isBlank(req.getMobile()) && Objects.nonNull(req.getMobile()) && req.getMobile().length() >= 1) {
-            map.put("mobile", req.getMobile());
-        } else {
-            map.put("mobile", AESUtil.encryptV0(req.getMobile()));
-        }
+        Map<String, Object> map = this.dealParam(req);
+
         Integer count = accountMapper.listCountByPage(map);
         if (count < 1) {
             return new HospitalSaasUserResp(Collections.emptyList(), 0);
@@ -211,6 +204,24 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         return new HospitalSaasUserResp(lists, count);
     }
 
+    private Map<String, Object> dealParam(HospitalSaasUserListReq req) {
+        Map<String, Object> map = new HashMap<>(5);
+        map.put("hospitalId", req.getHospitalId());
+        map.put("name", req.getName());
+        if (StringUtils.isBlank(req.getMobile()) && Objects.nonNull(req.getMobile()) && req.getMobile().length() >= 1) {
+            map.put("mobile", req.getMobile());
+        } else {
+            map.put("mobile", AESUtil.encryptV0(req.getMobile()));
+        }
+        return map;
+    }
+
+    @Override
+    public Integer count(HospitalSaasUserListReq req) {
+        Map<String, Object> map = this.dealParam(req);
+        return accountMapper.listCountByPage(map);
+    }
+
     @Override
     public int upsert(HospitalSaasUserReq req, PicaUser picaUser) {
         if (Objects.isNull(req) || Objects.isNull(req.getHospitalId()) || CollectionUtils.isEmpty(req.getRoleId())) {