From a077bd57d4e98c9e1c003cf2f153f6911b88872b Mon Sep 17 00:00:00 2001 From: qk123 <18211963828@163.com> Date: Mon, 15 Dec 2025 16:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=AE=A1=E7=90=86->=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=87=E4=BB=B6=E8=BD=AC=E7=A7=BB=E3=80=81=E5=8F=B7?= =?UTF-8?q?=E6=BA=90=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E3=80=81=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IDoctorScheduleAppService.java | 2 +- .../appservice/ISchedulePoolAppService.java | 8 + .../appservice/IScheduleSlotAppService.java | 4 + .../appservice/impl/DeptAppServiceImpl.java | 4 +- .../impl/DoctorScheduleAppServiceImpl.java | 4 +- .../impl/SchedulePoolAppServiceImpl.java | 41 +++++ .../impl/ScheduleSlotAppServiceImpl.java | 8 + .../controller/DoctorScheduleController.java | 3 +- .../controller/SchedulePoolController.java | 28 ++++ .../controller/ScheduleSlotController.java | 9 ++ .../dto/SchedulePoolDto.java | 104 ++++++++++++ .../mapper/SchedulePoolAppMapper.java | 7 + .../mapper/ScheduleSlotAppMapper.java | 7 + .../administration/service/impl/DeptImpl.java | 11 -- .../domain/Dept.java | 5 +- .../domain/DoctorSchedule.java | 8 +- .../domain/SchedulePool.java | 58 ++++++- .../domain/ScheduleSlot.java | 20 ++- .../mapper/DeptMapper.java | 4 +- .../mapper/DoctorScheduleMapper.java | 4 +- .../mapper/SchedulePoolMapper.java | 4 +- .../mapper/ScheduleSlotMapper.java | 4 +- .../service/IDeptService.java | 4 +- .../service/IDoctorScheduleService.java | 4 +- .../service/ISchedulePoolService.java | 4 +- .../service/IScheduleSlotService.java | 4 +- .../service/impl/DeptImpl.java | 11 ++ .../impl/DoctorScheduleServiceImpl.java | 8 +- .../service/impl/SchedulePoolServiceImpl.java | 8 +- .../service/impl/ScheduleSlotServiceImpl.java | 8 +- .../appoinmentmanage/doctorschedule/index.vue | 151 +++++++++++++++++- .../src/views/appoinmentmanage/index.vue | 2 +- 32 files changed, 489 insertions(+), 62 deletions(-) create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java delete mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/domain/Dept.java (89%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/domain/DoctorSchedule.java (92%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/domain/SchedulePool.java (66%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/domain/ScheduleSlot.java (65%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/mapper/DeptMapper.java (64%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/mapper/DoctorScheduleMapper.java (65%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/mapper/SchedulePoolMapper.java (64%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/mapper/ScheduleSlotMapper.java (64%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/IDeptService.java (55%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/IDoctorScheduleService.java (56%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/ISchedulePoolService.java (56%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/IScheduleSlotService.java (56%) create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/impl/DoctorScheduleServiceImpl.java (51%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/impl/SchedulePoolServiceImpl.java (51%) rename openhis-server-new/openhis-domain/src/main/java/com/openhis/{administration => appointmentmanage}/service/impl/ScheduleSlotServiceImpl.java (51%) 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 index d89e668c..a32b3009 100644 --- 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 @@ -1,7 +1,7 @@ package com.openhis.web.appointmentmanage.appservice; import com.core.common.core.domain.R; -import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.appointmentmanage.domain.DoctorSchedule; public interface IDoctorScheduleAppService { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java new file mode 100644 index 00000000..e5b3b780 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java @@ -0,0 +1,8 @@ +package com.openhis.web.appointmentmanage.appservice; + +import com.core.common.core.domain.R; +import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; + +public interface ISchedulePoolAppService { + R addSchedulePool(SchedulePoolDto schedulePoolDto); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java new file mode 100644 index 00000000..75090893 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java @@ -0,0 +1,4 @@ +package com.openhis.web.appointmentmanage.appservice; + +public interface IScheduleSlotAppService { +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java index eb7970e5..6177e8e4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java @@ -3,8 +3,8 @@ package com.openhis.web.appointmentmanage.appservice.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; -import com.openhis.administration.domain.Dept; -import com.openhis.administration.service.IDeptService; +import com.openhis.appointmentmanage.domain.Dept; +import com.openhis.appointmentmanage.service.IDeptService; import com.openhis.web.appointmentmanage.appservice.IDeptAppService; import org.springframework.stereotype.Service; 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 index 9ee83834..9fae7f0c 100644 --- 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 @@ -2,8 +2,8 @@ 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.appointmentmanage.domain.DoctorSchedule; +import com.openhis.appointmentmanage.service.IDoctorScheduleService; import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java new file mode 100644 index 00000000..8dda55da --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java @@ -0,0 +1,41 @@ +package com.openhis.web.appointmentmanage.appservice.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.core.common.core.domain.R; +import com.openhis.appointmentmanage.domain.SchedulePool; +import com.openhis.appointmentmanage.service.ISchedulePoolService; +import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService; +import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class SchedulePoolAppServiceImpl implements ISchedulePoolAppService { + + @Resource + private ISchedulePoolService schedulePoolService; + + @Override + public R addSchedulePool(SchedulePoolDto schedulePoolDto) { + //12/15 实体封装过程数据关系复杂 尚未完全理清 下次继续改 + if(ObjectUtil.isNull(schedulePoolDto)){ + return R.fail("号源不能为空"); + } + + SchedulePool schedulePool = new SchedulePool(); + schedulePool.setHospitalId(schedulePoolDto.getHospitalId()); + schedulePool.setDeptId(schedulePoolDto.getDeptId()); + schedulePool.setDoctorId(schedulePoolDto.getDoctorId()); + schedulePool.setDoctorName(schedulePoolDto.getDoctorName()); + schedulePool.setScheduleDate(schedulePoolDto.getScheduleDate()); + schedulePool.setShift(schedulePoolDto.getShift()); + schedulePool.setStartTime(schedulePoolDto.getStartTime()); + schedulePool.setEndTime(schedulePoolDto.getEndTime()); + + schedulePool.setRegType(schedulePoolDto.getRegType()); + schedulePool.setFee(schedulePoolDto.getFee()); + boolean save = schedulePoolService.save(schedulePool); + return R.ok(save); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java new file mode 100644 index 00000000..83d7cbfb --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java @@ -0,0 +1,8 @@ +package com.openhis.web.appointmentmanage.appservice.impl; + +import com.openhis.web.appointmentmanage.appservice.IScheduleSlotAppService; +import org.springframework.stereotype.Service; + +@Service +public class ScheduleSlotAppServiceImpl implements IScheduleSlotAppService { +} 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 index 52c7acd9..97355d8b 100644 --- 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 @@ -1,12 +1,11 @@ package com.openhis.web.appointmentmanage.controller; import com.core.common.core.domain.R; -import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.appointmentmanage.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") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java new file mode 100644 index 00000000..7bd52d94 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java @@ -0,0 +1,28 @@ +package com.openhis.web.appointmentmanage.controller; + + +import com.core.common.core.domain.R; +import com.openhis.appointmentmanage.domain.SchedulePool; +import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService; +import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/schedule-pool") +public class SchedulePoolController { + @Resource + private ISchedulePoolAppService schedulePoolAppService; + + /* + * 新增号源 + * + * */ + public R addSchedulePool(@RequestBody SchedulePoolDto schedulePoolDto) { + return R.ok(schedulePoolAppService.addSchedulePool(schedulePoolDto)); + } + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java new file mode 100644 index 00000000..3e644ef6 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java @@ -0,0 +1,9 @@ +package com.openhis.web.appointmentmanage.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/schedule-slot") +public class ScheduleSlotController { +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java new file mode 100644 index 00000000..90012ce0 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java @@ -0,0 +1,104 @@ +package com.openhis.web.appointmentmanage.dto; + +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; + +/** + * 号源池Dto + * + * @date 2025-12-12 + */ +@Data +public class SchedulePoolDto { + /** id */ + private Integer id; + + /** 业务编号 */ + private String poolCode; + + /** 医院ID */ + private Integer hospitalId; + + /** 科室ID */ + private Integer deptId; + + /** 医生ID */ + 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; + + /** 操作人ID */ + private Integer opUserId; + + /** 备注 */ + private String remark; + + /** 排班ID */ + private Integer scheduleId; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java new file mode 100644 index 00000000..c686ddc8 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.appointmentmanage.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface SchedulePoolAppMapper { +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java new file mode 100644 index 00000000..faa14307 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.appointmentmanage.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface ScheduleSlotAppMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java deleted file mode 100644 index f0548a62..00000000 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.openhis.administration.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.administration.domain.Dept; -import com.openhis.administration.mapper.DeptMapper; -import com.openhis.administration.service.IDeptService; -import org.springframework.stereotype.Service; - -@Service -public class DeptImpl extends ServiceImpl implements IDeptService { -} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java similarity index 89% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java index 3de4ab15..e99a3111 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java @@ -1,14 +1,13 @@ -package com.openhis.administration.domain; +package com.openhis.appointmentmanage.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.util.List; /** - * 科室Entity实体 + * 科室Entity * * @date 2025-12-08 */ 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/appointmentmanage/domain/DoctorSchedule.java similarity index 92% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DoctorSchedule.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java index 99371aea..1e8f2317 100644 --- 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/appointmentmanage/domain/DoctorSchedule.java @@ -1,4 +1,4 @@ -package com.openhis.administration.domain; +package com.openhis.appointmentmanage.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -6,7 +6,11 @@ import lombok.experimental.Accessors; import java.time.LocalDateTime; import java.time.LocalTime; - +/** + * 医生排班Entity + * + * @date 2025-12-12 + */ @Data @TableName(value = "adm_doctor_schedule") @Accessors(chain = true) 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/appointmentmanage/domain/SchedulePool.java similarity index 66% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/SchedulePool.java index 607ced3a..ad422c17 100644 --- 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/appointmentmanage/domain/SchedulePool.java @@ -1,4 +1,4 @@ -package com.openhis.administration.domain; +package com.openhis.appointmentmanage.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -7,7 +7,11 @@ import lombok.experimental.Accessors; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; - +/** + * 号源池Entity + * + * @date 2025-12-12 + */ @Data @TableName(value = "adm_schedule_pool") @Accessors(chain = true) @@ -15,36 +19,84 @@ public class SchedulePool { /** id */ private Integer id; + /** 业务编号 */ private String poolCode; + + /** 医院ID */ private Integer hospitalId; + + /** 科室ID */ private Integer deptId; + + /** 医生ID */ 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; + + /** 操作人ID */ private Integer opUserId; + + /** 备注 */ private String remark; + + /** 排班ID */ private Integer scheduleId; + /** 创建时间 */ private LocalDateTime createTime; 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/appointmentmanage/domain/ScheduleSlot.java similarity index 65% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ScheduleSlot.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java index 2e14a6ef..6270f9f1 100644 --- 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/appointmentmanage/domain/ScheduleSlot.java @@ -1,4 +1,4 @@ -package com.openhis.administration.domain; +package com.openhis.appointmentmanage.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -6,17 +6,33 @@ import lombok.experimental.Accessors; import java.time.LocalDateTime; import java.time.LocalTime; - +/** + * 号源池明细Entity + * + * @date 2025-12-12 + */ @Data @TableName(value = "adm_schedule_slot") @Accessors(chain = true) public class ScheduleSlot { + /** 明细主键 */ private Integer id; + + /** 号源池ID */ private Integer poolId; + + /** 序号 */ private Integer seqNo; + + /** 序号状态: 0-可用,1-已预约,2-已取消,3-已过期等 */ private Integer status; + + /** 预约订单ID */ private Integer orderId; + + /** 预计叫号时间 */ private LocalTime expectTime; + /** 创建时间 */ private LocalDateTime createTime; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java similarity index 64% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java index d0f33c48..dcbf9c61 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java @@ -1,7 +1,7 @@ -package com.openhis.administration.mapper; +package com.openhis.appointmentmanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.Dept; +import com.openhis.appointmentmanage.domain.Dept; import org.springframework.stereotype.Repository; @Repository 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/appointmentmanage/mapper/DoctorScheduleMapper.java similarity index 65% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DoctorScheduleMapper.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java index 5fa744e9..0eb56aec 100644 --- 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/appointmentmanage/mapper/DoctorScheduleMapper.java @@ -1,7 +1,7 @@ -package com.openhis.administration.mapper; +package com.openhis.appointmentmanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.appointmentmanage.domain.DoctorSchedule; import org.springframework.stereotype.Repository; @Repository 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/appointmentmanage/mapper/SchedulePoolMapper.java similarity index 64% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SchedulePoolMapper.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java index 4f011d18..3861f0df 100644 --- 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/appointmentmanage/mapper/SchedulePoolMapper.java @@ -1,7 +1,7 @@ -package com.openhis.administration.mapper; +package com.openhis.appointmentmanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.SchedulePool; +import com.openhis.appointmentmanage.domain.SchedulePool; import org.springframework.stereotype.Repository; @Repository 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/appointmentmanage/mapper/ScheduleSlotMapper.java similarity index 64% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ScheduleSlotMapper.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java index 8c20790f..7361cf20 100644 --- 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/appointmentmanage/mapper/ScheduleSlotMapper.java @@ -1,7 +1,7 @@ -package com.openhis.administration.mapper; +package com.openhis.appointmentmanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.ScheduleSlot; +import com.openhis.appointmentmanage.domain.ScheduleSlot; import org.springframework.stereotype.Repository; @Repository diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java similarity index 55% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java index 396a4ab9..78710fc1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java @@ -1,7 +1,7 @@ -package com.openhis.administration.service; +package com.openhis.appointmentmanage.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.administration.domain.Dept; +import com.openhis.appointmentmanage.domain.Dept; public interface IDeptService extends IService { } 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/appointmentmanage/service/IDoctorScheduleService.java similarity index 56% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDoctorScheduleService.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDoctorScheduleService.java index 9ebade4a..fc125b7d 100644 --- 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/appointmentmanage/service/IDoctorScheduleService.java @@ -1,7 +1,7 @@ -package com.openhis.administration.service; +package com.openhis.appointmentmanage.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.administration.domain.DoctorSchedule; +import com.openhis.appointmentmanage.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/appointmentmanage/service/ISchedulePoolService.java similarity index 56% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISchedulePoolService.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/ISchedulePoolService.java index d4039cc2..2b87a76d 100644 --- 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/appointmentmanage/service/ISchedulePoolService.java @@ -1,7 +1,7 @@ -package com.openhis.administration.service; +package com.openhis.appointmentmanage.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.administration.domain.SchedulePool; +import com.openhis.appointmentmanage.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/appointmentmanage/service/IScheduleSlotService.java similarity index 56% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IScheduleSlotService.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IScheduleSlotService.java index 8cedfb05..fa648b88 100644 --- 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/appointmentmanage/service/IScheduleSlotService.java @@ -1,7 +1,7 @@ -package com.openhis.administration.service; +package com.openhis.appointmentmanage.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.administration.domain.ScheduleSlot; +import com.openhis.appointmentmanage.domain.ScheduleSlot; public interface IScheduleSlotService extends IService { } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java new file mode 100644 index 00000000..dd16bd30 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java @@ -0,0 +1,11 @@ +package com.openhis.appointmentmanage.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.appointmentmanage.domain.Dept; +import com.openhis.appointmentmanage.mapper.DeptMapper; +import com.openhis.appointmentmanage.service.IDeptService; +import org.springframework.stereotype.Service; + +@Service +public class DeptImpl extends ServiceImpl implements IDeptService { +} 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/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java similarity index 51% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DoctorScheduleServiceImpl.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java index faa97368..fba1de35 100644 --- 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/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java @@ -1,9 +1,9 @@ -package com.openhis.administration.service.impl; +package com.openhis.appointmentmanage.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 com.openhis.appointmentmanage.domain.DoctorSchedule; +import com.openhis.appointmentmanage.mapper.DoctorScheduleMapper; +import com.openhis.appointmentmanage.service.IDoctorScheduleService; import org.springframework.stereotype.Service; @Service 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/appointmentmanage/service/impl/SchedulePoolServiceImpl.java similarity index 51% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SchedulePoolServiceImpl.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/SchedulePoolServiceImpl.java index fc6d035c..22373902 100644 --- 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/appointmentmanage/service/impl/SchedulePoolServiceImpl.java @@ -1,9 +1,9 @@ -package com.openhis.administration.service.impl; +package com.openhis.appointmentmanage.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 com.openhis.appointmentmanage.domain.SchedulePool; +import com.openhis.appointmentmanage.mapper.SchedulePoolMapper; +import com.openhis.appointmentmanage.service.ISchedulePoolService; import org.springframework.stereotype.Service; @Service 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/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java similarity index 51% rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ScheduleSlotServiceImpl.java rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java index 1035e2c4..a9c62120 100644 --- 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/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java @@ -1,9 +1,9 @@ -package com.openhis.administration.service.impl; +package com.openhis.appointmentmanage.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 com.openhis.appointmentmanage.domain.ScheduleSlot; +import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper; +import com.openhis.appointmentmanage.service.IScheduleSlotService; import org.springframework.stereotype.Service; @Service diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue index 8245cfa9..a6223f82 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue @@ -98,10 +98,24 @@ /> - + + + @@ -186,13 +200,32 @@ 取消 + + + +
+
+ {{ record.time }} +
+
+ + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue index cf5e6c9d..d2e536db 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue @@ -1,7 +1,7 @@