From d1aa91f72789b1f07e6e113948374c8c6182bdae Mon Sep 17 00:00:00 2001 From: Ranyunqiao <2499115710@qq.com> Date: Wed, 11 Mar 2026 10:26:00 +0800 Subject: [PATCH] =?UTF-8?q?167=20=E4=BD=8F=E9=99=A2=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E4=BD=8F=E9=99=A2=E6=8A=A4=E5=A3=AB=E7=AB=99-?= =?UTF-8?q?=E3=80=8B=E5=85=A5=E5=87=BA=E8=BD=AC=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=99=BB=E5=BD=95=E7=9A=84=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E8=83=BD=E6=8E=A5=E6=94=B6=E6=9F=A5=E7=9C=8B=E5=88=B0=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=A7=91=E5=AE=A4=E7=9A=84=E5=85=A5=E7=A7=91=E6=82=A3?= =?UTF-8?q?=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/ATDManageAppServiceImpl.java | 12 ++++++++++-- .../mapper/ATDManageAppMapper.java | 9 ++++++--- .../inhospitalnursestation/ATDManageAppMapper.xml | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java index 5a5e4509..009456cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java @@ -136,6 +136,9 @@ public class ATDManageAppServiceImpl implements IATDManageAppService { @Override public R getAdmissionPatientPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) { + // 获取当前登录用户的科室 ID + Long currentUserOrgId = SecurityUtils.getLoginUser().getOrgId(); + // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(admissionPageParam, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr, @@ -145,7 +148,8 @@ public class ATDManageAppServiceImpl implements IATDManageAppService { Page admissionPatientPage = atdManageAppMapper.selectAdmissionPatientPage( new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.IMP.getValue(), EncounterZyStatus.TO_BE_REGISTERED.getValue(), EncounterActivityStatus.ACTIVE.getValue(), - LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue()); + LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(), + currentUserOrgId); admissionPatientPage.getRecords().forEach(e -> { // 性别枚举 e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); @@ -171,6 +175,9 @@ public class ATDManageAppServiceImpl implements IATDManageAppService { */ @Override public R getAdmissionBedPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize) { + // 获取当前登录用户的科室 ID + Long currentUserOrgId = SecurityUtils.getLoginUser().getOrgId(); + // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(admissionPageParam, null, null, null); @@ -180,7 +187,8 @@ public class ATDManageAppServiceImpl implements IATDManageAppService { EncounterActivityStatus.ACTIVE.getValue(), LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(), LocationStatus.INACTIVE.getValue(), ChargeItemStatus.BILLABLE.getValue(), - ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDED.getValue()); + ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDED.getValue(), + currentUserOrgId); admissionBedPage.getRecords().forEach(e -> { // 性别枚举 e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java index dfc788be..1c728460 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java @@ -24,7 +24,7 @@ public interface ATDManageAppMapper { /** * 入院患者分页列表 - * + * * @param page 分页信息 * @param queryWrapper 查询条件 * @param imp 就诊类型：住院 @@ -33,12 +33,13 @@ public interface ATDManageAppMapper { * @param ward 位置类型：病区 * @param house 位置类型：病房 * @param bed 位置类型：病床 + * @param currentUserOrgId 当前登录用户科室 ID * @return 入院患者分页列表 */ Page selectAdmissionPatientPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("imp") Integer imp, @Param("toBeRegistered") Integer toBeRegistered, @Param("active") Integer active, @Param("ward") Integer ward, - @Param("house") Integer house, @Param("bed") Integer bed); + @Param("house") Integer house, @Param("bed") Integer bed, @Param("currentUserOrgId") Long currentUserOrgId); /** * 入院患者床位信息分页列表 @@ -54,13 +55,15 @@ public interface ATDManageAppMapper { * @param billable 收费状态：待结算 * @param billed 收费状态：已结算 * @param refunded 收费状态：已退费 + * @param currentUserOrgId 当前登录用户科室 ID * @return 患者床位信息分页列表 */ Page selectAdmissionBadPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("active") Integer active, @Param("ward") Integer ward, @Param("house") Integer house, @Param("bed") Integer bed, @Param("personalCashAccount") String personalCashAccount, @Param("inactive") Integer inactive, - @Param("billable") Integer billable, @Param("billed") Integer billed, @Param("refunded") Integer refunded); + @Param("billable") Integer billable, @Param("billed") Integer billed, @Param("refunded") Integer refunded, + @Param("currentUserOrgId") Long currentUserOrgId); /** * 查询住院患者详细信息 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml index 63956bc9..ab7deb1c 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml @@ -90,6 +90,7 @@ WHERE ae.delete_flag = '0' AND ae.class_enum = #{imp} AND ae.status_enum != #{toBeRegistered} + AND ae.organization_id = #{currentUserOrgId} GROUP BY ae.tenant_id, ae.id, ae.bus_no, @@ -198,6 +199,7 @@ WHERE bed.form_enum = #{bed} AND bed.delete_flag = '0' AND bed.status_enum != #{inactive} + AND (ae.organization_id = #{currentUserOrgId} OR ae.id IS NULL) GROUP BY bed.id, bed.bus_no, bed.tenant_id,