修改

IRaCIS.Core.API/Startup.cs

@@ -23,6 +23,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using Invio.Extensions.Authentication.JwtBearer;
 using Microsoft.AspNetCore.SignalR;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.StaticFiles;
 
 namespace IRaCIS.Core.API
 {

IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs

@@ -0,0 +1,54 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.FileProviders.Physical;
+using Microsoft.Extensions.Options;
+using System.IO;
+
+namespace IRaCIS.Core.API
+{
+    
+
+        //public class MultiDiskStaticFilesMiddleware 
+        //{
+        //    public MultiDiskStaticFilesMiddleware(RequestDelegate next,IWebHostEnvironment webHostEnvironment, StaticFileOptions options)
+        //        : base(next, webHostEnvironment, options)
+        //    {
+        //    }
+
+        //    public override async Task InvokeAsync(HttpContext context)
+        //    {
+        //        try
+        //        {
+        //            await base.InvokeAsync(context);
+        //        }
+        //        catch (FileNotFoundException)
+        //        {
+        //            var disks = GetDisks();
+
+        //            foreach (var disk in disks)
+        //            {
+        //                var fileInfo = new PhysicalFileInfo(new FileInfo(Path.Combine(disk, Options.RequestPath.Value)));
+        //                if (fileInfo.Exists)
+        //                {
+        //                    await SendFileAsync(context, fileInfo);
+        //                    return;
+        //                }
+        //            }
+
+        //            await Next.Invoke(context);
+        //        }
+        //    }
+
+        //    private string[] GetDisks()
+        //    {
+        //        // 获取系统中所有可用的磁盘
+        //        return DriveInfo.GetDrives()
+        //            .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)
+        //            .Select(d => d.RootDirectory.FullName)
+        //            .ToArray();
+        //    }
+        //}
+    
+}

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -1319,7 +1319,7 @@ namespace IRaCIS.Core.Application.Service
                         IsNeedClinicalDataSign = reReadingVisitTask.IsNeedClinicalDataSign,
                         IsClinicalDataSign = reReadingVisitTask.IsClinicalDataSign,
                         BeforeConvertedTaskId = reReadingVisitTask.BeforeConvertedTaskId,
-
+                        ReReadingApplyState= ReReadingApplyState.Default,
                         // TaskAllocationState = reReadingVisitTask.TaskAllocationState,
                         // AllocateTime = DateTime.Now,
                         //DoctorUserId = reReadingVisitTask.DoctorUserId,

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1083,10 +1083,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.ImageFilterState != ImageFilterState.Finished) ?
                 t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Min(t => t.SubjectVisit.VisitNum) : true)
 
-                .Where(t => t.TrialReadingCriterion.IsAutoCreate == false && t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.ImageFilterState != ImageFilterState.Finished) ?
-                t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Min(t => t.SubjectVisit.VisitNum) : true)
-
-
              
                 .Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
                 //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
@@ -1115,7 +1111,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 //已读任务量
                 HaveReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
 
-                ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || y.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed),
+                ExistReadingApply = x.Any(y => (y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && y.TrialReadingCriterionId == trialReadingCriterionId) || y.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed),
 
                 //查出所有未读的  未读的可读的  在这个列表基础上 过滤下   y.IsFrontTaskNeedSignButNotSign==false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)  这样容易排错 确认这三个字段是否维护有误
                 UnReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).OrderBy(x => x.VisitTaskNum)