IRC_NewDev
parent
045e9346ad
commit
8f08746377
|
@ -1442,6 +1442,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 是否是第一次转化的任务
|
/// 是否是第一次转化的任务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsFirstChangeTask { get; set; } = false;
|
public bool IsFirstChangeTask { get; set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 融合的PTSeriesId
|
||||||
|
/// </summary>
|
||||||
|
public Guid? PTSeriesId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 融合的CTSeriesId
|
||||||
|
/// </summary>
|
||||||
|
public Guid? CTSeriesId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// StudyId
|
||||||
|
/// </summary>
|
||||||
|
public Guid? OtherStudyId { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetVisitReadingQuestionOutDto
|
public class GetVisitReadingQuestionOutDto
|
||||||
|
|
|
@ -612,6 +612,21 @@ namespace IRaCIS.Application.Services
|
||||||
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
var visitaskIds = result.Select(x => x.VisitTaskId).ToList();
|
||||||
|
|
||||||
|
var otherStudys = await _readingTableAnswerRowInfoRepository.Where(x => visitaskIds.Contains(x.VisitTaskId))
|
||||||
|
.Where(x=>x.CTSeriesId!=null&&x.PTSeriesId!=null)
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.OtherStudyId,
|
||||||
|
x.CTSeriesId,
|
||||||
|
x.PTSeriesId,
|
||||||
|
x.VisitTaskId,
|
||||||
|
x.UpdateTime
|
||||||
|
}).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
foreach (var item in result)
|
foreach (var item in result)
|
||||||
{
|
{
|
||||||
var clinicalDataList = await _readingClinicalDataService.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
|
var clinicalDataList = await _readingClinicalDataService.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
|
||||||
|
@ -623,6 +638,14 @@ namespace IRaCIS.Application.Services
|
||||||
});
|
});
|
||||||
|
|
||||||
item.IsExistsClinicalData = clinicalDataList.Count > 0;
|
item.IsExistsClinicalData = clinicalDataList.Count > 0;
|
||||||
|
var otherStudy = otherStudys.Where(x => x.VisitTaskId == item.VisitTaskId).OrderByDescending(x => x.UpdateTime).FirstOrDefault();
|
||||||
|
if (otherStudy != null)
|
||||||
|
{
|
||||||
|
item.PTSeriesId = otherStudy.PTSeriesId;
|
||||||
|
item.CTSeriesId = otherStudy.CTSeriesId;
|
||||||
|
item.OtherStudyId = otherStudy.OtherStudyId;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue