XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改课题组展示

Test_HIR_Net8
hang 2025-09-10 10:36:32 +08:00
parent c09f27bf7d
commit 9b96259e59
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -2081,7 +2081,7 @@ namespace IRaCIS.Core.Application.Service.Common
} }
list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList(); list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ThenBy(t=>t.SignTime).ToList();
//处理裁判标记 //处理裁判标记
list = DealJudgeMark(criterion.ArbitrationRule, criterion.IsGlobalReading, list); list = DealJudgeMark(criterion.ArbitrationRule, criterion.IsGlobalReading, list);

2
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -1190,6 +1190,8 @@ namespace IRaCIS.Core.Application.Contracts
public decimal VisitTaskNum { get; set; } public decimal VisitTaskNum { get; set; }
public DateTime? SignTime { get; set; }
public bool? IsBaseline { get; set; } public bool? IsBaseline { get; set; }

8
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -849,7 +849,7 @@ namespace IRaCIS.Application.Services
else else
{ {
var list = _identityUserRepository.Where(t => t.Id == _userInfo.IdentityUserId).SelectMany(t => t.IdentityUserHospitalGroupList).Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true) var list = _identityUserRepository.Where(t => t.Id == _userInfo.IdentityUserId).SelectMany(t => t.IdentityUserHospitalGroupList).Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true)
.Select(t => new HospitalGroupInfo() { Code = t.HospitalGroup.Code, Id = t.Id, Name = t.HospitalGroup.Name, IsManager = t.IsManager }).ToList(); .Select(t => new HospitalGroupInfo() { Code = t.HospitalGroup.Code, Id = t.HospitalGroupId, Name = t.HospitalGroup.Name, IsManager = t.IsManager }).ToList();
item.CurrentUserHospitalGroupList = list; item.CurrentUserHospitalGroupList = list;
@ -981,7 +981,7 @@ namespace IRaCIS.Application.Services
[FromServices] IRepository<SCPStudyHospitalGroup> _scpStudyHospitalGroupRepository) [FromServices] IRepository<SCPStudyHospitalGroup> _scpStudyHospitalGroupRepository)
{ {
var existList = _scpStudyHospitalGroupRepository.Where(t => t.SCPStudyId == scpStudyId).Select(t => t.HospitalGroupId).ToList(); var existList = _scpStudyHospitalGroupRepository.Where(t => t.SCPStudyId == scpStudyId && t.HospitalGroup.IsEnable).Select(t => t.HospitalGroupId).ToList();
var isAdminOrOAOrGA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.Admin || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.OA var isAdminOrOAOrGA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.Admin || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.OA
|| _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA; || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA;
@ -991,7 +991,7 @@ namespace IRaCIS.Application.Services
.Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true).Select(t => t.HospitalGroupId).ToList(); .Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true).Select(t => t.HospitalGroupId).ToList();
// abc 课题组，人属于AB 课题组，删除仅仅删除这个标签 直接返回 // abc 课题组，人属于AB 课题组，删除仅仅删除这个标签 直接返回
if (!isAdminOrOAOrGA && existList.Count >= currentPMHospitalGroupIdList.Count) if (!isAdminOrOAOrGA && existList.Count > currentPMHospitalGroupIdList.Count)
{ {
//同课题组其他项目绑定了，那么这个绑定关系也不能删除 //同课题组其他项目绑定了，那么这个绑定关系也不能删除
@ -3619,7 +3619,7 @@ namespace IRaCIS.Application.Services
else else
{ {
var list = _identityUserReposiotry.Where(t => t.Id == _userInfo.IdentityUserId).SelectMany(t => t.IdentityUserHospitalGroupList).Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true) var list = _identityUserReposiotry.Where(t => t.Id == _userInfo.IdentityUserId).SelectMany(t => t.IdentityUserHospitalGroupList).Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable == true)
.Select(t => new HospitalGroupInfo() { Code = t.HospitalGroup.Code, Id = t.Id, Name = t.HospitalGroup.Name, IsManager = t.IsManager }).ToList(); .Select(t => new HospitalGroupInfo() { Code = t.HospitalGroup.Code, Id = t.HospitalGroupId, Name = t.HospitalGroup.Name, IsManager = t.IsManager }).ToList();
item.CurrentUserHospitalGroupList = list; item.CurrentUserHospitalGroupList = list;