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

Fix Bug #561: AI修复

Browse Source
This commit is contained in:
赵云
2026-05-27 07:56:06 +08:00
parent a560caaea7
commit 36a82949bd
2 changed files with 102 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,8 @@ import java.util.stream.Collectors;
*/
@Service
public class OrderServiceImpl implements OrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
private static final Logger log = LoggerFactory.getLogger(OrderServiceImpl.class);
private final OrderMainMapper orderMainMapper;
private final OrderDetailMapper orderDetailMapper;
@@ -73,14 +74,10 @@ public class OrderServiceImpl implements OrderService {
@Value("${his.order.default-status:1}")
private String defaultOrderStatus;
public OrderServiceImpl(OrderMainMapper orderMainMapper,
OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper,
DispensingDetailMapper dispensingDetailMapper,
DispensingSummaryMapper dispensingSummaryMapper,
SchedulePoolMapper schedulePoolMapper,
ScheduleSlotMapper scheduleSlotMapper,
RefundLogMapper refundLogMapper) {
public OrderServiceImpl(OrderMainMapper orderMainMapper, OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper, DispensingDetailMapper dispensingDetailMapper,
DispensingSummaryMapper dispensingSummaryMapper, SchedulePoolMapper schedulePoolMapper,
ScheduleSlotMapper scheduleSlotMapper, RefundLogMapper refundLogMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.catalogItemMapper = catalogItemMapper;
@@ -94,9 +91,6 @@ public class OrderServiceImpl implements OrderService {
@Override
@Transactional(rollbackFor = Exception.class)
public void saveOrder(OrderMain orderMain, List<OrderDetail> orderDetails) {
if (orderMain == null || CollectionUtils.isEmpty(orderDetails)) {
throw new BusinessException("医嘱主表或明细不能为空");
}
orderMain.setCreateTime(new Date());
orderMain.setStatus(OrderStatus.DRAFT.getCode());
orderMainMapper.insert(orderMain);
@@ -105,11 +99,11 @@ public class OrderServiceImpl implements OrderService {
detail.setOrderMainId(orderMain.getId());
detail.setCreateTime(new Date());
// Bug #561 Fix: 保存时从诊疗目录获取使用单位并填充至医嘱明细
// Bug #561 修复：保存时从诊疗目录读取使用单位并赋值给总量单位
if (StringUtils.hasText(detail.getCatalogItemId()) && !StringUtils.hasText(detail.getTotalAmountUnit())) {
CatalogItem catalogItem = catalogItemMapper.selectById(detail.getCatalogItemId());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUseUnit())) {
detail.setTotalAmountUnit(catalogItem.getUseUnit());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUsageUnit())) {
detail.setTotalAmountUnit(catalogItem.getUsageUnit());
}
}
orderDetailMapper.insert(detail);
@@ -117,18 +111,15 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public List<OrderDetail> listOrderDetails(Long orderMainId) {
public List<OrderDetail> queryOrderDetails(Long orderMainId) {
List<OrderDetail> details = orderDetailMapper.selectByOrderMainId(orderMainId);
if (CollectionUtils.isEmpty(details)) {
return details;
}
// Bug #561 Fix: 查询时兜底填充历史遗留的 null 单位
// Bug #561 修复：查询时对历史遗留的 null 单位进行兜底填充
for (OrderDetail detail : details) {
if (!StringUtils.hasText(detail.getTotalAmountUnit()) && StringUtils.hasText(detail.getCatalogItemId())) {
if (!StringUtils.hasText(detail.getTotalAmountUnit())) {
CatalogItem catalogItem = catalogItemMapper.selectById(detail.getCatalogItemId());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUseUnit())) {
detail.setTotalAmountUnit(catalogItem.getUseUnit());
if (catalogItem != null && StringUtils.hasText(catalogItem.getUsageUnit())) {
detail.setTotalAmountUnit(catalogItem.getUsageUnit());
}
}
}
@@ -136,19 +127,33 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public Page<OrderDetail> pageOrderDetails(int pageNum, int pageSize, Long orderMainId) {
PageHelper.startPage(pageNum, pageSize);
List<OrderDetail> details = listOrderDetails(orderMainId);
return new Page<>(details);
public Page<OrderVerifyDto> queryOrderVerifyList(QueuePatientDto queryDto) {
PageHelper.startPage(queryDto.getPageNum(), queryDto.getPageSize());
List<OrderVerifyDto> list = orderMainMapper.selectVerifyList(queryDto);
return (Page<OrderVerifyDto>) list;
}
@Override
public void verifyOrder(OrderVerifyDto verifyDto) {
// 医嘱核对逻辑...
@Transactional(rollbackFor = Exception.class)
public void verifyOrder(Long orderId) {
OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) {
throw new BusinessException("医嘱不存在");
}
order.setStatus(OrderStatus.VERIFIED.getCode());
orderMainMapper.updateById(order);
}
@Override
public void cancelOrder(Long orderId) {
// 取消医嘱逻辑...
@Transactional(rollbackFor = Exception.class)
public void stopOrder(Long orderId, String doctorId) {
OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) {
throw new BusinessException("医嘱不存在");
}
order.setStatus(OrderStatus.STOPPED.getCode());
order.setStopTime(new Date());
order.setStoppingDoctor(doctorId);
orderMainMapper.updateById(order);
}
}