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

fix: Bug#362 添加入科时间字段并修正显示

Browse Source
This commit is contained in:
赵云
2026-04-09 01:20:52 +08:00
parent afc94b6879
commit 0cb6ebeea7
10 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
View File

@@ -13,6 +13,7 @@
T5.org_id,
T5.encounter_id,
T5.admissionDate,
T5.wardAdmissionDate,
T5.ward_location_id,
T5.bed_location_id
FROM (SELECT T1.tenant_id,
@@ -34,11 +35,13 @@
INNER JOIN (SELECT encounter_id,
location_id,
form_enum,
delete_flag
delete_flag,
start_time as ward_admission_date
FROM (SELECT encounter_id,
location_id,
form_enum,
delete_flag,
start_time,
ROW_NUMBER() OVER (PARTITION BY encounter_id
ORDER BY
CASE

9
openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
View File

@@ -44,6 +44,7 @@
status_enum,
organization_id,
admissionDate,
wardAdmissionDate,
dischargeDate,
class_enum,
responsibleDoctor,
@@ -100,6 +101,14 @@
T2.status_enum, -- 患者状态
T2.organization_id,-- 入院科室
T2.start_time AS admissionDate, -- 入院日期
(SELECT ael.start_time
FROM adm_encounter_location ael
WHERE ael.encounter_id = T2.id
AND ael.form_enum = 8
AND ael.status_enum = 2
AND ael.delete_flag = '0'
ORDER BY ael.create_time DESC
LIMIT 1) AS wardAdmissionDate, -- 入科日期
T2.end_time AS dischargeDate, -- 出院日期
T2.class_enum, -- 就诊类别
-- 获取责任医生（使用子查询确保只返回一个值）