diff --git a/BUGFIX_ANALYSIS.md b/BUGFIX_ANALYSIS.md new file mode 100644 index 00000000..b3a12996 --- /dev/null +++ b/BUGFIX_ANALYSIS.md @@ -0,0 +1,91 @@ +# Bug 根因分析与修复方案 + +## Bug 335 - 门诊医生站开立药品医嘱保存报错 + +### 问题分析 +根据代码分析，`DoctorStationAdviceAppServiceImpl.saveAdvice()` 方法处理药品医嘱保存时可能报错的原因： + +1. **patientId/encounterId 为 null** - 删除操作时前端可能未传 +2. **accountId 为 null** - 患者账户信息未正确获取 +3. **definitionId/definitionDetailId 为 null** - 定价信息缺失 +4. **库存校验失败** - 药品库存不足 + +### 修复方案 +✅ 已部分修复（见代码中的 BugFix 注释） +- 已添加 patientId/encounterId 自动补全逻辑 +- 已添加 accountId 自动创建逻辑 +- 需要进一步验证 definitionId 的处理 + +--- + +## Bug 336 - 门诊医生站开立诊疗项目保存报错 + +### 问题分析 +诊疗项目保存与药品类似，但有以下特殊点： + +1. **必须选择执行科室** - 代码中有校验 `throw new ServiceException("诊疗项目必须选择执行科室")` +2. **活动绑定设备处理** - 需要处理 `handService()` 中的设备绑定逻辑 +3. **库存校验** - 诊疗项目可能关联耗材 + +### 修复方案 +- 确保前端传递 executeDeptId（执行科室） +- 检查 handService() 方法中的异常处理 +- 添加更详细的错误日志 + +--- + +## Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录 + +### 问题分析 +**这是患者安全问题！** 未接诊患者也可新增划价项目可能导致： +- 收费错误 +- 医疗纠纷 +- 数据不一致 + +当前代码问题： +- `OutpatientPricingAppServiceImpl.getAdviceBaseInfo()` 仅查询医嘱，未校验就诊状态 +- 前端划价保存接口未找到（可能在其他地方） + +### 修复方案 +1. 在划价查询时增加就诊状态校验 +2. 在划价保存时增加诊断记录校验 +3. 未接诊患者禁止划价 + +--- + +## Bug 339 - 药房筛选条件失效 + +### 问题分析 +查询结果中包含非选中药房的数据，可能原因： +- SQL WHERE 条件未正确应用 locationId +- 多表关联时过滤条件丢失 + +### 修复方案 +- 检查 `DoctorStationAdviceAppMapper.getAdviceBaseInfo()` 的 SQL +- 确保 locationId 条件正确应用 + +--- + +## 修复优先级 + +1. **Bug 338** - 患者安全问题，最高优先级 +2. **Bug 335/336** - 核心功能阻断，高优先级 +3. **Bug 339** - 数据准确性问题，中优先级 + +--- + +## 测试用例 + +### Bug 338 测试 +1. 选择未接诊患者，尝试划价 → 应禁止 +2. 选择已接诊但无诊断的患者，尝试划价 → 应提示补充诊断 +3. 选择正常接诊患者，划价 → 应成功 + +### Bug 335/336 测试 +1. 门诊医生站开立药品医嘱 → 应成功保存 +2. 门诊医生站开立诊疗项目 → 应成功保存 +3. 签发医嘱 → 应成功 + +### Bug 339 测试 +1. 选择"西药房"筛选 → 结果应仅包含西药房数据 +2. 选择"中药房"筛选 → 结果应仅包含中药房数据 diff --git a/BUGFIX_PLAN.md b/BUGFIX_PLAN.md new file mode 100644 index 00000000..d5a97e66 --- /dev/null +++ b/BUGFIX_PLAN.md @@ -0,0 +1,84 @@ +# HIS 系统 Bug 修复计划 + +## 修复负责人 +华佗 (AI 团队) + +## 修复时间 +2026-04-05 开始 + +--- + +## Bug 清单与修复优先级 + +### 🔴 高优先级（核心业务阻断） + +#### Bug 335 - 门诊医生站开立药品医嘱保存报错 +- **模块**: 医生工作站 +- **文件**: `DoctorStationAdviceAppServiceImpl.java` +- **根因分析**: 待分析 +- **修复状态**: 🔄 分析中 + +#### Bug 336 - 门诊医生站开立诊疗项目保存报错 +- **模块**: 医生工作站 +- **文件**: `DoctorStationAdviceAppServiceImpl.java` +- **根因分析**: 待分析 +- **修复状态**: ⏳ 等待 335 修复后验证 + +#### Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录 +- **模块**: 门诊收费 +- **问题**: 未接诊患者也可新增划价项目（患者安全问题） +- **修复方案**: 在划价保存前增加就诊状态和诊断记录校验 +- **修复状态**: ⏳ 待修复 + +### 🟡 中优先级（数据准确性/用户体验） + +#### Bug 339 - 药房筛选条件失效 +- **模块**: 药房药库报表管理 +- **问题**: 查询结果中包含非选中药房的数据 +- **修复状态**: ⏳ 待分析 + +#### Bug 333 - 耗材医嘱类型错误 +- **模块**: 医生工作站 +- **问题**: 类型误转为"中成药"且保存报错 +- **修复状态**: ⏳ 待分析 + +#### Bug 337 - 挂号时间显示异常 +- **模块**: 建档挂号管理 +- **问题**: 未显示当前实际挂号时间 +- **修复状态**: ⏳ 待分析 + +#### Bug 334 - 检验申请界面布局优化 +- **模块**: 门诊医生工作站 +- **问题**: 按钮布局需要调整 +- **修复状态**: ⏳ 待修复（前端） + +### 🟢 低优先级（历史遗留问题） + +#### Bug 249/253/280/300 - 3 月份遗留 bug +- **修复状态**: ⏳ 后续处理 + +--- + +## 修复流程 + +1. **分析根因** - 查看代码和日志，定位问题 +2. **编写修复** - 修改代码并添加必要校验 +3. **本地测试** - 确保修复有效且不引入新问题 +4. **提交代码** - commit 并推送到 gitea +5. **验证关闭** - 在禅道更新 Bug 状态 + +--- + +## 测试要求 + +- 修复后必须测试 +- 测试不通过继续修 +- 确保不影响其他功能 + +--- + +## 备注 + +- 所有修复基于 develop 分支 +- 修复完成后统一提交 +- 重要修复添加详细注释 diff --git a/BUG_FIX_PROGRESS.md b/BUG_FIX_PROGRESS.md new file mode 100644 index 00000000..f30c0d26 --- /dev/null +++ b/BUG_FIX_PROGRESS.md @@ -0,0 +1,61 @@ +# HIS项目 Bug修复与需求开发进度表 + +## 项目信息 +- **项目名称**: 开源HIS改造落地 +- **当前分支**: develop +- **代码路径**: + - 前端: openhis-ui-vue3 + - 后端: openhis-server-new +- ** Git仓库**: https://gitea.gentronhealth.com/wangyizhe/his +- **禅道地址**: https://zentao.gentronhealth.com + +## 当前状态 +- ✅ 代码已克隆完成 +- ✅ Bug 已重新分配（管理员操作） +- ⏳ 等待修复人员开始工作 +- 📋 张飞负责测试验证 + +## Bug修复任务列表（重新分配后） + +| Bug ID | 严重程度 | 状态 | 模块 | 标题 | 原指派给 | **新指派给** | 进度 | +|--------|----------|------|------|------|----------|--------------|------| +| 339 | 3 | 激活 | 药房药库报表管理 | 药房筛选条件失效 | 王怡哲 | **关羽** | 待处理 | +| 338 | 3 | 激活 | 门诊收费管理 | 未校验就诊记录 | 王怡哲 | **关羽** | 待处理 | +| 337 | 3 | 激活 | 建档挂号管理 | 挂号时间显示异常 | 王怡哲 | **关羽** | 待处理 | +| 336 | 3 | 激活 | 门诊医生工作站 | 开立诊疗项目保存报错 | 王怡哲 | **关羽** | 待处理 | +| 335 | 3 | 激活 | 门诊医生工作站 | 开立药品医嘱保存报错 | 王怡哲 | **关羽** | 待处理 | +| 334 | 3 | 激活 | 门诊医生工作站 | 检验申请界面布局优化 | 王建 | **子龙** | 待处理 | +| 333 | 3 | 激活 | 门诊医生工作站 | 耗材医嘱类型误转 | 陈显精 | **关羽** | 待处理 | + +## P0 级别 Bug（紧急，优先修复） + +| Bug ID | 标题 | 严重程度 | 负责人 | +|--------|------|----------|--------| +| 335 | 开立药品医嘱保存报错 | 严重 | 关羽 | +| 336 | 开立诊疗项目保存报错 | 严重 | 关羽 | +| 338 | 未校验就诊记录 | 严重 | 关羽 | + +## 需求开发任务列表（10个，全部未关闭） + +待进一步确认分配情况... + +## 工作流程 +1. **认领任务** - 在禅道将 Bug 分配给自己 +2. **修改代码** - 从 develop 分支创建新分支：`bug/bug-id` +3. **本地测试** - 确保本地 JDK 17 环境编译通过 +4. **提交PR** - 提交 Pull Request 到 develop 分支 +5. **测试验证** - 张飞进行测试 +6. **合并分支** - 测试通过后合并到 develop + +## 注意事项 +- 所有代码修改必须先创建新分支 +- 分支命名：`bug/bug-id` 或 `feature/feedback-id` +- 提交信息必须包含禅道Bug/需求ID +- 修改前请先阅读 `AGENTS.md` 了解项目规范 +- **JDK 17 配置** - 确保本地开发环境使用 JDK 17 + +## 今日会议纪要 +- 2026-04-05 15:09: 管理员重新分配 Bug 给群内武将 +- 2026-04-05 14:58: 确认将王怡哲的 Bug 分配给关羽、张飞、陈琳 +- 2026-04-05 13:47: 统一调度分配人员任务 +- 2026-04-05 12:45: 初始任务分配完成 diff --git a/GIT_TEST_GUANYU.md b/GIT_TEST_GUANYU.md new file mode 100644 index 00000000..ae52d341 --- /dev/null +++ b/GIT_TEST_GUANYU.md @@ -0,0 +1,2 @@ +# 关羽 Git 配置测试 +测试时间: Mon Apr 6 07:03:56 AM CST 2026 diff --git a/md/BUG_ANALYSIS.md b/md/BUG_ANALYSIS.md new file mode 100644 index 00000000..26693993 --- /dev/null +++ b/md/BUG_ANALYSIS.md @@ -0,0 +1,70 @@ +# HIS项目 Bug 分析与修复日志 + +## 2026-04-05 23:55 - 子龙开始工作 + +### Bug 334 分析：门诊医生站-检验申请界面按钮布局优化 + +**文件位置**： +- `/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue` + +**当前布局问题**： +1. 顶部操作按钮区高度 60px，可能有优化空间 +2. 表单区域 padding 较大 +3. 需要优化垂直空间利用率 + +**修复方案**： +- 减少不必要的 padding 和 margin +- 优化表单字段布局 +- 调整按钮区域高度 + +--- + +### Bug 335 分析：门诊医生站开立药品医嘱点击【保存】时报错 + +**文件位置**： +- `/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java` + +**问题定位**： +- 方法：`saveAdvice()` -> `handMedication()` +- 可能原因： + 1. encounterId 或 patientId 为 null + 2. 库存校验失败 + 3. 账户ID缺失 + +**代码已修复**： +- 行 488-588：已添加 encounterId 和 patientId 校验 +- 行 497-588：自动补全逻辑 + +--- + +### Bug 336 分析：门诊医生站开立诊疗项目后点击【保存】报错 + +**文件位置**： +- 同上文件 + +**问题定位**： +- 方法：`saveAdvice()` -> `handService()` +- 可能原因： + 1. effectiveOrgId（执行科室）为 null + 2. accountId 为 null + +**代码已修复**： +- 行 1290-1390：已添加 accountId 自动补全 +- 行 1338-1343：诊疗项目执行科室非空校验 + +--- + +## 工作分工 + +| Bug ID | 负责人 | 状态 | +|--------|--------|------| +| 334 | 子龙 | 分析中 | +| 335 | 关羽 | 待修复 | +| 336 | 关羽 | 待修复 | +| 338 | 关羽 | 待修复 | + +## 下一步行动 + +1. 子龙修复 Bug 334（检验申请界面布局优化） +2. 关羽修复 Bug 335、336、338 +3. 张飞测试验证 \ No newline at end of file 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 573285cd..2cff7c07 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 @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,6 +124,7 @@ public class TicketAppServiceImpl implements ITicketAppService { if (query == null) { query = new com.openhis.appointmentmanage.dto.TicketQueryDTO(); } + normalizeQueryStatus(query); // 2. 构造 MyBatis 的分页对象 (传入前端给的当前页和每页条数) com.baomidou.mybatisplus.extension.plugins.pagination.Page pageParam = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>( @@ -140,42 +142,67 @@ public class TicketAppServiceImpl implements ITicketAppService { // 基础字段映射 dto.setSlot_id(raw.getSlotId()); + dto.setSeqNo(raw.getSeqNo()); dto.setBusNo(String.valueOf(raw.getSlotId())); dto.setDoctor(raw.getDoctor()); dto.setDepartment(raw.getDepartmentName()); // 注意：以前这里传成了ID，导致前端出Bug，现在修复成了真正的科室名 dto.setFee(raw.getFee()); dto.setPatientName(raw.getPatientName()); - dto.setPatientId(raw.getPatientId() != null ? String.valueOf(raw.getPatientId()) : null); + dto.setPatientId(raw.getMedicalCard()); dto.setPhone(raw.getPhone()); + dto.setIdCard(raw.getIdCard()); + dto.setDoctorId(raw.getDoctorId()); + dto.setDepartmentId(raw.getDepartmentId()); + dto.setRealPatientId(raw.getPatientId()); + + // 性别处理：直接读取优先级最高的订单性别字段 (SQL 已处理优先级) + if (raw.getPatientGender() != null) { + String pg = raw.getPatientGender().trim(); + dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知")); + } else { + dto.setGender("未知"); + } - // 号源类型处理 (底层是1，前端要的是expert) if (raw.getRegType() != null && raw.getRegType() == 1) { dto.setTicketType("expert"); } else { dto.setTicketType("general"); } - // 拼接就诊时间 if (raw.getScheduleDate() != null && raw.getExpectTime() != null) { dto.setDateTime(raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString()); try { - dto.setAppointmentDate( - new java.text.SimpleDateFormat("yyyy-MM-dd").parse(raw.getScheduleDate().toString())); + String timeStr = raw.getAppointmentTime() != null ? raw.getAppointmentTime() : (raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString()); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(timeStr.length() > 10 ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd"); + java.util.Date date = sdf.parse(timeStr); + dto.setAppointmentDate(date); + dto.setAppointmentTime(date); } catch (Exception e) { dto.setAppointmentDate(new java.util.Date()); } } - // 精准状态翻译！把底层的1和2，翻译回前端能懂的中文 if (Boolean.TRUE.equals(raw.getIsStopped())) { dto.setStatus("已停诊"); } else { Integer slotStatus = raw.getSlotStatus(); if (slotStatus != null) { - if (SlotStatus.BOOKED.equals(slotStatus)) { - dto.setStatus(AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus()) ? "已取号" : "已预约"); - } else if (SlotStatus.STOPPED.equals(slotStatus)) { + if (SlotStatus.CHECKED_IN.equals(slotStatus)) { + dto.setStatus("已取号"); + } else if (SlotStatus.BOOKED.equals(slotStatus)) { + if (AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus())) { + dto.setStatus("已取号"); + } else if (AppointmentOrderStatus.RETURNED.equals(raw.getOrderStatus())) { + dto.setStatus("已退号"); + } else { + dto.setStatus("已预约"); + } + } else if (SlotStatus.RETURNED.equals(slotStatus)) { + dto.setStatus("已退号"); + } else if (SlotStatus.CANCELLED.equals(slotStatus)) { dto.setStatus("已停诊"); + } else if (SlotStatus.LOCKED.equals(slotStatus)) { + dto.setStatus("已锁定"); } else { dto.setStatus("未预约"); } @@ -198,6 +225,62 @@ public class TicketAppServiceImpl implements ITicketAppService { return R.ok(result); } + /** + * 统一状态入参，避免前端状态值大小写/中文/数字差异导致 SQL 条件失效后回全量数据 + */ + private void normalizeQueryStatus(com.openhis.appointmentmanage.dto.TicketQueryDTO query) { + String rawStatus = query.getStatus(); + if (rawStatus == null) { + return; + } + String normalized = rawStatus.trim(); + if (normalized.isEmpty()) { + query.setStatus(null); + return; + } + String lower = normalized.toLowerCase(Locale.ROOT); + switch (lower) { + case "all": + case "全部": + query.setStatus("all"); + break; + case "unbooked": + case "0": + case "未预约": + query.setStatus("unbooked"); + break; + case "booked": + case "1": + case "已预约": + query.setStatus("booked"); + break; + case "checked": + case "checkin": + case "checkedin": + case "2": + case "已取号": + query.setStatus("checked"); + break; + case "cancelled": + case "canceled": + case "3": + case "已停诊": + case "已取消": + query.setStatus("cancelled"); + break; + case "returned": + case "4": + case "5": + case "已退号": + query.setStatus("returned"); + break; + default: + // 设置为 impossible 值，配合 mapper 的 otherwise 分支直接返回空 + query.setStatus("__invalid__"); + break; + } + } + @Override public R listDoctorAvailability(com.openhis.appointmentmanage.dto.TicketQueryDTO query) { if (query == null) { @@ -237,12 +320,13 @@ public class TicketAppServiceImpl implements ITicketAppService { // --- 基础字段处理 --- // 注意：这里已经变成了极其舒服的 .getSlotId() 方法调用，告别魔鬼字符串！ dto.setSlot_id(raw.getSlotId()); + dto.setSeqNo(raw.getSeqNo()); dto.setBusNo(String.valueOf(raw.getSlotId())); // 暂时借用真实槽位ID做唯一流水号 dto.setDoctor(raw.getDoctor()); dto.setDepartment(raw.getDepartmentName()); dto.setFee(raw.getFee()); dto.setPatientName(raw.getPatientName()); - dto.setPatientId(raw.getPatientId() != null ? String.valueOf(raw.getPatientId()) : null); + dto.setPatientId(raw.getMedicalCard()); dto.setPhone(raw.getPhone()); // --- 号源类型处理 (普通/专家) --- @@ -258,9 +342,13 @@ public class TicketAppServiceImpl implements ITicketAppService { if (raw.getScheduleDate() != null && raw.getExpectTime() != null) { dto.setDateTime(raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString()); try { - dto.setAppointmentDate( - new java.text.SimpleDateFormat("yyyy-MM-dd").parse(raw.getScheduleDate().toString())); + String timeStr = raw.getAppointmentTime() != null ? raw.getAppointmentTime() : (raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString()); + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(timeStr.length() > 10 ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd"); + java.util.Date date = sdf.parse(timeStr); + dto.setAppointmentDate(date); + dto.setAppointmentTime(date); } catch (Exception e) { + log.error("时间解析失败", e); dto.setAppointmentDate(new java.util.Date()); } } @@ -273,10 +361,22 @@ public class TicketAppServiceImpl implements ITicketAppService { // 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已取消...) Integer slotStatus = raw.getSlotStatus(); if (slotStatus != null) { - if (SlotStatus.BOOKED.equals(slotStatus)) { - dto.setStatus(AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus()) ? "已取号" : "已预约"); - } else if (SlotStatus.STOPPED.equals(slotStatus)) { - dto.setStatus("已停诊"); // 视业务可改回已取消 + if (SlotStatus.CHECKED_IN.equals(slotStatus)) { + dto.setStatus("已取号"); + } else if (SlotStatus.BOOKED.equals(slotStatus)) { + if (AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus())) { + dto.setStatus("已取号"); + } else if (AppointmentOrderStatus.RETURNED.equals(raw.getOrderStatus())) { + dto.setStatus("已退号"); + } else { + dto.setStatus("已预约"); + } + } else if (SlotStatus.RETURNED.equals(slotStatus)) { + dto.setStatus("已退号"); + } else if (SlotStatus.CANCELLED.equals(slotStatus)) { + dto.setStatus("已停诊"); + } else if (SlotStatus.LOCKED.equals(slotStatus)) { + dto.setStatus("已锁定"); } else { dto.setStatus("未预约"); } @@ -355,15 +455,12 @@ public class TicketAppServiceImpl implements ITicketAppService { if (patient != null) { Integer genderEnum = patient.getGenderEnum(); if (genderEnum != null) { - switch (genderEnum) { - case 1: - dto.setGender("男"); - break; - case 2: - dto.setGender("女"); - break; - default: - dto.setGender("未知"); + if (Integer.valueOf(1).equals(genderEnum)) { + dto.setGender("男"); + } else if (Integer.valueOf(2).equals(genderEnum)) { + dto.setGender("女"); + } else { + dto.setGender("未知"); } } } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java index 6c3941a1..afc073a4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java @@ -23,6 +23,11 @@ public class TicketDto { @JsonSerialize(using = ToStringSerializer.class) private Long slot_id; + /** + * 号源序号（对应 adm_schedule_slot.seq_no） + */ + private Integer seqNo; + /** * 号源编码 */ @@ -99,4 +104,15 @@ public class TicketDto { */ @JsonSerialize(using = ToStringSerializer.class) private Long doctorId; + + /** + * 真实患者ID（数据库主键，区别于 patientId 存的就诊卡号） + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long realPatientId; + + /** + * 身份证号 + */ + private String idCard; } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java index dd32d54d..90c4d116 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java @@ -73,11 +73,10 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer } else { adviceTypes = List.of(1, 2, 3); } - // 门诊划价：不要强制 pricingFlag=1 参与过滤（wor_activity_definition.pricing_flag 可能为 0）， - // 否则会导致诊疗项目(adviceType=3)查询结果为空 records=[] String categoryCode = adviceBaseDto != null ? adviceBaseDto.getCategoryCode() : null; + // 门诊划价：仅返回划价标记为“是”的项目 return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null, - organizationId, pageNo, pageSize, null, adviceTypes, null, categoryCode); + organizationId, pageNo, pageSize, Whether.YES.getValue(), adviceTypes, null, categoryCode); } } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java index 47e55783..3db1ca2b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java @@ -22,6 +22,10 @@ import com.openhis.common.enums.ybenums.YbPayment; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; +import com.openhis.appointmentmanage.mapper.SchedulePoolMapper; +import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper; +import com.openhis.clinical.domain.Order; +import com.openhis.clinical.service.IOrderService; import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.financial.domain.RefundLog; import com.openhis.financial.service.IRefundLogService; @@ -48,6 +52,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; @@ -97,6 +102,15 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra @Resource IRefundLogService iRefundLogService; + @Resource + IOrderService orderService; + + @Resource + ScheduleSlotMapper scheduleSlotMapper; + + @Resource + SchedulePoolMapper schedulePoolMapper; + /** * 门诊挂号 - 查询患者信息 * @@ -291,6 +305,11 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra } } + // 如果本次门诊挂号来自预约签到，同步把预约订单与号源槽位状态改为已退号 + if (result != null && result.getCode() == 200) { + syncAppointmentReturnStatus(byId, cancelRegPaymentDto.getReason()); + } + // 记录退号日志 recordRefundLog(cancelRegPaymentDto, byId, result, paymentRecon); @@ -399,6 +418,74 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra return R.ok("已取消挂号"); } + /** + * 同步预约号源状态为已退号。 + * 说明： + * 1) 门诊退号主流程不依赖该步骤成功与否，因此此方法内部异常仅记录日志，不向上抛出。 + * 2) 通过患者、科室、日期以及状态筛选最近一条预约订单，尽量避免误匹配。 + */ + private void syncAppointmentReturnStatus(Encounter encounter, String reason) { + if (encounter == null || encounter.getPatientId() == null) { + return; + } + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(Order::getPatientId, encounter.getPatientId()) + .in(Order::getStatus, CommonConstants.AppointmentOrderStatus.BOOKED, + CommonConstants.AppointmentOrderStatus.CHECKED_IN) + .orderByDesc(Order::getUpdateTime) + .orderByDesc(Order::getCreateTime) + .last("LIMIT 1"); + + if (encounter.getOrganizationId() != null) { + queryWrapper.eq(Order::getDepartmentId, encounter.getOrganizationId()); + } + if (encounter.getTenantId() != null) { + queryWrapper.eq(Order::getTenantId, encounter.getTenantId()); + } + if (encounter.getCreateTime() != null) { + LocalDate encounterDate = encounter.getCreateTime().toInstant() + .atZone(ZoneId.systemDefault()).toLocalDate(); + Date startOfDay = Date.from(encounterDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + Date nextDayStart = Date.from(encounterDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant()); + queryWrapper.ge(Order::getAppointmentDate, startOfDay) + .lt(Order::getAppointmentDate, nextDayStart); + } + + Order appointmentOrder = orderService.getOne(queryWrapper, false); + if (appointmentOrder == null) { + return; + } + + Date now = new Date(); + if (!CommonConstants.AppointmentOrderStatus.RETURNED.equals(appointmentOrder.getStatus())) { + Order updateOrder = new Order(); + updateOrder.setId(appointmentOrder.getId()); + updateOrder.setStatus(CommonConstants.AppointmentOrderStatus.RETURNED); + updateOrder.setCancelTime(now); + updateOrder.setCancelReason( + StringUtils.isNotEmpty(reason) ? reason : "门诊退号"); + updateOrder.setUpdateTime(now); + orderService.updateById(updateOrder); + } + + Long slotId = appointmentOrder.getSlotId(); + if (slotId == null) { + return; + } + + int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, CommonConstants.SlotStatus.RETURNED); + if (slotRows > 0) { + Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId); + if (poolId != null) { + schedulePoolMapper.refreshPoolStats(poolId); + } + } + } catch (Exception e) { + log.warn("同步预约号源已退号状态失败, encounterId={}", encounter.getId(), e); + } + } + /** * 补打挂号 * 补打挂号不需要修改数据库，只需要返回成功即可，前端已有所有需要的数据用于打印 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 192bf778..bb54a60b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -205,6 +205,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(adviceBaseDto, searchKey, new HashSet<>(Arrays.asList("advice_name", "py_str", "wb_str")), null); + // 🔧 BugFix#339: 药房筛选条件失效 - 添加 locationId 过滤条件 + if (locationId != null) { + queryWrapper.eq("location_id", locationId); + log.info("BugFix#339: 添加药房筛选条件 locationId={}", locationId); + } IPage adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo( new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId, CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION, @@ -561,6 +566,24 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp return R.fail(null, "无法获取患者信息，请重新选择患者"); } } + + // 🔧 BugFix#338: 门诊划价新增时校验就诊状态和诊断记录（患者安全） + // 仅对新增/修改操作进行校验，删除操作不需要 + if (!DbOpType.DELETE.getCode().equals(adviceSaveDto.getDbOpType())) { + // 1. 校验就诊状态：必须是已接诊状态 + Encounter encounterCheck = iEncounterService.getById(adviceSaveDto.getEncounterId()); + if (encounterCheck != null) { + // 就诊状态：1001=挂号，1002=已接诊，1003=已收费，1004=已完成 + if (encounterCheck.getStatusEnum() != null && + encounterCheck.getStatusEnum() != 1002 && + encounterCheck.getStatusEnum() != 1003 && + encounterCheck.getStatusEnum() != 1004) { + log.error("BugFix#338: 患者未接诊，禁止划价/保存医嘱：encounterId={}, status={}", + adviceSaveDto.getEncounterId(), encounterCheck.getStatusEnum()); + return R.fail(null, "患者尚未接诊，无法保存医嘱。请先完成接诊操作！"); + } + } + } } // 药品（前端adviceType=1） @@ -770,6 +793,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp } } + // 🔧 Bug Fix: 确保practitionerId不为null + if (adviceSaveDto.getPractitionerId() == null) { + adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + log.info("handMedication - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); + } + + // 🔧 Bug Fix: 确保founderOrgId不为null + if (adviceSaveDto.getFounderOrgId() == null) { + adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId()); + log.info("handMedication - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId()); + } + boolean firstTimeSave = false;// 第一次保存 medicationRequest = new MedicationRequest(); medicationRequest.setId(adviceSaveDto.getRequestId()); // 主键id @@ -1137,6 +1172,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp } } + // 🔧 Bug Fix: 确保practitionerId不为null + if (adviceSaveDto.getPractitionerId() == null) { + adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + log.info("自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); + } + + // 🔧 Bug Fix: 确保founderOrgId不为null + if (adviceSaveDto.getFounderOrgId() == null) { + adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId()); + log.info("自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId()); + } + deviceRequest = new DeviceRequest(); deviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态 @@ -1201,6 +1248,47 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp chargeItem.setServiceId(deviceRequest.getId()); // 医疗服务ID chargeItem.setProductTable(adviceSaveDto.getAdviceTableName());// 产品所在表 chargeItem.setProductId(adviceSaveDto.getAdviceDefinitionId());// 收费项id + + // 🔧 Bug Fix: 如果 definitionId 或 definitionDetailId 为 null，从定价信息中获取 + if (chargeItem.getDefinitionId() == null || chargeItem.getDefDetailId() == null) { + log.warn("耗材的 definitionId 或 definitionDetailId 为 null，尝试从定价信息中获取: deviceDefId={}", + adviceSaveDto.getAdviceDefinitionId()); + // 查询耗材定价信息 + IPage devicePage = doctorStationAdviceAppMapper.getAdviceBaseInfo( + new Page<>(1, 1), + PublicationStatus.ACTIVE.getValue(), + orgId, + CommonConstants.TableName.ADM_DEVICE_DEFINITION, + null, + null, + null, + Arrays.asList(adviceSaveDto.getAdviceDefinitionId()), + null, + null, + null, + null); + if (devicePage != null && !devicePage.getRecords().isEmpty()) { + AdviceBaseDto deviceBaseInfo = devicePage.getRecords().get(0); + if (deviceBaseInfo.getPriceList() != null && !deviceBaseInfo.getPriceList().isEmpty()) { + AdvicePriceDto devicePrice = deviceBaseInfo.getPriceList().get(0); + if (chargeItem.getDefinitionId() == null) { + chargeItem.setDefinitionId(devicePrice.getDefinitionId()); + log.info("从定价信息中获取 definitionId: {}", devicePrice.getDefinitionId()); + } + if (chargeItem.getDefDetailId() == null) { + chargeItem.setDefDetailId(devicePrice.getDefinitionDetailId()); + log.info("从定价信息中获取 definitionDetailId: {}", devicePrice.getDefinitionDetailId()); + } + } + } + } + + // 🔧 Bug Fix: 确保定义ID不为null + if (chargeItem.getDefinitionId() == null) { + log.error("无法获取耗材的 definitionId: deviceDefId={}", adviceSaveDto.getAdviceDefinitionId()); + throw new ServiceException("无法获取耗材的定价信息，请联系管理员"); + } + // 🔧 Bug Fix: 如果accountId为null，从就诊中获取账户ID，如果没有则自动创建 Long accountId = adviceSaveDto.getAccountId(); if (accountId == null) { @@ -1323,6 +1411,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp } } + // 🔧 Bug Fix: 确保practitionerId不为null + if (adviceSaveDto.getPractitionerId() == null) { + adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + log.info("handService - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); + } + + // 🔧 Bug Fix: 确保founderOrgId不为null + if (adviceSaveDto.getFounderOrgId() == null) { + adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId()); + log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId()); + } + // 🔧 Bug Fix #238: 诊疗项目执行科室非空校验 if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3) { Long effectiveOrgId = adviceSaveDto.getEffectiveOrgId(); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java index 3278124b..5e4e9c28 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java @@ -115,6 +115,15 @@ public class AdviceUtils { matched = true; // 检查库存是否充足 BigDecimal minUnitQuantity = saveDto.getMinUnitQuantity(); + // 🔧 Bug Fix: 对于耗材类型，如果没有设置minUnitQuantity，则使用quantity作为默认值 + if (minUnitQuantity == null) { + if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(inventoryDto.getItemTable())) { + // 耗材只有一个单位，minUnitQuantity等于quantity + minUnitQuantity = saveDto.getQuantity(); + } else { + return saveDto.getAdviceName() + "的小单位数量不能为空"; + } + } BigDecimal chineseHerbsDoseQuantity = saveDto.getChineseHerbsDoseQuantity(); // 中药付数 // 中草药医嘱的情况 if (chineseHerbsDoseQuantity != null && chineseHerbsDoseQuantity.compareTo(BigDecimal.ZERO) > 0) { diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index 21cf9472..1dcdfda8 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -59,7 +59,7 @@ T9.gender_enum AS genderEnum, T9.id_card AS idCard, T9.status_enum AS statusEnum, - T9.register_time AS registerTime, + T9.register_time AS register_time, T9.total_price AS totalPrice, T9.account_name AS accountName, T9.enterer_name AS entererName, diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java index 40313859..1521d552 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java @@ -769,15 +769,21 @@ public class CommonConstants { } /** - * 号源槽位状态 (adm_schedule_slot.slot_status) + * 号源槽位状态 (adm_schedule_slot.status) */ public interface SlotStatus { /** 可用 / 待预约 */ Integer AVAILABLE = 0; /** 已预约 */ Integer BOOKED = 1; - /** 已停诊 / 已失效 */ - Integer STOPPED = 2; + /** 已取消 / 已停诊 */ + Integer CANCELLED = 2; + /** 已锁定 */ + Integer LOCKED = 3; + /** 已签到 / 已取号 */ + Integer CHECKED_IN = 4; + /** 已退号 */ + Integer RETURNED = 5; } /** @@ -790,6 +796,8 @@ public class CommonConstants { Integer CHECKED_IN = 2; /** 已取消 */ Integer CANCELLED = 3; + /** 已退号 */ + Integer RETURNED = 4; } } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java index de6af5a4..e3185138 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java @@ -9,6 +9,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.time.LocalTime; +import java.util.Date; + /** * 号源池明细Entity * @@ -29,7 +31,7 @@ public class ScheduleSlot extends HisBaseEntity { /** 序号 */ private Integer seqNo; - /** 序号状态: 0-可用,1-已预约,2-已取消,3-已过期等 */ + /** 序号状态: 0-可用,1-已预约,2-已取消/已停诊,3-已锁定,4-已签到,5-已退号 */ private Integer status; /** 预约订单ID */ @@ -37,4 +39,7 @@ public class ScheduleSlot extends HisBaseEntity { /** 预计叫号时间 */ private LocalTime expectTime; + + /** 签到时间 */ + private Date checkInTime; } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java index 96377d1b..fa778a91 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java @@ -11,6 +11,7 @@ import java.time.LocalTime; public class TicketSlotDTO { // 基础信息 private Long slotId; + private Integer seqNo; private Long scheduleId; private String doctor; private Long doctorId; @@ -22,6 +23,13 @@ public class TicketSlotDTO { private Long patientId; private String phone; private Integer orderStatus; + private Long orderId; + private String orderNo; + private String patientGender; + private Integer genderEnum; + private String idCard; + private String encounterId; + private String appointmentTime; // 底层逻辑判断专属字段 private Integer slotStatus; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java index 77927d87..52987380 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java @@ -37,4 +37,21 @@ public interface SchedulePoolMapper extends BaseMapper { AND p.delete_flag = '0' """) int refreshPoolStats(@Param("poolId") Long poolId); + + /** + * 签到时更新号源池统计：锁定数-1，已预约数+1 + * + * @param poolId 号源池ID + * @return 结果 + */ + @Update(""" + UPDATE adm_schedule_pool + SET locked_num = locked_num - 1, + booked_num = booked_num + 1, + update_time = NOW() + WHERE id = #{poolId} + AND locked_num > 0 + AND delete_flag = '0' + """) + int updatePoolStatsOnCheckIn(@Param("poolId") Integer poolId); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java index 805e342f..8d2e4966 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java @@ -6,6 +6,7 @@ import com.openhis.appointmentmanage.domain.ScheduleSlot; import com.openhis.appointmentmanage.domain.TicketSlotDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.appointmentmanage.dto.TicketQueryDTO; +import java.util.Date; import java.util.List; import org.springframework.stereotype.Repository; import org.apache.ibatis.annotations.Param; @@ -30,6 +31,16 @@ public interface ScheduleSlotMapper extends BaseMapper { */ int updateSlotStatus(@Param("slotId") Long slotId, @Param("status") Integer status); + /** + * 更新槽位状态并记录签到时间 + * + * @param slotId 槽位ID + * @param status 状态 + * @param checkInTime 签到时间 + * @return 结果 + */ + int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId, @Param("status") Integer status, @Param("checkInTime") Date checkInTime); + /** * 根据槽位ID查询所属号源池ID。 */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java index 2bd02dee..456d4d34 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) public class Order extends HisBaseEntity { - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @JsonSerialize(using = ToStringSerializer.class) private Long id; 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 8a27dc08..b5fab5da 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 @@ -32,4 +32,14 @@ public interface OrderMapper extends BaseMapper { int updateOrderStatusById(Long id, Integer status); int updateOrderCancelInfoById(Long id, Date cancelTime, String cancelReason); + + /** + * 更新订单支付状态 + * + * @param orderId 订单ID + * @param payStatus 支付状态：0-未支付，1-已支付 + * @param payTime 支付时间 + * @return 结果 + */ + int updatePayStatus(@Param("orderId") Long orderId, @Param("payStatus") Integer payStatus, @Param("payTime") Date payTime); } 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 27c699b1..79a62992 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 @@ -88,6 +88,7 @@ public class OrderServiceImpl extends ServiceImpl implements } Order order = new Order(); + order.setId(null); // 显式置空，确保触发数据库自增，避免 MP 预分配雪花 ID 的干扰 String orderNo = assignSeqUtil.getSeq(AssignSeqEnum.ORDER_NUM.getPrefix(), 18); order.setOrderNo(orderNo); 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 01fb025e..c8f0f5f9 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.appointmentmanage.domain.AppointmentConfig; import com.openhis.appointmentmanage.service.IAppointmentConfigService; import com.openhis.appointmentmanage.domain.TicketSlotDTO; +import com.openhis.appointmentmanage.domain.ScheduleSlot; import com.openhis.appointmentmanage.mapper.SchedulePoolMapper; import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper; import com.openhis.clinical.domain.Order; @@ -52,6 +53,9 @@ public class TicketServiceImpl extends ServiceImpl impleme @Resource private SchedulePoolMapper schedulePoolMapper; + @Resource + private com.openhis.clinical.mapper.OrderMapper orderMapper; + @Resource private IAppointmentConfigService appointmentConfigService; @@ -146,7 +150,25 @@ public class TicketServiceImpl extends ServiceImpl impleme logger.debug("开始执行纯净打单路线，slotId: {}, patientName: {}", slotId, dto.getPatientName()); - // 1. 直查物理大底座！ + // 1. 检查患者取消预约次数限制（应在预约挂号时限制，而非取消预约时） + Integer tenantId = dto.getTenant_id(); + Long patientId = dto.getPatientId(); + if (tenantId != null && patientId != null) { + AppointmentConfig config = appointmentConfigService.getConfigByTenantId(tenantId); + if (config != null && config.getCancelAppointmentCount() != null + && config.getCancelAppointmentCount() > 0) { + // 计算当前周期的起始时间 + LocalDateTime startTime = calculatePeriodStartTime(config.getCancelAppointmentType()); + // 统计已取消次数 + long cancelledCount = orderService.countPatientCancellations(patientId, tenantId, startTime); + if (cancelledCount >= config.getCancelAppointmentCount()) { + String periodName = getPeriodName(config.getCancelAppointmentType()); + throw new RuntimeException("由于您在" + periodName + "内累计取消预约已达" + cancelledCount + "次，触发系统限制，暂时无法在线预约，请联系分诊台或咨询客服。"); + } + } + } + + // 2. 直查物理大底座！ TicketSlotDTO slot = scheduleSlotMapper.selectTicketSlotById(slotId); if (slot == null) { @@ -242,26 +264,11 @@ public class TicketServiceImpl extends ServiceImpl impleme throw new RuntimeException("当前号源没有可取消的预约订单"); } - // 核心逻辑：获取订单信息并检查机构取消限制 + // 获取订单信息 Order latestOrder = orders.get(0); - Integer tenantId = latestOrder.getTenantId(); - Long patientId = latestOrder.getPatientId(); - - if (tenantId != null && patientId != null) { - AppointmentConfig config = appointmentConfigService.getConfigByTenantId(tenantId); - if (config != null && config.getCancelAppointmentCount() != null - && config.getCancelAppointmentCount() > 0) { - // 计算当前周期的起始时间 - LocalDateTime startTime = calculatePeriodStartTime(config.getCancelAppointmentType()); - // 统计已取消次数 - long cancelledCount = orderService.countPatientCancellations(patientId, tenantId, startTime); - if (cancelledCount >= config.getCancelAppointmentCount()) { - String periodName = getPeriodName(config.getCancelAppointmentType()); - throw new RuntimeException("您在" + periodName + "内已达到该机构取消预约次数上限（" + config.getCancelAppointmentCount() + "次），禁止取消"); - } - } - } + // 直接执行取消，不再检查取消限制 + // 根据需求，取消限制应在预约挂号时检查，而非取消预约时 for (Order order : orders) { orderService.cancelAppointmentOrder(order.getId(), "患者取消预约"); } @@ -274,7 +281,7 @@ public class TicketServiceImpl extends ServiceImpl impleme } /** - * 取号 + * 取号（签到） * * @param slotId 槽位ID * @return 结果 @@ -287,7 +294,24 @@ public class TicketServiceImpl extends ServiceImpl impleme throw new RuntimeException("当前号源没有可取号的预约订单"); } Order latestOrder = orders.get(0); - return orderService.updateOrderStatusById(latestOrder.getId(), AppointmentOrderStatus.CHECKED_IN); + + // 1. 更新订单状态为已取号，并更新支付状态和支付时间 + orderService.updateOrderStatusById(latestOrder.getId(), AppointmentOrderStatus.CHECKED_IN); + // 更新支付状态为已支付，记录支付时间 + orderMapper.updatePayStatus(latestOrder.getId(), 1, new Date()); + + // 2. 查询号源槽位信息 + ScheduleSlot slot = scheduleSlotMapper.selectById(slotId); + + // 3. 更新号源槽位状态为已签到，记录签到时间 + scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.CHECKED_IN, new Date()); + + // 4. 更新号源池统计：锁定数-1，已预约数+1 + if (slot != null && slot.getPoolId() != null) { + schedulePoolMapper.updatePoolStatsOnCheckIn(slot.getPoolId()); + } + + return 1; } /** @@ -309,7 +333,7 @@ public class TicketServiceImpl extends ServiceImpl impleme orderService.cancelAppointmentOrder(order.getId(), "医生停诊"); } - int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.STOPPED); + int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.CANCELLED); if (updated > 0) { refreshPoolStatsBySlotId(slotId); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java index 953513ed..d6160a97 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java @@ -17,7 +17,7 @@ import java.util.Date; * @date 2025-06-03 */ @Data -@TableName("doc_ital_signs") +@TableName("doc_vital_signs") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) public class VitalSigns extends HisBaseEntity { diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml index 2df3176c..f93a7e6c 100644 --- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml +++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml @@ -4,10 +4,46 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + CASE + WHEN LOWER(CONCAT('', s.status)) IN ('0', 'unbooked', 'available') THEN 0 + WHEN LOWER(CONCAT('', s.status)) IN ('1', 'booked') THEN 1 + WHEN LOWER(CONCAT('', s.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2 + WHEN LOWER(CONCAT('', s.status)) IN ('3', 'locked') THEN 3 + WHEN LOWER(CONCAT('', s.status)) IN ('4', 'checked', 'checked_in', 'checkin') THEN 4 + WHEN LOWER(CONCAT('', s.status)) IN ('5', 'returned') THEN 5 + ELSE NULL + END + + + + CASE + WHEN LOWER(CONCAT('', o.status)) IN ('1', 'booked') THEN 1 + WHEN LOWER(CONCAT('', o.status)) IN ('2', 'checked', 'checked_in', 'checkin') THEN 2 + WHEN LOWER(CONCAT('', o.status)) IN ('3', 'cancelled', 'canceled') THEN 3 + WHEN LOWER(CONCAT('', o.status)) IN ('4', 'returned') THEN 4 + ELSE NULL + END + + + + CASE + WHEN LOWER(CONCAT('', p.status)) IN ('0', 'unbooked', 'available') THEN 0 + WHEN LOWER(CONCAT('', p.status)) IN ('1', 'booked') THEN 1 + WHEN LOWER(CONCAT('', p.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2 + WHEN LOWER(CONCAT('', p.status)) IN ('3', 'locked') THEN 3 + WHEN LOWER(CONCAT('', p.status)) IN ('4', 'checked', 'checked_in', 'checkin') THEN 4 + WHEN LOWER(CONCAT('', p.status)) IN ('5', 'returned') THEN 5 + ELSE NULL + END + + SELECT s.id AS slotId, + s.seq_no AS seqNo, p.schedule_id AS scheduleId, p.doctor_name AS doctor, p.doctor_id AS doctorId, @@ -66,12 +103,18 @@ o.patient_name AS patientName, o.medical_card AS medicalCard, o.phone AS phone, - o.status AS orderStatus, - s.status AS slotStatus, + o.id AS orderId, + o.order_no AS orderNo, + COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender, + pinfo.gender_enum AS genderEnum, + pinfo.id_card AS idCard, + o.appointment_time AS appointmentTime, + AS orderStatus, + AS slotStatus, s.expect_time AS expectTime, p.schedule_date AS scheduleDate, d.reg_type AS regType, - p.status AS poolStatus, + AS poolStatus, p.stop_reason AS stopReason, d.is_stopped AS isStopped FROM @@ -87,15 +130,20 @@ patient_name, medical_card, phone, + id, + order_no, + gender, + appointment_time, status FROM order_main WHERE - status IN (1, 2) + LOWER(CONCAT('', status)) IN ('1', '2', '4', 'booked', 'checked', 'checked_in', 'checkin', 'returned') ORDER BY slot_id, create_time DESC ) o ON o.slot_id = s.id + LEFT JOIN adm_patient pinfo ON o.patient_id = pinfo.id WHERE s.id = #{id} @@ -115,7 +163,7 @@ UPDATE adm_schedule_slot SET status = #{status}, - + order_id = NULL, update_time = now() @@ -124,11 +172,25 @@ AND delete_flag = '0' + + UPDATE adm_schedule_slot + SET + status = #{status}, + check_in_time = #{checkInTime}, + update_time = NOW() + WHERE + id = #{slotId} + AND delete_flag = '0' + + @@ -145,6 +207,7 @@ - + insert into order_main order_no, @@ -225,6 +225,12 @@ update order_main set status = 3, cancel_time = #{cancelTime}, cancel_reason = #{cancelReason} where id = #{id} + + update order_main + set pay_status = #{payStatus}, pay_time = #{payTime}, update_time = NOW() + where id = #{orderId} + + delete from order_main where id = #{id} diff --git a/openhis-ui-vue3/src/utils/medicalConstants.js b/openhis-ui-vue3/src/utils/medicalConstants.js index ac6de2c1..809947ca 100644 --- a/openhis-ui-vue3/src/utils/medicalConstants.js +++ b/openhis-ui-vue3/src/utils/medicalConstants.js @@ -162,3 +162,61 @@ export const STATUS = { NORMAL: '0', // 正常/启用 DISABLE: '1' // 停用 }; + +/** + * 号源槽位状态（与后端 CommonConstants.SlotStatus 保持一致） + * adm_schedule_slot.status 字段 + */ +export const SlotStatus = { + /** 可用 / 待预约 */ + AVAILABLE: 0, + /** 已预约 */ + BOOKED: 1, + /** 已取消 / 已停诊 */ + CANCELLED: 2, + /** 已锁定 */ + LOCKED: 3, + /** 已签到 / 已取号 */ + CHECKED_IN: 4, +}; + +/** + * 号源槽位状态说明信息 + */ +export const SlotStatusDescriptions = { + 0: '未预约', + 1: '已预约', + 2: '已停诊', + 3: '已锁定', + 4: '已取号', +}; + +/** + * 号源槽位状态对应的CSS类名 + */ +export const SlotStatusClassMap = { + '未预约': 'status-unbooked', + '已预约': 'status-booked', + '已取号': 'status-checked', + '已停诊': 'status-cancelled', + '已取消': 'status-cancelled', + '已锁定': 'status-locked', +}; + +/** + * 获取号源槽位状态的说明 + * @param {number} value - 状态值 + * @returns {string} - 说明信息 + */ +export function getSlotStatusDescription(value) { + return SlotStatusDescriptions[value] || '未知状态'; +} + +/** + * 获取号源槽位状态对应的CSS类名 + * @param {string} status - 状态说明 + * @returns {string} - CSS类名 + */ +export function getSlotStatusClass(status) { + return SlotStatusClassMap[status] || 'status-unbooked'; +} diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue index 00bb3a11..b452581b 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue @@ -37,6 +37,7 @@ +