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

Fix Bug #497: 【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑

Browse Source 
根因分析：
1. SQL CASE 映射不完整：status_enum=3(COMPLETED) 直接映射为应用状态 4(已接收)，
   跳过了 2(已校对) 和 3(待接收)
2. status_enum=8 在数据中存在但枚举类中缺失定义
3. 前端已完整实现状态列和交互逻辑，问题在后端返回的状态值不正确

修复内容：
- RequestFormManageAppMapper.xml: 重构 SQL CASE 语句
  - status_enum=3 + performer_check_id 有值 → 2(已校对)，利用护士校对标记区分
  - status_enum=3 + performer_check_id 为空 → 4(已接收)
  - status_enum=4(ON_HOLD) → 3(待接收)
  - status_enum=5/6/7 → 7(已作废)
  - status_enum=8 → 6(已出报告)
- RequestStatus.java: 补充 COMPLETED_REPORT(8) 枚举值

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-14 14:26:12 +08:00
parent a2095775bd
commit c9a158ddee
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
View File

@@ -13,15 +13,14 @@
drf.requester_id, drf.requester_id,
drf.create_time, drf.create_time,
ap.NAME AS patient_name, ap.NAME AS patient_name,
CASE MIN(wsr.status_enum) CASE
WHEN 1 THEN 0 WHEN MIN(wsr.status_enum) = 1 THEN 0
WHEN 2 THEN 1 WHEN MIN(wsr.status_enum) = 2 THEN 1
WHEN 3 THEN 4 WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
WHEN 4 THEN 4 WHEN MIN(wsr.status_enum) = 3 THEN 4
WHEN 5 THEN 5 WHEN MIN(wsr.status_enum) = 4 THEN 3
WHEN 6 THEN 5 WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
WHEN 7 THEN 5 WHEN MIN(wsr.status_enum) = 8 THEN 6
WHEN 8 THEN 6
ELSE NULL ELSE NULL
END AS status END AS status
FROM doc_request_form AS drf FROM doc_request_form AS drf
@@ -41,15 +40,14 @@
AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second') AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND CASE MIN(wsr.status_enum) AND CASE
WHEN 1 THEN 0 WHEN MIN(wsr.status_enum) = 1 THEN 0
WHEN 2 THEN 1 WHEN MIN(wsr.status_enum) = 2 THEN 1
WHEN 3 THEN 4 WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
WHEN 4 THEN 4 WHEN MIN(wsr.status_enum) = 3 THEN 4
WHEN 5 THEN 5 WHEN MIN(wsr.status_enum) = 4 THEN 3
WHEN 6 THEN 5 WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
WHEN 7 THEN 5 WHEN MIN(wsr.status_enum) = 8 THEN 6
WHEN 8 THEN 6
ELSE NULL ELSE NULL
END = #{status}::integer END = #{status}::integer
</if> </if>

5
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
View File

@@ -49,6 +49,11 @@ public enum RequestStatus implements HisEnumInterface {
*/ */
ENDED(7, "ended", "不执行"), ENDED(7, "ended", "不执行"),
/**
* 已出报告
*/
COMPLETED_REPORT(8, "completed_report", "已出报告"),
/** /**
* 未知 * 未知
*/ */