修改

IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs

@@ -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
 {

IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs

@@ -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 };
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -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,

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -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);