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

401

Browse Source 
门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符
400
门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30
393
疾病报告管理-报告卡管理：状态为“审核失败”的报卡操作列缺失“审核”按钮
369
【住院管理】进入护理记录模块报错
361
三测单（体温单）住院第一日显示 1970-01-01，未正确获取入院日期
This commit is contained in:
Ranyunqiao
2026-04-21 11:38:05 +08:00
parent 994ffcb8b8
commit 88d9e19cc5
14 changed files with 245 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
View File

@@ -5,16 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.common.core.domain.R;
import com.core.common.utils.SecurityUtils;
import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
import com.openhis.web.triageandqueuemanage.dto.CallNumberDisplayResp;
import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
import com.openhis.web.triageandqueuemanage.dto.TriageQueueEncounterItem;
import com.openhis.web.triageandqueuemanage.dto.*;
import com.openhis.web.triageandqueuemanage.sse.CallNumberSseManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,10 +24,18 @@ import java.util.stream.Collectors;
@Service
public class TriageQueueAppServiceImpl implements TriageQueueAppService {
private static final String STATUS_WAITING = "WAITING";
private static final String STATUS_CALLING = "CALLING";
private static final String STATUS_SKIPPED = "SKIPPED";
private static final String STATUS_COMPLETED = "COMPLETED";
/**
* 分诊队列状态常量（数字编码）
* 0=WAITING(等待中), 10=CALLING(呼叫中), 20=IN_CLINIC(诊中),
* 30=COMPLETED(已完成), 40=SKIPPED(已跳过), 50=REFUNDED(已退费), 60=FOLLOW(已随访)
*/
public static final Integer STATUS_WAITING = 0;
public static final Integer STATUS_CALLING = 10;
public static final Integer STATUS_IN_CLINIC = 20;
public static final Integer STATUS_COMPLETED = 30;
public static final Integer STATUS_SKIPPED = 40;
public static final Integer STATUS_REFUNDED = 50;
public static final Integer STATUS_FOLLOW = 60;
@Resource
private TriageQueueItemService triageQueueItemService;
@@ -127,6 +131,8 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
.setPractitionerName(it.getPractitionerName())
.setPractitionerId(it.getPractitionerId()) // ✅ 新增字段（可选）
.setRoomNo(it.getRoomNo()) // ✅ 新增字段（可选）
.setPoolId(it.getPoolId()) // ✅ 号源池ID（用于div_log审计）
.setSlotId(it.getSlotId()) // ✅ 号源槽位ID（用于div_log审计）
.setStatus(STATUS_WAITING)
.setQueueOrder(++maxOrder)
.setDeleteFlag("0")

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
View File

@@ -59,7 +59,7 @@ public class CallNumberDisplayResp {
/** 患者姓名（脱敏） */
private String name;
/** 状态：CALLING=就诊中，WAITING=等待 */
private String status;
private Integer status;
/** 排队号 */
private Integer queueOrder;
}

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
View File

@@ -15,6 +15,10 @@ public class TriageQueueEncounterItem {
private Long practitionerId;
/** 诊室号（可选） */
private String roomNo;
/** 号源池ID（关联 adm_schedule_pool.id，用于 div_log 审计日志） */
private Long poolId;
/** 号源槽位ID（关联 adm_schedule_slot.id，用于 div_log 审计日志） */
private Long slotId;
}