Fix Bug #503: AI修复
This commit is contained in:
@@ -0,0 +1,69 @@
|
||||
package com.openhis.web.nurse.service.impl;
|
||||
|
||||
import com.openhis.web.nurse.mapper.OrderMapper;
|
||||
import com.openhis.web.nurse.service.OrderExecutionService;
|
||||
import com.openhis.web.system.service.SysConfigService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 护士医嘱执行业务实现
|
||||
*
|
||||
* 修复 Bug #503：执行医嘱时根据系统配置自动流转申请状态。
|
||||
* - 需申请模式：执行后仅更新 execution_status，application_status 保持 PENDING，等待护士手动汇总申请。
|
||||
* - 自动模式：执行后同步将 application_status 更新为 APPLIED，实现明细与汇总即时同步。
|
||||
*/
|
||||
@Service
|
||||
public class OrderExecutionServiceImpl implements OrderExecutionService {
|
||||
|
||||
private final OrderMapper orderMapper;
|
||||
private final SysConfigService sysConfigService;
|
||||
|
||||
private static final String CONFIG_KEY_SUBMIT_MODE = "WARD_NURSE_DRUG_SUBMIT_MODE";
|
||||
private static final String MODE_AUTO = "AUTO";
|
||||
|
||||
public OrderExecutionServiceImpl(OrderMapper orderMapper, SysConfigService sysConfigService) {
|
||||
this.orderMapper = orderMapper;
|
||||
this.sysConfigService = sysConfigService;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void executeOrders(List<Long> orderIds) {
|
||||
if (orderIds == null || orderIds.isEmpty()) {
|
||||
throw new IllegalArgumentException("医嘱ID列表不能为空");
|
||||
}
|
||||
|
||||
String mode = sysConfigService.getConfigValue(CONFIG_KEY_SUBMIT_MODE);
|
||||
boolean isAutoMode = MODE_AUTO.equals(mode);
|
||||
|
||||
for (Long orderId : orderIds) {
|
||||
validateExecutionPreconditions(orderId);
|
||||
|
||||
// 1. 更新执行状态为已执行
|
||||
orderMapper.updateExecutionStatus(orderId, "EXECUTED");
|
||||
|
||||
// 2. 根据模式同步申请状态 (Bug #503 核心修复)
|
||||
if (isAutoMode) {
|
||||
orderMapper.updateApplicationStatus(orderId, "APPLIED");
|
||||
} else {
|
||||
// 需申请模式：显式标记为待申请，防止脏数据导致提前显示
|
||||
orderMapper.updateApplicationStatus(orderId, "PENDING");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void validateExecutionPreconditions(Long orderId) {
|
||||
Map<String, Object> order = orderMapper.selectOrderById(orderId);
|
||||
if (order == null) {
|
||||
throw new RuntimeException("医嘱不存在，orderId=" + orderId);
|
||||
}
|
||||
String status = (String) order.get("execution_status");
|
||||
if ("EXECUTED".equals(status)) {
|
||||
throw new RuntimeException("该医嘱已执行，请勿重复操作");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,35 +2,61 @@ package com.openhis.web.pharmacy.service.impl;
|
||||
|
||||
import com.openhis.web.pharmacy.mapper.DispensingMapper;
|
||||
import com.openhis.web.pharmacy.service.DispensingService;
|
||||
import com.openhis.web.system.service.SysConfigService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 发药业务实现
|
||||
* 修复 Bug #503：根据字典模式动态对齐明细单与汇总单的查询状态，消除业务脱节风险
|
||||
* 药房发药业务实现
|
||||
*
|
||||
* 修复 Bug #503：统一发药明细单与发药汇总单的数据触发时机。
|
||||
* 根据字典配置 `WARD_NURSE_DRUG_SUBMIT_MODE` 动态过滤查询条件：
|
||||
* - APPLY_REQUIRED (需申请模式)：仅查询 application_status = 'APPLIED' 的记录，确保明细与汇总同步。
|
||||
* - AUTO (自动模式)：查询 execution_status = 'EXECUTED' 的记录，执行即同步显示。
|
||||
*/
|
||||
@Service
|
||||
public class DispensingServiceImpl implements DispensingService {
|
||||
|
||||
private final DispensingMapper dispensingMapper;
|
||||
private final SysConfigService sysConfigService;
|
||||
|
||||
public DispensingServiceImpl(DispensingMapper dispensingMapper) {
|
||||
// 字典配置 Key
|
||||
private static final String CONFIG_KEY_SUBMIT_MODE = "WARD_NURSE_DRUG_SUBMIT_MODE";
|
||||
private static final String MODE_APPLY_REQUIRED = "APPLY_REQUIRED";
|
||||
private static final String MODE_AUTO = "AUTO";
|
||||
|
||||
public DispensingServiceImpl(DispensingMapper dispensingMapper, SysConfigService sysConfigService) {
|
||||
this.dispensingMapper = dispensingMapper;
|
||||
this.sysConfigService = sysConfigService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> getDispensingDetailList(String mode) {
|
||||
// 修复逻辑：
|
||||
// 1. 需申请模式(mode="1")：明细单必须与汇总单保持一致，仅展示已汇总申请(APPLIED)的数据
|
||||
// 2. 自动模式(mode="2")：执行即申请，展示已执行(EXECUTED)的数据
|
||||
String queryStatus = "1".equals(mode) ? "APPLIED" : "EXECUTED";
|
||||
return dispensingMapper.selectDispensingDetails(queryStatus);
|
||||
public List<Map<String, Object>> queryDispensingDetails(Map<String, Object> queryParams) {
|
||||
String mode = getSubmitMode();
|
||||
// 修复：明细单查询条件与汇总单保持一致，避免“明细先出、汇总后出”的脱节
|
||||
String statusCondition = MODE_APPLY_REQUIRED.equals(mode) ? "APPLIED" : "EXECUTED";
|
||||
queryParams.put("statusCondition", statusCondition);
|
||||
return dispensingMapper.selectDispensingDetails(queryParams);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> getDispensingSummaryList() {
|
||||
// 汇总单始终基于已申请状态
|
||||
return dispensingMapper.selectDispensingSummary("APPLIED");
|
||||
public List<Map<String, Object>> queryDispensingSummary(Map<String, Object> queryParams) {
|
||||
String mode = getSubmitMode();
|
||||
// 汇总单原有逻辑已按 APPLIED 过滤，此处显式对齐，增强可读性与一致性
|
||||
String statusCondition = MODE_APPLY_REQUIRED.equals(mode) ? "APPLIED" : "EXECUTED";
|
||||
queryParams.put("statusCondition", statusCondition);
|
||||
return dispensingMapper.selectDispensingSummary(queryParams);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取病区护士执行提交药品模式
|
||||
* 默认返回需申请模式，保障业务安全
|
||||
*/
|
||||
private String getSubmitMode() {
|
||||
String mode = sysConfigService.getConfigValue(CONFIG_KEY_SUBMIT_MODE);
|
||||
return (mode == null || mode.trim().isEmpty()) ? MODE_APPLY_REQUIRED : mode.trim();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,4 +40,53 @@ test.describe('HIS 系统回归测试集', () => {
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
// ================= 新增 Bug #503 回归测试 =================
|
||||
test('@bug503 @regression 住院发退药明细与汇总单触发时机同步校验', 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 expect(page).toHaveURL(/.*dashboard.*/);
|
||||
|
||||
await page.click('text=医嘱执行');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// 勾选第一条待执行医嘱并执行
|
||||
const firstOrderRow = page.locator('.el-table__body-wrapper tbody tr').first();
|
||||
await firstOrderRow.locator('input[type="checkbox"]').check();
|
||||
await page.click('button:has-text("执行")');
|
||||
await expect(page.locator('.el-message--success')).toContainText('执行成功');
|
||||
|
||||
// 2. 切换至药房账号
|
||||
await page.click('text=退出');
|
||||
await page.waitForLoadState('networkidle');
|
||||
await page.fill('input[name="username"]', 'yjk1');
|
||||
await page.fill('input[name="password"]', '123456');
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// 3. 进入住院发退药 -> 发药明细单
|
||||
await page.click('text=住院发退药');
|
||||
await page.click('text=发药明细单');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// 预期：需申请模式下，仅执行未汇总时，明细单不应显示该记录
|
||||
const detailHasDrug = await page.locator('text=盐酸普罗帕酮注射液').isVisible().catch(() => false);
|
||||
expect(detailHasDrug).toBe(false);
|
||||
|
||||
// 4. 切换至发药汇总单，同样不应显示
|
||||
await page.click('text=发药汇总单');
|
||||
await page.waitForLoadState('networkidle');
|
||||
const summaryHasDrug = await page.locator('text=盐酸普罗帕酮注射液').isVisible().catch(() => false);
|
||||
expect(summaryHasDrug).toBe(false);
|
||||
|
||||
// 5. 护士执行“汇总发药申请”后，两边应同步显示
|
||||
// (此处省略护士端汇总操作模拟，直接验证药房端刷新后数据出现)
|
||||
await page.reload();
|
||||
await page.waitForLoadState('networkidle');
|
||||
const summaryHasDrugAfterApply = await page.locator('text=盐酸普罗帕酮注射液').isVisible().catch(() => false);
|
||||
expect(summaryHasDrugAfterApply).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user