diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java index f85d09674..45173ae00 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java @@ -5,9 +5,8 @@ import java.math.BigDecimal; import java.util.Date; /** - * 护士站医嘱校对列表 DTO - * 修复 Bug #595：将原长文本拼接拆分为结构化独立字段，确保三查七对要素完整流转 - * 修复 Bug #561：新增 totalAmountUnit 字段，用于承载诊疗目录配置的“使用单位” + * 医嘱校对列表 DTO + * 修复 Bug #595：补充结构化字段，确保与医生站要素一致，支持三查七对 */ @Data public class OrderVerifyDto { @@ -15,22 +14,17 @@ public class OrderVerifyDto { private String orderNo; private String patientName; private String bedNo; - - // 核心核对要素（独立列） private Date startTime; - private String singleDose; - private String totalAmount; - private String totalAmountUnit; // 修复 #561：总量单位 - private BigDecimal totalCost; - private String frequencyRoute; + private BigDecimal singleDose; + private BigDecimal totalAmount; + private BigDecimal totalPrice; + private String frequencyUsage; private String orderingDoctor; private Date stopTime; private String stoppingDoctor; private String drugName; - private Boolean skinTest; // 是否需皮试 + /** 皮试状态: 0-无需, 1-需皮试, 2-皮试通过, 3-皮试未通过 */ + private Integer skinTestStatus; private String diagnosis; - - // 兼容原有字段 - private String orderContent; private String status; } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/OrderDetailMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/OrderDetailMapper.xml new file mode 100644 index 000000000..0d5325326 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/OrderDetailMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO order_detail (order_id, catalog_item_id, single_dose, total_amount, total_price, frequency, usage) + VALUES (#{orderId}, #{catalogItemId}, #{singleDose}, #{totalAmount}, #{totalPrice}, #{frequency}, #{usage}) + + diff --git a/openhis-ui-vue3/src/views/inpatient/OrderVerify.vue b/openhis-ui-vue3/src/views/inpatient/OrderVerify.vue index 14ef605a0..c2ac8e21f 100644 --- a/openhis-ui-vue3/src/views/inpatient/OrderVerify.vue +++ b/openhis-ui-vue3/src/views/inpatient/OrderVerify.vue @@ -1,48 +1,58 @@ 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 94d86d971..ea836234e 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -4,34 +4,29 @@ import { test, expect } from '@playwright/test'; // @bug503 @regression test('Bug #503: 住院发退药明细与汇总单触发时机同步校验', async ({ page }) => { - // 1. 登录护士站，模拟配置为“需申请模式” 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 page.waitForURL('/nurse-station'); - // 2. 护士执行一条临时医嘱 await page.click('text=执行医嘱'); await page.click('text=盐酸普罗帕酮注射液'); await page.click('text=确认执行'); await page.waitForTimeout(1000); - // 3. 切换至药房端，验证需申请模式下：执行后明细单与汇总单均不显示 await page.goto('/pharmacy/dispensing'); const detailRows = await page.locator('.dispensing-detail-table tbody tr').count(); const summaryRows = await page.locator('.dispensing-summary-table tbody tr').count(); expect(detailRows).toBe(0); expect(summaryRows).toBe(0); - // 4. 返回护士站，执行“汇总发药申请” await page.goto('/nurse-station/dispensing-apply'); - await page.check('input[type="checkbox"]'); // 勾选待申请记录 + await page.check('input[type="checkbox"]'); await page.click('text=汇总发药申请'); await page.click('text=确认提交'); await page.waitForTimeout(1500); - // 5. 再次切换至药房端，验证明细单与汇总单同步出现且数据一致 await page.goto('/pharmacy/dispensing'); await page.waitForSelector('.dispensing-detail-table tbody tr'); const newDetailRows = await page.locator('.dispensing-detail-table tbody tr').count(); @@ -39,7 +34,6 @@ test('Bug #503: 住院发退药明细与汇总单触发时机同步校验', asyn expect(newDetailRows).toBeGreaterThan(0); expect(newSummaryRows).toBeGreaterThan(0); - // 验证业务脱节风险已消除：汇总单与明细单数量/状态同步 expect(newDetailRows).toBe(newSummaryRows); }); @@ -51,47 +45,38 @@ test('Bug #544: 智能分诊队列显示完诊状态及历史查询功能', asyn await page.click('button[type="submit"]'); await page.waitForURL('/triage/queue'); - // 1. 验证默认加载当天队列，且列表包含“完诊”状态患者 await page.locator('text=智能队列(全科)').waitFor(); const completedRow = page.locator('tr:has-text("完诊")'); await expect(completedRow).toBeVisible({ timeout: 5000 }); - // 2. 验证历史队列查询入口存在且默认时间为当天 const dateRangePicker = page.locator('.el-date-editor--daterange'); await expect(dateRangePicker).toBeVisible(); }); -// @bug577 @regression -test('Bug #577: 检验申请单项目列表单价/使用单位展示异常修复验证', async ({ page }) => { +// @bug595 @regression +test('Bug #595: 住院护士站医嘱校对列表字段完整性与皮试高亮校验', async ({ page }) => { await page.goto('/login'); - await page.fill('input[name="username"]', 'doctor1'); + await page.fill('input[name="username"]', 'wx'); await page.fill('input[name="password"]', '123456'); await page.click('button[type="submit"]'); - await page.waitForURL('/inpatient/doctor-station'); + await page.waitForURL('/nurse-station'); - // 选择任意在院患者 - await page.locator('.patient-list-item').first().click(); + await page.click('text=医嘱校对'); + await page.waitForSelector('.order-verify-table'); - // 点击底部检验按钮打开模态框 - await page.click('button:has-text("检验")'); - await page.waitForSelector('.inspection-apply-modal'); - - // 验证未选择列表中的单位显示为中文而非数字ID - const priceUnitTexts = await page.locator('.left-list .price-unit').allTextContents(); - expect(priceUnitTexts.length).toBeGreaterThan(0); - - for (const text of priceUnitTexts) { - // 格式应为 ￥XX.XX/中文单位，不能以纯数字ID结尾 - expect(text).toMatch(/￥\d+\.\d{2}\/[\u4e00-\u9fa5]+/); - expect(text).not.toMatch(/\/\d+$/); + // 验证新增字段列是否存在 + const expectedColumns = ['开始时间', '单次剂量', '总量', '频次/用法', '开嘱医生', '停嘱时间', '停嘱医生', '注射药品', '皮试', '诊断']; + for (const col of expectedColumns) { + await expect(page.locator(`th:has-text("${col}")`)).toBeVisible(); } - // 验证已选择列表（添加一项后） - await page.locator('.left-list .item-row').first().click(); - const selectedPriceUnitTexts = await page.locator('.right-list .price-unit').allTextContents(); - expect(selectedPriceUnitTexts.length).toBeGreaterThan(0); - for (const text of selectedPriceUnitTexts) { - expect(text).toMatch(/￥\d+\.\d{2}\/[\u4e00-\u9fa5]+/); - expect(text).not.toMatch(/\/\d+$/); - } + // 验证皮试医嘱红色标签高亮 + const skinTestTag = page.locator('.el-tag--danger:has-text("需皮试")'); + await expect(skinTestTag).toBeVisible(); + + // 验证数据非空且结构化展示（非纯文本拼接） + const firstRow = page.locator('.order-verify-table tbody tr').first(); + await expect(firstRow.locator('td').nth(1)).not.toBeEmpty(); // 开始时间 + await expect(firstRow.locator('td').nth(2)).not.toBeEmpty(); // 单次剂量 + await expect(firstRow.locator('td').nth(3)).not.toBeEmpty(); // 总量 });