From 8faba1ea2196711200f7cbb1e0d0c1be19047e7d Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 12 Mar 2026 15:13:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=82=A3=E8=80=85=E5=88=97=E8=A1=A8=E7=A7=91=E5=AE=A4ID?= =?UTF-8?q?=E4=BB=8E=E5=B0=B1=E8=AF=8A=E8=A1=A8=E8=8E=B7=E5=8F=96=20(Bug?= =?UTF-8?q?=20#175)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将org_id来源从adm_patient改为adm_encounter - adm_patient.organization_id通常为空 - adm_encounter.organization_id才是入院科室 - 修复按科室过滤时查不到患者的问题 --- .../NursingRecordAppMapper.xml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 70002ada..5aecbd19 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 @@ -16,13 +16,13 @@ T5.ward_location_id, T5.bed_location_id FROM (SELECT T1.tenant_id, - T1.id AS patient_id, --患者ID - T1.name AS patient_name, --患者姓名 - T1.bus_no AS patient_bus_no, --病历号 - T1.birth_date, --患者出生日期 - T1.gender_enum, --患者性别 - T1.organization_id AS org_id, --科室ID - T2.id AS encounter_id, --就诊ID + T1.id AS patient_id, --患者ID + T1.name AS patient_name, --患者姓名 + T1.bus_no AS patient_bus_no, --病历号 + T1.birth_date, --患者出生日期 + T1.gender_enum, --患者性别 + T2.organization_id AS org_id, --科室ID（从就诊表取） + T2.id AS encounter_id, --就诊ID T2.start_time AS admissionDate, --入院日期 T3.location_id AS ward_location_id, --病区 T4.location_id AS bed_location_id --床号 @@ -79,12 +79,12 @@ T6.context_json, T6.bed_location_id FROM (SELECT T1.tenant_id, - T1.id AS patient_id, --患者ID - T1.name AS patient_name, --患者姓名 - T1.birth_date, --患者出生日期 - T1.gender_enum, --患者性别 - T1.organization_id AS org_id, --科室ID - T2.id AS encounter_id, --就诊ID + T1.id AS patient_id, --患者ID + T1.name AS patient_name, --患者姓名 + T1.birth_date, --患者出生日期 + T1.gender_enum, --患者性别 + T2.organization_id AS org_id, --科室ID（从就诊表取） + T2.id AS encounter_id, --就诊ID T2.start_time AS admissionDate, --入院日期 T3.location_id AS ward_location_id, --病区 T5.id AS record_id, --记录单ID