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

uat-标注-7

Test_IRC_Net8
hang 2025-11-26 09:05:34 +08:00
parent d9c46acb03
commit 050a0875fe
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,7 +898,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
//靶段标注上传，查看访视级别，上传绑定访视级别 //靶段标注上传，查看访视级别，上传绑定访视级别
if (inQuery.IsImageSegmentLabel == true) if (inQuery.IsImageSegmentLabel == true)
{ {
var list = _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId && t.SubjectVisitId == inQuery.SubjectVisitId) var list = _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId)
.WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId)
//.WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|")) //.WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
.Select(u => new TaskNoneDicomStudyDTO() .Select(u => new TaskNoneDicomStudyDTO()
{ {
@ -1248,7 +1249,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0) var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0)
.Select(item => new SubjectVisitMarkStudyDto .Select(item => new SubjectVisitMarkStudyDto
{ {
SourceSubjectVisitId=item.SourceSubjectVisitId, SourceSubjectVisitId = item.SourceSubjectVisitId,
VisitTaskId = item.VisitTaskId, VisitTaskId = item.VisitTaskId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
SubjectCode = item.SubjectCode, SubjectCode = item.SubjectCode,
@ -1542,10 +1543,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
from leftVisitTask in cc.DefaultIfEmpty() from leftVisitTask in cc.DefaultIfEmpty()
select new ImageDownloadDto() select new ImageDownloadDto()
{ {
TrialId=sv.TrialId, TrialId = sv.TrialId,
SubjectId=sv.SubjectId, SubjectId = sv.SubjectId,
TrialSiteCode=sv.TrialSite.TrialSiteCode, TrialSiteCode = sv.TrialSite.TrialSiteCode,
VisitId=sv.Id, VisitId = sv.Id,
SubjectCode = inQuery.SubjectCode, SubjectCode = inQuery.SubjectCode,
VisitName = sv.VisitName, VisitName = sv.VisitName,
@ -2209,7 +2210,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
TrialId = t.TrialId, TrialId = t.TrialId,
SubjectId = t.Id, SubjectId = t.Id,
SubjectCode=t.Code, SubjectCode = t.Code,
IsUrgent = t.IsUrgent, IsUrgent = t.IsUrgent,
VisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(), VisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(),
MarkVisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(t => t.TaskStudyList.Any()), MarkVisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(t => t.TaskStudyList.Any()),
@ -2218,7 +2219,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
MarkDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.TaskStudyList).Count(), MarkDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.TaskStudyList).Count(),
NoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Count(), NoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Count(),
MarkNoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Where(t=>t.ImageLabelNoneDicomFileList.Any()).Count(), MarkNoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Where(t => t.ImageLabelNoneDicomFileList.Any()).Count(),
}).ToPagedListAsync(inQuery); }).ToPagedListAsync(inQuery);
return ResponseOutput.Ok(list); return ResponseOutput.Ok(list);