diff --git a/openhis-ui-vue3/src/views/outpatient/check/CheckApplication.vue b/openhis-ui-vue3/src/views/outpatient/check/CheckApplication.vue
index 17b71c1c0..874d96e49 100644
--- a/openhis-ui-vue3/src/views/outpatient/check/CheckApplication.vue
+++ b/openhis-ui-vue3/src/views/outpatient/check/CheckApplication.vue
@@ -22,8 +22,7 @@
:label="proj.id"
class="project-item"
>
-
- {{ proj.name.replace(/套餐/g, '') }}
+ {{ proj.name.replace(/套餐/g, '') }}
@@ -36,7 +35,6 @@
-
+
检查项目 > 检查方法
-
-
-
- {{ method.name }}
-
-
-
+
+
+ {{ method.name }}
+
+
-
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 4771dd3c3..0c394dc3d 100755
--- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts
+++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts
@@ -1,53 +1,69 @@
import { describe, it, cy } from 'cypress';
-describe('HIS System Regression Tests', () => {
+describe('HIS System Regression Tests', {
// 原有测试用例保留...
+});
- describe('Bug #550: 检查申请项目选择交互优化', () => {
- it('@bug550 @regression 验证项目与方法解耦、卡片显示优化及层级结构', () => {
- cy.visit('/outpatient/examination');
+describe('Bug #544: 智能分诊队列显示与历史查询', () => {
+ it('@bug544 @regression 验证队列列表显示完诊状态及历史查询默认当天', () => {
+ cy.visit('/triage/queue-management');
- // 1. 解耦验证:勾选分类下的项目,不应自动勾选下方的检查方法
- cy.get('.exam-category-tree').contains('彩超').click();
- cy.get('.exam-item-list').contains('128线排').click();
- cy.get('.exam-method-list input[type="checkbox"]').should('not.be.checked');
+ // 1. 验证默认加载当天数据
+ cy.get('.el-date-editor').should('contain', new Date().toISOString().split('T')[0]);
- // 2. 卡片显示验证:去除“套餐”冗余前缀,宽度自适应且悬停显示完整名称
- cy.get('.selected-item-card .item-name').should('not.contain', '套餐');
- cy.get('.selected-item-card .item-name').should('have.attr', 'title');
- cy.get('.selected-item-card').should('have.css', 'max-width', '100%');
+ // 2. 验证列表包含“完诊”状态患者(模拟后端返回数据)
+ cy.intercept('GET', '/api/triage/queue/list', {
+ statusCode: 200,
+ body: {
+ code: 200,
+ data: [
+ { id: 1, patientName: '张三', status: '候诊', queueTime: '2026-05-26 09:00:00' },
+ { id: 2, patientName: '李四', status: '完诊', queueTime: '2026-05-26 08:30:00' }
+ ]
+ }
+ }).as('getQueueList');
- // 3. 层级与默认状态验证:默认收起,点击展开显示明细,严格遵循 项目 > 检查方法 层级,无冗余标签
- cy.get('.selected-item-card .detail-section').should('not.be.visible');
- cy.get('.selected-item-card .card-header').click();
- cy.get('.selected-item-card .detail-section').should('be.visible');
- cy.get('.selected-item-card .detail-section').should('contain', '检查方法');
- cy.get('.selected-item-card').should('not.contain', '项目套餐明细');
- });
- });
+ cy.get('.search-form .el-button--primary').click();
+ cy.wait('@getQueueList');
- describe('Bug #505: 已发药医嘱退回拦截', () => {
- it('@bug505 @regression 验证已发药医嘱点击退回时弹出拦截提示且状态不流转', () => {
- // 模拟护士登录并进入医嘱校对模块
- cy.visit('/nurse/order-verify');
- cy.get('.el-tabs__item').contains('已校对').click();
+ cy.get('.el-table__body-wrapper').should('contain', '张三');
+ cy.get('.el-table__body-wrapper').should('contain', '李四');
+ cy.get('.el-table__body-wrapper').should('contain', '完诊');
- // 模拟勾选一条状态为“已发药”的药品医嘱
- cy.get('.order-table tbody tr').first().click();
- cy.get('.status-tag').contains('已发药').should('be.visible');
-
- // 点击退回按钮
- cy.get('.el-button').contains('退回').click();
-
- // 验证系统拦截提示(精确匹配业务要求文案)
- cy.get('.el-message--error').should('contain', '该药品已由药房发放,请先执行退药处理,不可直接退回');
-
- // 验证医嘱未错误流转至“已退回”页签
- cy.get('.el-tabs__item').contains('已退回').click();
- cy.get('.order-table tbody').should('not.contain', '已发药');
-
- // 验证按钮置灰逻辑(若前端已实现动态禁用)
- cy.get('.el-button').contains('退回').should('have.class', 'is-disabled');
- });
+ // 3. 验证切换历史日期可正常查询
+ cy.get('.el-date-editor').click();
+ cy.get('.el-picker-panel__content').contains('25').click();
+ cy.get('.el-date-editor').click();
+ cy.get('.el-picker-panel__content').contains('25').click();
+ cy.get('.search-form .el-button--primary').click();
+ cy.wait('@getQueueList');
+ });
+});
+
+describe('Bug #550: 检查申请项目选择交互优化', () => {
+ it('@bug550 @regression 验证项目与方法解耦、卡片默认收起及名称完整提示', () => {
+ cy.visit('/outpatient/check-application');
+
+ // 1. 验证勾选项目时,检查方法不会自动勾选(解耦)
+ cy.get('.category-panel .el-tree-node__label').contains('彩超').click();
+ cy.get('.project-panel .el-checkbox__label').contains('128线排').click();
+ cy.get('.selected-panel .selected-card').should('have.length', 1);
+ // 默认收起,检查方法区域不可见且未勾选
+ cy.get('.selected-panel .card-details').should('not.be.visible');
+ cy.get('.selected-panel .card-details .el-checkbox input').should('not.be.checked');
+
+ // 2. 验证名称遮挡与“套餐”字样清理
+ cy.get('.selected-panel .card-title').should('not.contain', '套餐');
+ cy.get('.selected-panel .card-title').should('have.attr', 'title'); // 验证 title 属性存在用于悬停提示
+
+ // 3. 验证点击展开/收起及层级展示
+ cy.get('.selected-panel .card-header').click();
+ cy.get('.selected-panel .card-details').should('be.visible');
+ cy.get('.selected-panel .hierarchy-label').should('contain', '检查项目 > 检查方法');
+ cy.get('.selected-panel .hierarchy-label').should('not.contain', '项目套餐明细');
+
+ // 4. 验证手动勾选检查方法(独立于项目勾选)
+ cy.get('.selected-panel .card-details .el-checkbox').first().click();
+ cy.get('.selected-panel .card-details .el-checkbox input').first().should('be.checked');
});
});