wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix Bug #503: AI修复

Browse Source
This commit is contained in:
关羽
2026-05-27 05:29:24 +08:00
parent 77e1c9c1f3
commit fbc9cea140
2 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/DispensingServiceImpl.java
View File

@@ -60,64 +60,59 @@ public class DispensingServiceImpl implements DispensingService {
// 2: 自动模式 -> 初始状态为 1 (已申请/药房立即可见)
int initialApplyStatus = "2".equals(mode) ? 1 : 0;
log.info("Bug #503 Fix: Nurse execution triggered. Mode={}, InitialApplyStatus={}", mode, initialApplyStatus);
for (DispensingDetail detail : detailList) {
detail.setOrderId(orderId);
detail.setApplyStatus(initialApplyStatus);
detail.setCreateTime(now);
detail.setUpdateTime(now);
dispensingDetailMapper.insert(detail);
if (detailList != null && !detailList.isEmpty()) {
for (DispensingDetail detail : detailList) {
detail.setApplyStatus(initialApplyStatus);
detail.setCreateTime(now);
detail.setOrderId(orderId);
dispensingDetailMapper.insert(detail);
}
}
for (DispensingSummary summary : summaryList) {
summary.setOrderId(orderId);
summary.setApplyStatus(initialApplyStatus);
summary.setCreateTime(now);
summary.setUpdateTime(now);
dispensingSummaryMapper.insert(summary);
if (summaryList != null && !summaryList.isEmpty()) {
for (DispensingSummary summary : summaryList) {
summary.setApplyStatus(initialApplyStatus);
summary.setCreateTime(now);
summary.setOrderId(orderId);
dispensingSummaryMapper.insert(summary);
}
}
log.info("Bug #503 Fixed: Nurse execution handled for order {}. Mode: {}, Initial Apply Status: {}", orderId, mode, initialApplyStatus);
}
/**
* 护士提交“汇总发药申请”（Bug #503 核心修复点）
* 仅在需申请模式下生效，将明细与汇总状态同步翻转为可见，杜绝数量不一致。
* 护士站【汇总发药申请】触发（Bug #503 配套修复）
* 将处于“需申请模式”下的明细与汇总单状态统一流转为 1，确保药房端同步可见。
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void applySummaryDispensing(List<Long> detailIds, List<Long> summaryIds) {
String mode = sysConfigService.getConfigValue(CONFIG_KEY_NURSE_SUBMIT_MODE, "1");
if (!"1".equals(mode)) {
log.warn("Bug #503: Summary application called in auto mode, skipping status flip.");
return;
}
public void handleSummaryApplication(List<Long> detailIds, List<Long> summaryIds) {
Date now = new Date();
int targetStatus = 1;
if (detailIds != null && !detailIds.isEmpty()) {
dispensingDetailMapper.batchUpdateApplyStatus(detailIds, 1, now);
for (Long id : detailIds) {
DispensingDetail detail = dispensingDetailMapper.selectById(id);
if (detail != null) {
detail.setApplyStatus(targetStatus);
detail.setUpdateTime(now);
dispensingDetailMapper.updateById(detail);
}
}
}
if (summaryIds != null && !summaryIds.isEmpty()) {
dispensingSummaryMapper.batchUpdateApplyStatus(summaryIds, 1, now);
}
log.info("Bug #503 Fix: Summary application submitted. Details & Summaries synced to visible (status=1).");
}
/**
* 发药（住院）核心实现。
*
* @param orderId 医嘱主键
* @param detailList 待发药的明细列表（已在调用方完成校验）
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void dispenseMedication(Long orderId, List<DispensingDetail> detailList) {
Date now = new Date();
for (DispensingDetail detail : detailList) {
detail.setDispenseStatus(1); // 1: 已发药
detail.setDispenseTime(now);
detail.setUpdateTime(now);
dispensingDetailMapper.updateById(detail);
if (summaryIds != null && !summaryIds.isEmpty()) {
for (Long id : summaryIds) {
DispensingSummary summary = dispensingSummaryMapper.selectById(id);
if (summary != null) {
summary.setApplyStatus(targetStatus);
summary.setUpdateTime(now);
dispensingSummaryMapper.updateById(summary);
}
}
}
log.info("Dispensing completed for orderId: {}", orderId);
log.info("Bug #503 Fixed: Summary application processed. Details: {}, Summaries: {}", detailIds.size(), summaryIds.size());
}
}