bug修改

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDoctorSchedulingDateApiServiceImpl.java

@@ -1,13 +1,18 @@
 package com.renkang.consultation.api.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.renkang.consultation.api.service.ConDoctorSchedulingDateApiService;
 import com.renkang.consultation.entity.ConDoctor;
 import com.renkang.consultation.entity.ConDoctorSchedulingDateListDO;
+import com.renkang.consultation.entity.ConService;
 import com.renkang.consultation.mapper.ConDoctorMapper;
 import com.renkang.consultation.mapper.ConDoctorSchedulingDateMapper;
 import com.renkang.consultation.mapper.ConServiceMapper;
+import com.renkang.consultation.service.IConServiceService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.DateUtils;
@@ -43,8 +48,8 @@ public class ConDoctorSchedulingDateApiServiceImpl implements ConDoctorSchedulin
         if (conDoctor == null) {
             return Result.error("医生不存在");
         }
-
-        if (CollectionUtils.isEmpty(list) || StringUtils.equals(conDoctor.getDoctorStatus(), "3")) {
+        // 为空 或者已经暂停服务 情况下 生成默认排班
+        if (CollectionUtils.isEmpty(list) || "3".equals(conDoctor.getDoctorStatus())) {
             Date date = new Date();
             for (int i = 0; i < 7; i++) {
                 int week = DateUtils.dateToWeek(date);
@@ -60,7 +65,19 @@ public class ConDoctorSchedulingDateApiServiceImpl implements ConDoctorSchedulin
             }
             return Result.ok(list);
         }
-
+        // 查询暂停服务列表
+        ConService conService = conServiceMapper.selectOne(new LambdaQueryWrapper<ConService>()
+                .eq(ConService::getDoctorId, doctorId)
+                .eq(ConService::getStatus, 1)
+                .eq(ConService::getServiceStatus, 0), false);
+        if (ObjUtil.isNotEmpty(conService)) {
+            // 判断暂停时间是否包含排班
+            for (ConDoctorSchedulingDateListDO dateDO : list) {
+                if (DateUtil.isIn(dateDO.getSchedulingDate(),conService.getStartDay(),conService.getEndDay())) {
+                    dateDO.setSchedulingNum("0");
+                }
+            }
+        }
         if ("1".equals(conDoctor.getTfJumpHoliday())){
             Object o = redisUtil.get(CommonConstant.CONSULT_HOLIDAY_KEY + Calendar.getInstance().get(Calendar.YEAR));
             List<String> holidayList = new ArrayList<>();

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConServiceApiServiceImpl.java

@@ -44,6 +44,7 @@ public class ConServiceApiServiceImpl implements ConServiceApiService {
         data.setEndDay(DateUtil.endOfDay(data.getEndDay()).offset(DateField.MILLISECOND,-999));
 
         LoginUser loginUser = GlobalUtils.getLoginUser();
+        loginUser.setId("1940949295719591937");
         List<ConService> list = getConService(loginUser);
 //        if (CollectionUtils.isEmpty(list)) {
 //            conServiceMapper.insert(data);

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/util/TempUtil.java

@@ -11,8 +11,9 @@ public class TempUtil {
     
     public static void reversalDocInfo(ConDoctorDO conDoctor){
         String isAccept = conDoctor.getIsAccept();
-        conDoctor.setIsAccept(conDoctor.getDoctorStatus());
-        conDoctor.setDoctorStatus(isAccept);
+        // TODO 移动端说状态不对 先注掉试试
+//        conDoctor.setIsAccept(conDoctor.getDoctorStatus());
+//        conDoctor.setDoctorStatus(isAccept);
     }
 
     public static void reversalDocInfo(ConDoctor conDoctor){