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

Fix Bug #561: AI修复

Browse Source
This commit is contained in:
赵云
2026-05-27 07:12:58 +08:00
parent 70ed18e0d1
commit 3daffe5711
2 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,11 +43,11 @@ import java.util.stream.Collectors;
*
* 修复 Bug #505、#503、#506、#561、#595 等。
*
* 关键修复点（Bug #503）：
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
*
* 解决方案：
* 关键修复点（Bug #561）：
* 医嘱录入后，总量单位显示为 "null"。
* 根因：查询/创建医嘱明细时，未关联或映射诊疗目录(CatalogItem)中的“使用单位”字段。
* 修复方案：在组装医嘱明细数据时，显式从 CatalogItem 获取 usageUnit 并赋值给 OrderDetail.quantityUnit，
* 增加空值保护，避免前端渲染出字符串 "null"。
*/
@Service
public class OrderServiceImpl implements OrderService {
@@ -58,72 +58,98 @@ public class OrderServiceImpl implements OrderService {
private final OrderDetailMapper orderDetailMapper;
private final CatalogItemMapper catalogItemMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final DispensingSummaryMapper dispensingSummaryMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final DispensingSummaryMapper dispensingSummaryMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final RefundLogMapper refundLogMapper;
public OrderServiceImpl(OrderMainMapper orderMainMapper,
OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper,
ScheduleSlotMapper scheduleSlotMapper,
DispensingDetailMapper dispensingDetailMapper,
DispensingSummaryMapper dispensingSummaryMapper,
SchedulePoolMapper schedulePoolMapper,
DispensingSummaryMapper dispensingSummaryMapper,
DispensingDetailMapper dispensingDetailMapper,
RefundLogMapper refundLogMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.catalogItemMapper = catalogItemMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.dispensingSummaryMapper = dispensingSummaryMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.dispensingSummaryMapper = dispensingSummaryMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.refundLogMapper = refundLogMapper;
}
@Override
@Transactional(rollbackFor = Exception.class)
public OrderMain createSurgeryOrder(Long catalogItemId, Long patientId, String doctorId) {
CatalogItem catalogItem = catalogItemMapper.selectById(catalogItemId);
if (catalogItem == null) {
throw new BusinessException("诊疗项目不存在，ID: " + catalogItemId);
public List<OrderDetail> listOrderDetails(Long mainId) {
List<OrderDetail> details = orderDetailMapper.selectByMainId(mainId);
// Bug #561 Fix: 填充总量单位
populateQuantityUnit(details);
return details;
}
@Override
public Page<OrderDetail> listOrderDetailsByPage(int pageNum, int pageSize, Long mainId) {
PageHelper.startPage(pageNum, pageSize);
List<OrderDetail> details = orderDetailMapper.selectByMainId(mainId);
// Bug #561 Fix: 填充总量单位
populateQuantityUnit(details);
return (Page<OrderDetail>) details;
}
/**
* 修复 Bug #561：从诊疗目录同步使用单位到医嘱明细
* 确保 quantityUnit 不为 null，防止前端直接渲染字符串 "null"
*/
private void populateQuantityUnit(List<OrderDetail> details) {
if (details == null || details.isEmpty()) {
return;
}
for (OrderDetail detail : details) {
if (detail.getCatalogItemId() != null) {
CatalogItem catalogItem = catalogItemMapper.selectById(detail.getCatalogItemId());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUsageUnit())) {
detail.setQuantityUnit(catalogItem.getUsageUnit());
} else {
// 兜底：若目录未配置，设为空字符串而非 null
detail.setQuantityUnit("");
}
}
}
OrderMain orderMain = new OrderMain();
orderMain.setPatientId(patientId);
orderMain.setDoctorId(doctorId);
orderMain.setOrderDate(new Date());
orderMain.setStatus(OrderStatus.DRAFT.getCode());
orderMain.setOrderType("SURGERY");
orderMainMapper.insert(orderMain);
OrderDetail orderDetail = new OrderDetail();
orderDetail.setOrderId(orderMain.getId());
orderDetail.setCatalogItemId(catalogItemId);
orderDetail.setItemName(catalogItem.getName());
orderDetail.setQuantity(1);
// 修复 Bug #561：医嘱录入后，总量单位显示异常，显示为“null”而非诊疗目录配置值
// 根因：原逻辑在构建 OrderDetail 时遗漏了从 CatalogItem 映射 usageUnit 到 totalUnit 的步骤
// 修复：显式读取诊疗目录配置的“使用单位”，若未配置则降级使用基础单位，确保前端渲染不为 null
String targetUnit = StringUtils.hasText(catalogItem.getUsageUnit())
? catalogItem.getUsageUnit()
: catalogItem.getUnit();
orderDetail.setTotalUnit(targetUnit);
orderDetailMapper.insert(orderDetail);
logger.info("手术医嘱创建成功，订单ID: {}, 项目: {}, 总量单位: {}", orderMain.getId(), catalogItem.getName(), targetUnit);
return orderMain;
}
@Override
public List<OrderDetail> getOrderDetailsByOrderId(Long orderId) {
return orderDetailMapper.selectByOrderId(orderId);
@Transactional(rollbackFor = Exception.class)
public void createOrder(OrderMain main, List<OrderDetail> details) {
orderMainMapper.insert(main);
if (details != null && !details.isEmpty()) {
for (OrderDetail detail : details) {
detail.setMainId(main.getId());
detail.setCreateTime(new Date());
// Bug #561 Fix: 创建时同步单位
if (detail.getCatalogItemId() != null) {
CatalogItem catalogItem = catalogItemMapper.selectById(detail.getCatalogItemId());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUsageUnit())) {
detail.setQuantityUnit(catalogItem.getUsageUnit());
} else {
detail.setQuantityUnit("");
}
}
orderDetailMapper.insert(detail);
}
}
}
@Override
public void verifyOrder(OrderVerifyDto verifyDto) {
// 医嘱核对逻辑...
public void verifyOrder(OrderVerifyDto dto) {
// 原有核对逻辑保持不变
logger.info("Verifying order: {}", dto.getOrderId());
}
@Override
public void cancelOrder(Long orderId) {
// 原有取消逻辑保持不变
logger.info("Cancelling order: {}", orderId);
}
}