Merge branch 'test'

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/QueryDoctorsDTO.java

 package com.ebaiyihui.family.doctor.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -17,4 +18,12 @@ public class QueryDoctorsDTO extends QueryFamousDTO {
      * 新冠门诊多科室
      */
     private List<Long> depts;
+
+
+    @ApiModelProperty("权益包id")
+    private String packageOrderId;
+
+    @ApiModelProperty("签约关联id")
+    private Long signSeqId;
+
 }

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/PatientSignService.java

@@ -48,7 +48,7 @@ public interface PatientSignService {
 
     List<PatientSignEntity> selectList(PatientSignEntity patientSignEntity);
 
-    List<PatientSignEntity> getListByPhone(String phone);
+    List<PatientSignEntity> getListByPhone(String phone, String activateOrderId);
 
     int updateById(PatientSignEntity patientSignEntity);
 

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/DoctorServiceImpl.java

@@ -13,6 +13,7 @@ import com.ebaiyihui.family.doctor.common.dto.*;
 import com.ebaiyihui.family.doctor.common.vo.*;
 import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
 import com.ebaiyihui.family.doctor.server.common.enums.SignStatus;
+import com.ebaiyihui.family.doctor.server.common.enums.StatusEnum;
 import com.ebaiyihui.family.doctor.server.entity.PatientEntity;
 import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 import com.ebaiyihui.family.doctor.server.entity.ServiceConfigEntity;
@@ -84,6 +85,7 @@ public class DoctorServiceImpl implements DoctorService {
         patientSignEntity.setPatientId(reqVo.getPatientId());
         patientSignEntity.setOrganId(reqVo.getOrganId());
         patientSignEntity.setSignStatus(SignStatus.SIGNED.getValue());
+        patientSignEntity.setPackageOrderId(reqVo.getPackageOrderId());
 
         QueryWrapper<PatientEntity> pWrapper = new QueryWrapper<>();
         PatientEntity patient = new PatientEntity();
@@ -157,6 +159,26 @@ public class DoctorServiceImpl implements DoctorService {
 //        if (LastSignFlag) {
 //            isLastSign(reqVo, doctorListVos, wOrganId, entity, doctorZxwzService);
 //        }
+
+        // 过滤签约过的医生信息
+        if (Objects.isNull(reqVo.getSignSeqId()) && Objects.nonNull(reqVo.getPackageOrderId())) {
+            QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
+            PatientSignEntity patientSign = new PatientSignEntity();
+//            patientSign.setPackageOrderId(reqVo.getPackageOrderId());
+            patientSign.setPatientId(reqVo.getPatientId());
+            patientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
+            patientSign.setSignStatus(SignStatus.SIGNED.getValue());
+            psWrapper.setEntity(patientSign);
+            psWrapper.notIn("package_order_id", reqVo.getPackageOrderId());
+            List<PatientSignEntity> patientSignEntities = patientSignMapper.selectList(psWrapper);
+            log.info("patientSignEntities={}", patientSignEntities);
+            if (!patientSignEntities.isEmpty()) {
+                List<Long> patientDoctorIds = patientSignEntities.stream().map(PatientSignEntity::getDoctorId).collect(Collectors.toList());
+                log.info("patientDoctorIds={}", patientDoctorIds);
+                doctorListVos = doctorListVos.stream().filter(doctorListVo -> !patientDoctorIds.contains(Long.valueOf(doctorListVo.getDoctorId()))).collect(Collectors.toList());
+            }
+        }
+
         pageResult.setPageNum(reqVo.getPageNum());
         pageResult.setPageSize(doctorListVos.size());
 //        pageResult.setPageSize(reqVo.getPageSize());
@@ -178,8 +200,7 @@ public class DoctorServiceImpl implements DoctorService {
         businessDoctorPageReqVo.setPageSize(9999);
         businessDoctorPageReqVo.setServiceCode(ImConstants.IM_QUERY_ACCOUNT_CODE);
 
-        BaseResponse<PageResult<DoctorBasicRespVO>> result =
-                doctorWorkingServiceClient.getBusinessDoctorBaseInfoPage(businessDoctorPageReqVo);
+        BaseResponse<PageResult<DoctorBasicRespVO>> result = doctorWorkingServiceClient.getBusinessDoctorBaseInfoPage(businessDoctorPageReqVo);
         if (!result.isSuccess()) {
             return BaseResponse.error("医生查询失败");
         }
@@ -408,8 +429,7 @@ public class DoctorServiceImpl implements DoctorService {
             BeanUtils.copyProperties(reqVo, businessDoctorPageReqVo);
             businessDoctorPageReqVo.setServiceCode(reqVo.getServiceCodes());
             log.info("医生数据入参" + JSON.toJSONString(businessDoctorPageReqVo));
-            BaseResponse<PageResult<DoctorBasicRespVO>> businessDoctorPage =
-                    doctorWorkingServiceClient.getBusinessDoctorBaseInfoPage(businessDoctorPageReqVo);
+            BaseResponse<PageResult<DoctorBasicRespVO>> businessDoctorPage = doctorWorkingServiceClient.getBusinessDoctorBaseInfoPage(businessDoctorPageReqVo);
             log.info("医生数据出参" + JSON.toJSONString(businessDoctorPage.getData()));
             if (null == businessDoctorPage.getData()) {
                 return new ArrayList<>();

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -30,6 +30,7 @@ import com.ebaiyihui.family.doctor.server.util.UUIDUtil;
 import com.ebaiyihui.family.doctor.server.vo.OrderTaskVo;
 import com.ebaiyihui.framework.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -111,72 +112,71 @@ public class PatientServiceImpl implements PatientService {
             patientSign.setAdmId(reqVo.getAdmId());
             psWrapper.setEntity(patientSign);
             oldPatientSignEntity = patientSignMapper.selectOne(psWrapper);
-        }
-
-        if (!SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) {
-            Integer signStatus = SignStatus.SIGNED.getValue();
-            Integer status = StatusEnum.IN_CONSULTATION.getValue();
-            if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
-                signStatus = SignStatus.CANCEL.getValue();
-                status = StatusEnum.FINISH_APPLY.getValue();
-            }
-            List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
-                    signStatus, status);
-            if (!patientSignEntities.isEmpty()) {
-                if (!SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
-                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
-                }
-                PatientSignEntity patientSignEntity = patientSignEntities.get(0);
             Date signCreateTime = oldPatientSignEntity.getCreateTime();
+            PatientSignEntity tempOldPatientSignEntity = new PatientSignEntity();
+            BeanUtils.copyProperties(oldPatientSignEntity, tempOldPatientSignEntity);
+            log.info("tempOldPatientSignEntity={}", tempOldPatientSignEntity);
+            log.info("入参查询oldPatientSignEntity={}", oldPatientSignEntity);
+            if (!oldPatientSignEntity.getSignId().equals(0L)) {
+                QueryWrapper<PatientSignEntity> cpsWrapper = new QueryWrapper<>();
+                PatientSignEntity cPatientSign = new PatientSignEntity();
+                cPatientSign.setId(oldPatientSignEntity.getSignId());
+                cpsWrapper.setEntity(cPatientSign);
+                oldPatientSignEntity = patientSignMapper.selectOne(cpsWrapper);
+                log.info("改签查询原始oldPatientSignEntity={}", oldPatientSignEntity);
+
+            }
+            // 改签查询原始签约信息
+            if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
+                if (!oldPatientSignEntity.getSignId().equals(0L)) {
                     log.info("signCreateTime={}, signStartTime={}, signEndTime={}", signCreateTime, signStartTime, signEndTime);
                     if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
                         return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
                     }
-                oldPatientSignEntity = patientSignEntity;
                 }
+                // 处理换绑医生
+                if ((!StringUtils.isEmpty(reqVo.getAdmId()) || !StringUtils.isEmpty(reqVo.getSignSeqId()))) {
+                    if (Objects.nonNull(tempOldPatientSignEntity)) {
+                        signEndTime = tempOldPatientSignEntity.getSignEndTime();
+                        tempOldPatientSignEntity.setStatus(StatusEnum.FINISH_APPLY.getValue());
+                        tempOldPatientSignEntity.setSignStatus(SignStatus.CANCEL.getValue());
+                        tempOldPatientSignEntity.setSubStatus(2);
+                        tempOldPatientSignEntity.setSignEndTime(curDate);
+                        patientSignMapper.updateById(tempOldPatientSignEntity);
                     } else {
-            QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
-            PatientSignEntity patientSign = new PatientSignEntity();
-            patientSign.setSignId(oldPatientSignEntity.getId());
-            patientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
-            patientSign.setSignStatus(SignStatus.NORMAL.getValue());
-            psWrapper.setEntity(patientSign);
-            PatientSignEntity patientSignEntity = patientSignMapper.selectOne(psWrapper);
+                        return BaseResponse.error("未查询到的签约医生，不能进行改签！！！");
+                    }
+                }
+
+
+            } else if (SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) { // 排班签约信息
+                QueryWrapper<PatientSignEntity> nPsWrapper = new QueryWrapper<>();
+                PatientSignEntity nPatientSign = new PatientSignEntity();
+                nPatientSign.setSignId(oldPatientSignEntity.getId());
+                nPatientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
+                nPatientSign.setSignStatus(SignStatus.NORMAL.getValue());
+                nPsWrapper.setEntity(nPatientSign);
+                PatientSignEntity patientSignEntity = patientSignMapper.selectOne(nPsWrapper);
                 if (Objects.nonNull(patientSignEntity)) {
                     return BaseResponse.success(patientSignEntity.getAdmId());
                 }
 
                 // 查询排班医生信息
-            ScheduleRecordEntity scheduleRecordEntity = getScheduleDoctor(reqVo.getPatientId(), oldPatientSignEntity.getDoctorId());
+                ScheduleRecordEntity scheduleRecordEntity = getScheduleDoctor(reqVo.getPatientId(), reqVo.getPackageOrderId(), tempOldPatientSignEntity.getDoctorId());
                 doctorId = Long.valueOf(scheduleRecordEntity.getDoctorId());
                 doctorName = scheduleRecordEntity.getDoctorName();
                 deptId = Long.valueOf(scheduleRecordEntity.getDeptId());
                 deptName = scheduleRecordEntity.getDeptName();
             }
-
-
-        // 处理换绑医生
-        if ((!StringUtils.isEmpty(reqVo.getAdmId()) || !StringUtils.isEmpty(reqVo.getSignSeqId()))
-                && SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
-            QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
-            PatientSignEntity patientSign = new PatientSignEntity();
-            if (Objects.nonNull(reqVo.getAdmId())) {
-                patientSign.setAdmId(reqVo.getAdmId());
-            }
-            if (Objects.nonNull(reqVo.getSignSeqId())) {
-                patientSign.setId(Long.valueOf(reqVo.getSignSeqId()));
+        } else { // 首次签约
+            Integer signStatus = SignStatus.SIGNED.getValue();
+            Integer status = StatusEnum.IN_CONSULTATION.getValue();
+            List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
+                    signStatus, status);
+            if (!patientSignEntities.isEmpty()) {
+                if (SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
+                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
                 }
-            psWrapper.setEntity(patientSign);
-            PatientSignEntity patientSignEntity = patientSignMapper.selectOne(psWrapper);
-            if (Objects.nonNull(patientSignEntity)) {
-                signEndTime = patientSignEntity.getSignEndTime();
-                patientSignEntity.setStatus(StatusEnum.FINISH_APPLY.getValue());
-                patientSignEntity.setSignStatus(SignStatus.CANCEL.getValue());
-                patientSignEntity.setSubStatus(2);
-                patientSignEntity.setSignEndTime(curDate);
-                patientSignMapper.updateById(patientSignEntity);
-            } else {
-                return BaseResponse.error("未查询到的签约医生，不能进行改签！！！");
             }
         }
 
@@ -310,12 +310,13 @@ public class PatientServiceImpl implements PatientService {
      * @param patientId
      * @return
      */
-    public ScheduleRecordEntity getScheduleDoctor(String patientId, Long doctorId) {
+    public ScheduleRecordEntity getScheduleDoctor(String patientId, String packageOrderId, Long doctorId) {
         String date = DateUtils.dateToSimpleString(new Date());
         String hourAndSecond = DateUtils.getHourAndSecond();
         QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
         PatientSignEntity patientSign = new PatientSignEntity();
         patientSign.setPatientId(patientId);
+        patientSign.setPackageOrderId(packageOrderId);
         patientSign.setSignStatus(SignStatus.NORMAL.getValue());
         patientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
         psWrapper.setEntity(patientSign);

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientSignServiceImpl.java

@@ -184,28 +184,22 @@ public class PatientSignServiceImpl implements PatientSignService {
     public BaseResponse<PageUtil<ImInfoListResVo>> queryImInfoList(ImInfoListDocReqDTO param) {
         param.setPageNum((param.getPageNum() - 1) * param.getPageSize());
         List<ImInfoListResVo> records = patientSignMapper.queryImInfoList(param);
-        //根据患者id分组
-        Map<String, List<ImInfoListResVo>> collect =
-                records.stream().collect(Collectors.groupingBy(ImInfoListResVo::getPatientId));
-
 
         List<ImInfoListResVo> resVo = new ArrayList<>();
-        for (String key : collect.keySet()) {
-            List<ImInfoListResVo> zkFbImInfoListResVos = collect.get(key);
-            List<String> admIds = zkFbImInfoListResVos.stream().map(ImInfoListResVo::getAdmId).collect(Collectors.toList());
-            ImInfoListResVo record = zkFbImInfoListResVos.get(0);
-            Integer age = IDCardUtil.getAge(record.getCredNo());
-            Integer gender = IDCardUtil.getGenderForInteger(record.getCredNo());
-
-            record.setAge(age);
-            record.setGender(gender);
+        for (ImInfoListResVo imInfoListResVo : records) {
+            Integer age = IDCardUtil.getAge(imInfoListResVo.getCredNo());
+            Integer gender = IDCardUtil.getGenderForInteger(imInfoListResVo.getCredNo());
 
-            String statusDesc = StatusEnum.getDesc(record.getStatus());
-            record.setStatusDesc(statusDesc);
+            imInfoListResVo.setAge(age);
+            imInfoListResVo.setGender(gender);
 
-            record.setStatus(record.getStatus());
-            record.setAdmIds(admIds);
-            resVo.add(record);
+            String statusDesc = StatusEnum.getDesc(imInfoListResVo.getStatus());
+            imInfoListResVo.setStatusDesc(statusDesc);
+            List<String> admIds = new ArrayList<>();
+            admIds.add(imInfoListResVo.getAdmId());
+            imInfoListResVo.setAdmIds(admIds);
+            imInfoListResVo.setStatus(imInfoListResVo.getStatus());
+            resVo.add(imInfoListResVo);
         }
 
         resVo = resVo.stream().sorted(Comparator.comparing(ImInfoListResVo::getUpdateTime)).collect(Collectors.toList());
@@ -318,10 +312,11 @@ public class PatientSignServiceImpl implements PatientSignService {
     }
 
     @Override
-    public List<PatientSignEntity> getListByPhone(String phone) {
+    public List<PatientSignEntity> getListByPhone(String phone, String activateOrderId) {
         QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
         PatientSignEntity patientSign = new PatientSignEntity();
         patientSign.setPatientPhone(phone);
+        patientSign.setPackageOrderId(activateOrderId);
         psWrapper.setEntity(patientSign);
 //        psWrapper.orderByDesc("create_time");
 //        psWrapper.last("limit 1");

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/ServiceConfigServiceImpl.java

@@ -79,6 +79,14 @@ public class ServiceConfigServiceImpl implements ServiceConfigService {
             throw new BusinessException("未查询到该医生上下线配置信息！");
         }
 
+        String date = DateUtils.dateToSimpleString(new Date());
+        String hourAndSecond = DateUtils.getHourAndSecond();
+        // 查询排班医生信息
+        List<ScheduleRecordEntity> scheduleRecordEntities = scheduleRecordMapper.selectByDate(String.valueOf(CommonConstants.ORGAN_CODE), 5, date, 1, hourAndSecond, serviceConfigEntity.getDoctorId());
+        if (!scheduleRecordEntities.isEmpty()){
+            throw new BusinessException("不能上下线，您今天有值班！");
+        }
+
         serviceConfigEntity.setOfficeStatus(requestOnlineOrOfflineVo.getOfficeStatus());
         int flag = serviceConfigMapper.updateById(serviceConfigEntity);
         if (flag <= 0) {
@@ -88,14 +96,6 @@ public class ServiceConfigServiceImpl implements ServiceConfigService {
                 throw new BusinessException("上线失败");
             }
         }
-        String date = DateUtils.dateToSimpleString(new Date());
-        String hourAndSecond = DateUtils.getHourAndSecond();
-        // 查询排班医生信息
-        List<ScheduleRecordEntity> scheduleRecordEntities = scheduleRecordMapper.selectByDate(String.valueOf(CommonConstants.ORGAN_CODE), 5, date, 1, hourAndSecond, serviceConfigEntity.getDoctorId());
-        if (!scheduleRecordEntities.isEmpty()){
-            throw new BusinessException("不能上下线，您今天有值班！");
-        }
-
         return requestOnlineOrOfflineVo;
     }
 

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/task/SignedTask.java

@@ -202,11 +202,10 @@ public class SignedTask {
                 for (MobileBenefitPackageEntity mbp : mobileBenefitPackageEntities) {
                     Date curTime = new Date();
                     Date endTime = DateUtils.parseDate(mbp.getBenefitsEndTime(), DateUtils.FULL_FORMAT);
-                    List<PatientSignEntity> patientSignEntities = patientSignSevice.getListByPhone(mbp.getPhone());
+                    List<PatientSignEntity> patientSignEntities = patientSignSevice.getListByPhone(mbp.getPhone(), mbp.getActivateOrderId());
                     mbp.setVersion(1);
                     for (PatientSignEntity patientSignEntity : patientSignEntities) {
                         if (endTime.after(curTime)) {
-                            patientSignEntity.setPackageOrderId(mbp.getActivateOrderId());
                             patientSignEntity.setSignEndTime(endTime);
                         } else {
                             if (SignStatus.SIGNED.getValue().equals(patientSignEntity.getSignStatus())