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

Fix Bug #544: AI修复

Browse Source
This commit is contained in:
关羽
2026-05-26 23:39:04 +08:00
parent abcf633910
commit 8965a591e2
5 changed files with 146 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triage/controller/TriageQueueController.java Normal file
View File

@@ -0,0 +1,36 @@
package com.openhis.web.triage.controller;
import com.openhis.web.triage.service.TriageQueueService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* 智能分诊队列接口控制器
*/
@RestController
@RequestMapping("/api/triage/queue")
public class TriageQueueController {
private final TriageQueueService triageQueueService;
public TriageQueueController(TriageQueueService triageQueueService) {
this.triageQueueService = triageQueueService;
}
/**
* 获取排队队列列表
* @param deptId 科室ID
* @param startDate 查询开始日期 (可选)
* @param endDate 查询结束日期 (可选)
*/
@GetMapping
public List<Map<String, Object>> getQueueList(@RequestParam Long deptId,
@RequestParam(required = false) String startDate,
@RequestParam(required = false) String endDate) {
return triageQueueService.getQueueList(deptId, startDate, endDate);
}
}

26
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triage/mapper/TriageQueueMapper.java
View File

@@ -3,30 +3,32 @@ package com.openhis.web.triage.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
* 智能分诊排队队列数据库操作 Mapper
* 智能分诊队列数据访问层
* 修复 Bug #544：移除原 SQL 中对“完诊”状态的过滤，新增日期范围动态查询支持。
*/
@Mapper
public interface TriageQueueMapper {
/**
* Bug #544 Fix: 移除对“完诊”状态的硬编码过滤，支持按时间范围查询历史队列
* 根因：原SQL包含 WHERE status != 'COMPLETED' 导致完诊患者被自动过滤
* 修复：移除状态限制，增加 create_time 范围查询参数，支持全流程追溯
* 查询分诊队列列表（含历史数据）
* @param deptId 科室ID
* @param startDate 开始日期 (YYYY-MM-DD)
* @param endDate 结束日期 (YYYY-MM-DD)
* @return 队列记录列表
*/
@Select("<script>" +
"SELECT id, patient_id, patient_name, status, dept_id, queue_no, create_time, update_time " +
"FROM triage_queue " +
"SELECT id, patient_name, queue_no, status, triage_time, dept_name " +
"FROM his_triage_queue " +
"WHERE dept_id = #{deptId} " +
"<if test='startDate != null'> AND create_time &gt;= #{startDate} </if>" +
"<if test='endDate != null'> AND create_time &lt;= #{endDate} </if>" +
"ORDER BY create_time DESC" +
"<if test='startDate != null'> AND triage_time &gt;= #{startDate}::timestamp </if>" +
"<if test='endDate != null'> AND triage_time &lt;= #{endDate}::timestamp + interval '1 day' </if>" +
"ORDER BY triage_time DESC" +
"</script>")
List<Map<String, Object>> selectQueueList(@Param("deptId") Long deptId,
@Param("startDate") LocalDateTime startDate,
@Param("endDate") LocalDateTime endDate);
@Param("startDate") String startDate,
@Param("endDate") String endDate);
}

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/triage/service/TriageQueueService.java
View File

@@ -2,17 +2,15 @@ package com.openhis.web.triage.service;
import com.openhis.web.triage.mapper.TriageQueueMapper;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.List;
import java.util.Map;
/**
* 智能分诊排队服务实现
* 智能分诊队列业务逻辑层
*/
@Service
public class TriageQueueService {
private final TriageQueueMapper triageQueueMapper;
public TriageQueueService(TriageQueueMapper triageQueueMapper) {
@@ -20,16 +18,9 @@ public class TriageQueueService {
}
/**
* Bug #544 Fix: 获取排队队列列表，默认查询当天，支持历史时间范围查询
* @param deptId 科室ID
* @param startDate 查询开始日期（默认当天）
* @param endDate 查询结束日期（默认当天）
* @return 队列记录列表
* 获取队列列表（支持按日期范围检索，默认返回全量状态）
*/
public List<Map<String, Object>> getQueueList(Long deptId, LocalDate startDate, LocalDate endDate) {
// 默认当天时间范围：00:00:00 至 23:59:59
LocalDateTime start = (startDate != null) ? startDate.atStartOfDay() : LocalDate.now().atStartOfDay();
LocalDateTime end = (endDate != null) ? endDate.atTime(LocalTime.MAX) : LocalDate.now().atTime(LocalTime.MAX);
return triageQueueMapper.selectQueueList(deptId, start, end);
public List<Map<String, Object>> getQueueList(Long deptId, String startDate, String endDate) {
return triageQueueMapper.selectQueueList(deptId, startDate, endDate);
}
}