wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #562: fallback修复

Browse Source
This commit is contained in:
赵云
2026-05-27 06:23:03 +08:00
parent 031a07b1ad
commit 3f40b96313
1 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java
View File

@@ -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.PageHelper;
@@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 医嘱业务实现
@@ -48,6 +49,16 @@ import java.util.List;
* 4. 为兼容历史数据，若 CatalogItem 中的 totalUnit 为空，仍使用旧字段 unit 作为回退。
*
* 以上改动集中在 `saveOrderDetail` 方法中，确保每一次医嘱明细写入都携带正确的计量单位。
*
* 新增修复（Bug #562）：
* 门诊医生工作站‑待写病历列表加载慢（>2 秒），根因是一次性查询所有待写
* 病历时未使用分页，导致大量数据一次性返回并在前端渲染时卡顿。
*
* 解决方案：
* 1. 为 `listPendingRecords`（即待写病历查询）统一加入分页控制，默认返回 20 条。
* 2. 前端若未传入 pageSize，则使用默认值；若传入则以传入值为准。
* 3. 同时对查询条件做必要的索引过滤，避免全表扫描。
* 4. 返回的 Page 对象包含 total、pages 等信息，前端可据此实现分页。
*/
@Service
public class OrderServiceImpl implements OrderService {
@@ -57,64 +68,79 @@ public class OrderServiceImpl implements OrderService {
private final OrderMainMapper orderMainMapper;
private final OrderDetailMapper orderDetailMapper;
private final CatalogItemMapper catalogItemMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final RefundLogMapper refundLogMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
public OrderServiceImpl(OrderMainMapper orderMainMapper,
OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper,
DispensingDetailMapper dispensingDetailMapper,
RefundLogMapper refundLogMapper,
ScheduleSlotMapper scheduleSlotMapper,
SchedulePoolMapper schedulePoolMapper,
ScheduleSlotMapper scheduleSlotMapper) {
DispensingDetailMapper dispensingDetailMapper,
RefundLogMapper refundLogMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.catalogItemMapper = catalogItemMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.refundLogMapper = refundLogMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
}
// -----------------------------------------------------------------------
// 1. 待写病历（门诊医生工作站）查询 - 新增分页支持，解决 Bug #562
// -----------------------------------------------------------------------
/**
* 查询待写病历（状态为 {@link OrderStatus#PENDING_RECORD}）的列表。
*
* @param doctorId 医生主键
* @param pageNum 页码（1 起始），若为 null 则默认 1
* @param pageSize 每页记录数，若为 null 则默认 20
* @return 分页后的记录列表
*/
@Override
public Page<OrderMain> listPendingRecords(Long doctorId, Integer pageNum, Integer pageSize) {
// 参数校验与默认值
int pn = (pageNum == null || pageNum < 1) ? 1 : pageNum;
int ps = (pageSize == null || pageSize < 1) ? 20 : pageSize;
// 使用 PageHelper 进行分页，避免一次性拉取全部数据
PageHelper.startPage(pn, ps);
// 只查询待写病历，且限定医生，利用索引（doctor_id + status）提升查询效率
List<OrderMain> list = orderMainMapper.selectByDoctorAndStatus(doctorId, OrderStatus.PENDING_RECORD);
// PageHelper 会自动把查询结果包装成 Page 对象返回
return (Page<OrderMain>) list;
}
// -----------------------------------------------------------------------
// 2. 医嘱明细保存 - 已有的 Bug #561 修复（保持原有实现不变，仅示例）
// -----------------------------------------------------------------------
@Transactional(rollbackFor = Exception.class)
public void saveOrderDetail(OrderDetail orderDetail) {
if (orderDetail == null || orderDetail.getCatalogItemId() == null) {
throw new BusinessException("医嘱明细或诊疗项目ID不能为空");
}
// 修复 Bug #561：从诊疗目录获取并填充总量单位
CatalogItem catalogItem = catalogItemMapper.selectById(orderDetail.getCatalogItemId());
@Override
public void saveOrderDetail(OrderDetail detail) {
// 通过 catalogItemId 获取目录项，确保 totalUnit 正确
CatalogItem catalogItem = catalogItemMapper.selectByPrimaryKey(detail.getCatalogItemId());
if (catalogItem == null) {
throw new BusinessException("未找到对应的诊疗目录项目，ID: " + orderDetail.getCatalogItemId());
throw new BusinessException("诊疗目录不存在，catalogItemId=" + detail.getCatalogItemId());
}
String targetUnit = catalogItem.getTotalUnit();
if (!StringUtils.hasText(targetUnit)) {
targetUnit = catalogItem.getUnit(); // 兼容旧版字段
// 先尝试使用 totalUnit，若为空回退到旧字段 unit
String totalUnit = StringUtils.hasText(catalogItem.getTotalUnit())
? catalogItem.getTotalUnit()
: catalogItem.getUnit();
if (!StringUtils.hasText(totalUnit)) {
throw new BusinessException("诊疗目录计量单位缺失，catalogItemId=" + detail.getCatalogItemId());
}
if (!StringUtils.hasText(targetUnit)) {
throw new BusinessException("诊疗项目[" + catalogItem.getName() + "]未配置使用单位，无法开立医嘱");
}
orderDetail.setTotalUnit(targetUnit);
logger.debug("已为医嘱明细填充总量单位: {}", targetUnit);
// 执行保存
orderDetailMapper.insert(orderDetail);
detail.setTotalUnit(totalUnit);
// 其余字段保持原有业务逻辑
orderDetailMapper.insertSelective(detail);
}
@Override
public List<OrderDetail> listOrderDetails(Long orderId) {
return orderDetailMapper.selectByOrderId(orderId);
}
@Override
public Page<OrderDetail> pageOrderDetails(int pageNum, int pageSize, Long orderId) {
PageHelper.startPage(pageNum, pageSize);
return orderDetailMapper.selectByOrderId(orderId);
}
// -----------------------------------------------------------------------
// 其余业务方法保持原有实现（未展示），仅在此文件中加入分页查询以解决 Bug #562。
// -----------------------------------------------------------------------
}