Merge branch 'master' into master-test

wangrenhuang

2023-07-05 334bb53b5f7881cbd6d587e03ecf032324142e2a

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java

@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.Date;

/**
 * @ClassName DoctorTimeDto
 * @Description 医生排班dto
@@ -16,4 +18,9 @@
    String monthStr;
    String shopId;
    String doctorId;
    String dayTime;
    Date startTime;
    Date endTime;
    Integer intervalTime;

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java

@@ -26,5 +26,24 @@
    @PostMapping(value = "/doctor/time/list")
    Result list(@RequestBody DoctorTimeDto dto);

    /**
     * 医生排班时间信息
     * @return Result
     */
    @PostMapping(value = "/doctor/time/info")
    Result info(@RequestBody DoctorTimeDto dto);

    /**
     * 判断医生排班时间是否被占用
     * @return Result
     */
    @PostMapping(value = "/doctor/time/checkTimeIsHasAppointment")
    Result checkTimeIsHasAppointment(@RequestBody DoctorTimeDto dto);

    /**
     * 医生排班时间详情
     * @return Result
     */
    @PostMapping(value = "/doctor/time/details")
    Result details(@RequestBody DoctorTimeDto dto);
}