Compare commits

..

No commits in common. "217b8713ffad0b7af0c4e3a5254c818800eecefd" and "f050416265773094a5a265dbdfbe83b4879f6ec4" have entirely different histories.

7 changed files with 3 additions and 43 deletions

View File

@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpGet]
public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetNoneDicomStudyList(
public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(
[FromQuery, NotDefault] Guid subjectVisitId,
[FromQuery] Guid? nonedicomStudyId,
[FromQuery] bool isFilterZip,
@ -63,10 +63,7 @@ namespace IRaCIS.Core.Application.Contracts
}
var list = await noneDicomStudyQueryable.ToListAsync();
var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
return ResponseOutput.Ok(list, config) ;
return await noneDicomStudyQueryable.ToListAsync();
}

View File

@ -15,8 +15,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsCriticalSequence { get; set; } = false;
public string StudyName { get; set; }
public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();

View File

@ -18,8 +18,6 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public int Type { get; set; }
public string StudyName { get; set; } = String.Empty;
public string Modality { get; set; } = String.Empty;
public string BodyPart { get; set; } = String.Empty;
@ -388,8 +386,6 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public string BodyPartForEdit { get; set; } = String.Empty;
public string StudyName { get; set; } = string.Empty;
public string ModalityForEdit { get; set; } = string.Empty;
public bool IsHaveUploadFailed { get; set; }

View File

@ -166,13 +166,6 @@ namespace IRaCIS.Core.Application.Contracts
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }
public List<StudyName> StudyNameList { get; set; }
public List<string> ImageFormatList { get; set; }
public bool IsShowStudyName { get; set; } = false;
}

View File

@ -824,8 +824,6 @@ namespace IRaCIS.Core.Application.Image.QA
study.BodyPartForEdit = updateModalityCommand.BodyPart;
study.ModalityForEdit = updateModalityCommand.Modality;
study.StudyName = updateModalityCommand.StudyName;
await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.StudyId == studyId, r => new DicomSeries() { BodyPartForEdit = updateModalityCommand.BodyPart });
}

View File

@ -69,23 +69,6 @@ namespace IRaCIS.Core.Application.Contracts
public List<string> ModalityList { get; set; } = new List<string>();
/// <summary>
/// 是否显示检查名称
/// </summary>
public bool IsShowStudyName { get; set; } = false;
/// <summary>
/// 检查名称列表
/// </summary>
public List<StudyName> StudyNameList { get; set; }
/// <summary>
/// 图像格式
/// </summary>
[StringLength(2000)]
public List<string> ImageFormatList { get; set; } = new List<string>();
public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }

View File

@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// 图像格式
/// </summary>
[StringLength(2000)]
public List<string> ImageFormatList { get; set; } = new List<string>() {"jpg","jpeg","png","bmp","pdf","zip" };
public List<string> ImageFormatList { get; set; } = new List<string>();
#endregion
#region 邮件配置
@ -325,11 +325,6 @@ public class StudyName
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string EnName { get; set; }
}
[ComplexType]