Merge branch 'Test.Study' into Uat.Study

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -118,8 +118,8 @@ namespace IRaCIS.Api.Controllers
                 {
                     Expires = DateTime.Now.AddMonths(1),
                     HttpOnly = true, // 确保 cookie 只能通过 HTTP 访问
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
+                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Unspecified, // 设置 SameSite 属性
-                    Secure = true // 确保 cookie 只能通过 HTTPS 访问
+                    Secure = false // 确保 cookie 只能通过 HTTPS 访问
                 };
 
                 HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);

IRaCIS.Core.API/Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Test_Study"
       },
-      "applicationUrl": "http://localhost:6000"
+      "applicationUrl": "http://localhost:6100"
     }
   }
 }

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -10558,6 +10558,20 @@
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.ReplaceQCTaskActionUser(System.Guid,System.Guid)">
             <summary>替换当前领取人 </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.CollectNextIQCQuality(IRaCIS.Core.Application.Contracts.GetNextIQCQualityInDto)">
+            <summary>
+            领取下一个质控任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.GetNextIQCQuality(IRaCIS.Core.Application.Contracts.GetNextIQCQualityInDto)">
+            <summary>
+            获取下一个质控任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.ObtainOrCancelQCTask(System.Guid,System.Guid,System.Boolean)">
             <summary>
             手动领取 或者取消 QC任务

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs

@@ -277,6 +277,7 @@ namespace IRaCIS.Application.Services
                .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
                .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
+               .OrderBy(x=>x.CreateTime)
                .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
             return trialClinicalDataList;
         }

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -189,6 +189,8 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                  .WhereIf(!inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
+                .Include(x=>x.ClinicalDataTrialSet)
+                .OrderBy(x=>x.ClinicalDataTrialSet.CreateTime)
                 .Select(x => new GetCRCClinicalDataOutDto()
                 {
                     Id = x.Id,

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
+        private readonly IRepository<ReadingCustomTag> _readingCustomTagRepository;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
         private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
         private readonly IRepository<Subject> _subjectRepository;
@@ -43,6 +44,7 @@ namespace IRaCIS.Core.Application.Services
                  IRepository<DicomInstance> dicomInstanceRepository,
                 IRepository<VisitTask> visitTaskRepository,
                    IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
+                     IRepository<ReadingCustomTag> readingCustomTagRepository,
               IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,
               IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
             IRepository<Subject> subjectRepository,
@@ -60,6 +62,7 @@ namespace IRaCIS.Core.Application.Services
             this._dicomInstanceRepository = dicomInstanceRepository;
             this._visitTaskRepository = visitTaskRepository;
             this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
+            this._readingCustomTagRepository = readingCustomTagRepository;
             this._noneDicomStudyFileRepository = noneDicomStudyFileRepository;
             this._readingPeriodPlanRepository = readingPeriodPlanRepository;
             _subjectRepository = subjectRepository;
@@ -325,6 +328,17 @@ namespace IRaCIS.Core.Application.Services
             }).ToListAsync();
 
 
+            var tag = await _readingCustomTagRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).Select(x => new
+            {
+                ShowOrder=  0,
+                RowIndex= 0m,
+                x.SeriesId,
+                x.StudyId,
+                x.InstanceId,
+            }).ToListAsync();
+
+            thisRowinfo.AddRange(tag);
+
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
 
             if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)