Fix Bug #505: AI修复

This commit is contained in:
2026-05-27 01:28:10 +08:00
parent 6a7e30e317
commit 72d2ef6f9b
2 changed files with 193 additions and 0 deletions

View File

@@ -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<Long> orderIds, String operator) {
for (Long orderId : orderIds) {
Map<String, Object> 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);
}
}
}

View File

@@ -0,0 +1,139 @@
<template>
<div class="order-verify-container">
<el-card class="header-card">
<el-tabs v-model="activeTab" @tab-click="handleTabChange">
<el-tab-pane label="待校对" name="pending" />
<el-tab-pane label="已校对" name="verified" />
<el-tab-pane label="已退回" name="returned" />
</el-tabs>
</el-card>
<el-card class="table-card">
<el-table
:data="orderList"
style="width: 100%"
@selection-change="handleSelectionChange"
v-loading="loading"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="order_no" label="医嘱号" width="120" />
<el-table-column prop="drug_name" label="药品名称" />
<el-table-column prop="exec_status" label="执行状态" width="100" />
<el-table-column prop="dispensing_status" label="发药状态" width="100">
<template #default="{ row }">
<el-tag :type="getDispensingTagType(row.dispensing_status)">
{{ formatDispensingStatus(row.dispensing_status) }}
</el-tag>
</template>
</el-table-column>
</el-table>
<div class="action-bar">
<el-button
type="primary"
:disabled="isReturnBtnDisabled"
@click="handleReturn"
>
退回
</el-button>
</div>
</el-card>
</div>
</template>
<script setup>
import { ref, computed } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import axios from 'axios';
const activeTab = ref('verified');
const orderList = ref([]);
const selectedOrders = ref([]);
const loading = ref(false);
// Bug #505 修复:计算退回按钮是否置灰
const isReturnBtnDisabled = computed(() => {
if (selectedOrders.value.length === 0) return true;
// 若任意选中项已发药,则禁用按钮
return selectedOrders.value.some(
(order) => order.dispensing_status === 'DISPENSED'
);
});
const handleSelectionChange = (selection) => {
selectedOrders.value = selection;
};
const handleReturn = async () => {
if (selectedOrders.value.length === 0) {
ElMessage.warning('请至少选择一条医嘱');
return;
}
// 二次防御:若前端置灰逻辑被绕过,拦截并提示
const hasDispensed = selectedOrders.value.some(
(order) => order.dispensing_status === 'DISPENSED'
);
if (hasDispensed) {
ElMessage.error('该药品已由药房发放,请先执行退药处理,不可直接退回');
return;
}
try {
await ElMessageBox.confirm('确认将选中医嘱退回至医生站?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
});
loading.value = true;
const orderIds = selectedOrders.value.map((o) => o.id);
await axios.post('/api/nurse/order/return', { orderIds });
ElMessage.success('退回成功');
fetchOrders();
} catch (err) {
if (err.response?.data?.message) {
ElMessage.error(err.response.data.message);
} else if (err !== 'cancel') {
ElMessage.error('退回失败,请重试');
}
} finally {
loading.value = false;
}
};
const fetchOrders = async () => {
loading.value = true;
try {
const res = await axios.get('/api/nurse/order/list', {
params: { tab: activeTab.value },
});
orderList.value = res.data.data || [];
} catch {
ElMessage.error('获取医嘱列表失败');
} finally {
loading.value = false;
}
};
const handleTabChange = () => fetchOrders();
const getDispensingTagType = (status) => {
const map = { PENDING: 'info', DISPENSED: 'success', RETURNED: 'warning' };
return map[status] || 'info';
};
const formatDispensingStatus = (status) => {
const map = { PENDING: '未发药', DISPENSED: '已发药', RETURNED: '已退药' };
return map[status] || status;
};
// 初始化加载
fetchOrders();
</script>
<style scoped>
.order-verify-container { padding: 16px; }
.header-card { margin-bottom: 16px; }
.action-bar { margin-top: 16px; display: flex; justify-content: flex-end; }
</style>