diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs
index 399200c29..7ac86d02a 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs
@@ -44,9 +44,9 @@ public class GetTrialFileTypeDataInDto
public Guid TrialId { get; set; }
///
- /// 是否授权
+ /// 是否启用
///
- public bool IsAuthorizedView { get; set; } = false;
+ public bool IsEnable { get; set; } = false;
}
public class CopySystemFileTypeToTrialInDto
{
diff --git a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs
index b774466b5..e151035a7 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs
@@ -138,15 +138,20 @@ public class TrialFileTypeService(IRepository _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(_mapper.ConfigurationProvider)
.ToListAsync();
- List 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 result = new List();
+ 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 };
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index aa5fc43b0..058b5e335 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service
IRepository _noneDicomStudyRepository,
IRepository _visitTaskRepository,
IRepository _trialRepository,
- IRepository _noneDicomStudyFileRepository,
+ IRepository _noneDicomStudyFileRepository,
IRepository _readingNoneDicomMarkRepository,
IRepository _userLogRepository,
IRepository _readingTableQuestionAnswerRepository,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
index 9c05a10bd..62a0f6bbd 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
@@ -68,7 +68,7 @@ namespace IRaCIS.Core.Application.Service
///
///
///
- [HttpPost]
+ [HttpPost("{id:guid}")]
public async Task DeleteTrialFileType(Guid id)
{
var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
diff --git a/IRaCIS.Core.Domain/FileRecord/FileType.cs b/IRaCIS.Core.Domain/FileRecord/FileType.cs
index ae48dbd2c..18573a2d2 100644
--- a/IRaCIS.Core.Domain/FileRecord/FileType.cs
+++ b/IRaCIS.Core.Domain/FileRecord/FileType.cs
@@ -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; }