查询条件修改

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -370,6 +370,7 @@ namespace IRaCIS.Core.Application.ViewModel
         [NotDefault]
         public Guid TrialId { get; set; }
 
+
 		public Guid? SiteId { get; set; }
 
         public Guid? SubjectId { get; set; }

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

@@ -835,10 +835,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .Where(t => t.RequestReReadingType == RequestReReadingType.DocotorApply)
                 .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.Id)
                 .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
-
+		    	 .WhereIf(queryVisitTask.RequestReReadingResultEnum != null, t => t.RequestReReadingResultEnum == queryVisitTask.RequestReReadingResultEnum)
 				.WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!))
                 .WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
+				   .WhereIf(queryVisitTask.ReadingCategory != null, t => t.OriginalReReadingTask.ReadingCategory == queryVisitTask.ReadingCategory)
 				 .WhereIf(queryVisitTask.ReReadingApplyState != null, t => t.OriginalReReadingTask.ReReadingApplyState == queryVisitTask.ReReadingApplyState)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
@@ -1174,7 +1175,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var result = new List<IRUnReadSubjectView>();
 
-            var propName = string.IsNullOrWhiteSpace(inDto.Page!.SortField) ? "UrgentCount" : inDto.Page.SortField;
+            var propName = string.IsNullOrWhiteSpace(inDto.Page!.SortField) ? "UnReadCanReadTaskCount" : inDto.Page.SortField;
 
             var visitTaskOrderQuery = inDto.Page.Asc ? visitTaskQuery.OrderBy(propName) : visitTaskQuery.OrderBy(propName + " desc");
             if (inDto.Page != null)

IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs

@@ -129,7 +129,7 @@ namespace IRaCIS.Application.Contracts
 
         public string LatestBlindName { get; set; } = string.Empty;
 
-        public bool IsMissingImages => MissingSubmmitCount > 0;
+        public bool IsMissingImages { get; set; } 
 
 		public Guid LatestSubmitSubjectVisitId { get; set; }
 
@@ -149,6 +149,8 @@ namespace IRaCIS.Application.Contracts
 
         public string Sex { get; set; } = string.Empty;
 
+
+		public bool? IsMissingImages { get; set; }
 		public Guid? SiteId { get; set; }
         public SubjectStatus? Status { get; set; } 
     }

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

@@ -121,10 +121,12 @@ namespace IRaCIS.Application.Services
                   .WhereIf(!string.IsNullOrWhiteSpace(param.Name), t => t.ShortName.Contains(param.Name))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.Sex), t => t.Sex.Contains(param.Sex))
                   .WhereIf(param.Status != null, t => t.Status == param.Status)
+					  
 				  .WhereIf(param.SiteId != null, t => t.SiteId == param.SiteId)
                   // CRC  只负责他管理site的受试者
                   .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
-                  .ProjectTo<SubjectQueryView>(_mapper.ConfigurationProvider);
+                  .ProjectTo<SubjectQueryView>(_mapper.ConfigurationProvider)
+				 .WhereIf(param.IsMissingImages != null, t => t.IsMissingImages == param.IsMissingImages);
 
 
             var pageList = await subjectQuery.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == string.Empty ? "Code" : param.SortField, param.Asc);

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

@@ -66,6 +66,7 @@ namespace IRaCIS.Core.Application.Service
 
                 
                 .ForMember(d => d.MissingSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.VisitNum <s.LatestSubjectVisit.VisitNum  && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
+				  .ForMember(d => d.IsMissingImages, u => u.MapFrom(s => s.SubjectVisitList.Any(t => t.VisitNum < s.LatestSubjectVisit.VisitNum && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
 				.ForMember(d => d.InPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == true)))
                 .ForMember(d => d.LostVisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.IsLostVisit)))
                 .ForMember(d => d.InPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == true)))