From 0cb6ebeea70f81da7ad2ddb58e217d06dee6e2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= Date: Thu, 9 Apr 2026 01:20:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Bug#362=20=E6=B7=BB=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=A7=91=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openhis/web/inpatientmanage/dto/NursingPageDto.java | 4 ++++ .../openhis/web/inpatientmanage/dto/PatientHomeDto.java | 6 ++++++ .../mapper/inpatientmanage/NursingRecordAppMapper.xml | 5 ++++- .../mapper/inpatientmanage/PatientHomeAppMapper.xml | 9 +++++++++ .../views/inpatientNurse/home/components/patientCard.vue | 4 ++-- .../home/components/patientDetialDialog.vue | 4 ++-- openhis-ui-vue3/src/views/inpatientNurse/home/index.vue | 2 +- .../src/views/inpatientNurse/tprChart/index.vue | 2 +- .../views/inpatientNurse/tprsheet/components/details.vue | 2 +- zentao_api.sh | 0 10 files changed, 30 insertions(+), 8 deletions(-) mode change 100644 => 100755 zentao_api.sh diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java index 44bf6d43..ceb35413 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java @@ -50,6 +50,10 @@ public class NursingPageDto { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date admissionDate; + /** 入科日期 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + private Date wardAdmissionDate; + /** 科室ID */ @JsonSerialize(using = ToStringSerializer.class) private Long orgId; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java index 04df3725..afa924dd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java @@ -229,6 +229,12 @@ public class PatientHomeDto { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date admissionDate; + /** + * 入科日期 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + private Date wardAdmissionDate; + /** * 出院日期 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml index 5aecbd19..8084e122 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml @@ -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 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml index 43a26ecf..b474788e 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml @@ -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, -- 就诊类别 -- 获取责任医生（使用子查询确保只返回一个值） diff --git a/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue index 3a048ce3..2a60afad 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue @@ -66,8 +66,8 @@
-
入院
-
{{ o.admissionDate }}
+
入科
+
{{ o.wardAdmissionDate }}
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue index a32b30b3..c1495a41 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue @@ -237,9 +237,9 @@ - + - +