feat:家庭医生初始化

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

@@ -23,6 +23,9 @@ public class RequestGetScheduleForWeekDTO {
     @ApiModelProperty("第几周")
     private Integer week;
 
+    @ApiModelProperty("更多周")
+    private Integer[] weeks;
+
     @ApiModelProperty("医生id")
     private String doctorId;
 

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

+package com.ebaiyihui.family.doctor.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: RequestUpdateScheduleStatusDTO
+ * @Author:yanliang
+ * @Date:2024/3/25 11:21
+ * @Description
+ */
+@Data
+public class RequestUpdateScheduleStatusDTO {
+
+    @ApiModelProperty("排班id")
+    private Long id;
+
+    @ApiModelProperty("停诊复诊：正常—— 1  停诊—— -1")
+    private Integer scheduleStatus;
+
+    @ApiModelProperty("需要停诊的日期 yyyy-MM-dd")
+    private String scheduleTime;
+
+    @ApiModelProperty("是否开启循环排班 1开启 -1关闭")
+    private Integer isCycleSchedule;
+}

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/controller/ScheduleRecordController.java

@@ -2,6 +2,7 @@ package com.ebaiyihui.family.doctor.server.controller;
 
 import com.ebaiyihui.family.doctor.common.dto.InsertScheduleRecordReqDTO;
 import com.ebaiyihui.family.doctor.common.dto.RequestGetScheduleForWeekDTO;
+import com.ebaiyihui.family.doctor.common.dto.RequestUpdateScheduleStatusDTO;
 import com.ebaiyihui.family.doctor.common.dto.ScheduleForWeekReqDTO;
 import com.ebaiyihui.family.doctor.common.vo.ResponseGetScheduleForWeekVo;
 import com.ebaiyihui.family.doctor.common.vo.ScheduleForWeekResVo;
@@ -56,4 +57,10 @@ public class ScheduleRecordController {
         return scheduleRecordService.scheduleForWeekNew(scheduleForWeekReqDTO);
 
     }
+
+    @RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
+    @ApiOperation("更新或者删除排班")
+    public BaseResponse<String> updateStatus(@RequestBody RequestUpdateScheduleStatusDTO updateScheduleStatusDTO) {
+        return scheduleRecordService.updateStatus(updateScheduleStatusDTO);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ebaiyihui.family.doctor.server.service;
 
 import com.ebaiyihui.family.doctor.common.dto.InsertScheduleRecordReqDTO;
 import com.ebaiyihui.family.doctor.common.dto.RequestGetScheduleForWeekDTO;
+import com.ebaiyihui.family.doctor.common.dto.RequestUpdateScheduleStatusDTO;
 import com.ebaiyihui.family.doctor.common.dto.ScheduleForWeekReqDTO;
 import com.ebaiyihui.family.doctor.common.vo.ResponseGetScheduleForWeekVo;
 import com.ebaiyihui.family.doctor.common.vo.ScheduleForWeekResVo;
@@ -23,4 +24,6 @@ public interface ScheduleRecordService {
     BaseResponse<List<ResponseGetScheduleForWeekVo>> getScheduleForWeek(RequestGetScheduleForWeekDTO requestGetScheduleForWeekDTO);
 
     BaseResponse<List<ScheduleForWeekResVo>> scheduleForWeekNew(ScheduleForWeekReqDTO scheduleForWeekReqDTO);
+
+    BaseResponse<String> updateStatus(RequestUpdateScheduleStatusDTO updateScheduleStatusDTO);
 }

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

@@ -34,7 +34,6 @@ public class ScheduleTask {
     @Autowired
     private ScheduleRecordMapper scheduleRecordMapper;
 
-    //    @Scheduled(cron = "0 0/2 * * * ?")
     @Scheduled(cron = "0 0 0 * * ?")
     public void regularTimeExport() {
 

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

@@ -22,6 +22,7 @@ import com.ebaiyihui.imforward.client.vo.IMQueryUserLoginRspVO;
 import com.ebaiyihui.imforward.client.vo.IMSingleMsgResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -50,9 +51,11 @@ public class SignedTask {
     @Autowired
     private ThirdOrderPushUtil thirdOrderPushUtil;
 
-    //    @Scheduled(cron = "0 0 10 * * ?")
+    @Scheduled(cron = "0 0 10 * * ?")
     public void healthRecordWhetherUpdate() {
-        List<PatientSignEntity> patientSignEntities = patientSignSevice.selectList(new PatientSignEntity());
+        PatientSignEntity patientSignEntity = new PatientSignEntity();
+        patientSignEntity.setStatus(StatusEnum.IN_CONSULTATION.getValue());
+        List<PatientSignEntity> patientSignEntities = patientSignSevice.selectList(patientSignEntity);
         if (!patientSignEntities.isEmpty()) {
             for (PatientSignEntity ps : patientSignEntities) {
                 HealthInfoDTO healthInfoDTO = new HealthInfoDTO();
@@ -128,7 +131,7 @@ public class SignedTask {
 
     }
 
-    //    @Scheduled(cron = "0 0 20 * * ?")
+    @Scheduled(cron = "0 0 20 * * ?")
     public void holidayPush() {
         List<PatientSignEntity> patientSignEntities = patientSignSevice.selectList(new PatientSignEntity());
         try {
@@ -177,7 +180,7 @@ public class SignedTask {
         }
     }
 
-    //    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void orderInvalidation() {
         List<MobileBenefitPackageEntity> mobileBenefitPackageEntities = mobileBenefitPackageMapper.queryMaxOneList();
         try {

family-doctor-server/src/main/resources/mapper/MobileBenefitPackageMapper.xml

@@ -59,6 +59,7 @@
             mobile_benefit_package
         WHERE
             phone = #{mobile} and activateOrderId = #{activateOrderId}
+            and NOW() BETWEEN STR_TO_DATE(benefitsStartTime, '%Y-%m-%d %H:%i:%s') AND STR_TO_DATE(benefitsEndTime, '%Y-%m-%d %H:%i:%s')
         ORDER BY
             x_create_time DESC
             LIMIT 0,1