修改阅片标准

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

@@ -65,9 +65,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
         public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId,bool isHaveSigned=true)
         {
             var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
-                .WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null)
                 .OrderBy(t => t.ShowOrder)
-                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType })
+                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType , ReadingInfoSignTime=t.ReadingInfoSignTime})
                 .ToListAsync();
 
             if (list.Count == 0)
@@ -75,7 +74,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 throw new BusinessValidationFailedException("该项目还未确认任何一个阅片标准");
 
             }
-            return list;
+
+          
+
+
+            return list.AsQueryable().WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null).ToList();
         }
 
 

IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs

@@ -294,6 +294,8 @@ namespace IRaCIS.Application.Contracts
         public ReadingMethod ReadingType { get; set; }
 
         public CriterionType? CriterionType { get; set; }
+
+        public DateTime? ReadingInfoSignTime { get; set; }
     }
 
     public class TrialCriterionReadingCategory