From 0d57e984a644f6b82a93bc7033228fc0079a5604 Mon Sep 17 00:00:00 2001 From: huabuweixin <148689675+huabuweixin@users.noreply.github.com> Date: Thu, 22 Jan 2026 15:09:52 +0800 Subject: [PATCH] =?UTF-8?q?76=20=E9=97=A8=E8=AF=8A=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E6=8C=82=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/ITicketAppService.java | 8 - .../appservice/impl/TicketAppServiceImpl.java | 312 ++- .../controller/TicketController.java | 22 - .../DoctorScheduleMapper.xml | 25 +- .../mapper/DoctorScheduleMapper.java | 4 + .../openhis/clinical/mapper/OrderMapper.java | 2 +- .../clinical/service/IOrderService.java | 3 +- .../service/impl/OrderServiceImpl.java | 3 +- .../service/impl/TicketServiceImpl.java | 8 +- .../resources/mapper/clinical/OrderMapper.xml | 2 + .../src/views/appoinmentmanage/index.vue | 1681 ----------------- .../outpatientAppointment/index.vue | 660 ++++--- .../views/appoinmentmanage/ticketManage.vue | 1638 ---------------- 13 files changed, 548 insertions(+), 3820 deletions(-) delete mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/index.vue delete mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java index dab4ddc9..e46c7083 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java @@ -13,14 +13,6 @@ import java.util.Map; */ public interface ITicketAppService { - /** - * 查询号源列表 - * - * @param params 查询参数 - * @return 号源列表 - */ - R listTicket(Map params); - /** * 预约号源 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java index 21a8c7cf..2bf09bf7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java @@ -4,20 +4,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.administration.domain.Patient; import com.openhis.administration.service.IPatientService; +import com.openhis.appointmentmanage.domain.DoctorSchedule; +import com.openhis.appointmentmanage.mapper.DoctorScheduleMapper; +import com.openhis.appointmentmanage.service.IDoctorScheduleService; +import com.openhis.clinical.domain.Order; import com.openhis.clinical.domain.Ticket; +import com.openhis.clinical.mapper.OrderMapper; import com.openhis.clinical.service.ITicketService; +import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; import com.openhis.web.appointmentmanage.appservice.ITicketAppService; import com.openhis.web.appointmentmanage.dto.TicketDto; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; +import java.time.*; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 号源管理应用服务实现类 * @@ -31,145 +39,14 @@ public class TicketAppServiceImpl implements ITicketAppService { @Resource private IPatientService patientService; + @Resource + private IDoctorScheduleAppService doctorScheduleAppService; + @Resource + private DoctorScheduleMapper doctorScheduleMapper; + @Resource + private OrderMapper orderMapper; - /** - * 查询号源列表 - * - * @param params 查询参数 - * @return 号源列表 - */ - @Override - public R listTicket(Map params) { - // 调试日志：打印所有参数 - System.out.println("=== listTicket方法收到的所有参数：==="); - for (Map.Entry entry : params.entrySet()) { - System.out.println(entry.getKey() + ": " + entry.getValue()); - } - System.out.println("================================="); - // 构建查询条件 - Ticket ticket = new Ticket(); - // 设置查询参数 - // 处理日期参数 - if (params.containsKey("date")) { - String date = (String) params.get("date"); - try { - // 将日期字符串转换为Date类型，设置到appointmentDate字段 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date appointmentDate = sdf.parse(date); - ticket.setAppointmentDate(appointmentDate); - System.out.println("设置的appointmentDate：" + appointmentDate); - } catch (Exception e) { - // 日期格式错误，忽略该参数 - System.out.println("日期格式错误，忽略该参数：" + date + "，错误信息：" + e.getMessage()); - } - } - // 处理状态参数 - if (params.containsKey("status")) { - String status = (String) params.get("status"); - System.out.println("接收到的status参数：" + status); - if (!"all".equals(status) && !"全部".equals(status)) { - // 将中文状态转换为英文状态 - if ("未预约".equals(status)) { - ticket.setStatus("unbooked"); - } else if ("已预约".equals(status)) { - ticket.setStatus("booked"); - } else if ("已取号".equals(status)) { - ticket.setStatus("checked"); - } else if ("已取消".equals(status)) { - ticket.setStatus("cancelled"); - } else if ("已锁定".equals(status)) { - ticket.setStatus("locked"); - } else { - ticket.setStatus(status); - } - System.out.println("设置的status：" + ticket.getStatus()); - } - } - if (params.containsKey("name")) { - String name = (String) params.get("name"); - ticket.setPatientName(name); - } - if (params.containsKey("card")) { - String card = (String) params.get("card"); - ticket.setMedicalCard(card); - } - if (params.containsKey("phone")) { - String phone = (String) params.get("phone"); - ticket.setPhone(phone); - } - if (params.containsKey("type")) { - String type = (String) params.get("type"); - System.out.println("前端传递的type参数值：" + type); - if (!"all".equals(type)) { - // 类型映射转换：前端传递英文类型，数据库存储中文类型 - if ("general".equals(type)) { - ticket.setTicketType("普通"); - } else if ("expert".equals(type)) { - ticket.setTicketType("专家"); - } else if ("普通".equals(type)) { - ticket.setTicketType("普通"); - } else if ("专家".equals(type)) { - ticket.setTicketType("专家"); - } else { - ticket.setTicketType(type); - } - System.out.println("转换后的ticketType值：" + ticket.getTicketType()); - } - } - - // 手动实现分页查询，避免MyBatis-Plus自动COUNT查询的问题 - int pageNum = params.get("page") != null ? Integer.valueOf(params.get("page").toString()) : 1; - int pageSize = params.get("limit") != null ? Integer.valueOf(params.get("limit").toString()) : 10; - - // 调试：输出构建的查询条件 - System.out.println("构建的查询条件：ticketType=" + ticket.getTicketType() + ", status=" + ticket.getStatus() + ", appointmentDate=" + ticket.getAppointmentDate()); - - // 1. 获取所有符合条件的记录 - List allTickets = ticketService.selectTicketList(ticket); - - // 调试：输出查询到的所有记录 - System.out.println("查询到的所有记录：" + allTickets); - if (!allTickets.isEmpty()) { - for (Ticket t : allTickets) { - System.out.println("记录详情：id=" + t.getId() + ", ticketType=" + t.getTicketType() + ", status=" + t.getStatus() + ", appointmentDate=" + t.getAppointmentDate() + ", deleteFlag=" + t.getDeleteFlag()); - } - } - - // 2. 计算总记录数 - long total = allTickets.size(); - System.out.println("手动计算的总记录数：" + total); - - // 3. 手动分页 - int start = (pageNum - 1) * pageSize; - int end = Math.min(start + pageSize, allTickets.size()); - List pageTickets; - if (start >= end) { - pageTickets = new ArrayList<>(); - } else { - pageTickets = allTickets.subList(start, end); - } - - // 4. 转换为DTO - List dtoList = pageTickets.stream().map(this::convertToDto).toList(); - - // 5. 构建响应数据，符合前端预期格式 - Map result = new HashMap<>(); - result.put("list", dtoList); - result.put("records", dtoList); // 兼容前端框架（如Element UI）可能使用的records字段 - result.put("total", total); - result.put("page", pageNum); - result.put("current", pageNum); // 兼容前端框架可能使用的current字段 - result.put("limit", pageSize); - result.put("pageSize", pageSize); // 兼容前端框架可能使用的pageSize字段 - result.put("size", pageSize); // 兼容前端框架可能使用的size字段 - result.put("pageNum", pageNum); // 兼容前端框架可能使用的pageNum字段 - result.put("pages", (int) Math.ceil((double) total / pageSize)); // 计算总页数 - - // 调试：输出响应数据 - System.out.println("返回的响应数据：" + result); - - return R.ok(result); - } + private static final Logger log = LoggerFactory.getLogger(TicketAppServiceImpl.class); /** * 预约号源 @@ -179,35 +56,73 @@ public class TicketAppServiceImpl implements ITicketAppService { */ @Override public R bookTicket(Map params) { + // 1. 获取 ticketId 和 slotId Long ticketId = null; + Long slotId = null; if (params.get("ticketId") != null) { ticketId = Long.valueOf(params.get("ticketId").toString()); } - if (ticketId == null) { - return R.fail("参数错误"); + if (params.get("slotId") != null) { + slotId = Long.valueOf(params.get("slotId").toString()); } + // 2. 参数校验 + if (ticketId == null || slotId == null) { + return R.fail("参数错误：ticketId 或 slotId 不能为空"); + } + try { + // 3. 执行原有的预约逻辑 int result = ticketService.bookTicket(params); - return R.ok(result > 0 ? "预约成功" : "预约失败"); + if (result > 0) { + // 4. 预约成功后，更新排班表状态 + DoctorSchedule schedule = new DoctorSchedule(); + schedule.setId(Math.toIntExact(slotId)); // 对应 XML 中的 WHERE id = #{id} + schedule.setIsStopped(true); // 设置为已预约 + schedule.setStopReason("booked"); // 设置停用原因 + + // 执行更新 + int updateCount = doctorScheduleMapper.updateDoctorSchedule(schedule); + + if (updateCount > 0) { + return R.ok("预约成功并已更新排班状态"); + } else { + // 如果更新失败，可能需要根据业务逻辑决定是否回滚预约 + return R.ok("预约成功，但排班状态更新失败"); + } + } else { + return R.fail("预约失败"); + } } catch (Exception e) { - return R.fail(e.getMessage()); + // e.printStackTrace(); + log.error(e.getMessage()); + return R.fail("系统异常：" + e.getMessage()); } } /** * 取消预约 * - * @param ticketId 号源ID + * @param slotId 医生排班ID * @return 结果 */ @Override - public R cancelTicket(Long ticketId) { - if (ticketId == null) { + public R cancelTicket(Long slotId) { + if (slotId == null) { return R.fail("参数错误"); } try { - int result = ticketService.cancelTicket(ticketId); - return R.ok(result > 0 ? "取消成功" : "取消失败"); + ticketService.cancelTicket(slotId); + DoctorSchedule schedule = new DoctorSchedule(); + schedule.setId(Math.toIntExact(slotId)); // 对应 WHERE id = #{id} + schedule.setIsStopped(false); // 设置为 false (数据库对应 0) + schedule.setStopReason(""); // 将原因清空 (设为空字符串) + // 3. 调用自定义更新方法 + int updateCount = doctorScheduleMapper.updateDoctorSchedule(schedule); + if (updateCount > 0) { + return R.ok("取消成功"); + } else { + return R.ok("取消成功"); + } } catch (Exception e) { return R.fail(e.getMessage()); } @@ -253,31 +168,87 @@ public class TicketAppServiceImpl implements ITicketAppService { @Override public R listAllTickets() { - // 创建固定的测试数据，用于验证前端是否能展示数据 - List testTickets = new ArrayList<>(); - - // 创建5条测试数据 - for (int i = 1; i <= 5; i++) { - TicketDto dto = new TicketDto(); - dto.setSlot_id((long) i); - dto.setBusNo("TEST0000" + i); - dto.setDepartment("内科"); - dto.setDoctor("张三"); - dto.setTicketType("expert"); - dto.setDateTime("08:00-08:50"); - dto.setStatus("未预约"); - dto.setFee("150"); - dto.setAppointmentDate(new Date()); - testTickets.add(dto); + // 1. 从 AppService 获取排班数据 + R response = doctorScheduleAppService.getDoctorScheduleList(); + // 获取返回的 List 数据 (假设 R.ok 里的数据是 List) + List scheduleList = (List) response.getData(); + + // 2. 转换数据为 TicketDto + List tickets = new ArrayList<>(); + + if (scheduleList != null) { + for (DoctorSchedule schedule : scheduleList) { + TicketDto dto = new TicketDto(); + + // 基础信息映射 + dto.setSlot_id(Long.valueOf(schedule.getId())); // Integer 转 Long + dto.setBusNo(String.valueOf(schedule.getId())); // 生成一个业务编号 + dto.setDepartment(String.valueOf(schedule.getDeptId())); // 如果有科室名建议关联查询，这里暂填ID + dto.setDoctor(schedule.getDoctor()); + + // 号源类型处理：根据挂号项目判断是普通号还是专家号 + String registerItem = schedule.getRegisterItem(); + if (registerItem != null && registerItem.contains("专家")) { + dto.setTicketType("expert"); + } else { + dto.setTicketType("general"); + } + // 时间处理：格式化为日期+时间范围，如 "2025-12-01 08:00-12:00" + String currentDate = LocalDate.now().toString(); // 或者从schedule中获取具体日期 + String timeRange = schedule.getStartTime() + "-" + schedule.getEndTime(); + dto.setDateTime(currentDate + " " + timeRange); + LocalTime nowTime = LocalTime.now(); + LocalTime endTime = schedule.getEndTime(); + String stopReason1 = schedule.getStopReason(); + if ("cancelled".equals(stopReason1)||(endTime != null && nowTime.isAfter(endTime))) { + dto.setStatus("已停诊"); + }else if (Boolean.TRUE.equals(schedule.getIsStopped())) { + // 获取原因并处理可能的空值 + String stopReason = schedule.getStopReason(); + // 使用 .equals() 比较内容，并将常量放在前面防止空指针 + if ("booked".equals(stopReason)) { + dto.setStatus("已预约"); + // --- 新增：获取患者信息 --- + List Order = orderMapper.selectOrderBySlotId(Long.valueOf(schedule.getId())); + Order latestOrder=Order.get(0); + + if (latestOrder != null) { + dto.setPatientName(latestOrder.getPatientName()); + dto.setPatientId(String.valueOf(latestOrder.getPatientId())); + dto.setPhone(latestOrder.getPhone()); + } + // ----------------------- + } else if ("checked".equals(stopReason)) { + dto.setStatus("已取号"); + } else { + // 兜底逻辑：如果 is_stopped 为 true 但没有匹配到原因 + dto.setStatus("不可预约"); + } + } else { + // is_stopped 为 false 或 null 时 + dto.setStatus("未预约"); + } + + // 费用处理 (挂号费 + 诊疗费) + int totalFee = schedule.getRegisterFee() + schedule.getDiagnosisFee(); + dto.setFee(String.valueOf(totalFee)); + + // 日期处理：LocalDateTime 转 Date + if (schedule.getCreateTime() != null) { + ZonedDateTime zdt = schedule.getCreateTime().atZone(ZoneId.systemDefault()); + dto.setAppointmentDate(Date.from(zdt.toInstant())); + } + + tickets.add(dto); + } } - - // 构建响应数据 + + // 3. 封装分页响应结构 Map result = new HashMap<>(); - result.put("list", testTickets); - result.put("total", testTickets.size()); + result.put("list", tickets); + result.put("total", tickets.size()); result.put("page", 1); result.put("limit", 20); - return R.ok(result); } @@ -322,9 +293,6 @@ public class TicketAppServiceImpl implements ITicketAppService { case "cancelled": dto.setStatus("已取消"); break; - case "locked": - dto.setStatus("已锁定"); - break; default: dto.setStatus(status); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java index e8baeed0..ae5f5e6c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java @@ -21,28 +21,6 @@ public class TicketController { @Resource private ITicketAppService ticketAppService; - - /** - * 查询号源列表 - * - * @param params 查询参数 - * @return 号源列表 - */ - @PostMapping("/list") - public R listTicket(@RequestBody Map params) { - return ticketAppService.listTicket(params); - } - - /** - * 查询号源列表（支持GET请求，兼容旧版本） - * - * @param params 查询参数 - * @return 号源列表 - */ - @GetMapping("/list") - public R listTicketByGet(@RequestParam Map params) { - return ticketAppService.listTicket(params); - } /** * 查询所有号源（用于测试） diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml index f927eefc..c1f0a5f9 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml @@ -46,6 +46,29 @@ , #{updateTime} ) - + + + UPDATE adm_doctor_schedule + + weekday = #{weekday}, + time_period = #{timePeriod}, + doctor = #{doctor}, + clinic = #{clinic}, + start_time = #{startTime}, + end_time = #{endTime}, + limit_number = #{limitNumber}, + call_sign_record = #{callSignRecord}, + register_item = #{registerItem}, + register_fee = #{registerFee}, + diagnosis_item = #{diagnosisItem}, + diagnosis_fee = #{diagnosisFee}, + is_online = #{isOnline}, + is_stopped = #{isStopped}, + stop_reason = #{stopReason}, + dept_id = #{deptId}, + update_time = #{updateTime} + + WHERE id = #{id} + diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java index 8dc18b2e..24bd1b8b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java @@ -10,4 +10,8 @@ public interface DoctorScheduleMapper extends BaseMapper { * 自定义插入方法，排除id字段（数据库GENERATED ALWAYS） */ int insertWithoutId(DoctorSchedule doctorSchedule); + /** + * 自定义更新方法 + */ + int updateDoctorSchedule(DoctorSchedule doctorSchedule); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java index 28ae0751..8a27dc08 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java @@ -27,7 +27,7 @@ public interface OrderMapper extends BaseMapper { int countOrders(Map params); - Order selectOrderBySlotId(Long slotId); + List selectOrderBySlotId(Long slotId); int updateOrderStatusById(Long id, Integer status); diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java index dc824952..87c3e66c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java @@ -25,8 +25,7 @@ public interface IOrderService extends IService { int countOrders(Map params); - Order selectOrderBySlotId(Long slotId); - + List selectOrderBySlotId(Long slotId); int updateOrderStatusById(Long id, Integer status); int updateOrderCancelInfoById(Long id, java.util.Date cancelTime, String cancelReason); diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java index 9eb18eee..d6bc8e43 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java @@ -3,7 +3,6 @@ package com.openhis.clinical.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.utils.AssignSeqUtil; -import com.core.common.utils.SecurityUtils; import com.openhis.clinical.domain.Order; import com.openhis.clinical.domain.Ticket; import com.openhis.clinical.mapper.OrderMapper; @@ -71,7 +70,7 @@ public class OrderServiceImpl extends ServiceImpl implements } @Override - public Order selectOrderBySlotId(Long slotId) { + public List selectOrderBySlotId(Long slotId) { return orderMapper.selectOrderBySlotId(slotId); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java index 183c27cf..08e456c0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java @@ -197,8 +197,8 @@ public class TicketServiceImpl extends ServiceImpl impleme throw new RuntimeException("号源不可取消预约"); } - Order order = orderService.selectOrderBySlotId(ticketId); - if (order != null) { + List orders = orderService.selectOrderBySlotId(ticketId); + for(Order order:orders){ orderService.cancelAppointmentOrder(order.getId(), "患者取消预约"); } @@ -249,8 +249,8 @@ public class TicketServiceImpl extends ServiceImpl impleme } // 检查是否存在相关订单，如果存在则取消 - Order order = orderService.selectOrderBySlotId(ticketId); - if (order != null) { + List orders = orderService.selectOrderBySlotId(ticketId); + for(Order order:orders){ orderService.cancelAppointmentOrder(order.getId(), "医生停诊"); } diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml index c3708321..4ade0b2d 100644 --- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml +++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml @@ -119,6 +119,8 @@ - - + @@ -105,38 +104,34 @@
-
-
{{ index + 1 }}
-
- {{ item.ticketType === 'general' ? '普通' : '专家' }} -
-
-
{{ item.dateTime }}
-
{{ item.doctor }}
+ +
{{ index + 1 }}
+ +
{{ item.dateTime }}
+
{{ item.status }}
-
挂号费: {{ item.fee }}
- + +
{{ item.doctor }}
+ +
挂号费：{{ item.fee }}元
+ +
{{ item.ticketType === 'general' ? '普通' : '专家' }}
+
-
{{ item.patientName }}
-
{{ item.patientId }}
-
性别：{{ item.patientGender || '-' }}
+ {{ item.patientName }}({{ item.patientId }}) +
+ +
+ 电话号码： {{ item.phone }}
- -
@@ -166,7 +161,7 @@
- +
@@ -192,6 +187,11 @@
序号
+ + +
+ 未找到符合条件的患者，请检查搜索条件 +
@@ -231,13 +231,14 @@ import { listTicket, bookTicket, cancelTicket, checkInTicket, cancelConsultation import { getPatientList } from '@/api/cardRenewal/api'; import { listDept } from '@/api/appoinmentmanage/dept'; import { ref } from 'vue' -import { ElDatePicker } from 'element-plus' +import { ElDatePicker, ElPagination, ElMessageBox, ElMessage } from 'element-plus' import useUserStore from '@/store/modules/user' export default { name: 'OutpatientAppointment', components: { - ElDatePicker + ElDatePicker, + ElPagination }, // 添加全局点击事件监听器，用于关闭右键菜单 @@ -324,35 +325,34 @@ export default { filteredTickets() { let filtered = [...this.tickets]; - // 按日期筛选（如果选择了日期） - 暂时注释掉以排查问题 - // if (this.selectedDate) { - // filtered = filtered.filter(ticket => { - // // 使用后端返回的dateTime字段进行筛选 - // if (ticket.dateTime) { - // return ticket.dateTime.startsWith(this.selectedDate); - // } - // return true; - // }); - // } + //按日期筛选（如果选择了日期） + if (this.selectedDate) { + filtered = filtered.filter(ticket => { + // 使用后端返回的dateTime字段进行筛选 + if (ticket.dateTime) { + return ticket.dateTime.startsWith(this.selectedDate); + } + return true; + }); + } - // 按状态筛选 - 暂时注释掉以排查问题 - // if (this.selectedStatus !== 'all') { - // // 状态映射表（后端返回中文状态，前端使用英文状态） - // const statusMap = { - // 'unbooked': '未预约', - // 'locked': '已锁定', - // 'booked': '已预约', - // 'checked': '已取号', - // 'cancelled': '已取消' - // }; - // const chineseStatus = statusMap[this.selectedStatus]; - // filtered = filtered.filter(ticket => ticket.status === chineseStatus); - // } + //按状态筛选 + if (this.selectedStatus !== 'all') { + // 状态映射表（后端返回中文状态，前端使用英文状态） + const statusMap = { + 'unbooked': '未预约', + 'booked': '已预约', + 'checked': '已取号', + 'cancelled': '已停诊' + }; + const chineseStatus = statusMap[this.selectedStatus]; + filtered = filtered.filter(ticket => ticket.status === chineseStatus); + } - // 按科室筛选 - 暂时注释掉以排查问题 - // if (this.selectedDepartment !== 'all') { - // filtered = filtered.filter(ticket => ticket.department === this.selectedDepartment); - // } + // 按科室筛选 + if (this.selectedDepartment !== 'all') { + filtered = filtered.filter(ticket => ticket.department === this.selectedDepartment); + } // 按号源类型筛选 filtered = filtered.filter(ticket => { @@ -365,62 +365,67 @@ export default { }); // 按医生筛选 - 暂时注释掉以排查问题 - // if (this.selectedDoctorId) { - // const selectedDoctor = this.doctors.find(d => d.id === this.selectedDoctorId); - // if (selectedDoctor) { - // filtered = filtered.filter(ticket => ticket.doctor === selectedDoctor.name); - // } - // } - - // 按患者信息筛选（姓名、就诊卡号、手机号） - 暂时注释掉以排查问题 - // if (this.patientName || this.patientCard || this.patientPhone) { - // filtered = filtered.filter(ticket => { - // const matchesName = !this.patientName || ticket.patientName?.includes(this.patientName); - // const matchesCard = !this.patientCard || ticket.patientId?.includes(this.patientCard); - // const matchesPhone = !this.patientPhone || ticket.phone?.includes(this.patientPhone); - // - // return matchesName && matchesCard && matchesPhone; - // }); - // } + if (this.selectedDoctorId) { + const selectedDoctor = this.doctors.find(d => d.id === this.selectedDoctorId); + if (selectedDoctor) { + filtered = filtered.filter(ticket => ticket.doctor === selectedDoctor.name); + } + } return filtered; }, + hasSearchCriteria() { + return Object.values(this.patientSearchParams).some(value => value && value.trim() !== ''); + }, }, methods: { selectDoctor(doctorId) { this.selectedDoctorId = doctorId - console.log('Selected doctor:', doctorId) // 医生选择后，筛选号源 this.onSearch(); }, onTypeChange() { - console.log('Type changed:', this.selectedType) // 移除onSearch()调用，让计算属性自动处理类型筛选 }, onDepartmentChange() { - console.log('Department changed:', this.selectedDepartment) this.onSearch() }, onDoctorSearch() { - console.log('Searching doctor:', this.searchQuery) // 使用计算属性filteredDoctors实现实时搜索，无需调用API }, openPatientSelectModal(ticketId) { - console.log('openPatientSelectModal called with ticketId:', ticketId); this.currentTicket = this.tickets.find(ticket => ticket.slot_id === ticketId); - console.log('Found ticket for modal:', this.currentTicket); - // 打开患者选择弹窗时，查询患者列表 - this.searchPatients(); + // 重置搜索参数 + this.patientSearchParams = { + patientName: '', + medicalCard: '', + idCard: '', + phone: '' + }; + // 清空患者列表 + this.patients = []; this.showPatientModal = true; - console.log('Show patient modal:', this.showPatientModal); + // 默认加载所有患者 + this.searchPatients(); }, // 患者搜索 - searchPatients() { - console.log('searchPatients called with params:', this.patientSearchParams); + searchPatients() { + // 检查是否有搜索条件 + const hasSearchCriteria = Object.values(this.patientSearchParams).some(value => value && value.trim() !== ''); + + // 设置加载状态 + this.isLoading = true; + + // 准备搜索参数，确保支持模糊匹配 + const searchParams = { + patientName: this.patientSearchParams.patientName?.trim() || '', + medicalCard: this.patientSearchParams.medicalCard?.trim() || '', + idCard: this.patientSearchParams.idCard?.trim() || '', + phone: this.patientSearchParams.phone?.trim() || '' + }; // 调用真实API获取患者列表 getPatientList(this.patientSearchParams).then(response => { - console.log('Patient API response:', response); // 尝试不同的数据结构解析 let records = []; if (response.data && response.data.records) { @@ -431,31 +436,40 @@ export default { records = response; } - this.patients = records; - console.log('Loaded patients:', this.patients); - + this.patients = records; + // 在前端进行额外的模糊匹配过滤（以防后端API不支持完整的模糊匹配） + if (hasSearchCriteria) { + this.patients = this.patients.filter(patient => { + const nameMatch = !searchParams.patientName || + (patient.name && patient.name.toLowerCase().includes(searchParams.patientName.toLowerCase())); + const cardMatch = !searchParams.medicalCard || + (patient.medicalCard && patient.medicalCard.toLowerCase().includes(searchParams.medicalCard.toLowerCase())); + const idMatch = !searchParams.idCard || + (patient.idCard && patient.idCard.toLowerCase().includes(searchParams.idCard.toLowerCase())); + const phoneMatch = !searchParams.phone || + (patient.phone && patient.phone.toLowerCase().includes(searchParams.phone.toLowerCase())); + + return nameMatch && cardMatch && idMatch && phoneMatch; + }); + } // 验证每个患者是否有idCard字段，如果没有，尝试使用其他唯一标识 this.patients.forEach((patient, index) => { - console.log(`Patient ${index}:`, patient); - console.log(`Patient ${index} has idCard:`, patient.idCard ? 'Yes' : 'No'); - console.log(`Patient ${index} has id:`, patient.id ? 'Yes' : 'No'); - console.log(`Patient ${index} has medicalCard:`, patient.medicalCard ? 'Yes' : 'No'); - // 如果没有idCard，尝试设置一个临时唯一标识 if (!patient.idCard) { patient.idCard = patient.id || patient.medicalCard || `temp_${index}`; - console.log(`Set temporary idCard for patient ${index}:`, patient.idCard); } }); if (this.patients.length === 0) { - console.log('No patients found in response'); - alert('没有找到患者数据，请检查搜索条件或联系管理员'); - } + ElMessage.error('没有找到患者数据，请检查搜索条件或联系管理员'); + } + // 清除加载状态 + this.isLoading = false; }).catch(error => { - console.error('获取患者列表失败:', error); this.patients = []; - alert('获取患者列表失败：' + (error.message || '未知错误')); + ElMessage.error('获取患者列表失败：' + (error.message || '未知错误')); + // 清除加载状态 + this.isLoading = false; }); }, @@ -483,18 +497,12 @@ export default { // 双击未预约卡片触发患者选择流程 handleDoubleClick(ticket) { - console.log('handleDoubleClick called with ticket:', ticket); if (ticket.status === '未预约') { this.currentTicket = ticket; - console.log('Set currentTicket:', this.currentTicket); this.selectedPatientId = null; - this.selectedPatient = null; - console.log('Reset selected patient info:', { selectedPatientId: this.selectedPatientId, selectedPatient: this.selectedPatient }); - + this.selectedPatient = null; // 先打开弹窗，再加载患者数据，避免等待 this.showPatientModal = true; - console.log('Show patient modal after double click:', this.showPatientModal); - // 调用患者搜索接口，加载患者列表 this.searchPatients(); } @@ -518,88 +526,66 @@ export default { // 确认取消预约 confirmCancelAppointment() { if (this.selectedTicketForCancel) { - // 二次确认，显示患者姓名 - if (confirm(`确认取消患者${this.selectedTicketForCancel.patientName || ''}的预约？`)) { - // 调用API取消预约 + // 使用 ElMessageBox.confirm 进行二次确认，显示患者姓名 + ElMessageBox.confirm( + `确认取消患者${this.selectedTicketForCancel.patientName || ''}的预约？`, + '系统提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 用户点击确定，调用API取消预约 this.cancelAppointment(this.selectedTicketForCancel); - } - this.closeContextMenu(); + }).catch(() => { + // 用户取消操作 + this.closeContextMenu(); + }); } }, - // 确认停诊 - confirmCancelConsultation(ticket) { - // 二次确认 - if (confirm(`确认取消${ticket.doctor}在${ticket.dateTime}的看诊吗？`)) { - // 调用API处理停诊 - this.cancelConsultation(ticket); - } - }, - - // 处理停诊 - cancelConsultation(ticket) { - // 使用真实API调用处理停诊 - cancelConsultation(ticket.slot_id).then(response => { - // API调用成功后，重新获取最新的号源数据 - this.onSearch(); - alert('停诊已处理，该号源已被取消'); - }).catch(error => { - console.error('停诊处理失败:', error); - alert('停诊处理失败，请稍后重试。'); - }); - }, - - // 确认取号 - confirmCheckIn(ticket) { - // 二次确认 - if (confirm(`确认${ticket.patientName || ''}取号吗？`)) { - // 调用API处理取号 - this.checkIn(ticket); - } - }, - - // 处理取号 - checkIn(ticket) { - // 使用真实API调用处理取号 - checkInTicket(ticket.slot_id).then(response => { - // API调用成功后，重新获取最新的号源数据 - this.onSearch(); - alert('取号成功！'); - }).catch(error => { - console.error('取号失败:', error); - alert('取号失败，请稍后重试。'); - }); - }, - // 取消预约API调用 cancelAppointment(ticket) { if (!ticket || !ticket.slot_id) { - console.error('取消预约失败：缺少号源信息'); - alert('取消预约失败：缺少号源信息'); + ElMessage.error('取消预约失败：缺少号源信息'); this.closeContextMenu(); return; } - // 使用真实API调用取消预约 - cancelTicket(ticket.slot_id).then(response => { - // API调用成功后，更新当前卡片状态 - const ticketIndex = this.tickets.findIndex(t => t.slot_id === ticket.slot_id); - if (ticketIndex !== -1) { - // 清除该号源关联的所有患者信息 - this.tickets[ticketIndex].status = '未预约'; - this.tickets[ticketIndex].patientName = null; - this.tickets[ticketIndex].patientId = null; - this.tickets[ticketIndex].patientGender = null; - this.tickets[ticketIndex].medicalCard = null; - this.tickets[ticketIndex].phone = null; + // 使用真实API调用取消预约，传递slot_id + cancelTicket(ticket.slot_id).then(response => { + // 根据后端返回判断是否成功 + if (response.code === 200 || response.msg === '取消成功' || response.message === '取消成功') { + console.log('取消预约成功，更新前端状态'); + + // API调用成功后，更新当前卡片状态 + const ticketIndex = this.tickets.findIndex(t => t.slot_id === ticket.slot_id); + if (ticketIndex !== -1) { + // 清除该号源关联的所有患者信息 + this.tickets[ticketIndex].status = '未预约'; + this.tickets[ticketIndex].patientName = null; + this.tickets[ticketIndex].patientId = null; + this.tickets[ticketIndex].patientGender = null; + this.tickets[ticketIndex].medicalCard = null; + this.tickets[ticketIndex].phone = null; + + // 更新医生号源列表中的余号数量 + this.updateDoctorsList(); + } + + // 关闭上下文菜单 + this.closeContextMenu(); + ElMessage.success('预约已取消，号源已释放'); + } else { + // 取消失败 + const errorMsg = response.msg || response.message || '取消预约失败'; + ElMessage.error(`取消预约失败：${errorMsg}`); + this.closeContextMenu(); } - - // 关闭上下文菜单 - this.closeContextMenu(); - alert('预约已取消，号源已释放'); }).catch(error => { - console.error('取消预约失败:', error); - alert('取消预约失败，请稍后重试。'); + const errorMsg = error.message || '取消预约失败，请稍后重试'; + ElMessage.error(`取消预约失败：${errorMsg}`); this.closeContextMenu(); }); }, @@ -608,63 +594,58 @@ export default { this.selectedPatientId = null }, selectPatient(patientId) { - console.log('selectPatient called with patientId:', patientId); - console.log('Current patients data:', this.patients); - console.log('Patients array length:', this.patients.length); - // 确保患者数据已加载 if (this.patients.length === 0) { - console.error('No patients data available'); - alert('患者数据未加载，请先搜索患者'); + ElMessage.error('患者数据未加载，请先搜索患者'); return; } this.selectedPatientId = patientId; - console.log('Set selectedPatientId:', this.selectedPatientId); - // 保存选择的患者对象 - 使用idCard作为唯一标识，但增加容错性 this.selectedPatient = this.patients.find(patient => { // 尝试多种匹配方式 const matchByIdCard = patient.idCard === patientId; const matchById = patient.id === patientId; const matchByMedicalCard = patient.medicalCard === patientId; - const match = matchByIdCard || matchById || matchByMedicalCard; - - console.log(`Checking patient ${patient.name || 'unknown'}:`); - console.log(` idCard: ${patient.idCard}, matchByIdCard: ${matchByIdCard}`); - console.log(` id: ${patient.id}, matchById: ${matchById}`); - console.log(` medicalCard: ${patient.medicalCard}, matchByMedicalCard: ${matchByMedicalCard}`); - console.log(` Overall match: ${match}`); - + const match = matchByIdCard || matchById || matchByMedicalCard; return match; }); - - console.log('Selected patient:', this.selectedPatient); - console.log('Selected patientId:', this.selectedPatientId); - if (this.selectedPatient) { - // 添加视觉反馈，验证患者是否被选中 - alert('已选择患者: ' + this.selectedPatient.name); - - // 可以考虑自动滚动到确认按钮，提高用户体验 - const confirmBtn = document.querySelector('.confirm-btn'); - if (confirmBtn) { - confirmBtn.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); - } + // 使用 ElMessageBox.confirm 进行二次确认 + ElMessageBox.confirm( + `确认选择患者 ${this.selectedPatient.name} 进行预约？`, + '患者确认', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'info' + } + ).then(() => { + // 用户点击确定，自动滚动到确认按钮 + ElMessage.success('已选择患者: ' + this.selectedPatient.name); + const confirmBtn = document.querySelector('.confirm-btn'); + if (confirmBtn) { + confirmBtn.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + } + }).catch(() => { + // 用户取消选择，清空已选患者 + this.selectedPatientId = null; + this.selectedPatient = null; + ElMessage.info('已取消患者选择'); + }); } else { - console.error('Patient not found with id:', patientId); - alert('未找到该患者，请重新选择'); + ElMessage.error('未找到该患者，请重新选择'); this.selectedPatientId = null; } }, confirmPatientSelection() { if (!this.selectedPatientId || !this.selectedPatient) { - alert('请选择患者'); + ElMessage.error('请选择患者'); return; } if (!this.currentTicket) { - alert('预约信息错误，请重新选择号源'); + ElMessage.error('预约信息错误，请重新选择号源'); this.closePatientSelectModal(); return; } @@ -672,6 +653,7 @@ export default { try { const userStore = useUserStore(); const appointmentData = { + slotId: this.currentTicket.slot_id, // 添加号源ID ticketId: Number(this.currentTicket.slot_id), patientId: this.selectedPatientId, // 使用身份证号作为患者ID，不需要转换为数字 patientName: this.selectedPatient.name, @@ -685,39 +667,41 @@ export default { // 验证必填字段 if (!appointmentData.ticketId || isNaN(appointmentData.ticketId)) { - alert('号源ID无效'); + ElMessage.error('号源ID无效'); return; } if (!appointmentData.patientId) { - alert('患者ID无效'); + ElMessage.error('患者ID无效'); return; } - - console.log('Sending appointment data to backend:', appointmentData); - bookTicket(appointmentData).then(response => { + // 调用真实API进行预约 + bookTicket(appointmentData).then(response => { const ticketIndex = this.tickets.findIndex(t => t.slot_id === this.currentTicket.slot_id); if (ticketIndex !== -1) { this.tickets[ticketIndex].status = '已预约'; this.tickets[ticketIndex].patientName = this.selectedPatient.name; this.tickets[ticketIndex].patientId = this.selectedPatient.medicalCard; this.tickets[ticketIndex].patientGender = this.selectedPatient.gender; + + // 更新医生号源列表中的余号数量 + this.updateDoctorsList(); } this.closePatientSelectModal(); - alert('预约成功，号源已锁定。患者到院签到时需缴费取号。'); + + // 重新加载号源数据，确保显示最新状态 + this.onSearch(); + + ElMessage.success('预约成功，号源已锁定。患者到院签到时需缴费取号。'); }).catch(error => { - console.error('预约失败:', error); - alert('预约失败，请稍后重试。'); + ElMessage.error('预约失败，请稍后重试。'); }); } catch (error) { - console.error('预约数据处理错误:', error); - alert('预约信息格式错误，请重新操作。'); + ElMessage.error('预约信息格式错误，请重新操作。'); } }, onDateChange() { - // 日期变化时刷新号源列表 - console.log('Date changed:', this.selectedDate) // 重置页码并重新加载数据 this.currentPage = 1; this.onSearch() @@ -731,16 +715,7 @@ export default { this.isMobile = window.innerWidth <= 768; }, onSearch() { - this.isLoading = true - console.log('Searching with:', { - date: this.selectedDate, - status: this.selectedStatus, - type: this.selectedType, - name: this.patientName, - card: this.patientCard, - phone: this.patientPhone - }); - + this.isLoading = true // 调用真实API获取号源数据 const queryParams = { date: this.selectedDate, @@ -749,7 +724,7 @@ export default { name: this.patientName, card: this.patientCard, phone: this.patientPhone, - page: 1, + page: this.currentPage, limit: this.pageSize }; @@ -757,10 +732,7 @@ export default { Promise.all([ listAllTickets(), // 使用测试接口获取固定的5条专家号数据 listDept() - ]).then(([ticketResponse, deptResponse]) => { - // 打印完整的响应数据以便调试 - console.log('完整的号源响应数据:', ticketResponse); - + ]).then(([ticketResponse, deptResponse]) => { // 处理号源数据 if (ticketResponse) { // 检查是否有data.list字段（后端返回的数据结构是{code, data:{list, total}}） @@ -775,6 +747,10 @@ export default { // 保存所有原始数据 this.allTickets = [...this.tickets]; + + // 根据患者信息进行前端筛选 + this.filterTicketsByPatientInfo(); + // 更新医生列表 this.updateDoctorsList(); this.hasMore = this.tickets.length < this.totalTickets; @@ -786,8 +762,7 @@ export default { } // 处理科室数据 - this.updateDepartmentsListFromApi(deptResponse); - + this.updateDepartmentsListFromApi(deptResponse); this.isLoading = false; }).catch(error => { console.error('获取数据失败:', error); @@ -798,9 +773,7 @@ export default { this.departments = [{ value: 'all', label: '全部科室' }]; this.isLoading = false; }); - }, - - + }, // 从号源数据中更新科室列表（备用方法） updateDepartmentsList() { const departmentSet = new Set(); @@ -855,6 +828,25 @@ export default { } }, + // 根据患者信息过滤号源 + filterTicketsByPatientInfo() { + // 如果没有输入患者信息，就不进行过滤 + if (!this.patientName && !this.patientCard && !this.patientPhone) { + return; + } + + // 根据患者信息进行过滤（使用AND逻辑，全部匹配） + this.tickets = this.tickets.filter(ticket => { + const matchesName = !this.patientName || ticket.patientName?.includes(this.patientName); + const matchesCard = !this.patientCard || ticket.patientId?.includes(this.patientCard); + const matchesPhone = !this.patientPhone || ticket.phone?.includes(this.patientPhone); + + return matchesName && matchesCard && matchesPhone; + }); + + console.log('按患者信息过滤后的号源数量:', this.tickets.length); + }, + // 获取号源状态文本 getStatusText(status) { switch (status) { @@ -901,10 +893,7 @@ export default { }); // 转换为数组 - this.doctors = Array.from(doctorMap.values()); - - // 打印医生列表以便调试 - console.log('生成的医生列表:', this.doctors); + this.doctors = Array.from(doctorMap.values()); }, // 加载更多数据 loadMore() { @@ -926,10 +915,7 @@ export default { limit: this.pageSize }; - listTicket(queryParams).then(response => { - // 打印完整的响应数据以便调试 - console.log('加载更多的号源响应数据:', response); - + listTicket(queryParams).then(response => { // 处理号源数据 if (response) { let newRecords = []; @@ -1461,6 +1447,15 @@ export default { align-items: center; } +.ticket-index { + position: absolute; + top: 12px; + left: 12px; + color: #1890ff; + font-size: 14px; + font-weight: bold; +} + .ticket-time { font-size: 14px; color: #333; @@ -1514,6 +1509,13 @@ export default { white-space: nowrap; } +.ticket-id-time { + font-size: 14px; + color: #333; + margin-bottom: 8px; + text-align: center; +} + .ticket-fee { font-size: 14px; color: #333; @@ -1547,50 +1549,6 @@ export default { color: #91d5ff; cursor: not-allowed; } - - .cancel-button { - background-color: #F56C6C; - color: white; - border: none; - border-radius: 4px; - padding: 4px 12px; - cursor: pointer; - font-size: 14px; - transition: background-color 0.3s; - margin-top: 8px; - align-self: center; - } - - .cancel-button:hover { - background-color: #F78989; - } - - .cancel-button:disabled { - background-color: #C0C4CC; - cursor: not-allowed; - } - - .check-in-button { - background-color: #67C23A; - color: white; - border: none; - border-radius: 4px; - padding: 4px 12px; - cursor: pointer; - font-size: 14px; - transition: background-color 0.3s; - margin-top: 8px; - align-self: center; - } - - .check-in-button:hover { - background-color: #85ce61; - } - - .check-in-button:disabled { - background-color: #C0C4CC; - cursor: not-allowed; - } /* 患者信息样式 */ .ticket-patient { @@ -1603,6 +1561,18 @@ export default { color: #333; } +/* 患者电话号码样式 */ +.ticket-phone { + margin-top: 4px; + padding: 4px; + background-color: rgba(34, 177, 76, 0.05); + border-radius: 4px; + font-size: 12px; + text-align: center; + color: #22b14c; + font-weight: 500; +} + /* 响应式设计 */ @media (max-width: 768px) { .ticket-grid { @@ -1618,6 +1588,14 @@ export default { .ticket-doctor { font-size: 13px; } + + .ticket-id-time { + font-size: 13px; + } + + .ticket-index { + font-size: 13px; + } } /* 弹窗样式 */ @@ -1803,6 +1781,54 @@ export default { box-shadow: none; } +/* 搜索提示样式 */ +.search-hint { + text-align: center; + color: #999; + font-size: 14px; + padding: 20px; + background-color: #fafafa; + border-radius: 4px; + margin: 10px 0; +} + +/* 加载指示器样式 */ +.loading-indicator { + text-align: center; + color: #666; + font-size: 14px; + padding: 20px; + display: flex; + align-items: center; + justify-content: center; + gap: 8px; +} + +.loading-spinner { + width: 16px; + height: 16px; + border: 2px solid #f3f3f3; + border-top: 2px solid #1890ff; + border-radius: 50%; + animation: spin 1s linear infinite; +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +.no-results { + text-align: center; + color: #666; + font-size: 14px; + padding: 20px; + background-color: #fff2f0; + border: 1px solid #ffccc7; + border-radius: 4px; + margin: 10px 0; +} + /* 右键菜单样式 */ .context-menu { position: fixed; @@ -1842,4 +1868,60 @@ export default { opacity: 0.7; cursor: not-allowed; } + +/* 分页组件样式 */ +.pagination-container { + display: flex; + justify-content: center; + margin-top: 20px; + padding: 20px 0; + background-color: #fafafa; + border-radius: 4px; +} + +.pagination-container .el-pagination { + font-size: 14px; +} + +.pagination-container .el-pagination .el-pager li { + min-width: 36px; + height: 36px; + line-height: 36px; + border-radius: 4px; + margin: 0 2px; +} + +.pagination-container .el-pagination .el-pager li:hover { + background-color: #e6f7ff; + color: #1890ff; +} + +.pagination-container .el-pagination .el-pager li.active { + background-color: #1890ff; + color: white; +} + +.pagination-container .el-pagination .btn-prev, +.pagination-container .el-pagination .btn-next { + width: 36px; + height: 36px; + border-radius: 4px; + margin: 0 2px; +} + +.pagination-container .el-pagination .el-pagination__sizes { + margin-right: 10px; +} + +.pagination-container .el-pagination .el-pagination__sizes .el-input { + width: 100px; +} + +.pagination-container .el-pagination .el-pagination__jump { + margin-left: 10px; +} + +.pagination-container .el-pagination .el-pagination__jump .el-input { + width: 60px; +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue b/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue deleted file mode 100644 index d74d4d57..00000000 --- a/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue +++ /dev/null @@ -1,1638 +0,0 @@ - - - - - \ No newline at end of file