维护历史退出人员数据

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -43,7 +43,7 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 360,
+    "AutoLoginOutMinutes": 120,
 
     "OpenLoginMFA": false,
 

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -62,7 +62,7 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
 
     "OpenLoginMFA": false,
 

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -12924,7 +12924,7 @@
             项目外部人员  录入流程相关
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Medallion.Threading.IDistributedLockProvider,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},IRaCIS.Core.Application.Service.IMailVerificationService,Medallion.Threading.IDistributedLockProvider,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             项目外部人员  录入流程相关
             </summary>	
@@ -15539,7 +15539,7 @@
             TrialSiteSurveyService
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VerificationCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserRole},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VerificationCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserRole},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             TrialSiteSurveyService
             </summary>	
@@ -16621,6 +16621,16 @@
             <param name="state"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.SetInstanceState(System.Guid,System.Guid,System.Guid,System.Int32)">
+            <summary>
+            1、设置为不读片，2 设置为读片(取消 先前设置为不读片)  4 设置为删除(数据库记录软删除) 5 恢复为未删除
+            </summary>
+            <param name="subjectVisitId"></param>
+            <param name="seriesId"></param>
+            <param name="instanceId"></param>
+            <param name="state"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.UpdateModality(IRaCIS.Core.Application.Contracts.DTO.UpdateModalityCommand)">
              <summary>
             type 1 :study 2: series 3:非dicom  QC修改检查部位和 拍片类型

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -7,6 +7,7 @@ using IRaCIS.Core.Infrastructure;
 using MailKit;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using MimeKit;
 
@@ -485,8 +486,6 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
-
         }
 
         //Site调研 用户加入项目
@@ -547,8 +546,6 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
-
         }
 
 
@@ -563,6 +560,9 @@ namespace IRaCIS.Core.Application.Service
 
             var userType = await _userTypeRepository.FirstAsync(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer);
 
+            //需要创建新的账户
+            var isNeedCreateNewUser = false;
+
             var @lock = _distributedLockProvider.CreateLock($"UserCode");
 
             using (await @lock.AcquireAsync())
@@ -572,6 +572,7 @@ namespace IRaCIS.Core.Application.Service
 
                 if (!isDoctorHaveAccount)
                 {
+                    isNeedCreateNewUser = true;
 
                     var saveItem = new IdentityUser() { FirstName = doctor.FirstName, LastName = doctor.LastName, EMail = doctor.EMail };
 
@@ -673,7 +674,12 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
+            //创建账号 和创建角色 一条，更新的时候才记录更新角色
+            if (isNeedCreateNewUser == false)
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
+            }
+
 
 
             return (sysUserInfo.Id, sysUserInfo.UserRoleList.First(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer).Id);

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -400,7 +400,7 @@ namespace IRaCIS.Core.Application.Services
 
             var unionQuery = systemDocQuery.Concat(trialDocQuery)
                 //过滤掉删除的，并且没有签名的
-                .Where(t=>!(t.IsDeleted == true && t.ConfirmTime==null))
+                .Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
                 .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                 .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                 .WhereIf(inQuery.IsSign == true, t => t.ConfirmTime != null)
@@ -477,6 +477,8 @@ namespace IRaCIS.Core.Application.Services
                                 && t.TrialUserRoleList.AsQueryable().Any(t => trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId))
                                 )
                                  .Where(t => inQuery.UserId != null ? t.IdentityUserId == inQuery.UserId : true)
+                                 .Where(t => inQuery.UserTypeId != null ? t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == inQuery.UserTypeId) : true)
+                       
 
                   join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
                    new { trialUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
@@ -514,10 +516,11 @@ namespace IRaCIS.Core.Application.Services
 
             var systemDocQuery =
                  from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(u => trialInfo.TrialFinishedTime != null ? u.CreateTime < trialInfo.TrialFinishedTime : true)
+                                                .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
                  from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
                        && t.TrialUserRoleList.Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
                     .Where(t => inQuery.UserId != null ? t.IdentityUserId == inQuery.UserId : true)
-
+                    .Where(t => inQuery.UserTypeId != null ? t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == inQuery.UserTypeId) : true)
                  join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                  from confirm in cc.DefaultIfEmpty()
                  select new UnionDocumentWithConfirmInfoView()
@@ -570,7 +573,7 @@ namespace IRaCIS.Core.Application.Services
 
             var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
 
-            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId==inQuery.TrialId &&   trialIdentityUserIdList.Contains(t.IdentityUserId)).IgnoreQueryFilters().Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
+            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId == inQuery.TrialId && trialIdentityUserIdList.Contains(t.IdentityUserId)).IgnoreQueryFilters().Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
 
 
             foreach (var item in result.CurrentPageData)

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -79,6 +79,11 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public int InstanceNumber { get; set; }
 
+        public bool IsReading { get; set; }
+        public bool IsDeleted { get; set; }
+
+
+
         public Guid? StudyId { get; set; }
 
         public List<int?> KeyFramesList { get; set; } = new List<int?> { };

IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs

@@ -19,13 +19,19 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{seriesId:guid}")]
         public async Task<IResponseOutput<List<DicomInstanceDTO>>> List(Guid seriesId)
         {
-            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId)/*.OrderBy(s => s.SliceLocation)*/.OrderBy(s => s.InstanceNumber).
-                ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+            var qcAuditState = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => t.DicomStudy.SubjectVisit.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId).IgnoreQueryFilters()
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                .OrderBy(s => s.InstanceNumber).ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            var imageResizePath = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => t.DicomSerie.ImageResizePath).FirstOrDefaultAsync();
+            var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new { t.DicomSerie.ImageResizePath,t.DicomSerie.IsDeleted,t.DicomSerie.IsReading }).FirstOrDefaultAsync();
 
-            return ResponseOutput.Ok(list, new { ImageResizePath = imageResizePath });
+            return ResponseOutput.Ok(list, seriesInfo);
         }
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
     public class SeriesService(IRepository<DicomSeries> _seriesRepository,
-        IRepository<DicomInstance> _instanceRepository, 
+        IRepository<DicomInstance> _instanceRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService
     {
 
@@ -22,14 +22,25 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet, Route("{studyId:guid}")]
         public async Task<IResponseOutput<List<DicomSeriesDTO>>> List(Guid studyId)
         {
-             //断点
-            var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).OrderBy(s => s.SeriesNumber).
-              ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
+            //质控的时候，要标记序列，和instance 删除  ，所以要返回全部，但是 质控通过后，pm 进去看的时候要看过滤后的
+
+            var qcAuditState = await _seriesRepository.Where(s => s.StudyId == studyId).Select(t => t.DicomStudy.SubjectVisit.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，预览过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            //断点
+            var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
               .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
-                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath }).ToListAsync();//.GroupBy(u => u.SeriesId);
+            var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
+                 .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                 .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
+                 .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();//.GroupBy(u => u.SeriesId);
+
 
             foreach (var series in seriesList)
             {
@@ -42,8 +53,12 @@ namespace IRaCIS.Core.Application.Services
                        HtmlPath = k.HtmlPath,
                        Path = k.Path,
                        InstanceNumber = k.InstanceNumber,
+                       IsReading = k.IsReading,
+                       IsDeleted = k.IsDeleted
 
                    }).ToList();
+
+                series.InstanceCount = series.InstanceInfoList.Count;
             }
 
             #region 暂时废弃

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -63,12 +63,15 @@ namespace IRaCIS.Core.Application.Service
                 // .ForMember(o => o.InstancePathList, t => t.MapFrom(u => u.DicomInstanceList.OrderBy(t=>t.InstanceNumber).Select(t => t.Path)))
                 ;
 
+            var isNeedStat = false;
             CreateMap<DicomStudy, QAStudyInfoDTO>()
                 .ForMember(o => o.IsCompleteClinicalData, t => t.MapFrom(u => !u.ReadingClinicalDataList.Any(x => x.ReadingClinicalDataPDFList.Count() == 0)))
                 .ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                 .ForMember(o => o.Uploader, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
                 .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
-                 .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t => t.FailedFileCount > 0)))
+                .ForMember(o => o.SeriesCount, t => t.MapFrom(u => isNeedStat == false ? u.SeriesCount : u.SeriesList.Count()))
+                .ForMember(o => o.InstanceCount, t => t.MapFrom(u => isNeedStat == false ? u.InstanceCount : u.InstanceList.Count()))
+                .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t => t.FailedFileCount > 0)))
                 .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct())));
 
 
@@ -84,9 +87,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<DicomInstance, DicomInstanceDTO>()
-                 .ForMember(o => o.IsDeleted, t => t.MapFrom(u => u.DicomSerie.IsDeleted))
-                 .ForMember(o => o.SliceThickness, t => t.MapFrom(u => u.DicomSerie.SliceThickness))
-                  .ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
+                 .ForMember(o => o.SliceThickness, t => t.MapFrom(u => u.DicomSerie.SliceThickness));
             CreateMap<DicomStudy, DicomStudyDTO>();
             CreateMap<DicomSeries, DicomSeriesDTO>();
             CreateMap<SCPSeries, DicomSeriesDTO>();

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -472,7 +472,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// </summary>
         public string OpByUserName { get; set; } = string.Empty;
 
-        public string? CreateUserName { get; set; }
+        public string? CreateUserRealName { get; set; }
 
         /// <summary>
         /// 阅读片人

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -106,7 +106,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //OptType = data.OptType,
                             IP = data.IP,
                             Reason = data.Reason,
-                            IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText!=null&& lefttrialSign.SignText!=string.Empty,
+                            IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText != null && lefttrialSign.SignText != string.Empty,
                             SignId = data.SignId,
                             ParentId = data.ParentId,
                             ChildrenTypeId = data.ChildrenTypeId,
@@ -190,7 +190,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
 
                    .WhereIf(!inQuery.TaskName.IsNullOrEmpty(), x => x.TaskName.Contains(inQuery.TaskName) || x.BlindName.Contains(inQuery.TaskName))
                  .WhereIf(!inQuery.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(inQuery.SubjectInfo))
-                 .WhereIf(!inQuery.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(inQuery.RoleName))
+                 .WhereIf(!inQuery.RoleName.IsNullOrEmpty(), x => x.RoleName == inQuery.RoleName)
                  //.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
                  //.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
                  .WhereIf(inQuery.StartTime != null, x => x.CreateTime >= inQuery.StartTime)
@@ -198,7 +198,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                  .WhereIf(inQuery.ModuleType != null, x => x.ModuleTypeId == inQuery.ModuleType)
                  .WhereIf(!inQuery.Description.IsNullOrEmpty(), x => x.Description.Contains(inQuery.Description) || x.DescriptionCN.Contains(inQuery.Description))
                  .WhereIf(!inQuery.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.OpByUserName))
-                  .WhereIf(!inQuery.CreateUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserName) || x.CreateUserRealName.Contains(inQuery.CreateUserName))
+                  .WhereIf(!inQuery.CreateUserRealName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserRealName) || x.CreateUserRealName.Contains(inQuery.CreateUserRealName))
 
                  //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
                  .WhereIf(inQuery.IsSign != null, x => x.IsSign == inQuery.IsSign);

IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs

@@ -56,12 +56,14 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndDate { get; set; }
 
-        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+        public string? LoginUserType { get; set; }
 
         public Guid? UserTypeId { get; set; }
 
         public Guid? IdentityUserId { get; set; }
 
+        public Guid? TargetIdentityUserId { get; set; }
+
         public bool? IsLoginUncommonly { get; set; }
 
     }

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service
         IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
          IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
          IRepository<IdentityUser> _identityUserRepository,
-
+          IRepository<Doctor> _doctorRepository,
         ISearcher _searcher, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IUserService
     {
 
@@ -182,6 +182,13 @@ namespace IRaCIS.Core.Application.Service
 
                     await VerifyUserEmailAsync(_userInfo.IdentityUserId, newEmail);
 
+                    // 修改用户邮箱的时候 需要修改医生表的邮箱
+                    var oldEmail = await _identityUserRepository.Where(t => t.Id == _userInfo.IdentityUserId).Select(t => t.EMail).FirstOrDefaultAsync();
+
+                    await _doctorRepository.UpdatePartialFromQueryAsync(x => x.EMail == oldEmail, u => new Doctor()
+                    {
+                        EMail = newEmail
+                    });
 
                     await _identityUserRepository.UpdatePartialFromQueryAsync(_userInfo.IdentityUserId, u => new IdentityUser()
                     {
@@ -934,9 +941,12 @@ namespace IRaCIS.Core.Application.Service
         {
             DateTime? trialCreateTime = inQuery.TrialId != null ? _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => t.CreateTime).FirstOrDefault() : null;
 
+
+
             var userLogQueryable =
                _userLogRepository.AsQueryable().IgnoreQueryFilters()
-                .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId || t.TargetIdentityUserId == inQuery.IdentityUserId)
+               .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
+               .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.TargetIdentityUserId)
                .WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId) || t.TargetIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
                .WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
@@ -946,7 +956,7 @@ namespace IRaCIS.Core.Application.Service
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.ActionUserName.Contains(inQuery.LoginFaildName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
-               .WhereIf(inQuery.LoginUserTypeEnum != null, t => t.CreateUserRole.UserTypeEnum == inQuery.LoginUserTypeEnum)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserType), t => t.ActionUserType == inQuery.LoginUserType)
                .WhereIf(inQuery.UserTypeId != null, t => t.CreateUserRole.UserTypeId == inQuery.UserTypeId)
 
              .ProjectTo<UserLogView>(_mapper.ConfigurationProvider);

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -402,9 +402,9 @@ namespace IRaCIS.Core.Application.Image.QA
                                                 ParentTriggerValue = data.ParentTriggerValue,
                                                 Type = data.Type,
                                                 TypeValue = data.TypeValue
-                                            }).ToListAsync();
+                                            }).OrderBy(t => t.ShowOrder).ToListAsync();
 
-            var result = questionAnswerlist.Where(x => x.ParentId == null).ToList();
+            var result = questionAnswerlist.Where(x => x.ParentId == null).OrderBy(t=>t.ShowOrder).ToList();
             result.ForEach(x =>
             {
                 GetQuestionChild(x, questionAnswerlist);
@@ -416,7 +416,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         private void GetQuestionChild(QCQuestionAnswer parent, List<QCQuestionAnswer> dataList)
         {
-            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).ToList();
+            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).OrderBy(t => t.ShowOrder).ToList();
 
             if (parent.Childrens.Count != 0)
             {
@@ -519,9 +519,16 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpGet("{subjectVisitId:guid}")]
         public async Task<IResponseOutput<List<QAStudyInfoDTO>>> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
         {
+            var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == subjectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
+
+            //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            var isNeedStat = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished;
 
             var visit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).FirstNotNullAsync();
-            var list = await _dicomStudyRepository.Where(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).OrderBy(t => t.StudyCode).ToListAsync();
+
+            var list = await _dicomStudyRepository.Where(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider,new { isNeedStat= isNeedStat }).OrderBy(t => t.StudyCode).ToListAsync();
 
 
             var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => t.Trial).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
@@ -530,7 +537,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             config.IsPacsConnectConfiged = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).AnyAsync(t => t.Trial.IsPACSConnect && t.Subject.TrialSite.TrialSiteDicomAEList.Any());
 
-            return ResponseOutput.Ok (list, config);
+            return ResponseOutput.Ok(list, config);
         }
 
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Image.QA
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
-        IDistributedLockProvider _distributedLockProvider, IReadingClinicalDataService _readingClinicalDataService, 
+        IDistributedLockProvider _distributedLockProvider, IReadingClinicalDataService _readingClinicalDataService,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IQCOperationService
     {
 
@@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.Image.QA
         #region QC质疑 以及回复 关闭
 
         [HttpGet("{trialId:guid}/{subjectVisitId:guid}/{currentQCType:int}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> VerifyQCCanAddChallenge(Guid subjectVisitId, [FromRoute] CurrentQC currentQCType)
         {
@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="currentQCType"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{trialQCProcess:int}/{currentQCType:int}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> AddOrUpdateQCChallenge(QCChallengeCommand qaQuestionCommand, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType)
         {
@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> CloseQCChallenge(CloseQCChallengeInDto input)
@@ -181,7 +181,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> DeleteQCChallenge(Guid qcChallengeId)
         {
@@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="qaDialogCommand"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> AddQCChallengeReply(QADialogCommand qaDialogCommand)
         {
@@ -244,7 +244,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="checkDialogCommand"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC)]
         public async Task<IResponseOutput> AddCheckChallengeReply(CheckChallengeDialogCommand checkDialogCommand)
         {
@@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> CloseCheckChallenge(CloseCheckChallengeDto input)
         {
@@ -320,7 +320,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [UnitOfWork]
         public async Task<IResponseOutput> SetCheckPass(SetCheckPassDt data)
@@ -367,7 +367,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequstCheckBack(Guid subjectVisitId)
         {
@@ -413,7 +413,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> RejectCheckBack(Guid subjectVisitId)
         {
             //if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM)
@@ -446,7 +446,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [UnitOfWork]
         public async Task<IResponseOutput> CheckBack(Guid subjectVisitId)
@@ -525,7 +525,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// 添加或者更新 QC核对问题列表   两个人不能同时操作，就算意外进去了，提交数据，也不会覆盖前一个人数据， 后台已经做好判断
         /// </summary>
         [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{trialQCProcess:int}/{currentQCType:int}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> AddOrUpdateQCQuestionAnswerList(QCQuestionAnswerCommand[] qcQuestionAnswerCommands, Guid trialId, Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType)
         {
@@ -597,7 +597,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="state"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{studyId:guid}/{seriesId:guid}/{state:int}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetSeriesState(Guid subjectVisitId, Guid studyId, Guid seriesId, int state)
         {
@@ -659,12 +659,80 @@ namespace IRaCIS.Core.Application.Image.QA
             return ResponseOutput.Ok(await _dicomStudyRepository.SaveChangesAsync());
         }
 
+        /// <summary>
+        /// 1、设置为不读片，2 设置为读片(取消 先前设置为不读片)  4 设置为删除(数据库记录软删除) 5 恢复为未删除
+        /// </summary>
+        /// <param name="subjectVisitId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="instanceId"></param>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{seriesId:guid}/{instanceId:guid}/{state:int}")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        public async Task<IResponseOutput> SetInstanceState(Guid subjectVisitId, Guid seriesId, Guid instanceId, int state)
+        {
+
+            await VerifyIsCanQCAsync(null, subjectVisitId);
+
+            var instance = (await _dicomInstanceRepository.Where(t => t.Id == instanceId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+
+            if (state == 1)
+            {
+                instance.IsReading = false;
+            }
+            else if (state == 2)
+            {
+                instance.IsReading = true;
+            }
+            else if (state == 4)
+            {
+                instance.IsDeleted = true;
+
+                var series = (await _dicomSeriesRepository.Where(t => t.Id == seriesId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+                series.InstanceCount = series.InstanceCount - 1;
+
+                var study = (await _dicomStudyRepository.Where(t => t.Id == series.StudyId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+                study.InstanceCount = study.InstanceCount - 1;
+
+                ////删除到最后一个instance
+                //if (series.InstanceCount == 0)
+                //{
+                //    series.IsDeleted = true;
+                //}
+
+
+
+            }
+            else if (state == 5)
+            {
+                instance.IsDeleted = false;
+
+                var series = (await _dicomSeriesRepository.Where(t => t.Id == seriesId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+                series.InstanceCount = series.InstanceCount + 1;
+
+                var study = (await _dicomStudyRepository.Where(t => t.Id == series.StudyId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+                study.InstanceCount = study.InstanceCount + 1;
+            
+
+            }
+
+            return ResponseOutput.Ok(await _dicomStudyRepository.SaveChangesAsync());
+        }
+
+
+
+
         /// <summary>
         ///type 1 :study 2: series 3:非dicom  QC修改检查部位和 拍片类型
         /// </summary>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> UpdateModality(UpdateModalityCommand updateModalityCommand)
         {
@@ -744,7 +812,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="trialId"></param>
         /// <returns></returns>SeriesCount
         [HttpPost, Route("{trialId:guid}/{subjectVisitId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> DeleteStudyList(Guid[] ids, Guid subjectVisitId, Guid trialId)
@@ -848,7 +916,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <summary>替换当前领取人 </summary>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> ReplaceQCTaskActionUser(Guid trialId, Guid subjectVisitId)
         {
             var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
@@ -994,7 +1062,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="obtaionOrCancel">true 获取  false是取消领取</param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{obtaionOrCancel:bool}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> ObtainOrCancelQCTask(Guid trialId, Guid subjectVisitId, bool obtaionOrCancel)
         {
@@ -1219,7 +1287,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
@@ -1507,7 +1575,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="auditState"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{auditState:int}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         [UnitOfWork]
         public async Task<IResponseOutput> QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState)
@@ -1741,7 +1809,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="setOrCancel"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{setOrCancel:bool}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetVisitUrgent(Guid trialId, Guid subjectVisitId, bool setOrCancel)
         {
@@ -1779,7 +1847,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="qcChallengeId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetNeedReupload(Guid trialId, Guid qcChallengeId)
         {
@@ -1880,7 +1948,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         /// <returns></returns>
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> SetReuploadFinished(CRCReuploadFinishedCommand cRCReuploadFinishedCommand)
         {
@@ -1993,7 +2061,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestReUpload(Guid qcChallengeId)
         {
@@ -2040,7 +2108,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <returns></returns>
 
         [HttpPut("{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> UpdateSubjectAndSVInfo(UploadSubjectAndVisitCommand command)
         {
             var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == command.SubjectVisitId)).IfNullThrowException();

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Service
                 (arbitrationRule == ArbitrationRule.Reading ?
                 u.Subject.SubjectVisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && u.VisitTaskNum < t.VisitTaskNum) :
                 false)))
-               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory == ReadingCategory.Judge ? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
+               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory == ReadingCategory.Judge ? u.JudgeResultRemark : ""))
                .ForMember(o => o.VisitNote, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.AdjustReason).FirstOrDefault()!.Answer))
                 //.ForMember(o => o.IsSubjectHaveReadingPeriod, t => t.MapFrom(u => arbitrationRule == ArbitrationRule.Reading ?
                 //u.Subject.ReadModuleList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading) : false))

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -54,6 +54,7 @@ namespace IRaCIS.Core.Application.Contracts
         ITokenService _tokenService,
         IRepository<UserType> _userTypeRepository,
         IMailVerificationService _mailVerificationService,
+         IRepository<UserLog> _userLogRepository,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteSurveyService
     {
         private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -672,7 +673,7 @@ namespace IRaCIS.Core.Application.Contracts
                 TrialSiteSurveyId = currentEntity!.Id,
                 Token = _tokenService.GetToken(new UserTokenInfo()
                 {
-                    IdentityUserId=Guid.NewGuid(),
+                    IdentityUserId = Guid.NewGuid(),
                     UserRoleId = Guid.NewGuid(),
                     UserName = "SiteSurvey",
                     UserTypeEnum = UserTypeEnum.Undefined,
@@ -871,6 +872,8 @@ namespace IRaCIS.Core.Application.Contracts
 
                 #region 人员生成
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
 
                 if (existSysUser != null)
                 {
@@ -949,11 +952,12 @@ namespace IRaCIS.Core.Application.Contracts
 
                 }
 
+
+
                 #endregion
 
                 await _identityUserRepository.SaveChangesAsync();
 
-
                 var identityUserId = existSysUser.Id;
 
                 #region 项目加入
@@ -1048,12 +1052,18 @@ namespace IRaCIS.Core.Application.Contracts
 
                 if (isNeedSendEmail)
                 {
+                    //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                    if (isNeedCreateNewUser == false)
+                    {
+                        await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole });
+                    }
 
                     var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
 
                     var usertyps = string.Join(',', dbUserType.Select(t => t.UserTypeName));
 
                     await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, identityUserId, usertyps, baseUrl, routeUrl);
+
                 }
 
                 var userJoinIdList = item.Select(t => t.Id).ToList();
@@ -1104,6 +1114,9 @@ namespace IRaCIS.Core.Application.Contracts
 
                 var existSysUser = await _identityUserRepository.Where(t => t.EMail == userEmail, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
+
                 if (existSysUser != null)
                 {
 
@@ -1288,9 +1301,17 @@ namespace IRaCIS.Core.Application.Contracts
 
                 if (isNeedSendEmail)
                 {
+                    //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                    if (isNeedCreateNewUser == false)
+                    {
+                        await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole });
+                    }
+
                     var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
                     var usertyps = string.Join(',', dbUserType.Select(t => t.UserTypeName));
                     await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, identityUserId, usertyps, baseUrl, routeUrl);
+
+
                 }
                 await _trialSiteUserRoleRepository.SaveChangesAsync();
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -94,6 +94,15 @@ namespace IRaCIS.Application.Contracts
         public Guid UserId { get; set; }
     }
 
+    public class TrialIdentityUserBasicInfo
+    {
+        public Guid IdentityUserId { get; set; }
+
+        public string UserName { get; set; }
+
+        public string FullName { get; set; }
+    }
+
     public class TrialMaintenanceDTO : UserTrialCommand
     {
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs

@@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service
          IRepository<TrialIdentityUser> _trialIdentityUserRepository,
         IRepository<Trial> _trialRepository,
         IRepository<UserType> _userTypeRepository,
+         IRepository<UserLog> _userLogRepository,
         IMailVerificationService _mailVerificationService,
         IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExternalUserService
     {
@@ -215,8 +216,13 @@ namespace IRaCIS.Core.Application.Service
 
                 //var identityUserId = item.Key;
 
+
+
                 var existSysUser = await _identityUserRepository.Where(t => t.EMail == userEmail, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
+
                 if (existSysUser != null)
                 {
 
@@ -294,7 +300,7 @@ namespace IRaCIS.Core.Application.Service
 
                     var newAddUser = await _identityUserRepository.AddAsync(generateUser);
 
-                   
+
 
                     existSysUser = newAddUser;
 
@@ -390,6 +396,12 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialExternalUseRepository.BatchUpdateNoTrackingAsync(t => externalIdList.Contains(t.Id), u => new TrialExternalUser() { IsJoin = true });
 
+                //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                if (isNeedCreateNewUser == false)
+                {
+                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole }, true);
+                }
+
 
             }
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -21,10 +21,10 @@ namespace IRaCIS.Core.Application.Service
     {
 
         [HttpGet]
-        public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId)
+        public async Task<List<TrialIdentityUserBasicInfo>> GetTrialUserList(Guid trialId)
         {
-            return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
-                  .Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.IdentityUser.UserName })
+            return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+                  .Select(t => new TrialIdentityUserBasicInfo() { FullName = t.IdentityUser.FullName, IdentityUserId = t.IdentityUserId, UserName = t.IdentityUser.UserName })
                   .ToListAsync();
         }
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput<string>> AddOrUpdateSV(SubjectVisitCommand svCommand)
@@ -161,7 +161,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{isUrgent:bool}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_IQC)]
         public async Task<IResponseOutput> SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent)
         {
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpDelete, Route("{trialId:guid}/{id:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> DeleteSV(Guid id)
         {
@@ -212,6 +212,13 @@ namespace IRaCIS.Core.Application.Services
         [AllowAnonymous]
         public async Task<List<VisitStudyDTO>> GetVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading, [FromQuery] Guid? visitTaskId)
         {
+
+            var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == sujectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+
             var isImageFilter = false;
             var criterionModalitys = "";
             if (visitTaskId != null)
@@ -236,13 +243,17 @@ namespace IRaCIS.Core.Application.Services
                 }).ToListAsync();
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
-            var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId))
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath }).ToListAsync();
+            var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()
+                   .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                   .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();
 
             foreach (var t in studyList)
             {
-                t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId)
-               .WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
+                t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId).IgnoreQueryFilters()
+               .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+               .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
                .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
 
@@ -257,7 +268,11 @@ namespace IRaCIS.Core.Application.Services
                         HtmlPath = k.HtmlPath,
                         Path = k.Path,
                         InstanceNumber = k.InstanceNumber,
+                        IsReading = k.IsReading,
+                        IsDeleted = k.IsDeleted,
                     }).ToList();
+
+                    series.InstanceCount = series.InstanceInfoList.Count();
                 }
                 );
 
@@ -497,8 +512,8 @@ namespace IRaCIS.Core.Application.Services
                     }).ToListAsync();
                 var studyIds = dicomStudyList.Select(t => t.StudyId).ToList();
 
-                var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId))
-                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
+                var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId) && t.IsReading)
+                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading }).ToListAsync();
 
                 List<DicomSeriesDTO> seriesLists = await _dicomSeriesRepository.Where(s => studyIds.Contains(s.StudyId))
                      .WhereIf(isManualGenerate == false, t => t.IsReading)
@@ -522,6 +537,9 @@ namespace IRaCIS.Core.Application.Services
 
                        }).ToList();
 
+                        // 设置阅片 不阅片，数字要要重新统计
+                        series.InstanceCount = series.InstanceInfoList.Count;
+
                         //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
                         //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                     });
@@ -607,7 +625,7 @@ namespace IRaCIS.Core.Application.Services
                                 item.InstanceInfoList.ForEach(x =>
                                 {
 
-                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0&&y.NumberOfFrames!=null).Select(y => y.NumberOfFrames).Distinct().ToList();
+                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0 && y.NumberOfFrames != null).Select(y => y.NumberOfFrames).Distinct().ToList();
 
                                     if (keyFramesList.Count() > 0)
                                     {
@@ -721,9 +739,18 @@ namespace IRaCIS.Core.Application.Services
             #endregion
 
 
+            #region 过滤空序列得检查 过滤空instance得序列
+
+            foreach (var study in studyList)
+            {
+                study.SeriesList = study.SeriesList.Where(t => t.InstanceCount > 0).ToList();
+            }
 
             var result = studyList.Where(x => x.SeriesCount > 0).ToList();
 
+            #endregion
+
+
             return result;
 
 
@@ -738,7 +765,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [Obsolete]
         public async Task<IResponseOutput> SetSVExecuted(Guid subjectVisitId)
         {

IRaCIS.Core.Application/TestService.cs

@@ -154,6 +154,72 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
+        /// <summary>
+        /// 项目退出历史数据维护
+        /// </summary>
+        /// <param name="_trialIdentityUserRepository"></param>
+        /// <param name="_trialUserRoleReposiotry"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        public async Task<IResponseOutput> OldTrialDeleteUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
+        {
+            _userInfo.IsNotNeedInspection = true;
+
+
+            if (_trialUserRoleReposiotry.Any(t => t.TrialUserId == Guid.Empty))
+            {
+                var list = _trialUserRoleReposiotry.Where(t => t.IsDeleted == true && t.TrialUserId == Guid.Empty, false, true).Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime, t.DeletedTime, t.DeleteUserId, t.CreateUserId }).ToList();
+
+
+                foreach (var item in list.GroupBy(t => new { t.IdentityUserId, t.TrialId }))
+                {
+
+                    var id = NewId.NextSequentialGuid();
+
+                    var userRoleList = item.ToList();
+
+                    var userIdList = item.Select(t => t.UserId).ToList();
+
+                    var first = userRoleList.OrderByDescending(t => t.RemoveTime).FirstOrDefault();
+
+
+                    //判断在项目中是否存在
+
+                    var find = _trialIdentityUserRepository.Where(t => t.IdentityUserId == first.IdentityUserId && t.TrialId == first.TrialId).FirstOrDefault();
+
+                    if (find == null)
+                    {
+                        await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser()
+                        {
+                            Id = id,
+                            IdentityUserId = item.Key.IdentityUserId,
+                            TrialId = item.Key.TrialId,
+                            RemoveTime = first.RemoveTime,
+                            IsDeleted = true,
+                            DeletedTime = first.DeletedTime,
+                            DeleteUserId = first.DeleteUserId,
+
+                        });
+
+
+                        await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = id, UpdateTime = (DateTime)first.DeletedTime });
+                    }
+                    else
+                    {
+                        await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = find.Id, UpdateTime = (DateTime)first.DeletedTime   });
+                    }
+
+
+
+                }
+
+                await _trialIdentityUserRepository.SaveChangesAsync();
+            }
+
+
+
+            return ResponseOutput.Ok();
+        }
 
         /// <summary>
         /// 用户多账号，初次维护数据

IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs

@@ -23,31 +23,40 @@ namespace IRaCIS.Core.Application.Triggers.AfterSaveTrigger
 
                 if (userlog.TargetIdentityUserId != null)
                 {
-                    var obj = await _identityUserRepository.Where(t => t.Id == userlog.TargetIdentityUserId).Select(t => new UserLogJsonObj()
+
+                    //判断是否需要记录详情
+
+                    if (userlog.OptType == UserOptType.AddUser || userlog.OptType == UserOptType.UpdateUser || userlog.OptType == UserOptType.UpdateUserRole
+                      || userlog.OptType == UserOptType.AccountEnable || userlog.OptType == UserOptType.AccountLocked)
                     {
-                        DepartmentName = t.DepartmentName,
-                        EMail = t.EMail,
-                        FirstName = t.FirstName,
-                        LastName = t.LastName,
-                        OrganizationName = t.OrganizationName,
-                        Phone = t.Phone,
-                        PositionName = t.PositionName,
-                        Sex = t.Sex,
-                        Status = t.Status,
-                        UserCode = t.UserCode,
-                        UserName = t.UserName,
-                        UserRoleList = t.UserRoleList.Select(t => new UserRoleLogObj()
+                        var obj = await _identityUserRepository.Where(t => t.Id == userlog.TargetIdentityUserId).Select(t => new UserLogJsonObj()
                         {
-                            IsUserRoleDisabled = t.IsUserRoleDisabled,
-                            UserTypeEnum = t.UserTypeEnum,
-                            UserTypeShortName = t.UserTypeRole.UserTypeShortName
-                        }).ToList()
+                            DepartmentName = t.DepartmentName,
+                            EMail = t.EMail,
+                            FirstName = t.FirstName,
+                            LastName = t.LastName,
+                            OrganizationName = t.OrganizationName,
+                            Phone = t.Phone,
+                            PositionName = t.PositionName,
+                            Sex = t.Sex,
+                            Status = t.Status,
+                            UserCode = t.UserCode,
+                            UserName = t.UserName,
+                            UserRoleList = t.UserRoleList.Select(t => new UserRoleLogObj()
+                            {
+                                IsUserRoleDisabled = t.IsUserRoleDisabled,
+                                UserTypeEnum = t.UserTypeEnum,
+                                UserTypeShortName = t.UserTypeRole.UserTypeShortName
+                            }).ToList()
 
-                    }).FirstOrDefaultAsync();
+                        }).FirstOrDefaultAsync();
 
 
 
-                    userlog.JsonObj = obj.ToJsonStr();
+                        userlog.JsonObj = obj.ToJsonStr();
+                    }
+
+
 
                 }
 

IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs

@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Domain.Share
         InSecondaryQC = 6,
 
 
-        //任何QC设置为QC Failed
+        //任何QC设置为QC Failed--去掉了
         QCFailed = 7,
 
         //2nd QC设置为QC Passed

IRaCIS.Core.Domain/Image/DicomInstance.cs

@@ -2,7 +2,7 @@
 
 [Comment("归档 -  Instance表")]
 [Table("DicomInstance")]
-public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
+public class DicomInstance : BaseFullDeleteAuditEntity, IEntitySeqId
 {
     #region 导航属性
     [JsonIgnore]
@@ -75,4 +75,6 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
 
    
     public string WindowWidth { get; set; } = null!;
+
+    public bool IsReading { get; set; } = true;
 }

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -10,6 +10,9 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
     [JsonIgnore]
     public List<DicomSeries> SeriesList { get; set; }
 
+    [JsonIgnore]
+    public List<DicomInstance> InstanceList { get; set; }
+
     [JsonIgnore]
     [ForeignKey("SubjectId")]
     public Subject Subject { get; set; }

IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs

@@ -13,7 +13,7 @@ public class DicomStudyConfigration : IEntityTypeConfiguration<DicomStudy>
     {
         builder.HasKey(e => e.SeqId);
 
-        //builder.HasMany(s => s.InstanceList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasMany(s => s.InstanceList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
 
         builder.HasMany(s => s.SeriesList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
 
@@ -42,7 +42,7 @@ public class DicomInstanceConfigration : IEntityTypeConfiguration<DicomInstance>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasOne(e => e.DicomStudy).WithMany().HasForeignKey(t=>t.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasOne(e => e.DicomStudy).WithMany(c=>c.InstanceList).HasForeignKey(t=>t.StudyId).HasPrincipalKey(st => st.Id);
 
         builder.HasMany(s => s.ReadingTableAnswerRowInfoList).WithOne(di => di.Instance).HasForeignKey(t => t.InstanceId).HasPrincipalKey(se => se.Id);
         

IRaCIS.Core.Infra.EFCore/Migrations/20250213021502_AddInstanceIsReading.cs

@@ -0,0 +1,61 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddInstanceIsReading : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "DeleteUserId",
+                table: "DicomInstance",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DeletedTime",
+                table: "DicomInstance",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDeleted",
+                table: "DicomInstance",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsReading",
+                table: "DicomInstance",
+                type: "bit",
+                nullable: false,
+                defaultValue: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DeleteUserId",
+                table: "DicomInstance");
+
+            migrationBuilder.DropColumn(
+                name: "DeletedTime",
+                table: "DicomInstance");
+
+            migrationBuilder.DropColumn(
+                name: "IsDeleted",
+                table: "DicomInstance");
+
+            migrationBuilder.DropColumn(
+                name: "IsReading",
+                table: "DicomInstance");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -793,6 +793,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("CreateUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<Guid?>("DeleteUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletedTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<long?>("FileSize")
                         .HasColumnType("bigint");
 
@@ -826,6 +832,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<DateTime?>("InstanceTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsReading")
+                        .HasColumnType("bit");
+
                     b.Property<int>("NumberOfFrames")
                         .HasColumnType("int");