Merge branch 'dev-0801' into 'release'

Dev 0801

See merge request !119

server/pom.xml

@@ -290,6 +290,23 @@
             <artifactId>pica-cloud-applet-client</artifactId>
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.pica.cloud.base.doctor</groupId>
+            <artifactId>pica-cloud-doctor-client</artifactId>
+            <version>2.2.17-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+                    <groupId>org.springframework.cloud</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.pica.cloud.base.doctor</groupId>
+            <artifactId>pica-cloud-doctor-common</artifactId>
+            <version>2.2.17-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -66,4 +66,6 @@ public interface DoctorService {
     void cancelAccountByDoctorId(CancelAccountDto cancelAccountDto, PicaUser fetchPicaUser);
 
     Boolean queryDoctorExistRole(QueryDoctorRole req);
+
+    void joinHospital(String orgName, Integer userId, Integer doctorId, Integer hospitalId);
 }

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

@@ -9,6 +9,7 @@ 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.AccountMapper;
 import com.pica.cloud.account.account.server.service.AccountService;
+import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
@@ -52,6 +53,9 @@ public class AccountServiceImpl implements AccountService {
     @Autowired
     private RegisterService registerService;
 
+    @Autowired
+    private DoctorService doctorService;
+
     //根据ID获取账号
     @Override
     public Account getById(long id) {
@@ -196,7 +200,9 @@ public class AccountServiceImpl implements AccountService {
             return account.getId().intValue();
         }
         if (existAccount.getHospitalId() == null || existAccount.getHospitalId() == 0) {
-            throw new AccountException(AccountExceptionEnum.CRM_MOBILE_NOT_IN_HOSPITAL);
+            doctorService.joinHospital(req.getHospitalName(),picaUser.getId(),existAccount.getId().intValue(),req.getHospitalId());
+//            throw new AccountException(AccountExceptionEnum.CRM_MOBILE_NOT_IN_HOSPITAL);
+            return 0;
         }
         if (!req.getHospitalId().equals(existAccount.getHospitalId())) {
             throw new AccountException(AccountExceptionEnum.CRM_MOBILE_IN_ANOTHER_HOSPITAL.getCode(), AccountExceptionEnum.CRM_MOBILE_IN_ANOTHER_HOSPITAL.getMessage().replace("{hospitalName}", existAccount.getHospital()));

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

@@ -17,6 +17,8 @@ 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.account.account.server.util.HttpUtil;
+import com.pica.cloud.base.doctor.doctor.client.HospitalDepartmentServiceClient;
+import com.pica.cloud.base.doctor.doctor.common.req.HospitalDepartmentReq;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
@@ -74,6 +76,9 @@ public class DoctorServiceImpl implements DoctorService {
     @Autowired
     private ISimpleProducer<String, Object> simpleProducer;
 
+    @Autowired
+    private HospitalDepartmentServiceClient hospitalDepartmentServiceClient;
+
     @Value("${pica.cloud.url}")
     private String picaCloudUrl;
     @Value("${kafka.doctor.change.result.topic}")
@@ -398,5 +403,20 @@ public class DoctorServiceImpl implements DoctorService {
         return kafkaModel;
     }
 
+    @Override
+    public void joinHospital(String orgName, Integer userId, Integer doctorId, Integer hospitalId){
+        HospitalDepartmentReq hosDepartReq = new HospitalDepartmentReq();
+        hosDepartReq.setDoctorId(doctorId.longValue());
+        hosDepartReq.setHospitalId(hospitalId.longValue());
+        hosDepartReq.setOperatorId(userId.longValue());
+        hosDepartReq.setHospital(orgName);
+        hosDepartReq.setOperatorSource(2);
+        try {
+            hospitalDepartmentServiceClient.joinHospital(hosDepartReq);
+        } catch (Exception e) {
+            logger.error("saveIntentionHospital hospitalDepartmentServiceClient.joinHospital error {}", e.getMessage());
+        }
+    }
+
 }
 

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

@@ -11,10 +11,7 @@ import com.pica.cloud.account.account.server.mapper.*;
 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;
-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.service.*;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
@@ -81,6 +78,9 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     @Value("${saas.sticker.id}")
     private Integer saasStickerId;
 
+    @Autowired
+    private DoctorService doctorService;
+
     @Override
     @Transactional
     public int register(HospitalSaasUserReq req, PicaUser picaUser) {
@@ -143,9 +143,11 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             }
             //用户存在的处理逻辑 给出提示信息
             Integer hospitalId = byMobilePhone.getHospitalId();
-            Hospital hospital;
+            Hospital hospital = null;
             if (null == hospitalId || null == (hospital = hospitalMapper.selectByPrimaryKey(hospitalId))){
-                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "该手机号已存在，但未加入机构，请至云鹊医App中加入机构");
+                doctorService.joinHospital(req.getHospitalName(),picaUser.getId(),byMobilePhone.getId().intValue(),req.getHospitalId());
+//                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "该手机号已存在，但未加入机构，请至云鹊医App中加入机构");
+                return 1;
             }
             if (hospitalId.equals(req.getHospitalId())){
                 throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "该手机号已存在本机构中");