diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java new file mode 100644 index 00000000..7779a83f --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java @@ -0,0 +1,11 @@ +package com.openhis.web.appointmentmanage.appservice; + +import com.core.common.core.domain.R; +import com.openhis.administration.domain.DoctorSchedule; + +public interface IDoctorScheduleAppService { + + R addDoctorSchedule(DoctorSchedule doctorSchedule); + + R removeDoctorSchedule(Integer doctorScheduleId); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java new file mode 100644 index 00000000..7e293a8c --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java @@ -0,0 +1,35 @@ +package com.openhis.web.appointmentmanage.appservice.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.core.common.core.domain.R; +import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.administration.service.IDoctorScheduleService; +import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService { + @Resource + private IDoctorScheduleService doctorScheduleService; + + + @Override + public R addDoctorSchedule(DoctorSchedule doctorSchedule) { + if (ObjectUtil.isEmpty(doctorSchedule)) { + return R.fail("医生排班不能为空"); + } + boolean save = doctorScheduleService.save(doctorSchedule); + return R.ok(save); + } + + @Override + public R removeDoctorSchedule(Integer doctorScheduleId) { + if (doctorScheduleId == null && ObjectUtil.isEmpty(doctorScheduleId)) { + return R.fail("排班id不能为空"); + } + boolean remove = doctorScheduleService.removeById(doctorScheduleId); + return R.ok(remove); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java new file mode 100644 index 00000000..eb6cf4e8 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java @@ -0,0 +1,35 @@ +package com.openhis.web.appointmentmanage.controller; + +import com.core.common.core.domain.R; +import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.websocket.server.PathParam; + +@RestController +@RequestMapping("/doctor-schedule") +public class DoctorScheduleController { + @Resource + private IDoctorScheduleAppService doctorScheduleAppService; + + /* + * 新增医生排班 + * + * */ + @PostMapping("/add") + public R addDoctorSchedule(@RequestBody DoctorSchedule doctorSchedule) { + return R.ok(doctorScheduleAppService.addDoctorSchedule(doctorSchedule)); + } + + /* + * 删除医生排班 + * + * */ + @DeleteMapping("/delete/{doctorScheduleId}") + public R removeDoctorSchedule(@PathVariable Integer doctorScheduleId){ + return R.ok(doctorScheduleAppService.removeDoctorSchedule(doctorScheduleId)); + } + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java new file mode 100644 index 00000000..8531440f --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.appointmentmanage.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface DoctorScheduleAppMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DoctorSchedule.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DoctorSchedule.java new file mode 100644 index 00000000..99371aea --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DoctorSchedule.java @@ -0,0 +1,70 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +@TableName(value = "adm_doctor_schedule") +@Accessors(chain = true) +public class DoctorSchedule { + /** id */ + private Integer id; + + /** 星期 */ + private String weekday; + + /** 时段 */ + private String timePeriod; + + /** 医生 */ + private String doctor; + + /** 诊室 */ + private String clinic; + + /** 开始时间 */ + private LocalTime startTime; + + /** 结束时间 */ + private LocalTime endTime; + + /** 限号数量 */ + private Integer limitNumber; + + /** 号源记录 */ + private String callSignRecord; + + /** 挂号项目 */ + private String registerItem; + + /** 挂号费 */ + private Integer registerFee; + + /** 诊查项目 */ + private String diagnosisItem; + + /** 诊疗费 */ + private Integer diagnosisFee; + + /** 线上挂号 */ + private Boolean isOnline; + + /** 是否停诊 */ + private Boolean isStopped; + + /** 停诊原因 */ + private String stopReason; + + /** 关联科室id */ + private Integer deptId; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java new file mode 100644 index 00000000..4676dbfe --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java @@ -0,0 +1,52 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +@TableName(value = "adm_schedule_pool") +@Accessors(chain = true) +public class SchedulePool { + /** id */ + private Integer id; + + private String poolCode; + private Integer hospitalId; + private Integer deptId; + private Integer doctorId; + private String doctorName; + private String clinicRoom; + private LocalDate scheduleDate; + private String shift; + /** 开始时间 */ + private LocalTime startTime; + + /** 结束时间 */ + private LocalTime endTime; + private Integer totalQuota; + private Integer bookedNum; + private Integer lockedNum; + private Integer availableNum; + private String regType; + private Double fee; + private Double insurancePrice; + private String supportChannel; + private Integer status; + private String stopReason; + private LocalDateTime releaseTime; + private LocalDateTime deadlineTime; + private Integer version; + private Integer opUserId; + private String remark; + private Integer scheduleId; + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ScheduleSlot.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ScheduleSlot.java new file mode 100644 index 00000000..2e14a6ef --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ScheduleSlot.java @@ -0,0 +1,25 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +@TableName(value = "adm_schedule_slot") +@Accessors(chain = true) +public class ScheduleSlot { + private Integer id; + private Integer poolId; + private Integer seqNo; + private Integer status; + private Integer orderId; + private LocalTime expectTime; + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DoctorScheduleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DoctorScheduleMapper.java new file mode 100644 index 00000000..5fa744e9 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DoctorScheduleMapper.java @@ -0,0 +1,9 @@ +package com.openhis.administration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.administration.domain.DoctorSchedule; +import org.springframework.stereotype.Repository; + +@Repository +public interface DoctorScheduleMapper extends BaseMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SchedulePoolMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SchedulePoolMapper.java new file mode 100644 index 00000000..4f011d18 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SchedulePoolMapper.java @@ -0,0 +1,9 @@ +package com.openhis.administration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.administration.domain.SchedulePool; +import org.springframework.stereotype.Repository; + +@Repository +public interface SchedulePoolMapper extends BaseMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ScheduleSlotMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ScheduleSlotMapper.java new file mode 100644 index 00000000..8c20790f --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ScheduleSlotMapper.java @@ -0,0 +1,9 @@ +package com.openhis.administration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.administration.domain.ScheduleSlot; +import org.springframework.stereotype.Repository; + +@Repository +public interface ScheduleSlotMapper extends BaseMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDoctorScheduleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDoctorScheduleService.java new file mode 100644 index 00000000..9ebade4a --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDoctorScheduleService.java @@ -0,0 +1,7 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.DoctorSchedule; + +public interface IDoctorScheduleService extends IService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISchedulePoolService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISchedulePoolService.java new file mode 100644 index 00000000..d4039cc2 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISchedulePoolService.java @@ -0,0 +1,7 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.SchedulePool; + +public interface ISchedulePoolService extends IService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IScheduleSlotService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IScheduleSlotService.java new file mode 100644 index 00000000..8cedfb05 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IScheduleSlotService.java @@ -0,0 +1,7 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.ScheduleSlot; + +public interface IScheduleSlotService extends IService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DoctorScheduleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DoctorScheduleServiceImpl.java new file mode 100644 index 00000000..faa97368 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DoctorScheduleServiceImpl.java @@ -0,0 +1,11 @@ +package com.openhis.administration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.administration.mapper.DoctorScheduleMapper; +import com.openhis.administration.service.IDoctorScheduleService; +import org.springframework.stereotype.Service; + +@Service +public class DoctorScheduleServiceImpl extends ServiceImpl implements IDoctorScheduleService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SchedulePoolServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SchedulePoolServiceImpl.java new file mode 100644 index 00000000..fc6d035c --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SchedulePoolServiceImpl.java @@ -0,0 +1,11 @@ +package com.openhis.administration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.SchedulePool; +import com.openhis.administration.mapper.SchedulePoolMapper; +import com.openhis.administration.service.ISchedulePoolService; +import org.springframework.stereotype.Service; + +@Service +public class SchedulePoolServiceImpl extends ServiceImpl implements ISchedulePoolService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ScheduleSlotServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ScheduleSlotServiceImpl.java new file mode 100644 index 00000000..1035e2c4 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ScheduleSlotServiceImpl.java @@ -0,0 +1,11 @@ +package com.openhis.administration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.ScheduleSlot; +import com.openhis.administration.mapper.ScheduleSlotMapper; +import com.openhis.administration.service.IScheduleSlotService; +import org.springframework.stereotype.Service; + +@Service +public class ScheduleSlotServiceImpl extends ServiceImpl implements IScheduleSlotService { +} diff --git a/openhis-ui-vue3/src/api/appoinmentmanage/doctorschedule.js b/openhis-ui-vue3/src/api/appoinmentmanage/doctorschedule.js new file mode 100644 index 00000000..e69de29b diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue new file mode 100644 index 00000000..35fea579 --- /dev/null +++ b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue @@ -0,0 +1,431 @@ + + + + + \ No newline at end of file