Compare commits
No commits in common. "c6920a1995d0a6afc8c976a726222b0624871a43" and "3981f2cd509950dd82f19cd6ed58a03c0b184421" have entirely different histories.
c6920a1995
...
3981f2cd50
|
|
@ -376,24 +376,10 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
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 ReadingVersion ReadingVersionEnum { get; set; }
|
||||
|
||||
public List<KeyFile> KeyFileList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 阅片工具
|
||||
/// </summary>
|
||||
|
|
@ -929,8 +915,6 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
{
|
||||
public List<string> ReadingToolList { get; set; } = new List<string>() { };
|
||||
|
||||
public List<KeyFile> KeyFileList { get; set; }=new List<KeyFile>() { };
|
||||
|
||||
public bool IsImageFilter { get; set; }
|
||||
public string CriterionModalitys { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application
|
|||
IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository,
|
||||
IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
|
||||
IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
|
||||
|
||||
IRepository<SystemCriterionKeyFile> _systemCriterionKeyFileRepository,
|
||||
IOSSService oSSService,
|
||||
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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -235,10 +235,9 @@ namespace IRaCIS.Core.Application.Service
|
|||
.ForMember(t => t.TrialUserList, u => u.Ignore());
|
||||
|
||||
|
||||
CreateMap<TrialCriterionKeyFile, KeyFile>();
|
||||
|
||||
|
||||
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.TrialReadingCriterionId, u => u.MapFrom(c => c.Id))
|
||||
.ForMember(t => t.TrialReadingCriterionName, u => u.MapFrom(c => c.CriterionName));
|
||||
|
|
|
|||
|
|
@ -17,10 +17,6 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
|
|||
|
||||
[JsonIgnore]
|
||||
|
||||
public List<TrialCriterionKeyFile> KeyFileList = new List<TrialCriterionKeyFile>();
|
||||
|
||||
[JsonIgnore]
|
||||
|
||||
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
|
||||
[JsonIgnore]
|
||||
|
||||
|
|
|
|||
|
|
@ -6,20 +6,13 @@ namespace IRaCIS.Core.Domain.Models;
|
|||
[Table("TrialCriterionKeyFile")]
|
||||
public class TrialCriterionKeyFile : BaseAddAuditEntity
|
||||
{
|
||||
|
||||
#region 导航属性
|
||||
[ForeignKey("TrialCriterionId")]
|
||||
[JsonIgnore]
|
||||
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 姓名标准Id
|
||||
/// </summary>
|
||||
public Guid TrialCriterionId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 文件名称
|
||||
/// 问价名称
|
||||
/// </summary>
|
||||
public string FileName { get; set; } = string.Empty;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue