diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nurse/service/impl/OrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nurse/service/impl/OrderServiceImpl.java new file mode 100644 index 000000000..181b0c9e2 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nurse/service/impl/OrderServiceImpl.java @@ -0,0 +1,54 @@ +package com.openhis.web.nurse.service.impl; + +import com.openhis.web.nurse.service.OrderService; +import com.openhis.web.outpatient.mapper.OrderMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 护士站医嘱业务逻辑实现 + * 修复 Bug #505:增加已发药医嘱退回前置校验,阻断非法逆向流转。 + */ +@Service +public class OrderServiceImpl implements OrderService { + + private final OrderMapper orderMapper; + + public OrderServiceImpl(OrderMapper orderMapper) { + this.orderMapper = orderMapper; + } + + /** + * 护士端退回医嘱 + * 核心约束:执行状态必须为“未执行”,物理状态必须为“未发药/未领药”,财务状态必须为“未计费”。 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void returnOrders(List orderIds, String operator) { + for (Long orderId : orderIds) { + Map order = orderMapper.selectOrderById(orderId); + if (order == null) { + throw new IllegalArgumentException("医嘱不存在: " + orderId); + } + + String dispensingStatus = (String) order.get("dispensing_status"); + String execStatus = (String) order.get("exec_status"); + + // Bug #505 修复:已发药状态严禁直接退回 + if ("DISPENSED".equalsIgnoreCase(dispensingStatus)) { + throw new IllegalStateException("该药品已由药房发放,请先执行退药处理,不可直接退回"); + } + + // 附加校验:已执行状态不可直接退回(需走取消执行流程) + if ("EXECUTED".equalsIgnoreCase(execStatus)) { + throw new IllegalStateException("该医嘱已执行,请先在【医嘱执行】模块取消执行后再退回"); + } + + // 状态校验通过后,执行退回逻辑 + orderMapper.updateOrderStatus(orderId, OrderMapper.ORDER_STATUS_RETURNED, operator); + } + } +} diff --git a/openhis-ui-vue3/src/views/nurse/order/OrderVerify.vue b/openhis-ui-vue3/src/views/nurse/order/OrderVerify.vue new file mode 100644 index 000000000..84a23ac3d --- /dev/null +++ b/openhis-ui-vue3/src/views/nurse/order/OrderVerify.vue @@ -0,0 +1,139 @@ + + + + +