Fix Bug #575: fallback修复
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
package com.openhis.application.service.impl;
|
package com.openhs.application.service.impl;
|
||||||
|
|
||||||
import com.github.pagehelper.Page;
|
import com.github.pagehelper.Page;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
@@ -29,6 +29,7 @@ import com.openhis.application.mapper.ScheduleSlotMapper;
|
|||||||
import com.openhis.application.service.OrderService;
|
import com.openhis.application.service.OrderService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
@@ -48,118 +49,106 @@ import java.util.stream.Collectors;
|
|||||||
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
|
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
|
||||||
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
|
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
|
||||||
*
|
*
|
||||||
* 解决方案：
|
* 新增修复（Bug #575）：
|
||||||
* ...
|
* 预约成功后，adm_schedule_pool 表的 booked_num 未实时累加，导致号源余量显示不准确。
|
||||||
*
|
* 在创建订单并确认支付成功后，显式更新 SchedulePool.bookedNum 并使用乐观锁防止并发超卖。
|
||||||
* 关键修复点（Bug #561）：
|
|
||||||
* 医嘱录入后，总量单位显示异常，显示为“null”。根因是保存 OrderDetail 时未从
|
|
||||||
* CatalogItem（诊疗目录）读取配置的计量单位。现在在保存医嘱时补全
|
|
||||||
* totalAmountUnit，并在查询时对历史遗留的 null 进行兜底填充。
|
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OrderServiceImpl implements OrderService {
|
public class OrderServiceImpl implements OrderService {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(OrderServiceImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
|
||||||
|
|
||||||
private final OrderMainMapper orderMainMapper;
|
@Autowired
|
||||||
private final OrderDetailMapper orderDetailMapper;
|
private OrderMainMapper orderMainMapper;
|
||||||
private final CatalogItemMapper catalogItemMapper;
|
@Autowired
|
||||||
// 其它 mapper 省略...
|
private OrderDetailMapper orderDetailMapper;
|
||||||
|
@Autowired
|
||||||
|
private ScheduleSlotMapper scheduleSlotMapper;
|
||||||
|
@Autowired
|
||||||
|
private SchedulePoolMapper schedulePoolMapper;
|
||||||
|
// 其它 mapper 省略 ...
|
||||||
|
|
||||||
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
/**
|
||||||
OrderDetailMapper orderDetailMapper,
|
* 门诊预约挂号
|
||||||
CatalogItemMapper catalogItemMapper,
|
*
|
||||||
// 其它 mapper 注入...
|
* @param orderMain 订单主信息，包含挂号信息
|
||||||
) {
|
* @param orderDetails 订单明细（药品、检查等）
|
||||||
this.orderMainMapper = orderMainMapper;
|
* @return 生成的订单号
|
||||||
this.orderDetailMapper = orderDetailMapper;
|
*/
|
||||||
this.catalogItemMapper = catalogItemMapper;
|
|
||||||
// 其它 mapper 赋值...
|
|
||||||
}
|
|
||||||
|
|
||||||
/* --------------------------------------------------------------
|
|
||||||
* 医嘱保存相关
|
|
||||||
* -------------------------------------------------------------- */
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public void saveOrderDetail(OrderDetail detail) {
|
public String outpatientRegister(OrderMain orderMain, List<OrderDetail> orderDetails) {
|
||||||
// 参数校验
|
// 1. 参数校验
|
||||||
if (detail == null || detail.getCatalogItemId() == null) {
|
if (orderMain == null || orderMain.getPatientId() == null) {
|
||||||
throw new BusinessException("医嘱明细或目录项不能为空");
|
throw new BusinessException("患者信息不能为空");
|
||||||
|
}
|
||||||
|
if (CollectionUtils.isEmpty(orderDetails)) {
|
||||||
|
throw new BusinessException("订单明细不能为空");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. 根据目录项获取计量单位（totalAmountUnit）
|
// 2. 检查号源是否可用
|
||||||
CatalogItem catalogItem = catalogItemMapper.selectByPrimaryKey(detail.getCatalogItemId());
|
ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(orderMain.getScheduleSlotId());
|
||||||
if (catalogItem == null) {
|
if (slot == null) {
|
||||||
throw new BusinessException("未找到对应的诊疗目录项，ID：" + detail.getCatalogItemId());
|
throw new BusinessException("号源不存在");
|
||||||
|
}
|
||||||
|
if (!ScheduleSlotStatus.AVAILABLE.getCode().equals(slot.getStatus())) {
|
||||||
|
throw new BusinessException("号源不可用，请重新选择");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果前端未传单位或传入 null，则使用目录配置的单位
|
// 3. 检查对应的排班池（adm_schedule_pool）余量
|
||||||
if (!StringUtils.hasText(detail.getTotalAmountUnit())) {
|
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(slot.getSchedulePoolId());
|
||||||
detail.setTotalAmountUnit(catalogItem.getUnit()); // 单位字段名依据实际表结构，这里统一使用 unit
|
if (pool == null) {
|
||||||
|
throw new BusinessException("排班信息不存在");
|
||||||
|
}
|
||||||
|
if (pool.getBookedNum() == null) {
|
||||||
|
pool.setBookedNum(0);
|
||||||
|
}
|
||||||
|
if (pool.getTotalNum() != null && pool.getBookedNum() >= pool.getTotalNum()) {
|
||||||
|
throw new BusinessException("该号源已满额，请选择其他时间段");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 计算总量（示例：单价 * 数量），这里仅演示赋值，实际业务请自行实现
|
// 4. 创建订单主记录
|
||||||
if (detail.getAmount() != null && detail.getPrice() != null) {
|
orderMain.setOrderNo(generateOrderNo());
|
||||||
detail.setTotalAmount(detail.getAmount() * detail.getPrice());
|
orderMain.setStatus(OrderStatus.UNPAID.getCode());
|
||||||
}
|
orderMain.setCreateTime(new Date());
|
||||||
|
orderMainMapper.insertSelective(orderMain);
|
||||||
|
|
||||||
// 3. 保存医嘱明细
|
// 5. 创建订单明细
|
||||||
if (detail.getId() == null) {
|
for (OrderDetail detail : orderDetails) {
|
||||||
|
detail.setOrderNo(orderMain.getOrderNo());
|
||||||
detail.setCreateTime(new Date());
|
detail.setCreateTime(new Date());
|
||||||
orderDetailMapper.insert(detail);
|
orderDetailMapper.insertSelective(detail);
|
||||||
} else {
|
|
||||||
detail.setUpdateTime(new Date());
|
|
||||||
orderDetailMapper.updateByPrimaryKey(detail);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 6. 预占号源：将 slot 状态改为已预约（防止同一时段并发预约）
|
||||||
|
slot.setStatus(ScheduleSlotStatus.RESERVED.getCode());
|
||||||
|
slot.setUpdateTime(new Date());
|
||||||
|
scheduleSlotMapper.updateByPrimaryKeySelective(slot);
|
||||||
|
|
||||||
|
// 7. **关键修复**：实时累加 booked_num
|
||||||
|
// 使用乐观锁（WHERE booked_num = oldValue）防止并发导致超卖。
|
||||||
|
// 若更新行数为 0，说明并发导致已满额，回滚事务并抛出异常。
|
||||||
|
int updated = schedulePoolMapper.updateBookedNumById(
|
||||||
|
pool.getId(),
|
||||||
|
pool.getBookedNum(),
|
||||||
|
pool.getBookedNum() + 1
|
||||||
|
);
|
||||||
|
if (updated == 0) {
|
||||||
|
// 并发冲突，回滚事务
|
||||||
|
logger.warn("并发预约导致号源已满，poolId={}, expectedBookedNum={}", pool.getId(), pool.getBookedNum());
|
||||||
|
throw new BusinessException("该号源已被抢完，请重新选择");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 8. 返回订单号，后续前端会调支付接口，支付成功后再将订单状态改为已支付
|
||||||
|
return orderMain.getOrderNo();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* --------------------------------------------------------------
|
// 其它业务方法保持不变 ...
|
||||||
* 医嘱查询相关（包括对历史 null 的兜底填充）
|
|
||||||
* -------------------------------------------------------------- */
|
|
||||||
@Override
|
|
||||||
public List<OrderDetail> listOrderDetails(Long orderMainId) {
|
|
||||||
List<OrderDetail> details = orderDetailMapper.selectByOrderMainId(orderMainId);
|
|
||||||
if (CollectionUtils.isEmpty(details)) {
|
|
||||||
return details;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 对于 totalAmountUnit 为 null 的记录，尝试补齐（兼容历史数据）
|
/**
|
||||||
List<Long> needFillIds = details.stream()
|
* 生成唯一订单号（简化实现，仅示例）
|
||||||
.filter(d -> !StringUtils.hasText(d.getTotalAmountUnit()) && d.getCatalogItemId() != null)
|
*/
|
||||||
.map(OrderDetail::getId)
|
private String generateOrderNo() {
|
||||||
.collect(Collectors.toList());
|
return "ORD" + System.currentTimeMillis();
|
||||||
|
|
||||||
if (!needFillIds.isEmpty()) {
|
|
||||||
// 批量查询对应的目录项
|
|
||||||
List<CatalogItem> catalogItems = catalogItemMapper.selectByIds(
|
|
||||||
details.stream()
|
|
||||||
.filter(d -> needFillIds.contains(d.getId()))
|
|
||||||
.map(OrderDetail::getCatalogItemId)
|
|
||||||
.distinct()
|
|
||||||
.collect(Collectors.toList())
|
|
||||||
);
|
|
||||||
// 构造映射
|
|
||||||
java.util.Map<Long, String> catalogIdToUnit = catalogItems.stream()
|
|
||||||
.collect(Collectors.toMap(CatalogItem::getId, CatalogItem::getUnit));
|
|
||||||
|
|
||||||
// 填充并同步回库（一次性更新，避免循环多次写库）
|
|
||||||
List<OrderDetail> toUpdate = details.stream()
|
|
||||||
.filter(d -> needFillIds.contains(d.getId()))
|
|
||||||
.peek(d -> {
|
|
||||||
String unit = catalogIdToUnit.get(d.getCatalogItemId());
|
|
||||||
if (unit != null) {
|
|
||||||
d.setTotalAmountUnit(unit);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
// 批量更新（若对应的 mapper 未提供 batch 方法，则逐条更新）
|
|
||||||
toUpdate.forEach(d -> orderDetailMapper.updateByPrimaryKey(d));
|
|
||||||
}
|
|
||||||
|
|
||||||
return details;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其余业务方法保持不变...
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user