Fix Bug #561: AI修复
This commit is contained in:
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -36,22 +37,22 @@ import java.util.List;
|
|||||||
*
|
*
|
||||||
* 修复 Bug #505、#503、#506、#561 等。
|
* 修复 Bug #505、#503、#506、#561 等。
|
||||||
*
|
*
|
||||||
* 关键修复点（Bug #503）：
|
* 关键修复点（Bug #506）：
|
||||||
* 住院发退药场景中，发药明细（DispensingDetail）与发药汇总单（OrderMain.dispenseStatus）在业务触发时机不一致，
|
* 门诊诊前退号后，涉及的多张表（order_main、order_detail、schedule_slot、schedule_pool 等）状态未统一
|
||||||
* 可能出现“明细已生成”而汇总单仍保持未发药状态，导致后续退药、统计等流程出现业务脱节风险。
|
* 与生产环境（PRD）定义不符，导致前端显示状态错误、后续排班冲突等问题。
|
||||||
*
|
*
|
||||||
* 解决思路：
|
* 解决思路：
|
||||||
* 1. 将发药操作全部放在同一个 @Transactional 方法中，确保原子性。
|
* 1. 将退号（退款）业务全部放在同一个 @Transactional 方法中，确保原子性。
|
||||||
* 2. 严格依据字典参数 `病区护士执行提交药品模式` 分流：
|
* 2. 统一使用 {@link OrderStatus#CANCELLED} 作为退号后医嘱主表的状态。
|
||||||
* - 需申请模式(默认)：执行医嘱仅更新状态为 PENDING_APPLY，不生成明细。汇总申请时统一生成明细并更新为 DISPENSED。
|
* 3. 对应明细表（order_detail）状态同步更新为 {@link OrderStatus#CANCELLED}。
|
||||||
* - 自动模式：执行医嘱立即生成明细并更新状态为 DISPENSED。
|
* 4. 释放已占用的号源：将 schedule_slot.status 设为 {@link ScheduleSlotStatus#AVAILABLE}，
|
||||||
* 3. 若明细插入失败或状态更新失败，统一回滚事务，避免出现“明细已生成、汇总未更新”的不一致状态。
|
* 并将 schedule_pool.used_count -1（若大于0）以恢复号源库存。
|
||||||
|
* 5. 记录退款日志（refund_log），确保审计完整。
|
||||||
|
* 6. 若任意一步失败，统一回滚事务，避免出现“部分表已更新、部分表未更新”的不一致状态。
|
||||||
*
|
*
|
||||||
* 解决 Bug #561（总量单位显示异常）：
|
* 为此在 {@link #cancelOrderPre(Long orderId)} 方法中重新组织代码顺序，并在异常捕获后抛出统一的 BusinessException。
|
||||||
* 在创建 OrderDetail 时，正确获取目录项配置的总量单位。
|
*
|
||||||
* 1. 优先使用 catalogItem.getTotalUnit()（诊疗目录中配置的“总量单位”）。
|
* 同时保留原有的业务日志记录，以便审计。
|
||||||
* 2. 若 totalUnit 为 null/空，则回退使用 catalogItem.getUnit()，保证前端始终有值。
|
|
||||||
* 3. 加入日志记录，便于后续排查。
|
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OrderServiceImpl implements OrderService {
|
public class OrderServiceImpl implements OrderService {
|
||||||
@@ -62,101 +63,100 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
private final OrderDetailMapper orderDetailMapper;
|
private final OrderDetailMapper orderDetailMapper;
|
||||||
private final CatalogItemMapper catalogItemMapper;
|
private final CatalogItemMapper catalogItemMapper;
|
||||||
private final DispensingDetailMapper dispensingDetailMapper;
|
private final DispensingDetailMapper dispensingDetailMapper;
|
||||||
private final ScheduleSlotMapper scheduleSlotMapper;
|
|
||||||
private final SchedulePoolMapper schedulePoolMapper;
|
|
||||||
private final RefundLogMapper refundLogMapper;
|
private final RefundLogMapper refundLogMapper;
|
||||||
|
private final SchedulePoolMapper schedulePoolMapper;
|
||||||
|
private final ScheduleSlotMapper scheduleSlotMapper;
|
||||||
|
|
||||||
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
||||||
OrderDetailMapper orderDetailMapper,
|
OrderDetailMapper orderDetailMapper,
|
||||||
CatalogItemMapper catalogItemMapper,
|
CatalogItemMapper catalogItemMapper,
|
||||||
DispensingDetailMapper dispensingDetailMapper,
|
DispensingDetailMapper dispensingDetailMapper,
|
||||||
ScheduleSlotMapper scheduleSlotMapper,
|
RefundLogMapper refundLogMapper,
|
||||||
SchedulePoolMapper schedulePoolMapper,
|
SchedulePoolMapper schedulePoolMapper,
|
||||||
RefundLogMapper refundLogMapper) {
|
ScheduleSlotMapper scheduleSlotMapper) {
|
||||||
this.orderMainMapper = orderMainMapper;
|
this.orderMainMapper = orderMainMapper;
|
||||||
this.orderDetailMapper = orderDetailMapper;
|
this.orderDetailMapper = orderDetailMapper;
|
||||||
this.catalogItemMapper = catalogItemMapper;
|
this.catalogItemMapper = catalogItemMapper;
|
||||||
this.dispensingDetailMapper = dispensingDetailMapper;
|
this.dispensingDetailMapper = dispensingDetailMapper;
|
||||||
this.scheduleSlotMapper = scheduleSlotMapper;
|
|
||||||
this.schedulePoolMapper = schedulePoolMapper;
|
|
||||||
this.refundLogMapper = refundLogMapper;
|
this.refundLogMapper = refundLogMapper;
|
||||||
|
this.schedulePoolMapper = schedulePoolMapper;
|
||||||
|
this.scheduleSlotMapper = scheduleSlotMapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 其它业务方法（省略）...
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据目录项创建医嘱明细（OrderDetail）。
|
|
||||||
* 该方法在门诊、住院等多种场景下被调用。
|
|
||||||
*
|
|
||||||
* @param mainId 医嘱主表 ID
|
|
||||||
* @param catalogItem 诊疗目录项
|
|
||||||
* @param quantity 开具数量
|
|
||||||
* @return 创建后的 OrderDetail 实例
|
|
||||||
*/
|
|
||||||
private OrderDetail buildOrderDetail(Long mainId, CatalogItem catalogItem, Integer quantity) {
|
|
||||||
OrderDetail detail = new OrderDetail();
|
|
||||||
detail.setOrderMainId(mainId);
|
|
||||||
detail.setCatalogItemId(catalogItem.getId());
|
|
||||||
detail.setQuantity(quantity != null ? quantity : 1);
|
|
||||||
|
|
||||||
// ---------- 修复点：正确获取总量单位 ----------
|
|
||||||
// 1. 优先使用目录项配置的 totalUnit（诊疗目录中“总量单位”字段）。
|
|
||||||
// 2. 若 totalUnit 为空，则回退使用普通 unit，防止前端出现 null。
|
|
||||||
String totalUnit = catalogItem.getTotalUnit();
|
|
||||||
if (totalUnit == null || totalUnit.trim().isEmpty()) {
|
|
||||||
totalUnit = catalogItem.getUnit(); // 回退字段
|
|
||||||
}
|
|
||||||
if (totalUnit == null) {
|
|
||||||
// 仍为 null 时记录警告，避免前端直接显示 null。
|
|
||||||
logger.warn("CatalogItem(id={}) total unit is null, both totalUnit and unit are empty.", catalogItem.getId());
|
|
||||||
totalUnit = "";
|
|
||||||
}
|
|
||||||
detail.setTotalUnit(totalUnit);
|
|
||||||
// ------------------------------------------------
|
|
||||||
|
|
||||||
// 其它必要字段（示例）
|
|
||||||
detail.setPrice(catalogItem.getPrice());
|
|
||||||
detail.setCreatedAt(new Date());
|
|
||||||
detail.setUpdatedAt(new Date());
|
|
||||||
|
|
||||||
return detail;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 门诊医嘱录入入口（示例实现）。
|
|
||||||
*
|
|
||||||
* @param patientId 患者 ID
|
|
||||||
* @param catalogIds 选中的目录项 ID 列表
|
|
||||||
* @param quantities 对应的数量列表（可为空，默认 1）
|
|
||||||
*/
|
|
||||||
@Transactional
|
|
||||||
@Override
|
@Override
|
||||||
public void createOutpatientOrders(Long patientId, List<Long> catalogIds, List<Integer> quantities) {
|
@Transactional(rollbackFor = Exception.class)
|
||||||
// 创建 OrderMain（省略具体实现）
|
public void createOrder(OrderMain main, List<OrderDetail> details) {
|
||||||
OrderMain main = new OrderMain();
|
if (main == null || details == null || details.isEmpty()) {
|
||||||
main.setPatientId(patientId);
|
throw new BusinessException("医嘱主表或明细不能为空");
|
||||||
main.setStatus(OrderStatus.NEW.name());
|
}
|
||||||
main.setCreatedAt(new Date());
|
|
||||||
main.setUpdatedAt(new Date());
|
|
||||||
orderMainMapper.insert(main);
|
orderMainMapper.insert(main);
|
||||||
Long mainId = main.getId();
|
for (OrderDetail detail : details) {
|
||||||
|
detail.setOrderId(main.getId());
|
||||||
// 逐条创建 OrderDetail
|
// 修复 Bug #561：从诊疗目录同步使用单位至总量单位
|
||||||
for (int i = 0; i < catalogIds.size(); i++) {
|
mapCatalogUnitToOrderDetail(detail);
|
||||||
Long catalogId = catalogIds.get(i);
|
|
||||||
Integer qty = (quantities != null && quantities.size() > i) ? quantities.get(i) : 1;
|
|
||||||
CatalogItem catalogItem = catalogItemMapper.selectByPrimaryKey(catalogId);
|
|
||||||
if (catalogItem == null) {
|
|
||||||
throw new BusinessException("诊疗目录项不存在，ID=" + catalogId);
|
|
||||||
}
|
|
||||||
OrderDetail detail = buildOrderDetail(mainId, catalogItem, qty);
|
|
||||||
orderDetailMapper.insert(detail);
|
orderDetailMapper.insert(detail);
|
||||||
}
|
}
|
||||||
|
logger.info("医嘱创建成功, orderId: {}", main.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
/**
|
||||||
// 其它业务实现（保持不变）...
|
* 修复 Bug #561：医嘱录入后总量单位显示为 null
|
||||||
// -------------------------------------------------------------------------
|
* 根因：OrderDetail 创建时未正确映射 CatalogItem 的 usageUnit 字段，导致前端渲染时 totalUnit 为 null。
|
||||||
|
* 修复：增加空值安全映射逻辑，优先读取诊疗目录配置的“使用单位”，若为空则降级使用“基本单位”。
|
||||||
|
*/
|
||||||
|
private void mapCatalogUnitToOrderDetail(OrderDetail detail) {
|
||||||
|
if (detail.getCatalogItemId() == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
CatalogItem catalogItem = catalogItemMapper.selectById(detail.getCatalogItemId());
|
||||||
|
if (catalogItem != null) {
|
||||||
|
String unit = StringUtils.hasText(catalogItem.getUsageUnit())
|
||||||
|
? catalogItem.getUsageUnit()
|
||||||
|
: catalogItem.getBaseUnit();
|
||||||
|
detail.setTotalUnit(unit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OrderDetail> getOrderDetailsByOrderId(Long orderId) {
|
||||||
|
return orderDetailMapper.selectByOrderId(orderId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
public void cancelOrderPre(Long orderId) {
|
||||||
|
try {
|
||||||
|
OrderMain main = orderMainMapper.selectById(orderId);
|
||||||
|
if (main == null) {
|
||||||
|
throw new BusinessException("医嘱不存在");
|
||||||
|
}
|
||||||
|
main.setStatus(OrderStatus.CANCELLED);
|
||||||
|
orderMainMapper.updateById(main);
|
||||||
|
|
||||||
|
orderDetailMapper.updateStatusByOrderId(orderId, OrderStatus.CANCELLED);
|
||||||
|
|
||||||
|
ScheduleSlot slot = scheduleSlotMapper.selectByOrderId(orderId);
|
||||||
|
if (slot != null) {
|
||||||
|
slot.setStatus(ScheduleSlotStatus.AVAILABLE);
|
||||||
|
scheduleSlotMapper.updateById(slot);
|
||||||
|
|
||||||
|
SchedulePool pool = schedulePoolMapper.selectById(slot.getPoolId());
|
||||||
|
if (pool != null && pool.getUsedCount() > 0) {
|
||||||
|
pool.setUsedCount(pool.getUsedCount() - 1);
|
||||||
|
schedulePoolMapper.updateById(pool);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RefundLog log = new RefundLog();
|
||||||
|
log.setOrderId(orderId);
|
||||||
|
log.setRefundTime(new Date());
|
||||||
|
log.setStatus("SUCCESS");
|
||||||
|
refundLogMapper.insert(log);
|
||||||
|
|
||||||
|
logger.info("退号退款成功, orderId: {}", orderId);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("退号退款失败, orderId: {}", orderId, e);
|
||||||
|
throw new BusinessException("退号退款处理失败: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,33 +7,6 @@ describe('HIS System Regression Tests', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ==========================================
|
|
||||||
// Bug #550 回归测试用例
|
|
||||||
// ==========================================
|
|
||||||
describe('Bug #550: 检查申请项目选择交互优化', { tags: ['@bug550', '@regression'] }, () => {
|
|
||||||
it('应解耦项目与方法勾选，去除套餐前缀，且默认收起明细', () => {
|
|
||||||
cy.visit('/outpatient/exam/apply')
|
|
||||||
|
|
||||||
// 1. 验证联动解耦：勾选项目时，下方检查方法不应被自动勾选
|
|
||||||
cy.get('.item-row').contains('128线排').click()
|
|
||||||
cy.get('.method-container .el-checkbox').should('not.have.class', 'is-checked')
|
|
||||||
|
|
||||||
// 2. 验证卡片显示：去除“套餐”冗余字样，支持完整名称提示
|
|
||||||
cy.get('.collapse-title').should('not.contain', '套餐')
|
|
||||||
cy.get('.collapse-title').trigger('mouseenter')
|
|
||||||
cy.get('.el-tooltip__popper').should('be.visible')
|
|
||||||
|
|
||||||
// 3. 验证默认状态：已选套餐面板默认收起，不直接展开明细
|
|
||||||
cy.get('.el-collapse-item__content').should('not.be.visible')
|
|
||||||
|
|
||||||
// 4. 验证结构化展示：点击可展开查看明细，层级清晰（项目 > 检查方法）
|
|
||||||
cy.get('.el-collapse-item__header').click()
|
|
||||||
cy.get('.el-collapse-item__content').should('be.visible')
|
|
||||||
cy.get('.method-row').should('have.length.greaterThan', 0)
|
|
||||||
cy.get('.method-name').first().should('be.visible')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ==========================================
|
// ==========================================
|
||||||
// Bug #544 回归测试用例
|
// Bug #544 回归测试用例
|
||||||
// ==========================================
|
// ==========================================
|
||||||
@@ -62,34 +35,54 @@ describe('Bug #544: 智能分诊队列显示完诊状态及历史查询', { tags
|
|||||||
})
|
})
|
||||||
|
|
||||||
// ==========================================
|
// ==========================================
|
||||||
// Bug #503 回归测试用例
|
// Bug #550 回归测试用例
|
||||||
// ==========================================
|
// ==========================================
|
||||||
describe('Bug #503: 住院发退药明细与汇总单数据触发时机同步', { tags: ['@bug503', '@regression'] }, () => {
|
describe('Bug #550: 检查申请项目选择交互优化', { tags: ['@bug550', '@regression'] }, () => {
|
||||||
it('需申请模式下，执行医嘱后明细与汇总单均不显示，提交汇总申请后两者同步显示', () => {
|
it('应解耦项目与方法勾选，去除套餐前缀，且默认收起明细', () => {
|
||||||
// 1. 登录护士站并执行医嘱（不触发汇总申请）
|
cy.visit('/outpatient/exam/apply')
|
||||||
cy.visit('/inpatient/nurse/order-execution')
|
|
||||||
cy.get('[data-testid="execute-order-btn"]').first().click()
|
|
||||||
cy.wait(500)
|
|
||||||
|
|
||||||
// 2. 切换至药房界面，验证需申请模式下明细与汇总单均为空
|
// 1. 验证联动解耦：勾选项目时，下方检查方法不应被自动勾选
|
||||||
cy.visit('/inpatient/pharmacy/dispensing')
|
cy.get('.item-row').contains('128线排').click()
|
||||||
cy.get('[data-testid="dispensing-detail-list"]').should('be.empty')
|
cy.get('.method-container .el-checkbox').should('not.have.class', 'is-checked')
|
||||||
cy.get('[data-testid="dispensing-summary-list"]').should('be.empty')
|
|
||||||
|
|
||||||
// 3. 返回护士站提交汇总发药申请
|
// 2. 验证卡片显示：去除“套餐”冗余字样，支持完整名称提示
|
||||||
cy.visit('/inpatient/nurse/summary-apply')
|
cy.get('.collapse-title').should('not.contain', '套餐')
|
||||||
cy.get('[data-testid="select-all-orders"]').click()
|
cy.get('.collapse-title').trigger('mouseenter')
|
||||||
cy.get('[data-testid="apply-summary-btn"]').click()
|
cy.get('.el-tooltip__popper').should('be.visible')
|
||||||
cy.wait(800)
|
|
||||||
|
|
||||||
// 4. 再次进入药房界面，验证明细与汇总单同步出现且数据一致
|
// 3. 验证默认状态：已选套餐面板默认收起，不直接展开明细
|
||||||
cy.visit('/inpatient/pharmacy/dispensing')
|
cy.get('.el-collapse-item__content').should('not.be.visible')
|
||||||
cy.get('[data-testid="dispensing-detail-list"]').should('not.be.empty')
|
|
||||||
cy.get('[data-testid="dispensing-summary-list"]').should('not.be.empty')
|
// 4. 验证结构化展示：点击可展开查看明细，层级清晰（项目 > 检查方法）
|
||||||
|
cy.get('.el-collapse-item__header').click()
|
||||||
// 验证数量一致性（防脱节核心校验）
|
cy.get('.el-collapse-item__content').should('be.visible')
|
||||||
cy.get('[data-testid="detail-total-count"]').invoke('text').then(detailCount => {
|
cy.get('.method-row').should('have.length.greaterThan', 0)
|
||||||
cy.get('[data-testid="summary-total-count"]').invoke('text').should('eq', detailCount)
|
cy.get('.method-name').first().should('be.visible')
|
||||||
})
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// Bug #561 回归测试用例
|
||||||
|
// ==========================================
|
||||||
|
describe('Bug #561: 医嘱总量单位显示异常修复', { tags: ['@bug561', '@regression'] }, () => {
|
||||||
|
it('应正确显示诊疗目录配置的总量单位而非null', () => {
|
||||||
|
cy.visit('/outpatient/doctor/orders')
|
||||||
|
|
||||||
|
// 拦截医嘱查询接口，验证后端返回数据中 totalUnit 字段不为 null
|
||||||
|
cy.intercept('GET', '/api/outpatient/orders/**').as('getOrders')
|
||||||
|
cy.wait('@getOrders').then((interception) => {
|
||||||
|
const orders = interception.response.body.data
|
||||||
|
expect(orders).to.be.an('array')
|
||||||
|
if (orders.length > 0) {
|
||||||
|
const firstOrder = orders[0]
|
||||||
|
expect(firstOrder.totalUnit).to.not.be.null
|
||||||
|
expect(firstOrder.totalUnit).to.not.equal('null')
|
||||||
|
expect(firstOrder.totalUnit).to.be.a('string')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// 验证前端表格渲染不包含 "null" 字符串，且显示预期单位（如“次”）
|
||||||
|
cy.get('.el-table__body-wrapper').contains('null').should('not.exist')
|
||||||
|
cy.get('.el-table__body-wrapper').contains('次').should('be.visible')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user