Compare commits

..

No commits in common. "c6920a1995d0a6afc8c976a726222b0624871a43" and "3981f2cd509950dd82f19cd6ed58a03c0b184421" have entirely different histories.

5 changed files with 3 additions and 46 deletions

View File

@ -376,24 +376,10 @@ namespace IRaCIS.Core.Application.Contracts
public string SignCode { get; set; } = string.Empty; public string SignCode { get; set; } = string.Empty;
} }
public class KeyFile
{
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 文件路径
/// </summary>
public string FilePath { get; set; } = string.Empty;
}
public class GetTrialReadingInfoOutDto public class GetTrialReadingInfoOutDto
{ {
public ReadingVersion ReadingVersionEnum { get; set; } public ReadingVersion ReadingVersionEnum { get; set; }
public List<KeyFile> KeyFileList { get; set; }
/// <summary> /// <summary>
/// 阅片工具 /// 阅片工具
/// </summary> /// </summary>
@ -929,8 +915,6 @@ namespace IRaCIS.Core.Application.Contracts
{ {
public List<string> ReadingToolList { get; set; } = new List<string>() { }; public List<string> ReadingToolList { get; set; } = new List<string>() { };
public List<KeyFile> KeyFileList { get; set; }=new List<KeyFile>() { };
public bool IsImageFilter { get; set; } public bool IsImageFilter { get; set; }
public string CriterionModalitys { get; set; } public string CriterionModalitys { get; set; }

View File

@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application
IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository, IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository,
IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository, IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
IRepository<ReadingCriterionPage> _readingCriterionPageRepository, IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
IRepository<SystemCriterionKeyFile> _systemCriterionKeyFileRepository, IRepository<SystemCriterionKeyFile> _systemCriterionKeyFileRepository,
IOSSService oSSService, IOSSService oSSService,
IRepository<TrialCriterionKeyFile> _trialCriterionKeyFileRepository, IRepository<TrialCriterionKeyFile> _trialCriterionKeyFileRepository,
@ -655,22 +656,6 @@ namespace IRaCIS.Core.Application
}); });
List<TrialCriterionKeyFile> keyFileList = new List<TrialCriterionKeyFile>();
await _trialCriterionKeyFileRepository.BatchDeleteNoTrackingAsync(t => t.TrialCriterionId == inDto.TrialReadingCriterionId);
if (inDto.KeyFileList != null && inDto.KeyFileList.Count > 0)
{
foreach (var keyFile in inDto.KeyFileList)
{
keyFileList.Add(new TrialCriterionKeyFile()
{
TrialCriterionId = inDto.TrialReadingCriterionId,
FileName = keyFile.FileName,
FilePath = keyFile.FilePath
});
}
await _trialCriterionKeyFileRepository.AddRangeAsync(keyFileList);
}
//判断是否存在附加评估 //判断是否存在附加评估
if (inDto.IsAdditionalAssessment) if (inDto.IsAdditionalAssessment)
{ {

View File

@ -235,10 +235,9 @@ namespace IRaCIS.Core.Application.Service
.ForMember(t => t.TrialUserList, u => u.Ignore()); .ForMember(t => t.TrialUserList, u => u.Ignore());
CreateMap<TrialCriterionKeyFile, KeyFile>();
CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>() CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>()
.ForMember(t => t.KeyFileList, u => u.MapFrom(c => c.KeyFileList))
.ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys)) .ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys))
.ForMember(t => t.TrialReadingCriterionId, u => u.MapFrom(c => c.Id)) .ForMember(t => t.TrialReadingCriterionId, u => u.MapFrom(c => c.Id))
.ForMember(t => t.TrialReadingCriterionName, u => u.MapFrom(c => c.CriterionName)); .ForMember(t => t.TrialReadingCriterionName, u => u.MapFrom(c => c.CriterionName));

View File

@ -17,10 +17,6 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
[JsonIgnore] [JsonIgnore]
public List<TrialCriterionKeyFile> KeyFileList = new List<TrialCriterionKeyFile>();
[JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>(); public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
[JsonIgnore] [JsonIgnore]

View File

@ -6,20 +6,13 @@ namespace IRaCIS.Core.Domain.Models;
[Table("TrialCriterionKeyFile")] [Table("TrialCriterionKeyFile")]
public class TrialCriterionKeyFile : BaseAddAuditEntity public class TrialCriterionKeyFile : BaseAddAuditEntity
{ {
#region 导航属性
[ForeignKey("TrialCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
/// <summary> /// <summary>
/// 姓名标准Id /// 姓名标准Id
/// </summary> /// </summary>
public Guid TrialCriterionId { get; set; } public Guid TrialCriterionId { get; set; }
/// <summary> /// <summary>
/// 文件名称 /// 问价名称
/// </summary> /// </summary>
public string FileName { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty;