Merge branch 'test'

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

@@ -79,6 +79,7 @@ public class ServiceConfigServiceImpl implements ServiceConfigService {
             throw new BusinessException("未查询到该医生上下线配置信息！");
         }
 
+        if (requestOnlineOrOfflineVo.getOfficeStatus().equals(-1)){
             String date = DateUtils.dateToSimpleString(new Date());
             String hourAndSecond = DateUtils.getHourAndSecond();
             // 查询排班医生信息
@@ -86,6 +87,7 @@ public class ServiceConfigServiceImpl implements ServiceConfigService {
             if (!scheduleRecordEntities.isEmpty()){
                 throw new BusinessException("不能上下线，您今天有值班！");
             }
+        }
 
         serviceConfigEntity.setOfficeStatus(requestOnlineOrOfflineVo.getOfficeStatus());
         int flag = serviceConfigMapper.updateById(serviceConfigEntity);