diff --git a/postdischarge-common/src/main/java/com/xinelu/common/annotation/DataScope.java b/postdischarge-common/src/main/java/com/xinelu/common/annotation/DataScope.java index 1e06e736..67a20471 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/annotation/DataScope.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/annotation/DataScope.java @@ -14,7 +14,7 @@ public @interface DataScope { /** * 机构表别名 */ - public String anencyAlias() default ""; + public String agencyAlias() default ""; /** * 部门表的别名 */ diff --git a/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java b/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java index c8a9dd9c..e56e12cd 100644 --- a/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java +++ b/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java @@ -68,7 +68,7 @@ public class DataScopeAspect { SysUser currentUser = loginUser.getUser(); // 如果是超级管理员,则不过滤数据 if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) { - dataScopeFilter(joinPoint, currentUser, controllerDataScope.anencyAlias(), controllerDataScope.deptAlias(), + dataScopeFilter(joinPoint, currentUser, controllerDataScope.agencyAlias(), controllerDataScope.deptAlias(), controllerDataScope.userAlias()); } } @@ -81,7 +81,7 @@ public class DataScopeAspect { * @param user 用户 * @param userAlias 别名 */ - public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String anencyAlias, String deptAlias, String userAlias) { + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String agencyAlias, String deptAlias, String userAlias) { StringBuilder sqlString = new StringBuilder(); for (SysRole role : user.getRoles()) { @@ -94,7 +94,7 @@ public class DataScopeAspect { " OR {}.department_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); } else if(DATA_SCOPE_AGENCY.equals(dataScope)){ // 机构数据权限 - sqlString.append(StringUtils.format(" OR {}.hospital_agency_id = {} ", anencyAlias, user.getHospitalAgencyId())); + sqlString.append(StringUtils.format(" OR {}.hospital_agency_id = {} ", agencyAlias, user.getHospitalAgencyId())); } else if (DATA_SCOPE_DEPT.equals(dataScope)) { // 部门数据权限 sqlString.append(StringUtils.format(" OR {}.department_id = {} ", deptAlias, user.getDepartmentId())); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java index c25477be..337c2407 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java @@ -53,7 +53,6 @@ public class PatientBlacklistAbnormalCauseController extends BaseController { * 查询患者黑名单异常原因列表 */ @ApiOperation("查询患者黑名单异常原因列表") - @PreAuthorize("@ss.hasPermi('manage:cause:list')") @GetMapping("/getList") public R> getList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { List list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java index ac325fe8..3e7b9e3e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.signpatientmanageroutenode; +import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +15,7 @@ import java.time.LocalDate; **/ @ApiModel("患者任务查询传输对象") @Data -public class PatientTaskDto { +public class PatientTaskDto extends BaseEntity { /** * 患者主键 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java index 16582571..7c9b040d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.signpatientrecord; +import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; @@ -13,7 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; **/ @ApiModel("签约患者查询传输对象") @Data -public class SignPatientListDto { +public class SignPatientListDto extends BaseEntity { /** * 患者姓名 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java index 74230e2e..8194600a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java @@ -50,7 +50,7 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService { * @return 患者-黑明单关系 */ @Override - @DataScope(anencyAlias = "b") + @DataScope(agencyAlias = "b") public List selectPatientBlacklistList(PatientBlacklistDto patientBlacklist) { return patientBlacklistMapper.selectPatientBlacklistList(patientBlacklist); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 78c53fcc..d5122b92 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -65,7 +65,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { * @return 患者信息 */ @Override - @DataScope(anencyAlias = "p") + @DataScope(agencyAlias = "p") public List selectPatientInfoList(PatientInfoDto patientInfo) { return patientInfoMapper.selectPatientInfoList(patientInfo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index 3f43235f..b85ce503 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -111,7 +111,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } @Override - @DataScope(anencyAlias = "p") + @DataScope(agencyAlias = "p") public List selectList(PatientInfoDto patientInfo) { return preHospitalizationMapper.selectList(patientInfo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java index dc60d5a4..08320b64 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java @@ -80,7 +80,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { * @return 宣教库管理 */ @Override - @DataScope(anencyAlias = "p") + @DataScope(agencyAlias = "p") public List selectPropagandaInfoList(PropagandaInfoDto propagandaInfo) { return propagandaInfoMapper.selectPropagandaInfoList(propagandaInfo); } @@ -217,7 +217,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { } @Override - @DataScope(anencyAlias = "d") + @DataScope(agencyAlias = "d") public List selectNumByDept(PropagandaInfoDto propagandaInfoDto) { return propagandaInfoMapper.selectNumByDept(propagandaInfoDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 7912cdf0..c1c9dbf0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.signpatientmanageroutenode.impl; import com.alibaba.fastjson2.JSONObject; +import com.xinelu.common.annotation.DataScope; import com.xinelu.common.constant.RouteNodeNameConstants; import com.xinelu.common.constant.TaskContentConstants; import com.xinelu.common.constant.TaskCreateTypeConstant; @@ -311,7 +312,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage return signPatientManageRouteNodeMapper.deleteSignPatientManageRouteNodeById(id); } - @Override public List selectPatientTaskList(PatientTaskDto patientTaskDto) { + @Override + @DataScope(agencyAlias = "patient") + public List selectPatientTaskList(PatientTaskDto patientTaskDto) { return signPatientManageRouteNodeMapper.selectPatientTaskList(patientTaskDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index 8b38bd37..7e3ef2f5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.signpatientrecord.impl; +import com.xinelu.common.annotation.DataScope; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.constant.TaskCreateTypeConstant; import com.xinelu.common.constant.TemplateTypeConstants; @@ -90,7 +91,9 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { @Resource private PatientNodeParamsLogMapper patientNodeParamsLogMapper; - @Override public List selectList(SignPatientListDto signPatientRecord) { + @Override + @DataScope(agencyAlias = "sign") + public List selectList(SignPatientListDto signPatientRecord) { return signPatientRecordMapper.selectList(signPatientRecord); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 21ba461f..74e74677 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -740,6 +740,8 @@ and patient.patient_source like concat('%', #{patientSource}, '%') + + ${params.dataScope} group by patient.hospital_agency_id, patient.id diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index f6601da7..9c539bf7 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -399,6 +399,8 @@ and date_format(p.service_end_time, '%y%m%d') <= date_format(#{serviceEndTimeEnd}, '%y%m%d') + + ${params.dataScope}