diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 0b497bc62..0438ae94b 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -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); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 2a9a33da8..c7cd8d236 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1190,6 +1190,8 @@ namespace IRaCIS.Core.Application.Contracts public decimal VisitTaskNum { get; set; } + public DateTime? SignTime { get; set; } + public bool? IsBaseline { get; set; } diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index ce21ba603..61c740d6f 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -849,7 +849,7 @@ namespace IRaCIS.Application.Services else { 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; @@ -981,7 +981,7 @@ namespace IRaCIS.Application.Services [FromServices] IRepository _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 || _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(); // abc 课题组,人属于AB 课题组,删除仅仅删除这个标签 直接返回 - if (!isAdminOrOAOrGA && existList.Count >= currentPMHospitalGroupIdList.Count) + if (!isAdminOrOAOrGA && existList.Count > currentPMHospitalGroupIdList.Count) { //同课题组其他项目绑定了,那么这个绑定关系也不能删除 @@ -3619,7 +3619,7 @@ namespace IRaCIS.Application.Services else { 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;