修改
continuous-integration/drone/push Build is running Details

Test_IRC_Net8
he 2025-02-25 14:24:44 +08:00
parent 7770fc264b
commit 8496e6bcd7
5 changed files with 14 additions and 12 deletions

View File

@ -44,9 +44,9 @@ public class GetTrialFileTypeDataInDto
public Guid TrialId { get; set; }
/// <summary>
/// 是否授权
/// 是否启用
/// </summary>
public bool IsAuthorizedView { get; set; } = false;
public bool IsEnable { get; set; } = false;
}
public class CopySystemFileTypeToTrialInDto
{

View File

@ -138,15 +138,20 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
TrialId = inDto.TrialId
});
var trialFileTypeList = await _trialFileTypeRepository.Where(x=>x.TrialId==inDto.TrialId)
.WhereIf(inDto.IsAuthorizedView, x => x.IsAuthorizedView)
.WhereIf(inDto.IsEnable, x => x.IsEnable)
.OrderBy(x=>x.ShowOrder)
.ProjectTo<TrialFileTypeView>(_mapper.ConfigurationProvider)
.ToListAsync();
List<TrialFileTypeData> result= trialFileTypeList.GroupBy(x =>new { x.ArchiveTypeEnum},(key,list)=>new TrialFileTypeData() {
ArchiveTypeEnum= key.ArchiveTypeEnum,
TrialFileTypeList=list.OrderBy(y=>y.ShowOrder).ToList(),
}).OrderBy(x=>x.ArchiveTypeEnum).ToList();
List<TrialFileTypeData> result = new List<TrialFileTypeData>();
foreach (ArchiveType type in Enum.GetValues(typeof(ArchiveType)))
{
result.Add(new TrialFileTypeData()
{
ArchiveTypeEnum = type,
TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).ToList()
});
}
return new GetTrialFileTypeDataOutDto() { TrialFileTypeDataList = result };

View File

@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<NoneDicomStudy> _noneDicomStudyRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<Trial> _trialRepository,
IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
IRepository<UserLog> _userLogRepository,
IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,

View File

@ -68,7 +68,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost]
[HttpPost("{id:guid}")]
public async Task<IResponseOutput> DeleteTrialFileType(Guid id)
{
var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);

View File

@ -127,9 +127,6 @@ public class TrialFileType : BaseFullAuditEntity
[Comment("是否确认收入项")]
public bool IsConfirmRecord { get; set; }
[Comment("是否授权查看")]
public bool IsAuthorizedView { get; set; }
[Comment("首次定稿日期")]
public DateOnly FirstFinalDate { get; set; }