关键图里增加分割路径,支持下载
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
c3e9024a57
commit
84b65ee122
|
|
@ -849,9 +849,13 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public List<TrialKeyPicturePath> QuestionMarkPictureList { get; set; }
|
public List<TrialKeyPicturePath> QuestionMarkPictureList { get; set; }
|
||||||
|
|
||||||
public List<TrialKeyPicturePath> TableQuestionRowPictureList { get; set; }
|
public List<TrialKeyPicturePath> TableQuestionRowPictureList { get; set; }
|
||||||
|
|
||||||
|
public List<TrialKeyPicturePath> SegmentationFileList { get; set; }
|
||||||
}
|
}
|
||||||
public class TrialKeyPicturePath
|
public class TrialKeyPicturePath
|
||||||
{
|
{
|
||||||
|
public string SegmentationName { get; set; }
|
||||||
|
|
||||||
public string PicturePath { get; set; }
|
public string PicturePath { get; set; }
|
||||||
|
|
||||||
public string OtherPicturePath { get; set; }
|
public string OtherPicturePath { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -1650,7 +1650,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id) && t.CheckState == CheckStateEnum.CVPassed))
|
var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id) && t.CheckState == CheckStateEnum.CVPassed))
|
||||||
//一致性分析,导致查询出来两条数据
|
//一致性分析,导致查询出来两条数据
|
||||||
join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id)) on sv.Id equals visitTask.SourceSubjectVisitId into cc
|
join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id)) on sv.Id equals visitTask.SourceSubjectVisitId into cc
|
||||||
from leftVisitTask in cc.DefaultIfEmpty()
|
from leftVisitTask in cc.DefaultIfEmpty()
|
||||||
select new ImageDownloadDto()
|
select new ImageDownloadDto()
|
||||||
|
|
@ -2004,7 +2004,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
public async Task<List<Guid?>> GetTrialUnreadVisitList(Guid trialId)
|
public async Task<List<Guid?>> GetTrialUnreadVisitList(Guid trialId)
|
||||||
{
|
{
|
||||||
|
|
||||||
var subjectVisitList = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId!=null).Select(t => t.SourceSubjectVisitId)
|
var subjectVisitList = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId != null).Select(t => t.SourceSubjectVisitId)
|
||||||
.Distinct().ToListAsync();
|
.Distinct().ToListAsync();
|
||||||
|
|
||||||
return subjectVisitList;
|
return subjectVisitList;
|
||||||
|
|
@ -2054,6 +2054,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
|
|
||||||
TableQuestionRowPictureList = t.LesionList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(),
|
TableQuestionRowPictureList = t.LesionList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(),
|
||||||
|
|
||||||
|
SegmentationFileList = t.SegmentationList.Select(c => new TrialKeyPicturePath { PicturePath = c.SEGUrl, SegmentationName=c.SegmentationName, OtherPicturePath = string.Empty }).ToList(),
|
||||||
|
|
||||||
Id = t.Id,
|
Id = t.Id,
|
||||||
//裁判选择结果
|
//裁判选择结果
|
||||||
JudgeResultTaskId = t.JudgeVisitTask.JudgeResultTaskId,
|
JudgeResultTaskId = t.JudgeVisitTask.JudgeResultTaskId,
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,9 @@ public class VisitTask : BaseFullAuditEntity
|
||||||
{
|
{
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public List<Segmentation> SegmentationList { get; set; } = new List<Segmentation>();
|
||||||
|
|
||||||
//针对肿瘤学任务的 导航属性,关联肿瘤学结果
|
//针对肿瘤学任务的 导航属性,关联肿瘤学结果
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public List<ReadingOncologyTaskInfo> OncologyResultList { get; set; }
|
public List<ReadingOncologyTaskInfo> OncologyResultList { get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue