From d8511ecb1bcc504bdc8b94c2c3c869c94ace139a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= Date: Thu, 9 Apr 2026 16:16:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug364=20-=20=E6=B7=BB=E5=8A=A0=E7=97=85?= =?UTF-8?q?=E5=8E=86=E5=8F=B7=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/AdviceManageAppServiceImpl.java | 2 +- .../web/regdoctorstation/dto/RegPatientMainInfoDto.java | 5 +++++ .../mapper/regdoctorstation/AdviceManageAppMapper.xml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index 200ab054..3d0663df 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -101,7 +101,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(regPatientMainInfoDto, searchKey, - new HashSet<>(Arrays.asList("bus_no", "patient_name", "in_hospital_org_name", "house_name")), request); + new HashSet<>(Arrays.asList("bus_no", "patient_bus_no", "patient_name", "in_hospital_org_name", "house_name")), request); // 当前登录所属的科室 Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId(); // 住院医生站-只查询当前登录的科室相关的患者 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java index 4c3cc3f7..d2df91f3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java @@ -35,6 +35,11 @@ public class RegPatientMainInfoDto { */ private String busNo; + /** + * 患者病历号 + */ + private String patientBusNo; + /** * 入院时间 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml index 00357c45..c5d06303 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml @@ -10,6 +10,7 @@ rpmi.encounter_id, rpmi.status_enum, rpmi.bus_no, + rpmi.patient_bus_no, rpmi.in_hospital_time, rpmi.in_hospital_days, rpmi.out_hospital_time, @@ -31,6 +32,7 @@ ae.ID AS encounter_id, ae.status_enum AS status_enum, ae.bus_no AS bus_no, + ap.bus_no AS patient_bus_no, ae.start_time AS in_hospital_time, (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days, ae.end_time AS out_hospital_time, @@ -110,6 +112,7 @@ ae.ID AS encounter_id, ae.status_enum AS status_enum, ae.bus_no AS bus_no, + ap.bus_no AS patient_bus_no, ae.start_time AS in_hospital_time, (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days, ae.end_time AS out_hospital_time,