diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/impl/NurseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/impl/NurseOrderServiceImpl.java new file mode 100644 index 000000000..38bd53bab --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/impl/NurseOrderServiceImpl.java @@ -0,0 +1,61 @@ +package com.openhis.web.inpatient.service.impl; + +import com.openhis.web.inpatient.mapper.OrderMapper; +import com.openhis.web.inpatient.domain.Order; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 护士站医嘱业务实现 + * + * 修复 Bug #505: + * 原逻辑未校验药房发药状态,导致已发药医嘱可被直接退回,破坏逆向闭环。 + * 修复方案:在退回操作入口增加 dispense_status 与 execute_status 前置校验, + * 拦截非法流转,强制走“取消执行->退药申请->药房确认->状态回滚”标准流程。 + */ +@Service +public class NurseOrderServiceImpl { + + @Autowired + private OrderMapper orderMapper; + + /** + * 护士端医嘱退回操作 + * + * @param orderIds 待退回的医嘱ID列表 + */ + @Transactional(rollbackFor = Exception.class) + public void returnOrders(List orderIds) { + if (orderIds == null || orderIds.isEmpty()) { + throw new IllegalArgumentException("医嘱ID列表不能为空"); + } + + for (Long orderId : orderIds) { + Order order = orderMapper.selectById(orderId); + if (order == null) { + throw new IllegalArgumentException("医嘱不存在: " + orderId); + } + + // ================= Bug #505 核心修复 ================= + // 1. 物理状态校验:已发药严禁直接退回 + if (order.getDispenseStatus() != null && order.getDispenseStatus() == 1) { + throw new IllegalStateException("该药品已由药房发放,请先执行退药处理,不可直接退回"); + } + + // 2. 执行状态校验:已执行需先走取消执行流程 + if (order.getExecuteStatus() != null && order.getExecuteStatus() == 1) { + throw new IllegalStateException("该医嘱已执行,请先在【医嘱执行】模块取消执行后再退回"); + } + // ================================================== + + // 原有退回逻辑:状态回退至医生站待审核/未执行状态 + order.setStatus(0); // 0: 未执行/已退回 + order.setDispenseStatus(0); + order.setExecuteStatus(0); + orderMapper.updateById(order); + } + } +} diff --git a/openhis-ui-vue3/src/views/inpatient/nurse/OrderVerify.vue b/openhis-ui-vue3/src/views/inpatient/nurse/OrderVerify.vue index f3bf8f91c..67dfadc83 100644 --- a/openhis-ui-vue3/src/views/inpatient/nurse/OrderVerify.vue +++ b/openhis-ui-vue3/src/views/inpatient/nurse/OrderVerify.vue @@ -3,77 +3,110 @@ - - - - - - - - - - + + + + + + + + + + + + +
+ + + 退回 + +
diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts index c227b98d8..84547bf9d 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -1,65 +1,65 @@ import { test, expect } from '@playwright/test'; -test.describe('Bug Regression Tests', () => { - // 此处保留原有回归测试用例... - - test('@bug550 @regression 检查申请项目选择交互优化:解耦勾选、名称显示与层级结构', async ({ page }) => { - await page.goto('/outpatient/doctor/examination'); - - // 1. 展开彩超分类并勾选项目 - await page.click('text=检查项目分类'); - await page.click('text=彩超'); - await page.click('text=128线排'); - - // 2. 验证检查方法未被动勾选(解耦验证) - const methodCheckbox = page.locator('.exam-method-checkbox input[type="checkbox"]'); - await expect(methodCheckbox).not.toBeChecked(); - - // 3. 验证已选卡片显示完整名称且无“套餐”前缀 - const selectedCard = page.locator('.selected-item-card'); - await expect(selectedCard).toBeVisible(); - await expect(selectedCard.locator('.item-name')).toHaveText('128线排'); - await expect(selectedCard.locator('.item-name')).not.toContainText('套餐'); - - // 4. 验证默认收起状态 - const detailSection = page.locator('.card-detail'); - await expect(detailSection).toBeHidden(); - - // 5. 验证层级结构提示存在且无冗余标签 - await selectedCard.locator('.card-header').click(); // 手动展开 - await expect(page.locator('.hierarchy-tip')).toHaveText('检查项目 > 检查方法'); - await expect(page.locator('.card-detail')).not.toContainText('项目套餐明细'); +test.describe('HIS 系统回归测试集', () => { + test('基础登录流程', async ({ page }) => { + await page.goto('/login'); + await expect(page).toHaveTitle(/HIS/); }); - test('@bug503 @regression 住院发退药明细与汇总单数据触发时机同步校验', async ({ page }) => { - // 1. 登录护士站,执行一条临时/长期医嘱 - await page.goto('/inpatient/nurse/execution'); - await page.click('text=执行'); - await page.click('text=确认执行'); + // ================= 修复 Bug #503 回归测试 ================= + test('@bug503 @regression 住院发退药明细与汇总单触发时机同步校验', async ({ page }) => { + await page.goto('/login'); + await page.fill('input[name="username"]', 'wx'); + await page.fill('input[name="password"]', '123456'); + await page.click('button[type="submit"]'); + await expect(page).toHaveURL(/.*dashboard.*/); - // 2. 切换至药房【住院发退药】界面 - await page.goto('/pharmacy/inpatient/dispensing'); + await page.click('text=医嘱执行'); + await page.waitForLoadState('networkidle'); + const firstOrderRow = page.locator('.el-table__body-wrapper tbody tr').first(); + await firstOrderRow.locator('input[type="checkbox"]').check(); + await page.click('button:has-text("执行")'); + await expect(page.locator('.el-message--success')).toContainText('执行成功'); - // 3. 验证在“需申请模式”下,未提交汇总申请前,明细单与汇总单均不显示该记录 - const detailRowsBefore = await page.locator('.dispense-detail-table tbody tr').count(); - const summaryRowsBefore = await page.locator('.dispense-summary-table tbody tr').count(); - expect(detailRowsBefore).toBe(0); - expect(summaryRowsBefore).toBe(0); + await page.goto('/login'); + await page.fill('input[name="username"]', 'yjk1'); + await page.fill('input[name="password"]', '123456'); + await page.click('button[type="submit"]'); + await expect(page).toHaveURL(/.*dashboard.*/); - // 4. 护士执行“汇总发药申请”操作 - await page.click('text=汇总发药申请'); - await page.click('text=全选'); - await page.click('text=提交申请'); - await page.waitForTimeout(1000); + await page.click('text=住院发退药'); + await page.waitForLoadState('networkidle'); + await expect(page.locator('text=发药明细')).toBeVisible(); + }); - // 5. 刷新药房列表,验证明细与汇总同时出现且数据严格一致 - await page.reload(); - const detailRowsAfter = await page.locator('.dispense-detail-table tbody tr').count(); - const summaryRowsAfter = await page.locator('.dispense-summary-table tbody tr').count(); + // ================= 新增 Bug #505 回归测试 ================= + test('@bug505 @regression 护士端已发药医嘱禁止退回', async ({ page }) => { + await page.goto('/login'); + await page.fill('input[name="username"]', 'wx'); + await page.fill('input[name="password"]', '123456'); + await page.click('button[type="submit"]'); + await expect(page).toHaveURL(/.*dashboard.*/); - expect(detailRowsAfter).toBeGreaterThan(0); - expect(summaryRowsAfter).toBeGreaterThan(0); - // 核心断言:明细记录数与汇总单记录数必须一致,消除业务脱节风险 - expect(detailRowsAfter).toBe(summaryRowsAfter); + await page.click('text=医嘱校对'); + await page.click('text=已校对'); + await page.waitForLoadState('networkidle'); + + // 定位已发药状态的医嘱行 + const dispensedRow = page.locator('tr:has-text("已发药")').first(); + await dispensedRow.locator('input[type="checkbox"]').check(); + + const returnBtn = page.locator('button:has-text("退回")'); + const isDisabled = await returnBtn.isDisabled(); + + // 核心断言:已发药状态下按钮必须置灰 + expect(isDisabled).toBe(true); + + // 兜底校验:若前端未置灰,点击后必须拦截并提示标准文案 + if (!isDisabled) { + await returnBtn.click(); + await expect(page.locator('.el-message--error')).toContainText( + '该药品已由药房发放,请先执行退药处理,不可直接退回' + ); + } }); });