diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index c4abf5844..c3f127a64 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -11656,6 +11656,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageClinicalDataToBeConfirmList(IRaCIS.Core.Application.Contracts.ImageClinicalDataToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -11664,6 +11665,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetCRCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -11681,6 +11683,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageReUploadToBeDoneList(IRaCIS.Core.Application.Contracts.ImageReUploadToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -11689,14 +11692,16 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageSubmittedToBeDoneList(IRaCIS.Core.Application.Contracts.ImageSubmittedToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            加急影像提交   --CRC 待办
+             加急影像提交   --CRC 待办
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageQualityToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQualityToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -11705,14 +11710,16 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetQCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            QC 质疑
+             QC 质疑
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetIRImageReadingToBeDoneList(IRaCIS.Core.Application.Contracts.IRImageReadingToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -11730,6 +11737,7 @@
             IR医学反馈 
             </summary>
             <param name="inQuery"></param>
+            <param name="_taskMedicalReviewRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetMIMMedicalCommentsToBeDoneList(IRaCIS.Core.Application.Contracts.MedicalCommentsToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial})">
@@ -11738,6 +11746,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_taskMedicalReviewRepository"></param>
+            <param name="_trialReadingCriterionRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetMedicalCommentsFirstToBeDone(IRaCIS.Core.Application.Contracts.MedicalCommentsFirstToBeDoneQuery,IRaCIS.Core.Application.Interfaces.ITaskMedicalReviewService)">
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index 2695eb31f..5e322a36f 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Service
             var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskAllocationRuleDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             //所有标准都是一样  后台只返回任意一个标准的就好了
-            var trialTaskConfig = _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
+            var trialTaskConfig = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             return (list, trialTaskConfig);
         }
diff --git a/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs b/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs
index 67925dce8..1c17ceebe 100644
--- a/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs
@@ -23,7 +23,7 @@ namespace IRaCIS.Application.Services
         public async Task<ResearchPublicationDTO> GetResearchPublication(Guid doctorId)
         {
             var doctorScientificResearchInfo = await researchPublicationRepository.Where(o => o.DoctorId == doctorId)
-                .ProjectTo<ResearchPublicationDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+                .ProjectTo<ResearchPublicationDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             return doctorScientificResearchInfo;
         }
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 915c2a035..0c91f8dc2 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -95,7 +95,7 @@ namespace IRaCIS.Core.Application.Service
 			  .ForMember(d => d.ValueCN, u => u.MapFrom(s => s.Dictionary.ValueCN));
 
             CreateMap<ReadingTaskQuestionMark, GetTableAnswerRowInfoOutDto>()
-                .ForMember(d => d.FristAddTaskId, u => u.MapFrom(s => s.FirstAddTaskId.Value));
+                .ForMember(d => d.FristAddTaskId, u => u.MapFrom(s => s.FirstAddTaskId!.Value));
             CreateMap<ReadingTaskQuestionMark, QuestionMarkInfo>();
             CreateMap<QuestionMarkInfo, ReadingTaskQuestionMark>();
             //CreateMap<ReadingClinicalDataView, GetReadingClinicalDataListOutDto>();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 83e1268e8..0b4096b78 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index f396c0497..6a535fc53 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 1998d5da7..957bb2abf 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index bd528675f..635651259 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index 2e26f574a..7e2263f4d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index f2f5a253d..4d1125b99 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -18,7 +18,6 @@ using IRaCIS.Core.Application.Filter;
 using static IRaCIS.Core.Domain.Share.StaticData;
 using IRaCIS.Core.Application.Service;
 using DocumentFormat.OpenXml.Office.CustomUI;
-using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Core.Application
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 1d1de0f11..0a55d9f12 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -505,8 +505,8 @@ namespace IRaCIS.Core.Application.Services
                         })
                         .ToList();
 
-                    series.WindowWidth = instanceList.FirstOrDefault()?.WindowWidth;
-                    series.WindowCenter = instanceList.FirstOrDefault()?.WindowCenter;
+                    series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+                    series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                 });
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 8128b08df..051c8868a 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -83,7 +83,7 @@ namespace IRaCIS.Application.Services
         public async Task<IResponseOutput> TestDistributedLock( )
         {
 
-            _repository.Where<User>().Select(t => t.FullName).FirstOrDefault();
+         await   _repository.Where<User>().Select(t => t.FullName).FirstNotNullAsync();
 
             Console.WriteLine($"我进来了当前值是：" + IntValue);
             _logger.LogWarning($"我进来了当前值是：" + IntValue);