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

修改列表默认排序
continuous-integration/drone/push Build is running Details

Uat_IRC_Net8
hang 2025-07-30 11:30:41 +08:00
parent e979649ef4
commit eccb127492
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -195,8 +195,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
Modalities = t.Modalities, Modalities = t.Modalities,
SeriesCount = t.SeriesCount, SeriesCount = t.SeriesCount,
ReadingInstanceCount=t.InstanceList.Where(t=>t.IsReading && t.DicomSerie.IsReading).Count(), ReadingInstanceCount = t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading).Count(),
ReadingSeriesCount= t.SeriesList.Where(t => t.IsReading).Count(), ReadingSeriesCount = t.SeriesList.Where(t => t.IsReading).Count(),
}).ToList(), }).ToList(),
UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo() UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo()
@ -731,7 +731,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
Path = t.Path Path = t.Path
}).ToList(), }).ToList(),
ReadingFileCount= ns.FileCount, ReadingFileCount = ns.FileCount,
}; };
@ -1126,7 +1126,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
HtmlPath = k.HtmlPath, HtmlPath = k.HtmlPath,
Path = k.Path, Path = k.Path,
InstanceNumber = k.InstanceNumber, InstanceNumber = k.InstanceNumber,
FileSize=k.FileSize, FileSize = k.FileSize,
}).ToList() }).ToList()
}) })
}); });
@ -1228,9 +1228,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
//DicomImageSize = t.StudyList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize), //DicomImageSize = t.StudyList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize),
//NoneDicomImageSize = t.NoneDicomStudyList.SelectMany(t => t.NoneDicomFileList).Sum(t => t.FileSize) //NoneDicomImageSize = t.NoneDicomStudyList.SelectMany(t => t.NoneDicomFileList).Sum(t => t.FileSize)
}); });
var defalutSortArray = new string[] { nameof(TrialVisitImageStatView.TrialSiteCode), nameof(QCCRCVisitViewModel.SubjectCode), nameof(QCCRCVisitViewModel.VisitNum) };
var pagelist = await query.Where(t => t.TotalImageCount > 0).ToPagedListAsync(inQuery, defalutSortArray);
var pagelist = await query.Where(t => t.TotalImageCount > 0).ToPagedListAsync(inQuery);
return ResponseOutput.Ok(pagelist); return ResponseOutput.Ok(pagelist);
} }

6
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Image.QA
.WhereIf(inQuery.AuditEndTime != null, t => t.AuditTime <= inQuery.AuditEndTime) .WhereIf(inQuery.AuditEndTime != null, t => t.AuditTime <= inQuery.AuditEndTime)
.ProjectTo<ImageBackViewModel>(_mapper.ConfigurationProvider); .ProjectTo<ImageBackViewModel>(_mapper.ConfigurationProvider);
var defalutSortArray = new string[] { nameof(ImageBackViewModel.IsUrgent) + " desc", nameof(ImageBackViewModel.SubjectCode), nameof(ImageBackViewModel.VisitNum) }; var defalutSortArray = new string[] { nameof(ImageBackViewModel.ImageBackState), nameof(ImageBackViewModel.CreateTime), nameof(ImageBackViewModel.SubjectCode), nameof(ImageBackViewModel.VisitNum) };
var pageList = await query.ToPagedListAsync(inQuery, defalutSortArray); var pageList = await query.ToPagedListAsync(inQuery, defalutSortArray);
return ResponseOutput.Ok(pageList); return ResponseOutput.Ok(pageList);
@ -490,7 +490,7 @@ namespace IRaCIS.Core.Application.Image.QA
var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : trialConfirmTime == null ? DateTime.Now : (DateTime)trialConfirmTime; var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : trialConfirmTime == null ? DateTime.Now : (DateTime)trialConfirmTime;
if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview) || (inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime.AddSeconds(1) < trialConfirmTime) if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview) || (inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime.AddSeconds(1) < trialConfirmTime)
|| (sv.AuditState >= AuditStateEnum.PrimaryQCPassed && inDto.CurrentQCEnum==CurrentQC.First)) //1QC通过时，这个时候看1qc答案 || (sv.AuditState >= AuditStateEnum.PrimaryQCPassed && inDto.CurrentQCEnum == CurrentQC.First)) //1QC通过时，这个时候看1qc答案
{ {
//之前质控完的，+二次复核完的，都要从答案表中取 二次复核完的还需要加时间 //之前质控完的，+二次复核完的，都要从答案表中取 二次复核完的还需要加时间
@ -718,7 +718,7 @@ namespace IRaCIS.Core.Application.Image.QA
var qaChallengeQuery = _qcChallengeRepository.Where(t => t.SubjectVisitId == subjectVisitId && t.QCProcessEnum == trialQCProcess) var qaChallengeQuery = _qcChallengeRepository.Where(t => t.SubjectVisitId == subjectVisitId && t.QCProcessEnum == trialQCProcess)
.ProjectTo<ChallengeAndDialog>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.UserRoleId }); .ProjectTo<ChallengeAndDialog>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.UserRoleId });
var list = await qaChallengeQuery.OrderByDescending(t=>t.CreateTime).ToListAsync(); var list = await qaChallengeQuery.OrderByDescending(t => t.CreateTime).ToListAsync();
//list.ForEach(t => t.DialogList.ToList().ForEach(u => u.IsCurrentUser = _userInfo.Id == u.CreateUserId)); //list.ForEach(t => t.DialogList.ToList().ForEach(u => u.IsCurrentUser = _userInfo.Id == u.CreateUserId));