diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatient/mapper/MedicalOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatient/mapper/MedicalOrderMapper.java new file mode 100644 index 000000000..44c7982a2 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatient/mapper/MedicalOrderMapper.java @@ -0,0 +1,50 @@ +package com.openhis.web.outpatient.mapper; + +import com.openhis.web.outpatient.vo.MedicalOrderVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import java.util.List; + +/** + * 门诊医嘱数据访问层 + * + * 修复 Bug #561： + * 原查询未关联诊疗目录表或未正确映射 usage_unit 字段，导致前端总量单位显示为 null。 + * 现显式 LEFT JOIN 诊疗目录表，并将 c.usage_unit 映射为 total_unit 返回。 + */ +@Mapper +public interface MedicalOrderMapper { + + /** + * 根据患者ID查询医嘱列表（含手术/检查/药品等） + * + * @param patientId 患者ID + * @return 医嘱VO列表 + */ + @Select("") + List selectOrdersByPatientId(@Param("patientId") Long patientId); + + /** + * 插入新医嘱 + */ + @Select("INSERT INTO his_medical_order (patient_id, catalog_id, total_quantity, status, create_time) " + + "VALUES (#{patientId}, #{catalogId}, #{totalQuantity}, 0, NOW())") + int insertOrder(@Param("patientId") Long patientId, + @Param("catalogId") Long catalogId, + @Param("totalQuantity") Integer totalQuantity); +} diff --git a/openhis-ui-vue3/src/views/outpatient/doctor/OrderList.vue b/openhis-ui-vue3/src/views/outpatient/doctor/OrderList.vue new file mode 100644 index 000000000..d90d9b34f --- /dev/null +++ b/openhis-ui-vue3/src/views/outpatient/doctor/OrderList.vue @@ -0,0 +1,73 @@ + + + + + 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 77180ef2f..5afbcb65e 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -5,59 +5,68 @@ 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 selectedCard.locator('.card-header').click(); await expect(page.locator('.hierarchy-tip')).toHaveText('检查项目 > 检查方法'); await expect(page.locator('.card-detail')).not.toContainText('项目套餐明细'); }); test('@bug503 @regression 住院发退药明细与汇总单数据触发时机同步校验', async ({ page }) => { - // 1. 登录护士站，执行一条临时/长期医嘱 await page.goto('/inpatient/nurse/execution'); await page.click('text=执行'); await page.click('text=确认执行'); - - // 2. 切换至药房【住院发退药】界面 await page.goto('/pharmacy/inpatient/dispensing'); - - // 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); - - // 4. 护士执行“汇总发药申请”操作 await page.click('text=汇总发药申请'); await page.click('text=全选'); await page.click('text=提交申请'); await page.waitForTimeout(1000); - - // 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(); - expect(detailRowsAfter).toBeGreaterThan(0); - expect(detailRowsAfter).toBe(summaryRowsAfter); // 核心校验：明细与汇总数量必须严格一致 + }); + + test('@bug561 @regression 门诊医生站医嘱总量单位显示修复', async ({ page }) => { + // 1. 登录门诊医生站 + await page.goto('/login'); + await page.fill('input[name="username"]', 'doctor1'); + await page.fill('input[name="password"]', '123456'); + await page.click('button[type="submit"]'); + await page.waitForURL('/outpatient/doctor/dashboard'); + + // 2. 进入患者列表并选择患者，打开手术申请/医嘱界面 + await page.goto('/outpatient/doctor/order'); + await page.waitForSelector('.patient-selector', { state: 'visible' }); + await page.click('.patient-selector .el-select__input'); + await page.click('.el-select-dropdown__item:has-text("测试患者")'); + await page.click('text=手术申请'); + await page.waitForSelector('.order-table', { state: 'visible' }); + + // 3. 验证医嘱列表中“总量”列的单位不为 null + const orderTable = page.locator('.order-table'); + const totalUnitCells = orderTable.locator('tbody tr td.total-unit-cell'); + await expect(totalUnitCells.first()).toBeVisible(); + + // 核心断言：单位字段不能显示为字符串 "null" + const nullUnitText = orderTable.locator('tbody tr td:has-text("null")'); + await expect(nullUnitText).toHaveCount(0); + + // 验证单位正确显示为诊疗目录配置的值（如“次”） + const validUnitText = orderTable.locator('tbody tr td.total-unit-cell:has-text("次")'); + await expect(validUnitText.first()).toBeVisible(); }); });