Merge remote-tracking branch 'origin/develop' into develop

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<AdmissionPageParam> 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<AdmissionPatientPageDto> 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<AdmissionPageParam> 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()));

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<AdmissionPatientPageDto> selectAdmissionPatientPage(@Param("page") Page<AdmissionPatientPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<AdmissionPageParam> 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<AdmissionBedPageDto> selectAdmissionBadPage(@Param("page") Page<AdmissionBedPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<AdmissionPageParam> 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);
 
     /**
      * 查询住院患者详细信息

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,