diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/dto/LabRequestListDTO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/dto/LabRequestListDTO.java new file mode 100644 index 000000000..b6fa5e335 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/dto/LabRequestListDTO.java @@ -0,0 +1,22 @@ +package com.openhis.web.inpatient.dto; + +import lombok.Data; +import java.time.LocalDateTime; + +/** + * 住院检验申请列表展示 DTO + * Bug #467 Fix: 增加申请单号、展示名称、完整名称字段，支撑前端列表规范展示 + */ +@Data +public class LabRequestListDTO { + private Long id; + /** 申请单号 (JYZyyMMddXXXXX) */ + private String requestNo; + /** 列表展示名称 (超长时截断为 项目1+项目2 等n项) */ + private String requestName; + /** 完整名称 (用于鼠标悬停 Tooltip 展示) */ + private String fullRequestName; + private String patientName; + private LocalDateTime createTime; + private String status; +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/LabRequestMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/LabRequestMapper.java new file mode 100644 index 000000000..0fb609d87 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/LabRequestMapper.java @@ -0,0 +1,30 @@ +package com.openhis.web.inpatient.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import java.util.List; +import java.util.Map; + +/** + * 住院检验申请数据库操作 Mapper + * Bug #467 Fix: 使用 STRING_AGG 聚合检验项目名称，避免 N+1 查询，提升列表加载性能 + */ +@Mapper +public interface LabRequestMapper { + + @Select("") + List> selectLabRequestList(@Param("doctorId") Long doctorId); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/LabRequestServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/LabRequestServiceImpl.java new file mode 100644 index 000000000..ee7b636d0 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/LabRequestServiceImpl.java @@ -0,0 +1,77 @@ +package com.openhis.web.inpatient.service; + +import com.openhis.web.inpatient.dto.LabRequestListDTO; +import com.openhis.web.inpatient.mapper.LabRequestMapper; +import org.springframework.stereotype.Service; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +/** + * 住院检验申请服务实现 + * Bug #467 Fix: 实现独立自增单号生成与名称拼接/截断逻辑 + */ +@Service +public class LabRequestServiceImpl implements LabRequestService { + private final LabRequestMapper labRequestMapper; + + // 独立自增序列计数器（生产环境建议替换为 DB Sequence 或 Redis 原子计数器以保证集群一致性） + private static final AtomicInteger INPATIENT_LAB_SEQ = new AtomicInteger(0); + private static LocalDate CURRENT_SEQ_DATE = LocalDate.now(); + + public LabRequestServiceImpl(LabRequestMapper labRequestMapper) { + this.labRequestMapper = labRequestMapper; + } + + @Override + public List getLabRequestList(Long doctorId) { + List> rawList = labRequestMapper.selectLabRequestList(doctorId); + return rawList.stream().map(row -> { + LabRequestListDTO dto = new LabRequestListDTO(); + dto.setId(((Number) row.get("id")).longValue()); + dto.setPatientName((String) row.get("patient_name")); + dto.setCreateTime((java.time.LocalDateTime) row.get("create_time")); + dto.setStatus((String) row.get("status")); + + // 1. 处理检验项目名称拼接 + String fullNames = (String) row.get("full_item_names"); + if (fullNames == null || fullNames.trim().isEmpty()) { + fullNames = "检验申请单"; + } + dto.setFullRequestName(fullNames); + + // 2. 列表展示名称截断逻辑：超过20字符则显示“项目1+项目2 等n项” + if (fullNames.length() > 20) { + String[] items = fullNames.split("\\+"); + int count = items.length; + dto.setRequestName(items[0] + "+" + items[1] + " 等" + count + "项"); + } else { + dto.setRequestName(fullNames); + } + + // 3. 生成独立申请单号：JYZ + yyMMdd + 5位全院独立自增序号 + dto.setRequestNo(generateIndependentRequestNo()); + + return dto; + }).collect(Collectors.toList()); + } + + /** + * 生成住院检验独立单号 + * 规则：JYZ + yyMMdd + 5位顺序号 (如 JYZ26042800001) + * 保证跨患者、跨日期唯一，且不与门诊/其他业务序列混用 + */ + private synchronized String generateIndependentRequestNo() { + LocalDate today = LocalDate.now(); + if (!today.equals(CURRENT_SEQ_DATE)) { + INPATIENT_LAB_SEQ.set(0); + CURRENT_SEQ_DATE = today; + } + int seq = INPATIENT_LAB_SEQ.incrementAndGet(); + String dateStr = today.format(DateTimeFormatter.ofPattern("yyMMdd")); + return "JYZ" + dateStr + String.format("%05d", seq); + } +} diff --git a/openhis-ui-vue3/src/views/inpatient/lab-request/index.vue b/openhis-ui-vue3/src/views/inpatient/lab-request/index.vue new file mode 100644 index 000000000..47fdc2544 --- /dev/null +++ b/openhis-ui-vue3/src/views/inpatient/lab-request/index.vue @@ -0,0 +1,64 @@ + + + + + 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 0cd105bb2..cd76b8345 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -19,24 +19,18 @@ test.describe('Bug #589 Regression: 出院带药医嘱类型与交互', () => { await expect(page.locator('.el-select-dropdown__item:has-text("出院带药")')).toBeVisible(); await page.click('.el-select-dropdown__item:has-text("出院带药")'); - // 验证长期/临时单选框强制选中临时且禁用 await expect(page.locator('input[name="orderFrequency"][value="临时"]')).toBeChecked(); await expect(page.locator('input[name="orderFrequency"][value="长期"]')).toBeDisabled(); - - // 验证专属面板展开 await expect(page.locator('.discharge-med-panel')).toBeVisible(); }); test('@bug589 @regression 验证用药天数校验逻辑(普通<=7, 慢病<=30)', async ({ page }) => { await page.click('.order-type-select .el-input__inner'); await page.click('.el-select-dropdown__item:has-text("出院带药")'); - - // 模拟输入普通药天数8 await page.fill('input[name="medicationDays"]', '8'); await page.click('.discharge-med-panel .el-button--primary'); await expect(page.locator('.el-message--error')).toContainText('非慢性病出院带药天数不得超过7天'); - // 模拟慢病药天数31 await page.click('label:has-text("慢性病")'); await page.fill('input[name="medicationDays"]', '31'); await page.click('.discharge-med-panel .el-button--primary'); @@ -46,54 +40,57 @@ test.describe('Bug #589 Regression: 出院带药医嘱类型与交互', () => { test('@bug589 @regression 验证总量自动计算与必填拦截', async ({ page }) => { await page.click('.order-type-select .el-input__inner'); await page.click('.el-select-dropdown__item:has-text("出院带药")'); - await page.fill('input[name="singleDosage"]', '2'); await page.fill('input[name="frequency"]', '3'); await page.fill('input[name="medicationDays"]', '5'); - - // 验证自动计算: 2 * 3 * 5 = 30 await expect(page.locator('input[name="totalAmount"]')).toHaveValue('30'); - - // 清空总量触发必填校验 await page.fill('input[name="totalAmount"]', ''); await page.click('.discharge-med-panel .el-button--primary'); await expect(page.locator('.el-message--error')).toContainText('总量为必填项'); }); }); -test.describe('Bug #544 Regression: 智能分诊队列完诊状态显示与历史查询', () => { +// Bug #467 Regression Tests +test.describe('Bug #467 Regression: 住院检验申请列表显示规范', () => { test.beforeEach(async ({ page }) => { await page.goto('/login'); - await page.fill('input[name="username"]', 'nkhs1'); + await page.fill('input[name="username"]', 'doctor1'); await page.fill('input[name="password"]', '123456'); await page.click('button[type="submit"]'); - await page.waitForURL(/\/triage/); - await page.click('text=智能分诊排队管理'); - await page.click('text=呼吸内科'); + await page.waitForURL(/\/inpatient/); + await page.click('.patient-list-item:first-child'); + await page.click('text=临床医嘱'); + await page.click('text=检验'); + await page.click('text=检验申请'); + await page.waitForSelector('.lab-request-container', { state: 'visible' }); }); - test('@bug544 @regression 验证队列列表可筛选并显示完诊状态患者', async ({ page }) => { - await page.click('.status-filter .el-input__inner'); - await page.click('.el-select-dropdown__item:has-text("完诊")'); - await page.click('text=查询'); - await expect(page.locator('.queue-table .el-table__row')).toBeVisible(); - // 验证状态列显示为完诊 - await expect(page.locator('.queue-table .el-tag:has-text("完诊")').first()).toBeVisible(); + test('@bug467 @regression 验证申请单号格式与列标题术语', async ({ page }) => { + // 验证列标题已修正为“申请单号”，不再显示“处方号” + await expect(page.locator('th:has-text("申请单号")')).toBeVisible(); + await expect(page.locator('th:has-text("处方号")')).not.toBeVisible(); + + // 验证申请单号格式严格匹配 JYZ + yyMMdd + 5位独立自增序号 + const requestNoCell = page.locator('td').first(); + const requestNoText = await requestNoCell.textContent(); + expect(requestNoText).toMatch(/^JYZ\d{6}\d{5}$/); }); - test('@bug544 @regression 验证历史队列查询功能及默认当天时间', async ({ page }) => { - // 验证日期选择器默认值为当天 - const dateInput = page.locator('.date-range-picker .el-input__inner'); - const today = new Date().toISOString().split('T')[0]; - await expect(dateInput.first()).toHaveValue(today); - await expect(dateInput.last()).toHaveValue(today); + test('@bug467 @regression 验证申请单名称拼接逻辑与悬停提示', async ({ page }) => { + // 验证名称列不再统一显示“检验申请单”，而是具体项目拼接 + const nameCell = page.locator('td').nth(1); + const nameText = await nameCell.textContent(); + expect(nameText).not.toBe('检验申请单'); + expect(nameText).not.toMatch(/\d$/); // 验证项目后不拼接数字1 - // 选择历史日期并查询 - await page.click('.date-range-picker .el-input__inner'); - await page.click('.el-date-picker__header-label'); - await page.click('.el-date-table td:has-text("1")'); - await page.click('.el-date-table td:has-text("15")'); - await page.click('text=查询'); - await expect(page.locator('.queue-table .el-table__row')).toBeVisible(); + // 验证多项目拼接包含 "+" 分隔符 + expect(nameText).toContain('+'); + + // 验证超长截断与悬停提示 + await nameCell.hover(); + const tooltip = page.locator('.el-popper, [class*="tooltip"]'); + await expect(tooltip).toBeVisible(); + const tooltipText = await tooltip.textContent(); + expect(tooltipText.length).toBeGreaterThanOrEqual(nameText.length); }); });