患者管理列表仅查看本人数据权限。

postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java

@@ -97,7 +97,7 @@ public class DataScopeAspect {
 	            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()));
-            } else if (DATA_SCOPE_SELF.equals(dataScope)) { // 部门数据权限
+            } else if (StringUtils.equals(dataScope, DATA_SCOPE_SELF) && StringUtils.isNotBlank(userAlias)) { // 本人数据权限
 	            sqlString.append(StringUtils.format(" OR {} = {} ", userAlias, user.getUserId()));
             }
         }

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(agencyAlias = "b")
+    @DataScope(agencyAlias = "b", deptAlias = "b", userAlias = "p.attending_physician_id")
     public List<PatientBlacklistVo> selectPatientBlacklistList(PatientBlacklistDto patientBlacklist) {
         return patientBlacklistMapper.selectPatientBlacklistList(patientBlacklist);
     }

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java

@@ -28,6 +28,14 @@ public interface IPatientInfoService {
      */
     List<PatientInfo> selectPatientInfoList(PatientInfoDto patientInfo);
 
+	/**
+	 * 查询患者信息列表
+	 *
+	 * @param patientInfo 患者信息
+	 * @return 患者信息集合
+	 */
+	List<PatientInfo> selectAllPatientList(PatientInfoDto patientInfo);
+
     /**
      * 新增患者信息
      *

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java

@@ -65,11 +65,22 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
      * @return 患者信息
      */
     @Override
-    @DataScope(agencyAlias = "p")
+    @DataScope(agencyAlias = "p", userAlias = "p.attending_physician_id")
     public List<PatientInfo> selectPatientInfoList(PatientInfoDto patientInfo) {
         return patientInfoMapper.selectPatientInfoList(patientInfo);
     }
 
+	/**
+	 * 查询患者信息列表
+	 *
+	 * @param patientInfo 患者信息
+	 * @return 患者信息
+	 */
+	@Override
+	public List<PatientInfo> selectAllPatientList(PatientInfoDto patientInfo) {
+		return patientInfoMapper.selectPatientInfoList(patientInfo);
+	}
+
     /**
      * 新增患者信息
      *

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java

@@ -80,7 +80,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital
         PatientInfoDto patientInfoDto = new PatientInfoDto();
         patientInfoDto.setCardNo(preHospitalization.getCardNo());
 		patientInfoDto.setHospitalAgencyId(preHospitalization.getHospitalAgencyId());
-        List<PatientInfo> patientList = patientInfoService.selectPatientInfoList(patientInfoDto);
+        List<PatientInfo> patientList = patientInfoService.selectAllPatientList(patientInfoDto);
 		PatientInfo patientInfo = new PatientInfo();
         if (CollectionUtils.isEmpty(patientList)) {
             // 保存患者信息
@@ -228,7 +228,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital
             PatientInfoDto patientQuery = new PatientInfoDto();
             patientQuery.setCardNo(item.getCardNo());
 	        patientQuery.setHospitalAgencyId(preHospitalization.getHospitalAgencyId());
-            List<PatientInfo> patientInfoList = patientInfoService.selectPatientInfoList(patientQuery);
+            List<PatientInfo> patientInfoList = patientInfoService.selectAllPatientList(patientQuery);
             if (CollectionUtils.isNotEmpty(patientInfoList)) {
                 // 修改居民信息
                 PatientInfo updInfo = patientInfoList.get(0);

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java

@@ -122,7 +122,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 	    PatientInfoDto patientInfoDto = new PatientInfoDto();
 		patientInfoDto.setHospitalAgencyId(saveBody.getHospitalAgencyId());
 		patientInfoDto.setCardNo(saveBody.getCardNo());
-	    List<PatientInfo> patientInfoList = patientInfoService.selectPatientInfoList(patientInfoDto);
+	    List<PatientInfo> patientInfoList = patientInfoService.selectAllPatientList(patientInfoDto);
 		// 患者档案信息新增/修改
 	    PatientInfo patientInfo = new PatientInfo();
 	    if(CollectionUtils.isEmpty(patientInfoList)) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java

@@ -107,7 +107,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 	private ILabelFieldContentService labelFieldContentService;
 
 	@Override
-	@DataScope(agencyAlias = "sign")
+	@DataScope(agencyAlias = "sign", deptAlias = "sign", userAlias = "sign.billing_doctor_id")
 	public List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord) {
 		return signPatientRecordMapper.selectList(signPatientRecord);
 	}

postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java

@@ -71,7 +71,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u", agencyAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u.user_id", agencyAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
     }
@@ -83,7 +83,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u.user_id")
     public List<SysUser> selectAllocatedList(SysUser user) {
         return userMapper.selectAllocatedList(user);
     }
@@ -95,7 +95,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u.user_id")
     public List<SysUser> selectUnallocatedList(SysUser user) {
         return userMapper.selectUnallocatedList(user);
     }