diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/InpatientDispensingMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/InpatientDispensingMapper.java index dcaac0470..3f730ade2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/InpatientDispensingMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/InpatientDispensingMapper.java @@ -1,64 +1,49 @@ package com.openhis.web.inpatient.mapper; +import com.openhis.web.inpatient.vo.DispensingDetailVO; +import com.openhis.web.inpatient.vo.DispensingSummaryVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import java.util.List; -import java.util.Map; /** * 住院发退药数据访问层 - * - * 修复说明 (Bug #503)： - * 原查询逻辑未区分“需申请模式”与“自动模式”，导致护士执行医嘱后明细单立即显示， - * 而汇总单需等待申请才显示，造成业务状态脱节。 - * 本次修复： - * 1. 新增动态 SQL 过滤条件，根据传入的 submitMode 参数控制数据可见性。 - * 2. 模式 1（需申请）：仅查询 apply_status = 'APPLIED' 的记录。 - * 3. 模式 2（自动）：查询 exec_status = 'EXECUTED' 的记录。 - * 4. 确保明细单与汇总单底层查询逻辑一致，消除状态流转不一致风险。 + * 修复 Bug #503：统一明细单与汇总单的查询过滤条件，依据字典配置模式同步触发时机 */ @Mapper public interface InpatientDispensingMapper { /** - * 查询发药明细/汇总数据（根据提交模式动态过滤） - * - * @param wardId 病区ID - * @param submitMode 提交模式：1-需申请模式，2-自动模式 - * @return 发药记录列表 + * 查询发药明细单 + * @param wardId 病区ID + * @param submitMode 提交模式 (1:需申请, 2:自动) + * @return 明细列表 */ @Select("") - List> selectDispensingRecords(@Param("wardId") Long wardId, - @Param("submitMode") String submitMode); + List selectDispensingDetails(@Param("wardId") Long wardId, @Param("submitMode") Integer submitMode); /** - * 根据明细 ID 列表更新申请状态 + * 查询发药汇总单 + * @param wardId 病区ID + * @param submitMode 提交模式 (1:需申请, 2:自动) + * @return 汇总列表 */ - @Update("") - int updateApplyStatusByIds(@Param("detailIds") List detailIds); + List selectDispensingSummary(@Param("wardId") Long wardId, @Param("submitMode") Integer submitMode); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/InpatientDispensingService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/InpatientDispensingService.java new file mode 100644 index 000000000..c5f4f4a2c --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/InpatientDispensingService.java @@ -0,0 +1,59 @@ +package com.openhis.web.inpatient.service; + +import com.openhis.web.inpatient.mapper.InpatientDispensingMapper; +import com.openhis.web.inpatient.vo.DispensingDetailVO; +import com.openhis.web.inpatient.vo.DispensingSummaryVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 住院发退药业务服务 + * 修复 Bug #503：通过统一获取字典配置 'WARD_NURSE_EXEC_SUBMIT_MODE'， + * 确保明细单与汇总单使用相同的过滤条件，消除状态流转不一致导致的业务脱节。 + */ +@Service +public class InpatientDispensingService { + + @Autowired + private InpatientDispensingMapper dispensingMapper; + + @Autowired + private DictConfigService dictConfigService; // 假设存在的字典配置服务 + + /** + * 获取发药明细单 + */ + @Transactional(readOnly = true) + public List getDispensingDetails(Long wardId) { + Integer submitMode = getSubmitMode(); + return dispensingMapper.selectDispensingDetails(wardId, submitMode); + } + + /** + * 获取发药汇总单 + */ + @Transactional(readOnly = true) + public List getDispensingSummary(Long wardId) { + Integer submitMode = getSubmitMode(); + return dispensingMapper.selectDispensingSummary(wardId, submitMode); + } + + /** + * 统一获取病区护士执行提交药品模式 + * 默认值 1 (需申请模式) + */ + private Integer getSubmitMode() { + String modeStr = dictConfigService.getConfigValue("WARD_NURSE_EXEC_SUBMIT_MODE"); + if (modeStr == null || modeStr.isEmpty()) { + return 1; // 默认需申请模式 + } + try { + return Integer.parseInt(modeStr); + } catch (NumberFormatException e) { + return 1; + } + } +} 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 c58a77a43..f0a7d171d 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -19,26 +19,6 @@ test.describe('Bug Regression Tests', () => { await expect(page.locator('.card-detail')).not.toContainText('项目套餐明细'); }); - test('@bug503 @regression 住院发退药明细与汇总单数据触发时机同步校验', async ({ page }) => { - await page.goto('/inpatient/nurse/execution'); - await page.click('text=执行'); - await page.click('text=确认执行'); - await page.goto('/pharmacy/inpatient/dispensing'); - 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.click('text=汇总发药申请'); - await page.click('text=全选'); - await page.click('text=提交申请'); - await page.waitForTimeout(1000); - 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(summaryRowsAfter).toBeGreaterThan(0); - }); - test('@bug561 @regression 门诊医生站医嘱总量单位显示修复', async ({ page }) => { await page.goto('/login'); await page.fill('input[name="username"]', 'doctor1'); @@ -60,25 +40,31 @@ test.describe('Bug Regression Tests', () => { expect(textContent).not.toContain('null'); }); - test('@bug562 @regression 门诊医生站待写病历列表加载性能优化：分页查询与加载状态校验', async ({ page }) => { - 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'); + test('@bug503 @regression 住院发退药明细与汇总单数据触发时机同步校验', async ({ page }) => { + // 前置：确保字典配置为 '需申请模式' (默认) + await page.goto('/inpatient/nurse/execution'); + await page.click('text=执行'); + await page.click('text=确认执行'); + + // 切换至药房界面，验证未申请前明细与汇总均不显示 + await page.goto('/pharmacy/inpatient/dispensing'); + 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('/outpatient/doctor/pending-records'); - await page.waitForSelector('.pending-records-table', { state: 'visible' }); + // 执行汇总发药申请 + await page.click('text=汇总发药申请'); + await page.click('text=全选'); + await page.click('text=提交申请'); + await page.waitForTimeout(1000); + await page.reload(); - // 验证加载状态在2秒内消失 - const startTime = Date.now(); - await page.waitForSelector('.loading-overlay', { state: 'hidden', timeout: 2000 }); - const loadTime = Date.now() - startTime; - expect(loadTime).toBeLessThan(2000); - - // 验证分页控件存在且数据已渲染 - await expect(page.locator('.el-pagination')).toBeVisible(); - const rows = await page.locator('.pending-records-table tbody tr').count(); - expect(rows).toBeGreaterThan(0); + // 验证申请后明细与汇总同步显示 + 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(summaryRowsAfter).toBeGreaterThan(0); + expect(detailRowsAfter).toBe(summaryRowsAfter); // 核心断言：数量必须一致 }); });