@@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||
/// </summary>
|
||||
public List<StudyName> StudyNameList { get; set; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
|
||||
@@ -1040,7 +1040,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||
|
||||
public class TrialSPMConfigCommand
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public Guid Id { get; set; }
|
||||
|
||||
[Comment("SPM 参与中心调研")]
|
||||
public bool IsSPMJoinSiteSurvey { get; set; }
|
||||
@@ -1184,6 +1184,9 @@ namespace IRaCIS.Core.Application.Contracts
|
||||
|
||||
public class TrialBodyPartView
|
||||
{
|
||||
|
||||
public bool IsStudyUse { get; set; }
|
||||
|
||||
public string Code { get; set; }
|
||||
|
||||
|
||||
|
||||
@@ -503,8 +503,9 @@ namespace IRaCIS.Core.Application
|
||||
&& x.ReadingCriterionPageId == null)
|
||||
.ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
|
||||
|
||||
return (result, new {
|
||||
ReadingVersionEnum= trialCriterion.ReadingVersionEnum
|
||||
return (result, new
|
||||
{
|
||||
ReadingVersionEnum = trialCriterion.ReadingVersionEnum
|
||||
});
|
||||
}
|
||||
|
||||
@@ -585,7 +586,7 @@ namespace IRaCIS.Core.Application
|
||||
|
||||
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
|
||||
{
|
||||
ReadingToolList=inDto.ReadingToolList,
|
||||
ReadingToolList = inDto.ReadingToolList,
|
||||
IsImageFilter = inDto.IsImageFilter,
|
||||
ImageDownloadEnum = inDto.ImageDownloadEnum,
|
||||
ImageUploadEnum = inDto.ImageUploadEnum,
|
||||
@@ -1334,7 +1335,35 @@ namespace IRaCIS.Core.Application
|
||||
/// <returns></returns>
|
||||
public async Task<IResponseOutput<List<TrialBodyPartView>>> GetTrialBodyPartList(Guid trialId)
|
||||
{
|
||||
var list = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialBodyPartList).Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, Id = t.Id, IsHandAdd = t.IsHandAdd }).OrderBy(t=>t.Name).ToListAsync();
|
||||
var list = await _trialRepository.Where(t => t.Id == trialId)
|
||||
.SelectMany(t => t.TrialBodyPartList)
|
||||
.Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, Id = t.Id, IsHandAdd = t.IsHandAdd })
|
||||
.OrderBy(t => t.Name).ToListAsync();
|
||||
|
||||
|
||||
var useBodyPart = _trialRepository.Where(t => t.Id == trialId).Select(t => new
|
||||
{
|
||||
DicomBodyPartList = t.StudyList.Where(t => t.BodyPartForEdit != "")
|
||||
.Select(c => c.BodyPartForEdit)
|
||||
.Distinct(),
|
||||
NoneDicomBodyPartList = t.NoneDicomStudyList.Where(t => t.BodyPart != "")
|
||||
.Select(c => c.BodyPart)
|
||||
.Distinct(),
|
||||
|
||||
}).FirstOrDefault();
|
||||
|
||||
foreach (var item in list)
|
||||
{
|
||||
var useBodyPartList = new List<string>();
|
||||
if (useBodyPart != null)
|
||||
{
|
||||
useBodyPartList = useBodyPart.DicomBodyPartList.Union(useBodyPart.NoneDicomBodyPartList).Distinct().ToList();
|
||||
}
|
||||
|
||||
item.IsStudyUse = useBodyPartList.Any(t => t == item.Name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return ResponseOutput.Ok(list);
|
||||
}
|
||||
@@ -1417,7 +1446,7 @@ namespace IRaCIS.Core.Application
|
||||
[HttpPost]
|
||||
public async Task<IResponseOutput> UpdateTrialStudyNameList(UpdateTrialStudyNameListInDto inDto)
|
||||
{
|
||||
|
||||
|
||||
|
||||
var trial = await _trialRepository.FirstOrDefaultAsync(x => x.Id == inDto.TrialId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user